Completed
Push — fix-error-handling-regression ( ef2bf2 )
by Alexander
09:24
created
framework/db/Migration.php 1 patch
Doc Comments   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -90,7 +90,7 @@  discard block
 block discarded – undo
90 90
     /**
91 91
      * This method contains the logic to be executed when applying this migration.
92 92
      * Child classes may override this method to provide actual migration logic.
93
-     * @return bool return a false value to indicate the migration fails
93
+     * @return false|null return a false value to indicate the migration fails
94 94
      * and should not proceed further. All other return values mean the migration succeeds.
95 95
      */
96 96
     public function up()
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
119 119
      * This method contains the logic to be executed when removing this migration.
120 120
      * The default implementation throws an exception indicating the migration cannot be removed.
121 121
      * Child classes may override this method if the corresponding migrations can be removed.
122
-     * @return bool return a false value to indicate the migration fails
122
+     * @return false|null return a false value to indicate the migration fails
123 123
      * and should not proceed further. All other return values mean the migration succeeds.
124 124
      */
125 125
     public function down()
@@ -164,7 +164,7 @@  discard block
 block discarded – undo
164 164
      * please refer to [implicit commit](http://dev.mysql.com/doc/refman/5.7/en/implicit-commit.html). If this is the case,
165 165
      * you should still implement `up()` and `down()`, instead.
166 166
      *
167
-     * @return bool return a false value to indicate the migration fails
167
+     * @return boolean|null return a false value to indicate the migration fails
168 168
      * and should not proceed further. All other return values mean the migration succeeds.
169 169
      */
170 170
     public function safeUp()
@@ -182,7 +182,7 @@  discard block
 block discarded – undo
182 182
      * please refer to [implicit commit](http://dev.mysql.com/doc/refman/5.7/en/implicit-commit.html). If this is the case,
183 183
      * you should still implement `up()` and `down()`, instead.
184 184
      *
185
-     * @return bool return a false value to indicate the migration fails
185
+     * @return boolean|null return a false value to indicate the migration fails
186 186
      * and should not proceed further. All other return values mean the migration succeeds.
187 187
      */
188 188
     public function safeDown()
@@ -401,7 +401,7 @@  discard block
 block discarded – undo
401 401
      * The method will properly quote the table and column names.
402 402
      * @param string $name the name of the primary key constraint.
403 403
      * @param string $table the table that the primary key constraint will be added to.
404
-     * @param string|array $columns comma separated string or array of columns that the primary key will consist of.
404
+     * @param string[] $columns comma separated string or array of columns that the primary key will consist of.
405 405
      */
406 406
     public function addPrimaryKey($name, $table, $columns)
407 407
     {
@@ -429,9 +429,9 @@  discard block
 block discarded – undo
429 429
      * The method will properly quote the table and column names.
430 430
      * @param string $name the name of the foreign key constraint.
431 431
      * @param string $table the table that the foreign key constraint will be added to.
432
-     * @param string|array $columns the name of the column to that the constraint will be added on. If there are multiple columns, separate them with commas or use an array.
432
+     * @param string $columns the name of the column to that the constraint will be added on. If there are multiple columns, separate them with commas or use an array.
433 433
      * @param string $refTable the table that the foreign key references to.
434
-     * @param string|array $refColumns the name of the column that the foreign key references to. If there are multiple columns, separate them with commas or use an array.
434
+     * @param string $refColumns the name of the column that the foreign key references to. If there are multiple columns, separate them with commas or use an array.
435 435
      * @param string $delete the ON DELETE option. Most DBMS support these options: RESTRICT, CASCADE, NO ACTION, SET DEFAULT, SET NULL
436 436
      * @param string $update the ON UPDATE option. Most DBMS support these options: RESTRICT, CASCADE, NO ACTION, SET DEFAULT, SET NULL
437 437
      */
@@ -460,7 +460,7 @@  discard block
 block discarded – undo
460 460
      * Builds and executes a SQL statement for creating a new index.
461 461
      * @param string $name the name of the index. The name will be properly quoted by the method.
462 462
      * @param string $table the table that the new index will be created for. The table name will be properly quoted by the method.
463
-     * @param string|array $columns the column(s) that should be included in the index. If there are multiple columns, please separate them
463
+     * @param string $columns the column(s) that should be included in the index. If there are multiple columns, please separate them
464 464
      * by commas or use an array. Each column name will be properly quoted by the method. Quoting will be skipped for column names that
465 465
      * include a left parenthesis "(".
466 466
      * @param bool $unique whether to add UNIQUE constraint on the created index.
Please login to merge, or discard this patch.
framework/console/controllers/BaseMigrateController.php 1 patch
Doc Comments   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -204,7 +204,7 @@  discard block
 block discarded – undo
204 204
      * yii migrate/down all # revert all migrations
205 205
      * ```
206 206
      *
207
-     * @param int|string $limit the number of migrations to be reverted. Defaults to 1,
207
+     * @param integer $limit the number of migrations to be reverted. Defaults to 1,
208 208
      * meaning the last applied migration will be reverted. When value is "all", all migrations will be reverted.
209 209
      * @throws Exception if the number of the steps specified is less than 1.
210 210
      *
@@ -266,7 +266,7 @@  discard block
 block discarded – undo
266 266
      * yii migrate/redo all # redo all migrations
267 267
      * ```
268 268
      *
269
-     * @param int|string $limit the number of migrations to be redone. Defaults to 1,
269
+     * @param integer $limit the number of migrations to be redone. Defaults to 1,
270 270
      * meaning the last applied migration will be redone. When equals "all", all migrations will be redone.
271 271
      * @throws Exception if the number of the steps specified is less than 1.
272 272
      *
@@ -463,7 +463,7 @@  discard block
 block discarded – undo
463 463
      * yii migrate/history all # showing the whole history
464 464
      * ```
465 465
      *
466
-     * @param int|string $limit the maximum number of migrations to be displayed.
466
+     * @param integer $limit the maximum number of migrations to be displayed.
467 467
      * If it is "all", the whole migration history will be displayed.
468 468
      * @throws \yii\console\Exception if invalid limit value passed
469 469
      */
@@ -507,7 +507,7 @@  discard block
 block discarded – undo
507 507
      * yii migrate/new all # showing all new migrations
508 508
      * ```
509 509
      *
510
-     * @param int|string $limit the maximum number of new migrations to be displayed.
510
+     * @param integer $limit the maximum number of new migrations to be displayed.
511 511
      * If it is `all`, all available new migrations will be displayed.
512 512
      * @throws \yii\console\Exception if invalid limit value passed
513 513
      */
Please login to merge, or discard this patch.