Completed
Pull Request — master (#17092)
by Klochok
13:54
created
framework/db/conditions/SimpleConditionBuilder.php 1 patch
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -5,7 +5,6 @@
 block discarded – undo
5 5
 use yii\db\ExpressionBuilderInterface;
6 6
 use yii\db\ExpressionBuilderTrait;
7 7
 use yii\db\ExpressionInterface;
8
-use yii\db\Query;
9 8
 
10 9
 /**
11 10
  * Class NotConditionBuilder builds objects of [[SimpleCondition]]
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.
framework/i18n/Formatter.php 1 patch
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1912,7 +1912,7 @@  discard block
 block discarded – undo
1912 1912
     /**
1913 1913
      * Fallback for formatting value as an integer number by removing any decimal digits without rounding.
1914 1914
      *
1915
-     * @param string|int|float $value the value to be formatted.
1915
+     * @param string $value the value to be formatted.
1916 1916
      * @return string the formatted result.
1917 1917
      * @since 2.0.16
1918 1918
      */
@@ -1939,7 +1939,7 @@  discard block
 block discarded – undo
1939 1939
      * Property [[decimalSeparator]] will be used to represent the decimal point. The value is rounded automatically
1940 1940
      * to the defined decimal digits.
1941 1941
      *
1942
-     * @param string|int|float $value the value to be formatted.
1942
+     * @param string $value the value to be formatted.
1943 1943
      * @param int $decimals the number of digits after the decimal point. The default value is `0`.
1944 1944
      * @return string the formatted result.
1945 1945
      * @since 2.0.16
@@ -1976,7 +1976,7 @@  discard block
 block discarded – undo
1976 1976
     /**
1977 1977
      * Fallback for formatting value as a currency number.
1978 1978
      *
1979
-     * @param string|int|float $value the value to be formatted.
1979
+     * @param string $value the value to be formatted.
1980 1980
      * @param string $currency the 3-letter ISO 4217 currency code indicating the currency to use.
1981 1981
      * If null, [[currencyCode]] will be used.
1982 1982
      * @return string the formatted result.
Please login to merge, or discard this patch.
framework/log/Target.php 1 patch
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -11,7 +11,6 @@
 block discarded – undo
11 11
 use yii\base\Component;
12 12
 use yii\base\InvalidConfigException;
13 13
 use yii\helpers\ArrayHelper;
14
-use yii\helpers\StringHelper;
15 14
 use yii\helpers\VarDumper;
16 15
 use yii\web\Request;
17 16
 
Please login to merge, or discard this patch.
framework/console/controllers/MessageController.php 1 patch
Doc Comments   +4 added lines, -1 removed lines patch added patch discarded remove patch
@@ -632,7 +632,7 @@  discard block
 block discarded – undo
632 632
      * Finds out a line of the first non-char PHP token found.
633 633
      *
634 634
      * @param array $tokens
635
-     * @return int|string
635
+     * @return string
636 636
      * @since 2.0.1
637 637
      */
638 638
     protected function getLine($tokens)
@@ -889,6 +889,9 @@  discard block
 block discarded – undo
889 889
         }
890 890
     }
891 891
 
892
+    /**
893
+     * @param string $dirName
894
+     */
892 895
     private function deleteUnusedPhpMessageFiles($existingCategories, $dirName)
893 896
     {
894 897
         $messageFiles = FileHelper::findFiles($dirName);
Please login to merge, or discard this patch.
framework/helpers/BaseArrayHelper.php 1 patch
Doc Comments   +6 added lines, -6 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
     {
@@ -264,7 +264,7 @@  discard block
 block discarded – undo
264 264
      * the path can be described by a string when each key should be separated by a dot
265 265
      * you can also describe the path as an array of keys
266 266
      * if the path is null then `$array` will be assigned the `$value`
267
-     * @param mixed $value the value to be written
267
+     * @param string $value the value to be written
268 268
      * @since 2.0.13
269 269
      */
270 270
     public static function setValue(&$array, $path, $value)
@@ -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.