Completed
Pull Request — 2.1 (#11529)
by Misbahul D
12:09
created
framework/base/Model.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -401,7 +401,7 @@
 block discarded – undo
401 401
      * $model->validators[] = $newValidator;
402 402
      * ~~~
403 403
      *
404
-     * @return ArrayObject|\yii\validators\Validator[] all the validators declared in the model.
404
+     * @return ArrayObject all the validators declared in the model.
405 405
      */
406 406
     public function getValidators()
407 407
     {
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
@@ -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/CacheController.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -225,7 +225,7 @@
 block discarded – undo
225 225
     /**
226 226
      * Prompts user with confirmation if caches should be flushed.
227 227
      * @param array $cachesNames
228
-     * @return boolean
228
+     * @return boolean|null
229 229
      */
230 230
     private function confirmFlush($cachesNames)
231 231
     {
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
@@ -300,7 +300,7 @@  discard block
 block discarded – undo
300 300
      * Prompts user with confirmation if fixtures should be loaded.
301 301
      * @param array $fixtures
302 302
      * @param array $except
303
-     * @return boolean
303
+     * @return boolean|null
304 304
      */
305 305
     private function confirmLoad($fixtures, $except)
306 306
     {
@@ -329,7 +329,7 @@  discard block
 block discarded – undo
329 329
      * Prompts user with confirmation for fixtures that should be unloaded.
330 330
      * @param array $fixtures
331 331
      * @param array $except
332
-     * @return boolean
332
+     * @return boolean|null
333 333
      */
334 334
     private function confirmUnload($fixtures, $except)
335 335
     {
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.