Completed
Pull Request — master (#15622)
by Brandon
11:42
created
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/mssql/QueryBuilder.php 1 patch
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -8,7 +8,6 @@
 block discarded – undo
8 8
 namespace yii\db\mssql;
9 9
 
10 10
 use yii\base\InvalidParamException;
11
-use yii\base\NotSupportedException;
12 11
 use yii\db\Expression;
13 12
 
14 13
 /**
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
@@ -8,7 +8,6 @@
 block discarded – undo
8 8
 namespace yii\db\pgsql;
9 9
 
10 10
 use yii\base\InvalidParamException;
11
-use yii\db\ExpressionInterface;
12 11
 use yii\db\PdoValue;
13 12
 use yii\db\Query;
14 13
 use yii\helpers\StringHelper;
Please login to merge, or discard this patch.
framework/db/BaseActiveRecord.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -100,7 +100,7 @@
 block discarded – undo
100 100
 
101 101
     /**
102 102
      * {@inheritdoc}
103
-     * @return static|null ActiveRecord instance matching the condition, or `null` if nothing matches.
103
+     * @return BaseActiveRecord ActiveRecord instance matching the condition, or `null` if nothing matches.
104 104
      */
105 105
     public static function findOne($condition)
106 106
     {
Please login to merge, or discard this patch.
framework/db/oci/Schema.php 1 patch
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -240,6 +240,7 @@
 block discarded – undo
240 240
 
241 241
     /**
242 242
      * {@inheritdoc}
243
+     * @param string $name
243 244
      */
244 245
     public function quoteSimpleTableName($name)
245 246
     {
Please login to merge, or discard this patch.
framework/db/sqlite/QueryBuilder.php 1 patch
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -466,6 +466,7 @@
 block discarded – undo
466 466
 
467 467
     /**
468 468
      * {@inheritdoc}
469
+     * @param Query $query
469 470
      */
470 471
     public function build($query, $params = [])
471 472
     {
Please login to merge, or discard this patch.
framework/log/SyslogTarget.php 1 patch
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -73,6 +73,7 @@
 block discarded – undo
73 73
 
74 74
     /**
75 75
      * {@inheritdoc}
76
+     * @return string
76 77
      */
77 78
     public function formatMessage($message)
78 79
     {
Please login to merge, or discard this patch.
framework/data/DataFilter.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -350,7 +350,7 @@
 block discarded – undo
350 350
     /**
351 351
      * Detect attribute type from given validator.
352 352
      *
353
-     * @param Validator validator from which to detect attribute type.
353
+     * @param Validator Validator from which to detect attribute type.
354 354
      * @return string|null detected attribute type.
355 355
      * @since 2.0.14 
356 356
      */
Please login to merge, or discard this patch.