Completed
Pull Request — 2.1 (#14865)
by
unknown
12:17
created
build/controllers/PhpDocController.php 1 patch
Doc Comments   +20 added lines, -2 removed lines patch added patch discarded remove patch
@@ -113,6 +113,9 @@  discard block
 block discarded – undo
113 113
         return array_merge(parent::options($actionID), ['updateFiles', 'skipFrameworkRequirements']);
114 114
     }
115 115
 
116
+    /**
117
+     * @param string|null $root
118
+     */
116 119
     protected function findFiles($root, $needsInclude = true)
117 120
     {
118 121
         $except = [];
@@ -233,6 +236,9 @@  discard block
 block discarded – undo
233 236
         return FileHelper::findFiles($root, $options);
234 237
     }
235 238
 
239
+    /**
240
+     * @param string $extensionPath
241
+     */
236 242
     private function setUpExtensionAliases($extensionPath)
237 243
     {
238 244
         foreach (scandir($extensionPath) as $extension) {
@@ -340,6 +346,9 @@  discard block
 block discarded – undo
340 346
         }
341 347
     }
342 348
 
349
+    /**
350
+     * @param string $line
351
+     */
343 352
     protected function fixParamTypes($line)
344 353
     {
345 354
         return preg_replace_callback('~@(param|return) ([\w\\|]+)~i', function ($matches) {
@@ -556,7 +565,7 @@  discard block
 block discarded – undo
556 565
     /**
557 566
      * remove multi empty lines and trim trailing whitespace.
558 567
      *
559
-     * @param $doc
568
+     * @param string $doc
560 569
      * @return string
561 570
      */
562 571
     protected function cleanDocComment($doc)
@@ -575,7 +584,7 @@  discard block
 block discarded – undo
575 584
 
576 585
     /**
577 586
      * Replace property annotations in doc comment.
578
-     * @param $doc
587
+     * @param string $doc
579 588
      * @param $properties
580 589
      * @return string
581 590
      */
@@ -742,6 +751,9 @@  discard block
 block discarded – undo
742 751
         return [$className, $phpdoc];
743 752
     }
744 753
 
754
+    /**
755
+     * @param string $pattern
756
+     */
745 757
     protected function match($pattern, $subject, $split = false)
746 758
     {
747 759
         $sets = [];
@@ -766,6 +778,9 @@  discard block
 block discarded – undo
766 778
         return $sets;
767 779
     }
768 780
 
781
+    /**
782
+     * @param string $str
783
+     */
769 784
     protected function fixSentence($str)
770 785
     {
771 786
         // TODO fix word wrap
@@ -776,6 +791,9 @@  discard block
 block discarded – undo
776 791
         return strtoupper(substr($str, 0, 1)) . substr($str, 1) . ($str[strlen($str) - 1] != '.' ? '.' : '');
777 792
     }
778 793
 
794
+    /**
795
+     * @param string $param
796
+     */
779 797
     protected function getPropParam($prop, $param)
780 798
     {
781 799
         return isset($prop['property']) ? $prop['property'][$param] : (isset($prop['get']) ? $prop['get'][$param] : $prop['set'][$param]);
Please login to merge, or discard this patch.
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/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/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/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.