@@ -196,7 +196,7 @@ discard block |
||
196 | 196 | * `$categories` and `$excludeCategories` as parameters to retrieve the |
197 | 197 | * results that you are interested in. |
198 | 198 | * |
199 | - * @param array $categories list of categories that you are interested in. |
|
199 | + * @param string[] $categories list of categories that you are interested in. |
|
200 | 200 | * You can use an asterisk at the end of a category to do a prefix match. |
201 | 201 | * For example, 'yii\db\*' will match categories starting with 'yii\db\', |
202 | 202 | * such as 'yii\db\Connection'. |
@@ -246,7 +246,7 @@ discard block |
||
246 | 246 | * Returns the statistical results of DB queries. |
247 | 247 | * The results returned include the number of SQL statements executed and |
248 | 248 | * the total time spent. |
249 | - * @return array the first element indicates the number of SQL statements executed, |
|
249 | + * @return integer[] the first element indicates the number of SQL statements executed, |
|
250 | 250 | * and the second element the total time spent in SQL execution. |
251 | 251 | */ |
252 | 252 | public function getDbProfiling() |
@@ -768,7 +768,7 @@ discard block |
||
768 | 768 | |
769 | 769 | /** |
770 | 770 | * Sets the GROUP BY part of the query. |
771 | - * @param string|array|Expression $columns the columns to be grouped by. |
|
771 | + * @param string $columns the columns to be grouped by. |
|
772 | 772 | * Columns can be specified in either a string (e.g. "id, name") or an array (e.g. ['id', 'name']). |
773 | 773 | * The method will automatically quote the column names unless a column contains some parenthesis |
774 | 774 | * (which means the column contains a DB expression). |
@@ -967,7 +967,7 @@ discard block |
||
967 | 967 | |
968 | 968 | /** |
969 | 969 | * Appends a SQL statement using UNION operator. |
970 | - * @param string|Query $sql the SQL statement to be appended using UNION |
|
970 | + * @param Query $sql the SQL statement to be appended using UNION |
|
971 | 971 | * @param bool $all TRUE if using UNION ALL and FALSE if using UNION |
972 | 972 | * @return $this the query object itself |
973 | 973 | */ |
@@ -114,6 +114,9 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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 | try { |
@@ -558,7 +571,7 @@ discard block |
||
558 | 571 | /** |
559 | 572 | * remove multi empty lines and trim trailing whitespace |
560 | 573 | * |
561 | - * @param $doc |
|
574 | + * @param string $doc |
|
562 | 575 | * @return string |
563 | 576 | */ |
564 | 577 | protected function cleanDocComment($doc) |
@@ -577,7 +590,7 @@ discard block |
||
577 | 590 | |
578 | 591 | /** |
579 | 592 | * Replace property annotations in doc comment |
580 | - * @param $doc |
|
593 | + * @param string $doc |
|
581 | 594 | * @param $properties |
582 | 595 | * @return string |
583 | 596 | */ |
@@ -745,6 +758,9 @@ discard block |
||
745 | 758 | return [$className, $phpdoc]; |
746 | 759 | } |
747 | 760 | |
761 | + /** |
|
762 | + * @param string $pattern |
|
763 | + */ |
|
748 | 764 | protected function match($pattern, $subject, $split = false) |
749 | 765 | { |
750 | 766 | $sets = []; |
@@ -766,6 +782,9 @@ discard block |
||
766 | 782 | return $sets; |
767 | 783 | } |
768 | 784 | |
785 | + /** |
|
786 | + * @param string $str |
|
787 | + */ |
|
769 | 788 | protected function fixSentence($str) |
770 | 789 | { |
771 | 790 | // TODO fix word wrap |
@@ -774,6 +793,9 @@ discard block |
||
774 | 793 | return strtoupper(substr($str, 0, 1)) . substr($str, 1) . ($str[strlen($str) - 1] != '.' ? '.' : ''); |
775 | 794 | } |
776 | 795 | |
796 | + /** |
|
797 | + * @param string $param |
|
798 | + */ |
|
777 | 799 | protected function getPropParam($prop, $param) |
778 | 800 | { |
779 | 801 | return isset($prop['property']) ? $prop['property'][$param] : (isset($prop['get']) ? $prop['get'][$param] : $prop['set'][$param]); |
@@ -144,7 +144,7 @@ |
||
144 | 144 | /** |
145 | 145 | * Generates a hash code that can be used for client-side validation. |
146 | 146 | * @param string $code the CAPTCHA code |
147 | - * @return string a hash code generated from the CAPTCHA code |
|
147 | + * @return integer a hash code generated from the CAPTCHA code |
|
148 | 148 | */ |
149 | 149 | public function generateValidationHash($code) |
150 | 150 | { |
@@ -392,7 +392,7 @@ |
||
392 | 392 | * @param bool|array $eagerLoading whether to eager load the relations specified in `$with`. |
393 | 393 | * When this is a boolean, it applies to all relations specified in `$with`. Use an array |
394 | 394 | * to explicitly list which relations in `$with` need to be eagerly loaded. Defaults to `true`. |
395 | - * @param string|array $joinType the join type of the relations specified in `$with`. |
|
395 | + * @param string $joinType the join type of the relations specified in `$with`. |
|
396 | 396 | * When this is a string, it applies to all relations specified in `$with`. Use an array |
397 | 397 | * in the format of `relationName => joinType` to specify different join types for different relations. |
398 | 398 | * @return $this the query object itself |
@@ -114,7 +114,7 @@ |
||
114 | 114 | /** |
115 | 115 | * Returns a single column from the next row of a result set. |
116 | 116 | * @param int $columnIndex zero-based column index |
117 | - * @return mixed the column of the current row, false if no more rows available |
|
117 | + * @return string the column of the current row, false if no more rows available |
|
118 | 118 | */ |
119 | 119 | public function readColumn($columnIndex) |
120 | 120 | { |
@@ -208,7 +208,7 @@ discard block |
||
208 | 208 | |
209 | 209 | /** |
210 | 210 | * Generates a link tag that refers to an external CSS file. |
211 | - * @param array|string $url the URL of the external CSS file. This parameter will be processed by [[Url::to()]]. |
|
211 | + * @param string|boolean $url the URL of the external CSS file. This parameter will be processed by [[Url::to()]]. |
|
212 | 212 | * @param array $options the tag options in terms of name-value pairs. The following options are specially handled: |
213 | 213 | * |
214 | 214 | * - condition: specifies the conditional comments for IE, e.g., `lt IE 9`. When this is specified, |
@@ -1854,7 +1854,7 @@ discard block |
||
1854 | 1854 | * ``` |
1855 | 1855 | * |
1856 | 1856 | * @param array $options the options to be modified. |
1857 | - * @param string|array $class the CSS class(es) to be added |
|
1857 | + * @param string $class the CSS class(es) to be added |
|
1858 | 1858 | */ |
1859 | 1859 | public static function addCssClass(&$options, $class) |
1860 | 1860 | { |
@@ -789,7 +789,7 @@ |
||
789 | 789 | * }); |
790 | 790 | * ``` |
791 | 791 | * |
792 | - * @param string|array $url the URL to be redirected to. This can be in one of the following formats: |
|
792 | + * @param string $url the URL to be redirected to. This can be in one of the following formats: |
|
793 | 793 | * |
794 | 794 | * - a string representing a URL (e.g. "http://example.com") |
795 | 795 | * - a string representing a URL alias (e.g. "@example.com") |
@@ -175,7 +175,7 @@ discard block |
||
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 |
||
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. |