Completed
Push — 21-merge-master-test ( 19c265...2d5475 )
by Alexander
13:06
created
framework/caching/Cache.php 1 patch
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -202,7 +202,7 @@  discard block
 block discarded – undo
202 202
      * expiration time will be replaced with the new ones, respectively.
203 203
      *
204 204
      * @param array $items the items to be cached, as key-value pairs.
205
-     * @param null|int|\DateInterval $ttl the TTL value of this item. If not set, default value is used.
205
+     * @param integer $ttl the TTL value of this item. If not set, default value is used.
206 206
      * @param Dependency $dependency dependency of the cached items. If the dependency changes,
207 207
      * the corresponding values in the cache will be invalidated when it is fetched via [[get()]].
208 208
      * This parameter is ignored if [[serializer]] is false.
@@ -245,7 +245,7 @@  discard block
 block discarded – undo
245 245
      * If the cache already contains such a key, the existing value and expiration time will be preserved.
246 246
      *
247 247
      * @param array $values the items to be cached, as key-value pairs.
248
-     * @param null|int|\DateInterval $ttl the TTL value of this item. If not set, default value is used.
248
+     * @param integer $ttl the TTL value of this item. If not set, default value is used.
249 249
      * @param Dependency $dependency dependency of the cached items. If the dependency changes,
250 250
      * the corresponding values in the cache will be invalidated when it is fetched via [[get()]].
251 251
      * This parameter is ignored if [[serializer]] is false.
@@ -307,7 +307,7 @@  discard block
 block discarded – undo
307 307
 
308 308
     /**
309 309
      * Deletes a value with the specified key from cache.
310
-     * @param mixed $key a key identifying the value to be deleted from cache. This can be a simple string or
310
+     * @param string $key a key identifying the value to be deleted from cache. This can be a simple string or
311 311
      * a complex data structure consisting of factors representing the key.
312 312
      * @return bool if no error happens during deletion
313 313
      */
Please login to merge, or discard this patch.
framework/web/MultipartFormDataParser.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -212,7 +212,7 @@
 block discarded – undo
212 212
     /**
213 213
      * Parses content part headers.
214 214
      * @param string $headerContent headers source content
215
-     * @return array parsed headers.
215
+     * @return callable parsed headers.
216 216
      */
217 217
     private function parseHeaders($headerContent)
218 218
     {
Please login to merge, or discard this patch.
framework/db/ActiveQuery.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -397,7 +397,7 @@
 block discarded – undo
397 397
      * not mean, that the relations are populated from the query result. An
398 398
      * extra query will still be performed to bring in the related data.
399 399
      * Defaults to `true`.
400
-     * @param string|array $joinType the join type of the relations specified in `$with`.
400
+     * @param string $joinType the join type of the relations specified in `$with`.
401 401
      * When this is a string, it applies to all relations specified in `$with`. Use an array
402 402
      * in the format of `relationName => joinType` to specify different join types for different relations.
403 403
      * @return $this the query object itself
Please login to merge, or discard this patch.
framework/db/Query.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -866,7 +866,7 @@  discard block
 block discarded – undo
866 866
 
867 867
     /**
868 868
      * Sets the GROUP BY part of the query.
869
-     * @param string|array|ExpressionInterface $columns the columns to be grouped by.
869
+     * @param string $columns the columns to be grouped by.
870 870
      * Columns can be specified in either a string (e.g. "id, name") or an array (e.g. ['id', 'name']).
871 871
      * The method will automatically quote the column names unless a column contains some parenthesis
872 872
      * (which means the column contains a DB expression).
@@ -1069,7 +1069,7 @@  discard block
 block discarded – undo
1069 1069
 
1070 1070
     /**
1071 1071
      * Appends a SQL statement using UNION operator.
1072
-     * @param string|Query $sql the SQL statement to be appended using UNION
1072
+     * @param Query $sql the SQL statement to be appended using UNION
1073 1073
      * @param bool $all TRUE if using UNION ALL and FALSE if using UNION
1074 1074
      * @return $this the query object itself
1075 1075
      */
Please login to merge, or discard this patch.
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/Schema.php 2 patches
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.
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -15,7 +15,6 @@
 block discarded – undo
15 15
 use yii\caching\Cache;
16 16
 use yii\caching\CacheInterface;
17 17
 use yii\caching\TagDependency;
18
-use yii\helpers\StringHelper;
19 18
 
20 19
 /**
21 20
  * Schema is the base class for concrete DBMS-specific schema classes.
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.