Completed
Pull Request — master (#11729)
by Thiago
09:02
created
framework/helpers/BaseFileHelper.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -623,7 +623,7 @@
 block discarded – undo
623 623
      * @param string $pattern
624 624
      * @param boolean $caseSensitive
625 625
      * @throws \yii\base\InvalidParamException
626
-     * @return array with keys: (string) pattern, (int) flags, (int|boolean) firstWildcard
626
+     * @return string with keys: (string) pattern, (int) flags, (int|boolean) firstWildcard
627 627
      */
628 628
     private static function parseExcludePattern($pattern, $caseSensitive)
629 629
     {
Please login to merge, or discard this patch.
framework/helpers/BaseHtml.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -199,7 +199,7 @@  discard block
 block discarded – undo
199 199
 
200 200
     /**
201 201
      * Generates a link tag that refers to an external CSS file.
202
-     * @param array|string $url the URL of the external CSS file. This parameter will be processed by [[Url::to()]].
202
+     * @param string|boolean $url the URL of the external CSS file. This parameter will be processed by [[Url::to()]].
203 203
      * @param array $options the tag options in terms of name-value pairs. The following option is specially handled:
204 204
      *
205 205
      * - condition: specifies the conditional comments for IE, e.g., `lt IE 9`. When this is specified,
@@ -1810,7 +1810,7 @@  discard block
 block discarded – undo
1810 1810
      * ~~~
1811 1811
      *
1812 1812
      * @param array $options the options to be modified.
1813
-     * @param string|array $class the CSS class(es) to be added
1813
+     * @param string $class the CSS class(es) to be added
1814 1814
      */
1815 1815
     public static function addCssClass(&$options, $class)
1816 1816
     {
Please login to merge, or discard this patch.
framework/log/Logger.php 1 patch
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
128 128
      * Logs a message with the given type and category.
129 129
      * If [[traceLevel]] is greater than 0, additional call stack information about
130 130
      * the application code will be logged as well.
131
-     * @param string|array $message the message to be logged. This can be a simple string or a more
131
+     * @param string $message the message to be logged. This can be a simple string or a more
132 132
      * complex data structure that will be handled by a [[Target|log target]].
133 133
      * @param integer $level the level of the message. This must be one of the following:
134 134
      * `Logger::LEVEL_ERROR`, `Logger::LEVEL_WARNING`, `Logger::LEVEL_INFO`, `Logger::LEVEL_TRACE`,
@@ -193,7 +193,7 @@  discard block
 block discarded – undo
193 193
      * `$categories` and `$excludeCategories` as parameters to retrieve the
194 194
      * results that you are interested in.
195 195
      *
196
-     * @param array $categories list of categories that you are interested in.
196
+     * @param string[] $categories list of categories that you are interested in.
197 197
      * You can use an asterisk at the end of a category to do a prefix match.
198 198
      * For example, 'yii\db\*' will match categories starting with 'yii\db\',
199 199
      * such as 'yii\db\Connection'.
@@ -242,7 +242,7 @@  discard block
 block discarded – undo
242 242
      * Returns the statistical results of DB queries.
243 243
      * The results returned include the number of SQL statements executed and
244 244
      * the total time spent.
245
-     * @return array the first element indicates the number of SQL statements executed,
245
+     * @return integer[] the first element indicates the number of SQL statements executed,
246 246
      * and the second element the total time spent in SQL execution.
247 247
      */
248 248
     public function getDbProfiling()
Please login to merge, or discard this patch.
framework/log/SyslogTarget.php 1 patch
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -54,6 +54,7 @@
 block discarded – undo
54 54
 
55 55
     /**
56 56
      * @inheritdoc
57
+     * @return string
57 58
      */
58 59
     public function formatMessage($message)
59 60
     {
Please login to merge, or discard this patch.
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/validators/DateValidator.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -244,7 +244,7 @@
 block discarded – undo
244 244
      * Parses date string into UNIX timestamp
245 245
      *
246 246
      * @param string $value string representing date
247
-     * @return integer|false a UNIX timestamp or `false` on failure.
247
+     * @return integer a UNIX timestamp or `false` on failure.
248 248
      */
249 249
     protected function parseDateValue($value)
250 250
     {
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|boolean 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.
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.