diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md index c3e13113cc..494abb6ca1 100644 --- a/framework/CHANGELOG.md +++ b/framework/CHANGELOG.md @@ -7,8 +7,10 @@ Yii Framework 2 Change Log - Bug #17744: Fix a bug with setting incorrect `defaultValue` to AR column with `CURRENT_TIMESTAMP(x)` as default expression (MySQL >= 5.6.4) (bizley) - Bug #17749: Dispatcher fix if target crashed in PHP 7.0+ (kamarton) - Bug #17762: PHP 7.4: Remove special condition for converting PHP errors to exceptions if they occurred inside of `__toString()` call (rob006) +- Bug #17771: migrate/fresh was not returning exit code (samdark) - Bug #17767: Make `Formatter::formatNumber` method protected (TheCodeholic) + 2.0.31 December 18, 2019 ------------------------ diff --git a/framework/console/controllers/BaseMigrateController.php b/framework/console/controllers/BaseMigrateController.php index 704bba7450..aac5b9a9e4 100644 --- a/framework/console/controllers/BaseMigrateController.php +++ b/framework/console/controllers/BaseMigrateController.php @@ -464,10 +464,11 @@ abstract class BaseMigrateController extends Controller if ($this->confirm( "Are you sure you want to reset the database and start the migration from the beginning?\nAll data will be lost irreversibly!")) { $this->truncateDatabase(); - $this->actionUp(); - } else { - $this->stdout('Action was cancelled by user. Nothing has been performed.'); + return $this->actionUp(); } + + $this->stdout('Action was cancelled by user. Nothing has been performed.'); + return ExitCode::OK; } /**