Completed
Pull Request — master (#12971)
by Walt
834:47 queued 797:38
created
framework/captcha/CaptchaAction.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -138,7 +138,7 @@
 block discarded – undo
138 138
     /**
139 139
      * Generates a hash code that can be used for client side validation.
140 140
      * @param string $code the CAPTCHA code
141
-     * @return string a hash code generated from the CAPTCHA code
141
+     * @return integer a hash code generated from the CAPTCHA code
142 142
      */
143 143
     public function generateValidationHash($code)
144 144
     {
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
@@ -370,7 +370,7 @@
 block discarded – undo
370 370
      * Finds out a line of the first non-char PHP token found
371 371
      *
372 372
      * @param array $tokens
373
-     * @return int|string
373
+     * @return string
374 374
      * @since 2.0.1
375 375
      */
376 376
     protected function getLine($tokens)
Please login to merge, or discard this patch.
framework/db/ActiveQuery.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -385,7 +385,7 @@
 block discarded – undo
385 385
      * @param boolean|array $eagerLoading whether to eager load the relations specified in `$with`.
386 386
      * When this is a boolean, it applies to all relations specified in `$with`. Use an array
387 387
      * to explicitly list which relations in `$with` need to be eagerly loaded.
388
-     * @param string|array $joinType the join type of the relations specified in `$with`.
388
+     * @param string $joinType the join type of the relations specified in `$with`.
389 389
      * When this is a string, it applies to all relations specified in `$with`. Use an array
390 390
      * in the format of `relationName => joinType` to specify different join types for different relations.
391 391
      * @return $this the query object itself
Please login to merge, or discard this patch.
framework/db/ActiveRecord.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -320,7 +320,7 @@
 block discarded – undo
320 320
     /**
321 321
      * Returns the list of all attribute names of the model.
322 322
      * The default implementation will return all column names of the table associated with this AR class.
323
-     * @return array list of attribute names.
323
+     * @return integer[] list of attribute names.
324 324
      */
325 325
     public function attributes()
326 326
     {
Please login to merge, or discard this patch.
framework/db/ActiveRelationTrait.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -185,7 +185,7 @@  discard block
 block discarded – undo
185 185
      * Finds the related records and populates them into the primary models.
186 186
      * @param string $name the relation name
187 187
      * @param array $primaryModels primary models
188
-     * @return array the related models
188
+     * @return ActiveRecordInterface[] the related models
189 189
      * @throws InvalidConfigException if [[link]] is invalid
190 190
      */
191 191
     public function populateRelation($name, &$primaryModels)
@@ -341,7 +341,7 @@  discard block
 block discarded – undo
341 341
     }
342 342
 
343 343
     /**
344
-     * @param array $models
344
+     * @param ActiveRecordInterface[] $models
345 345
      * @param array $link
346 346
      * @param array $viaModels
347 347
      * @param array $viaLink
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 integer $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.
framework/db/oci/Schema.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
+     * @param string $name
57 58
      */
58 59
     public function quoteSimpleTableName($name)
59 60
     {
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.