Completed
Pull Request — master (#14892)
by Dmitry
37:27
created
framework/console/controllers/FixtureController.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -310,7 +310,7 @@  discard block
 block discarded – undo
310 310
      * Prompts user with confirmation if fixtures should be loaded.
311 311
      * @param array $fixtures
312 312
      * @param array $except
313
-     * @return bool
313
+     * @return boolean|null
314 314
      */
315 315
     private function confirmLoad($fixtures, $except)
316 316
     {
@@ -342,7 +342,7 @@  discard block
 block discarded – undo
342 342
      * Prompts user with confirmation for fixtures that should be unloaded.
343 343
      * @param array $fixtures
344 344
      * @param array $except
345
-     * @return bool
345
+     * @return boolean|null
346 346
      */
347 347
     private function confirmUnload($fixtures, $except)
348 348
     {
Please login to merge, or discard this patch.
framework/helpers/BaseFileHelper.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -634,7 +634,7 @@
 block discarded – undo
634 634
      * @param string $pattern
635 635
      * @param bool $caseSensitive
636 636
      * @throws \yii\base\InvalidParamException
637
-     * @return array with keys: (string) pattern, (int) flags, (int|bool) firstWildcard
637
+     * @return string with keys: (string) pattern, (int) flags, (int|bool) firstWildcard
638 638
      */
639 639
     private static function parseExcludePattern($pattern, $caseSensitive)
640 640
     {
Please login to merge, or discard this patch.
framework/base/ErrorHandler.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -194,7 +194,7 @@
 block discarded – undo
194 194
      * @param string $message the error message.
195 195
      * @param string $file the filename that the error was raised in.
196 196
      * @param int $line the line number the error was raised at.
197
-     * @return bool whether the normal error handler continues.
197
+     * @return null|false whether the normal error handler continues.
198 198
      *
199 199
      * @throws ErrorException
200 200
      */
Please login to merge, or discard this patch.
framework/console/Controller.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -284,7 +284,7 @@
 block discarded – undo
284 284
      *
285 285
      * @param string $message to echo out before waiting for user input
286 286
      * @param bool $default this value is returned if no selection is made.
287
-     * @return bool whether user confirmed.
287
+     * @return boolean|null whether user confirmed.
288 288
      * Will return true if [[interactive]] is false.
289 289
      */
290 290
     public function confirm($message, $default = false)
Please login to merge, or discard this patch.
framework/web/UrlRule.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -334,7 +334,7 @@  discard block
 block discarded – undo
334 334
      * @param UrlManager $manager the URL manager
335 335
      * @param string $route the route. It should not have slashes at the beginning or the end.
336 336
      * @param array $params the parameters
337
-     * @return string|bool the created URL, or `false` if this rule cannot be used for creating this URL.
337
+     * @return false|string the created URL, or `false` if this rule cannot be used for creating this URL.
338 338
      */
339 339
     public function createUrl($manager, $route, $params)
340 340
     {
@@ -425,7 +425,7 @@  discard block
 block discarded – undo
425 425
      * When found - replaces this placeholder key with a appropriate name of matching parameter.
426 426
      * Used in [[parseRequest()]], [[createUrl()]].
427 427
      *
428
-     * @param array $matches result of `preg_match()` call
428
+     * @param string[] $matches result of `preg_match()` call
429 429
      * @return array input array with replaced placeholder keys
430 430
      * @see placeholders
431 431
      * @since 2.0.7
Please login to merge, or discard this patch.
framework/log/Logger.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -196,7 +196,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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()
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
@@ -768,7 +768,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
      */
Please login to merge, or discard this patch.
framework/captcha/CaptchaAction.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -144,7 +144,7 @@
 block discarded – undo
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
     {
Please login to merge, or discard this patch.
framework/db/DataReader.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -114,7 +114,7 @@
 block discarded – undo
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
     {
Please login to merge, or discard this patch.