Completed
Pull Request — master (#12971)
by Walt
797:57 queued 795:17
created
framework/requirements/YiiRequirementChecker.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -60,7 +60,7 @@
 block discarded – undo
60 60
      * Check the given requirements, collecting results into internal field.
61 61
      * This method can be invoked several times checking different requirement sets.
62 62
      * Use [[getResult()]] or [[render()]] to get the results.
63
-     * @param array|string $requirements requirements to be checked.
63
+     * @param string $requirements requirements to be checked.
64 64
      * If an array, it is treated as the set of requirements;
65 65
      * If a string, it is treated as the path of the file, which contains the requirements;
66 66
      * @return $this self instance.
Please login to merge, or discard this patch.
framework/web/Request.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -426,7 +426,7 @@
 block discarded – undo
426 426
      * If the parameter does not exist, the second parameter passed to this method will be returned.
427 427
      * @param string $name the parameter name
428 428
      * @param mixed $defaultValue the default parameter value if the parameter does not exist.
429
-     * @return mixed the parameter value
429
+     * @return string the parameter value
430 430
      * @see getBodyParams()
431 431
      * @see setBodyParams()
432 432
      */
Please login to merge, or discard this patch.
framework/web/Response.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -726,7 +726,7 @@
 block discarded – undo
726 726
      * });
727 727
      * ~~~
728 728
      *
729
-     * @param string|array $url the URL to be redirected to. This can be in one of the following formats:
729
+     * @param string $url the URL to be redirected to. This can be in one of the following formats:
730 730
      *
731 731
      * - a string representing a URL (e.g. "http://example.com")
732 732
      * - a string representing a URL alias (e.g. "@example.com")
Please login to merge, or discard this patch.
framework/web/User.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -163,7 +163,7 @@  discard block
 block discarded – undo
163 163
      * stored in session and reconstruct the corresponding identity object, if it has not done so before.
164 164
      * @param boolean $autoRenew whether to automatically renew authentication status if it has not been done so before.
165 165
      * This is only useful when [[enableSession]] is true.
166
-     * @return IdentityInterface|null the identity object associated with the currently logged-in user.
166
+     * @return null|boolean the identity object associated with the currently logged-in user.
167 167
      * `null` is returned if the user is not logged in (not authenticated).
168 168
      * @see login()
169 169
      * @see logout()
@@ -254,7 +254,7 @@  discard block
 block discarded – undo
254 254
      * with the provided access token. If successful, it will call [[login()]] to log in the authenticated user.
255 255
      * If authentication fails or [[login()]] is unsuccessful, it will return null.
256 256
      * @param string $token the access token
257
-     * @param mixed $type the type of the token. The value of this parameter depends on the implementation.
257
+     * @param string $type the type of the token. The value of this parameter depends on the implementation.
258 258
      * For example, [[\yii\filters\auth\HttpBearerAuth]] will set this parameter to be `yii\filters\auth\HttpBearerAuth`.
259 259
      * @return IdentityInterface|null the identity associated with the given access token. Null is returned if
260 260
      * the access token is invalid or [[login()]] is unsuccessful.
Please login to merge, or discard this patch.
framework/widgets/LinkPager.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -224,7 +224,7 @@
 block discarded – undo
224 224
     }
225 225
 
226 226
     /**
227
-     * @return array the begin and end pages that need to be displayed.
227
+     * @return integer[] the begin and end pages that need to be displayed.
228 228
      */
229 229
     protected function getPageRange()
230 230
     {
Please login to merge, or discard this patch.
framework/db/Query.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -795,7 +795,7 @@
 block discarded – undo
795 795
 
796 796
     /**
797 797
      * Appends a SQL statement using UNION operator.
798
-     * @param string|Query $sql the SQL statement to be appended using UNION
798
+     * @param Query $sql the SQL statement to be appended using UNION
799 799
      * @param boolean $all TRUE if using UNION ALL and FALSE if using UNION
800 800
      * @return $this the query object itself
801 801
      */
Please login to merge, or discard this patch.
framework/behaviors/AttributeBehavior.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -126,7 +126,7 @@
 block discarded – undo
126 126
      * This method is called by [[evaluateAttributes()]]. Its return value will be assigned
127 127
      * to the attributes corresponding to the triggering event.
128 128
      * @param Event $event the event that triggers the current attribute updating.
129
-     * @return mixed the attribute value
129
+     * @return string the attribute value
130 130
      */
131 131
     protected function getValue($event)
132 132
     {
Please login to merge, or discard this patch.
build/controllers/PhpDocController.php 1 patch
Doc Comments   +24 added lines, -2 removed lines patch added patch discarded remove patch
@@ -114,6 +114,9 @@  discard block
 block discarded – undo
114 114
         return array_merge(parent::options($actionID), ['updateFiles', 'skipFrameworkRequirements']);
115 115
     }
116 116
 
117
+    /**
118
+     * @param string|null $root
119
+     */
117 120
     protected function findFiles($root, $needsInclude = true)
118 121
     {
119 122
         $except = [];
@@ -237,6 +240,9 @@  discard block
 block discarded – undo
237 240
         return FileHelper::findFiles($root, $options);
238 241
     }
239 242
 
243
+    /**
244
+     * @param string $extensionPath
245
+     */
240 246
     private function setUpExtensionAliases($extensionPath)
241 247
     {
242 248
         foreach (scandir($extensionPath) as $extension) {
@@ -344,6 +350,9 @@  discard block
 block discarded – undo
344 350
         }
345 351
     }
346 352
 
353
+    /**
354
+     * @param string $line
355
+     */
347 356
     protected function fixParamTypes($line)
348 357
     {
349 358
         return preg_replace_callback('~@(param|return) ([\w\\|]+)~i', function($matches) {
@@ -477,6 +486,10 @@  discard block
 block discarded – undo
477 486
         // TODO
478 487
     }
479 488
 
489
+    /**
490
+     * @param null|string $className
491
+     * @param string $propertyDoc
492
+     */
480 493
     protected function updateClassPropertyDocs($file, $className, $propertyDoc)
481 494
     {
482 495
         $ref = new \ReflectionClass($className);
@@ -552,7 +565,7 @@  discard block
 block discarded – undo
552 565
     /**
553 566
      * remove multi empty lines and trim trailing whitespace
554 567
      *
555
-     * @param $doc
568
+     * @param string $doc
556 569
      * @return string
557 570
      */
558 571
     protected function cleanDocComment($doc)
@@ -571,7 +584,7 @@  discard block
 block discarded – undo
571 584
 
572 585
     /**
573 586
      * Replace property annotations in doc comment
574
-     * @param $doc
587
+     * @param string $doc
575 588
      * @param $properties
576 589
      * @return string
577 590
      */
@@ -739,6 +752,9 @@  discard block
 block discarded – undo
739 752
         return [$className, $phpdoc];
740 753
     }
741 754
 
755
+    /**
756
+     * @param string $pattern
757
+     */
742 758
     protected function match($pattern, $subject, $split = false)
743 759
     {
744 760
         $sets = [];
@@ -760,6 +776,9 @@  discard block
 block discarded – undo
760 776
         return $sets;
761 777
     }
762 778
 
779
+    /**
780
+     * @param string $str
781
+     */
763 782
     protected function fixSentence($str)
764 783
     {
765 784
         // TODO fix word wrap
@@ -768,6 +787,9 @@  discard block
 block discarded – undo
768 787
         return strtoupper(substr($str, 0, 1)) . substr($str, 1) . ($str[strlen($str) - 1] != '.' ? '.' : '');
769 788
     }
770 789
 
790
+    /**
791
+     * @param string $param
792
+     */
771 793
     protected function getPropParam($prop, $param)
772 794
     {
773 795
         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/web/ViewAction.php 1 patch
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -9,7 +9,6 @@
 block discarded – undo
9 9
 
10 10
 use Yii;
11 11
 use yii\base\Action;
12
-use yii\base\InvalidParamException;
13 12
 use yii\base\ViewNotFoundException;
14 13
 
15 14
 /**
Please login to merge, or discard this patch.