Completed
Pull Request — master (#15002)
by Dmitry
13:34
created
framework/web/User.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -175,7 +175,7 @@  discard block
 block discarded – undo
175 175
      * stored in session and reconstruct the corresponding identity object, if it has not done so before.
176 176
      * @param bool $autoRenew whether to automatically renew authentication status if it has not been done so before.
177 177
      * This is only useful when [[enableSession]] is true.
178
-     * @return IdentityInterface|null the identity object associated with the currently logged-in user.
178
+     * @return null|boolean the identity object associated with the currently logged-in user.
179 179
      * `null` is returned if the user is not logged in (not authenticated).
180 180
      * @see login()
181 181
      * @see logout()
@@ -259,7 +259,7 @@  discard block
 block discarded – undo
259 259
      * with the provided access token. If successful, it will call [[login()]] to log in the authenticated user.
260 260
      * If authentication fails or [[login()]] is unsuccessful, it will return null.
261 261
      * @param string $token the access token
262
-     * @param mixed $type the type of the token. The value of this parameter depends on the implementation.
262
+     * @param string $type the type of the token. The value of this parameter depends on the implementation.
263 263
      * For example, [[\yii\filters\auth\HttpBearerAuth]] will set this parameter to be `yii\filters\auth\HttpBearerAuth`.
264 264
      * @return IdentityInterface|null the identity associated with the given access token. Null is returned if
265 265
      * the access token is invalid or [[login()]] is unsuccessful.
Please login to merge, or discard this patch.
framework/helpers/BaseHtml.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -216,7 +216,7 @@
 block discarded – undo
216 216
 
217 217
     /**
218 218
      * Generates a link tag that refers to an external CSS file.
219
-     * @param array|string $url the URL of the external CSS file. This parameter will be processed by [[Url::to()]].
219
+     * @param string|boolean $url the URL of the external CSS file. This parameter will be processed by [[Url::to()]].
220 220
      * @param array $options the tag options in terms of name-value pairs. The following options are specially handled:
221 221
      *
222 222
      * - condition: specifies the conditional comments for IE, e.g., `lt IE 9`. When this is specified,
Please login to merge, or discard this patch.
framework/console/controllers/BaseMigrateController.php 1 patch
Doc Comments   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -204,7 +204,7 @@  discard block
 block discarded – undo
204 204
      * yii migrate/down all # revert all migrations
205 205
      * ```
206 206
      *
207
-     * @param int|string $limit the number of migrations to be reverted. Defaults to 1,
207
+     * @param integer $limit the number of migrations to be reverted. Defaults to 1,
208 208
      * meaning the last applied migration will be reverted. When value is "all", all migrations will be reverted.
209 209
      * @throws Exception if the number of the steps specified is less than 1.
210 210
      *
@@ -266,7 +266,7 @@  discard block
 block discarded – undo
266 266
      * yii migrate/redo all # redo all migrations
267 267
      * ```
268 268
      *
269
-     * @param int|string $limit the number of migrations to be redone. Defaults to 1,
269
+     * @param integer $limit the number of migrations to be redone. Defaults to 1,
270 270
      * meaning the last applied migration will be redone. When equals "all", all migrations will be redone.
271 271
      * @throws Exception if the number of the steps specified is less than 1.
272 272
      *
@@ -463,7 +463,7 @@  discard block
 block discarded – undo
463 463
      * yii migrate/history all # showing the whole history
464 464
      * ```
465 465
      *
466
-     * @param int|string $limit the maximum number of migrations to be displayed.
466
+     * @param integer $limit the maximum number of migrations to be displayed.
467 467
      * If it is "all", the whole migration history will be displayed.
468 468
      * @throws \yii\console\Exception if invalid limit value passed
469 469
      */
@@ -507,7 +507,7 @@  discard block
 block discarded – undo
507 507
      * yii migrate/new all # showing all new migrations
508 508
      * ```
509 509
      *
510
-     * @param int|string $limit the maximum number of new migrations to be displayed.
510
+     * @param integer $limit the maximum number of new migrations to be displayed.
511 511
      * If it is `all`, all available new migrations will be displayed.
512 512
      * @throws \yii\console\Exception if invalid limit value passed
513 513
      */
Please login to merge, or discard this patch.
framework/db/pgsql/Schema.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -266,7 +266,7 @@
 block discarded – undo
266 266
     /**
267 267
      * Loads the column information into a [[ColumnSchema]] object.
268 268
      * @param array $info column information
269
-     * @return ColumnSchema the column schema object
269
+     * @return \yii\db\ColumnSchema the column schema object
270 270
      */
271 271
     protected function loadColumnSchema($info)
272 272
     {
Please login to merge, or discard this patch.
framework/base/Application.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -530,7 +530,7 @@
 block discarded – undo
530 530
 
531 531
     /**
532 532
      * Returns the request component.
533
-     * @return \yii\web\Request|\yii\console\Request the request component.
533
+     * @return Request the request component.
534 534
      */
535 535
     public function getRequest()
536 536
     {
Please login to merge, or discard this patch.
framework/db/Command.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -242,7 +242,7 @@  discard block
 block discarded – undo
242 242
 
243 243
     /**
244 244
      * Binds a parameter to the SQL statement to be executed.
245
-     * @param string|int $name parameter identifier. For a prepared statement
245
+     * @param string $name parameter identifier. For a prepared statement
246 246
      * using named placeholders, this will be a parameter name of
247 247
      * the form `:name`. For a prepared statement using question mark
248 248
      * placeholders, this will be the 1-indexed position of the parameter.
@@ -379,7 +379,7 @@  discard block
 block discarded – undo
379 379
     /**
380 380
      * Executes the SQL statement and returns the value of the first column in the first row of data.
381 381
      * This method is best used when only a single value is needed for a query.
382
-     * @return string|null|false the value of the first column in the first row of the query result.
382
+     * @return string the value of the first column in the first row of the query result.
383 383
      * False is returned if there is no value.
384 384
      * @throws Exception execution failed
385 385
      */
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
@@ -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) {
@@ -473,6 +482,10 @@  discard block
 block discarded – undo
473 482
         // TODO
474 483
     }
475 484
 
485
+    /**
486
+     * @param null|string $className
487
+     * @param string $propertyDoc
488
+     */
476 489
     protected function updateClassPropertyDocs($file, $className, $propertyDoc)
477 490
     {
478 491
         try {
@@ -553,7 +566,7 @@  discard block
 block discarded – undo
553 566
     /**
554 567
      * remove multi empty lines and trim trailing whitespace.
555 568
      *
556
-     * @param $doc
569
+     * @param string $doc
557 570
      * @return string
558 571
      */
559 572
     protected function cleanDocComment($doc)
@@ -572,7 +585,7 @@  discard block
 block discarded – undo
572 585
 
573 586
     /**
574 587
      * Replace property annotations in doc comment.
575
-     * @param $doc
588
+     * @param string $doc
576 589
      * @param $properties
577 590
      * @return string
578 591
      */
@@ -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 = [];
@@ -762,6 +778,9 @@  discard block
 block discarded – undo
762 778
         return $sets;
763 779
     }
764 780
 
781
+    /**
782
+     * @param string $str
783
+     */
765 784
     protected function fixSentence($str)
766 785
     {
767 786
         // TODO fix word wrap
@@ -771,6 +790,9 @@  discard block
 block discarded – undo
771 790
         return strtoupper(substr($str, 0, 1)) . substr($str, 1) . ($str[strlen($str) - 1] != '.' ? '.' : '');
772 791
     }
773 792
 
793
+    /**
794
+     * @param string $param
795
+     */
774 796
     protected function getPropParam($prop, $param)
775 797
     {
776 798
         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/console/controllers/MessageController.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -622,7 +622,7 @@
 block discarded – undo
622 622
      * Finds out a line of the first non-char PHP token found.
623 623
      *
624 624
      * @param array $tokens
625
-     * @return int|string
625
+     * @return string
626 626
      * @since 2.0.1
627 627
      */
628 628
     protected function getLine($tokens)
Please login to merge, or discard this patch.
framework/i18n/MessageFormatter.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -52,7 +52,7 @@
 block discarded – undo
52 52
     /**
53 53
      * Get the error code from the last operation.
54 54
      * @link http://php.net/manual/en/messageformatter.geterrorcode.php
55
-     * @return string Code of the last error.
55
+     * @return integer Code of the last error.
56 56
      */
57 57
     public function getErrorCode()
58 58
     {
Please login to merge, or discard this patch.