Completed
Pull Request — 2.1 (#15488)
by Nikolay
37:27
created
framework/validators/Validator.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -288,7 +288,7 @@
 block discarded – undo
288 288
     /**
289 289
      * Validates a given value.
290 290
      * You may use this method to validate a value out of the context of a data model.
291
-     * @param mixed $value the data value to be validated.
291
+     * @param string|null $value the data value to be validated.
292 292
      * @param string $error the error message to be returned, if the validation fails.
293 293
      * @return bool whether the data is valid.
294 294
      */
Please login to merge, or discard this patch.
framework/helpers/BaseArrayHelper.php 1 patch
Doc Comments   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -112,7 +112,7 @@  discard block
 block discarded – undo
112 112
      * @param array $a array to be merged to
113 113
      * @param array $b array to be merged from. You can specify additional
114 114
      * arrays via third argument, fourth argument etc.
115
-     * @return array the merged array (the original arrays are not changed.)
115
+     * @return callable the merged array (the original arrays are not changed.)
116 116
      */
117 117
     public static function merge($a, $b)
118 118
     {
@@ -447,7 +447,7 @@  discard block
 block discarded – undo
447 447
      * ```
448 448
      *
449 449
      * @param array $array the array that needs to be indexed or grouped
450
-     * @param string|\Closure|null $key the column name or anonymous function which result will be used to index the array
450
+     * @param null|string $key the column name or anonymous function which result will be used to index the array
451 451
      * @param string|string[]|\Closure[]|null $groups the array of keys, that will be used to group the input array
452 452
      * by one or more keys. If the $key attribute or its value for the particular element is null and $groups is not
453 453
      * defined, the array element will be discarded. Otherwise, if $groups is specified, array element will be added
@@ -567,8 +567,8 @@  discard block
 block discarded – undo
567 567
      * ```
568 568
      *
569 569
      * @param array $array
570
-     * @param string|\Closure $from
571
-     * @param string|\Closure $to
570
+     * @param string $from
571
+     * @param string $to
572 572
      * @param string|\Closure $group
573 573
      * @return array
574 574
      */
@@ -623,7 +623,7 @@  discard block
 block discarded – undo
623 623
      * To sort by multiple keys, provide an array of keys here.
624 624
      * @param int|array $direction the sorting direction. It can be either `SORT_ASC` or `SORT_DESC`.
625 625
      * When sorting by multiple keys with different sorting directions, use an array of sorting directions.
626
-     * @param int|array $sortFlag the PHP sort flag. Valid values include
626
+     * @param integer $sortFlag the PHP sort flag. Valid values include
627 627
      * `SORT_REGULAR`, `SORT_NUMERIC`, `SORT_STRING`, `SORT_LOCALE_STRING`, `SORT_NATURAL` and `SORT_FLAG_CASE`.
628 628
      * Please refer to [PHP manual](http://php.net/manual/en/function.sort.php)
629 629
      * for more details. When sorting by multiple keys with different sort flags, use an array of sort flags.
Please login to merge, or discard this patch.
framework/helpers/BaseStringHelper.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -355,7 +355,7 @@
 block discarded – undo
355 355
      * Safely casts a float to string independent of the current locale.
356 356
      *
357 357
      * The decimal separator will always be `.`.
358
-     * @param float|int $number a floating point number or integer.
358
+     * @param double $number a floating point number or integer.
359 359
      * @return string the string representation of the number.
360 360
      * @since 2.0.13
361 361
      */
Please login to merge, or discard this patch.
framework/db/pgsql/QueryBuilder.php 1 patch
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -7,7 +7,6 @@
 block discarded – undo
7 7
 
8 8
 namespace yii\db\pgsql;
9 9
 
10
-use yii\base\InvalidParamException;
11 10
 use yii\helpers\StringHelper;
12 11
 
13 12
 /**
Please login to merge, or discard this patch.
framework/db/Schema.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -403,7 +403,7 @@  discard block
 block discarded – undo
403 403
      * Executes the INSERT command, returning primary key values.
404 404
      * @param string $table the table that new rows will be inserted into.
405 405
      * @param array $columns the column data (name => value) to be inserted into the table.
406
-     * @return array|false primary key values or false if the command fails
406
+     * @return string primary key values or false if the command fails
407 407
      * @since 2.0.4
408 408
      */
409 409
     public function insert($table, $columns)
@@ -609,7 +609,7 @@  discard block
 block discarded – undo
609 609
     /**
610 610
      * Returns the cache key for the specified table name.
611 611
      * @param string $name the table name.
612
-     * @return mixed the cache key.
612
+     * @return string[] the cache key.
613 613
      */
614 614
     protected function getCacheKey($name)
615 615
     {
Please login to merge, or discard this patch.
framework/web/Request.php 1 patch
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -499,7 +499,7 @@  discard block
 block discarded – undo
499 499
 
500 500
     /**
501 501
      * Specifies the URI instance.
502
-     * @param UriInterface|\Closure|array $uri URI instance or its DI compatible configuration.
502
+     * @param UriInterface $uri URI instance or its DI compatible configuration.
503 503
      * @since 2.1.0
504 504
      */
505 505
     public function setUri($uri)
@@ -750,7 +750,7 @@  discard block
 block discarded – undo
750 750
      * If the parameter does not exist, the second parameter passed to this method will be returned.
751 751
      * @param string $name the parameter name
752 752
      * @param mixed $defaultValue the default parameter value if the parameter does not exist.
753
-     * @return mixed the parameter value
753
+     * @return string the parameter value
754 754
      * @see getParsedBody()
755 755
      * @see setParsedBody()
756 756
      */
@@ -876,7 +876,7 @@  discard block
 block discarded – undo
876 876
     /**
877 877
      * Return the server environment parameter by name.
878 878
      * @param string $name parameter name.
879
-     * @param mixed $default default value to return if the parameter does not exist.
879
+     * @param string $default default value to return if the parameter does not exist.
880 880
      * @return mixed parameter value.
881 881
      * @since 2.1.0
882 882
      */
Please login to merge, or discard this patch.