yiisoft / yii2

framework/db/ActiveQuery.php

Doc Comments +1 added lines, -1 removed lines

@@ -397,7 +397,7 @@
      * not mean, that the relations are populated from the query result. An
      * extra query will still be performed to bring in the related data.
      * Defaults to `true`.
-     * @param string|array $joinType the join type of the relations specified in `$with`.
+     * @param string $joinType the join type of the relations specified in `$with`.
      * When this is a string, it applies to all relations specified in `$with`. Use an array
      * in the format of `relationName => joinType` to specify different join types for different relations.
      * @return $this the query object itself

framework/validators/Validator.php

Doc Comments +1 added lines, -1 removed lines

@@ -288,7 +288,7 @@
     /**
      * Validates a given value.
      * You may use this method to validate a value out of the context of a data model.
-     * @param mixed $value the data value to be validated.
+     * @param string|null $value the data value to be validated.
      * @param string $error the error message to be returned, if the validation fails.
      * @return bool whether the data is valid.
      */

framework/helpers/BaseArrayHelper.php

Doc Comments +5 added lines, -5 removed lines

@@ -112,7 +112,7 @@ 
      * @param array $a array to be merged to
      * @param array $b array to be merged from. You can specify additional
      * arrays via third argument, fourth argument etc.
-     * @return array the merged array (the original arrays are not changed.)
+     * @return callable the merged array (the original arrays are not changed.)
      */
     public static function merge($a, $b)
     {
@@ -447,7 +447,7 @@ 
      * ```
      *
      * @param array $array the array that needs to be indexed or grouped
-     * @param string|\Closure|null $key the column name or anonymous function which result will be used to index the array
+     * @param null|string $key the column name or anonymous function which result will be used to index the array
      * @param string|string[]|\Closure[]|null $groups the array of keys, that will be used to group the input array
      * by one or more keys. If the $key attribute or its value for the particular element is null and $groups is not
      * defined, the array element will be discarded. Otherwise, if $groups is specified, array element will be added
@@ -567,8 +567,8 @@ 
      * ```
      *
      * @param array $array
-     * @param string|\Closure $from
-     * @param string|\Closure $to
+     * @param string $from
+     * @param string $to
      * @param string|\Closure $group
      * @return array
      */
@@ -623,7 +623,7 @@ 
      * To sort by multiple keys, provide an array of keys here.
      * @param int|array $direction the sorting direction. It can be either `SORT_ASC` or `SORT_DESC`.
      * When sorting by multiple keys with different sorting directions, use an array of sorting directions.
-     * @param int|array $sortFlag the PHP sort flag. Valid values include
+     * @param integer $sortFlag the PHP sort flag. Valid values include
      * `SORT_REGULAR`, `SORT_NUMERIC`, `SORT_STRING`, `SORT_LOCALE_STRING`, `SORT_NATURAL` and `SORT_FLAG_CASE`.
      * Please refer to [PHP manual](http://php.net/manual/en/function.sort.php)
      * for more details. When sorting by multiple keys with different sort flags, use an array of sort flags.

framework/helpers/BaseStringHelper.php

Doc Comments +1 added lines, -1 removed lines

@@ -355,7 +355,7 @@
      * Safely casts a float to string independent of the current locale.
      *
      * The decimal separator will always be `.`.
-     * @param float|int $number a floating point number or integer.
+     * @param double $number a floating point number or integer.
      * @return string the string representation of the number.
      * @since 2.0.13
      */

framework/db/pgsql/QueryBuilder.php

Unused Use Statements -1 removed lines

@@ -7,7 +7,6 @@
 
 namespace yii\db\pgsql;
 
-use yii\base\InvalidParamException;
 use yii\helpers\StringHelper;
 
 /**

framework/db/Schema.php

Doc Comments +2 added lines, -2 removed lines

@@ -403,7 +403,7 @@ 
      * Executes the INSERT command, returning primary key values.
      * @param string $table the table that new rows will be inserted into.
      * @param array $columns the column data (name => value) to be inserted into the table.
-     * @return array|false primary key values or false if the command fails
+     * @return string primary key values or false if the command fails
      * @since 2.0.4
      */
     public function insert($table, $columns)
@@ -609,7 +609,7 @@ 
     /**
      * Returns the cache key for the specified table name.
      * @param string $name the table name.
-     * @return mixed the cache key.
+     * @return string[] the cache key.
      */
     protected function getCacheKey($name)
     {

framework/web/Request.php

Doc Comments +3 added lines, -3 removed lines

@@ -499,7 +499,7 @@ 
 
     /**
      * Specifies the URI instance.
-     * @param UriInterface|\Closure|array $uri URI instance or its DI compatible configuration.
+     * @param UriInterface $uri URI instance or its DI compatible configuration.
      * @since 2.1.0
      */
     public function setUri($uri)
@@ -750,7 +750,7 @@ 
      * If the parameter does not exist, the second parameter passed to this method will be returned.
      * @param string $name the parameter name
      * @param mixed $defaultValue the default parameter value if the parameter does not exist.
-     * @return mixed the parameter value
+     * @return string the parameter value
      * @see getParsedBody()
      * @see setParsedBody()
      */
@@ -876,7 +876,7 @@ 
     /**
      * Return the server environment parameter by name.
      * @param string $name parameter name.
-     * @param mixed $default default value to return if the parameter does not exist.
+     * @param string $default default value to return if the parameter does not exist.
      * @return mixed parameter value.
      * @since 2.1.0
      */

framework/validators/IpValidator.php

Unused Use Statements -3 removed lines

@@ -9,10 +9,7 @@
 
 use Yii;
 use yii\base\InvalidConfigException;
-use yii\helpers\Html;
 use yii\helpers\IpHelper;
-use yii\helpers\Json;
-use yii\web\JsExpression;
 
 /**
  * The validator checks if the attribute value is a valid IPv4/IPv6 address or subnet.

framework/base/Controller.php

Doc Comments +1 added lines, -1 removed lines

@@ -241,7 +241,7 @@
      * where `Xyz` stands for the action ID. If found, an [[InlineAction]] representing that
      * method will be created and returned.
      * @param string $id the action ID.
-     * @return Action|null the newly created action instance. Null if the ID doesn't resolve into any action.
+     * @return Action the newly created action instance. Null if the ID doesn't resolve into any action.
      */
     public function createAction($id)
     {