Completed
Pull Request — master (#12971)
by Walt
834:47 queued 797:38
created
framework/console/Controller.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -283,7 +283,7 @@  discard block
 block discarded – undo
283 283
      *
284 284
      * @param string $message to echo out before waiting for user input
285 285
      * @param bool $default this value is returned if no selection is made.
286
-     * @return bool whether user confirmed.
286
+     * @return boolean|null whether user confirmed.
287 287
      * Will return true if [[interactive]] is false.
288 288
      */
289 289
     public function confirm($message, $default = false)
@@ -319,7 +319,7 @@  discard block
 block discarded – undo
319 319
      * until [[beforeAction()]] is being called.
320 320
      *
321 321
      * @param string $actionID the action id of the current request
322
-     * @return array the names of the options valid for the action
322
+     * @return string[] the names of the options valid for the action
323 323
      */
324 324
     public function options($actionID)
325 325
     {
Please login to merge, or discard this patch.
framework/console/controllers/CacheController.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -231,7 +231,7 @@
 block discarded – undo
231 231
     /**
232 232
      * Prompts user with confirmation if caches should be flushed.
233 233
      * @param array $cachesNames
234
-     * @return bool
234
+     * @return boolean|null
235 235
      */
236 236
     private function confirmFlush($cachesNames)
237 237
     {
Please login to merge, or discard this patch.
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/BaseArrayHelper.php 1 patch
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -459,8 +459,8 @@  discard block
 block discarded – undo
459 459
      * ```
460 460
      *
461 461
      * @param array $array
462
-     * @param string|\Closure $from
463
-     * @param string|\Closure $to
462
+     * @param string $from
463
+     * @param string $to
464 464
      * @param string|\Closure $group
465 465
      * @return array
466 466
      */
@@ -515,7 +515,7 @@  discard block
 block discarded – undo
515 515
      * To sort by multiple keys, provide an array of keys here.
516 516
      * @param int|array $direction the sorting direction. It can be either `SORT_ASC` or `SORT_DESC`.
517 517
      * When sorting by multiple keys with different sorting directions, use an array of sorting directions.
518
-     * @param int|array $sortFlag the PHP sort flag. Valid values include
518
+     * @param integer $sortFlag the PHP sort flag. Valid values include
519 519
      * `SORT_REGULAR`, `SORT_NUMERIC`, `SORT_STRING`, `SORT_LOCALE_STRING`, `SORT_NATURAL` and `SORT_FLAG_CASE`.
520 520
      * Please refer to [PHP manual](http://php.net/manual/en/function.sort.php)
521 521
      * for more details. When sorting by multiple keys with different sort flags, use an array of sort flags.
Please login to merge, or discard this patch.
framework/helpers/BaseConsole.php 1 patch
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -576,7 +576,7 @@  discard block
 block discarded – undo
576 576
      * - windows without ansicon
577 577
      * - not tty consoles
578 578
      *
579
-     * @param mixed $stream
579
+     * @param resource $stream
580 580
      * @return bool true if the stream supports ANSI colors, otherwise false.
581 581
      */
582 582
     public static function streamSupportsAnsiColors($stream)
@@ -601,7 +601,7 @@  discard block
 block discarded – undo
601 601
      * @param bool $refresh whether to force checking and not re-use cached size value.
602 602
      * This is useful to detect changing window size while the application is running but may
603 603
      * not get up to date values on every terminal.
604
-     * @return array|bool An array of ($width, $height) or false when it was not able to determine size.
604
+     * @return string An array of ($width, $height) or false when it was not able to determine size.
605 605
      */
606 606
     public static function getScreenSize($refresh = false)
607 607
     {
@@ -807,7 +807,7 @@  discard block
 block discarded – undo
807 807
      *
808 808
      * @param string $message to print out before waiting for user input
809 809
      * @param bool $default this value is returned if no selection is made.
810
-     * @return bool whether user confirmed
810
+     * @return boolean|null whether user confirmed
811 811
      */
812 812
     public static function confirm($message, $default = false)
813 813
     {
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/i18n/MessageFormatter.php 1 patch
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -52,7 +52,7 @@  discard block
 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
     {
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
79 79
      * @param string $pattern The pattern string to insert parameters into.
80 80
      * @param array $params The array of name value pairs to insert into the format string.
81 81
      * @param string $language The locale to use for formatting locale-dependent parts
82
-     * @return string|bool The formatted pattern string or `FALSE` if an error occurred
82
+     * @return string|false The formatted pattern string or `FALSE` if an error occurred
83 83
      */
84 84
     public function format($pattern, $params, $language)
85 85
     {
@@ -259,7 +259,7 @@  discard block
 block discarded – undo
259 259
      * @param string $pattern The pattern string to insert things into.
260 260
      * @param array $args The array of values to insert into the format string
261 261
      * @param string $locale The locale to use for formatting locale-dependent parts
262
-     * @return string|bool The formatted pattern string or `FALSE` if an error occurred
262
+     * @return false|string The formatted pattern string or `FALSE` if an error occurred
263 263
      */
264 264
     protected function fallbackFormat($pattern, $args, $locale)
265 265
     {
Please login to merge, or discard this patch.
framework/validators/DateValidator.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -308,7 +308,7 @@
 block discarded – undo
308 308
      * Parses date string into UNIX timestamp
309 309
      *
310 310
      * @param string $value string representing date
311
-     * @return int|false a UNIX timestamp or `false` on failure.
311
+     * @return integer a UNIX timestamp or `false` on failure.
312 312
      */
313 313
     protected function parseDateValue($value)
314 314
     {
Please login to merge, or discard this patch.
framework/web/AssetManager.php 1 patch
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -326,7 +326,7 @@  discard block
 block discarded – undo
326 326
      * Returns the actual file path for the specified asset.
327 327
      * @param AssetBundle $bundle the asset bundle which the asset file belongs to
328 328
      * @param string $asset the asset path. This should be one of the assets listed in [[js]] or [[css]].
329
-     * @return string|bool the actual file path, or false if the asset is specified as an absolute URL
329
+     * @return string|false the actual file path, or false if the asset is specified as an absolute URL
330 330
      */
331 331
     public function getAssetPath($bundle, $asset)
332 332
     {
@@ -462,7 +462,7 @@  discard block
 block discarded – undo
462 462
     /**
463 463
      * Publishes a file.
464 464
      * @param string $src the asset file to be published
465
-     * @return array the path and the URL that the asset is published as.
465
+     * @return string[] the path and the URL that the asset is published as.
466 466
      * @throws InvalidParamException if the asset to be published does not exist.
467 467
      */
468 468
     protected function publishFile($src)
@@ -507,7 +507,7 @@  discard block
 block discarded – undo
507 507
      *   it is found in the target directory. This option is used only when publishing a directory.
508 508
      *   This overrides [[forceCopy]] if set.
509 509
      *
510
-     * @return array the path directory and the URL that the asset is published as.
510
+     * @return string[] the path directory and the URL that the asset is published as.
511 511
      * @throws InvalidParamException if the asset to be published does not exist.
512 512
      */
513 513
     protected function publishDirectory($src, $options)
Please login to merge, or discard this patch.