Merge pull request #19962 from terabytesoftw/remove-deprecated-contro…

…ller Remove deprecated constant to `Controller::class`.
yiisoft · Sep 22, 2023 · d2c397d · d2c397d
2 parents b0cc791 + f7a9fa5
commit d2c397d
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 12 deletions.
diff --git a/framework/console/Controller.php b/framework/console/Controller.php
@@ -38,15 +38,6 @@
  */
 class Controller extends \yii\base\Controller
 {
-    /**
-     * @deprecated since 2.0.13. Use [[ExitCode::OK]] instead.
-     */
-    const EXIT_CODE_NORMAL = 0;
-    /**
-     * @deprecated since 2.0.13. Use [[ExitCode::UNSPECIFIED_ERROR]] instead.
-     */
-    const EXIT_CODE_ERROR = 1;
-
     /**
      * @var bool whether to run the command interactively.
      */

diff --git a/tests/framework/console/controllers/DbMessageControllerTest.php b/tests/framework/console/controllers/DbMessageControllerTest.php
@@ -8,6 +8,7 @@
 namespace yiiunit\framework\console\controllers;
 
 use Yii;
+use yii\console\ExitCode;
 use yii\db\Connection;
 
 /**
@@ -44,7 +45,7 @@ protected static function runConsoleAction($route, $params = [])
         ob_start();
         $result = Yii::$app->runAction($route, $params);
         echo 'Result is ' . $result;
-        if ($result !== \yii\console\Controller::EXIT_CODE_NORMAL) {
+        if ($result !== ExitCode::OK) {
             ob_end_flush();
         } else {
             ob_end_clean();

diff --git a/tests/framework/i18n/DbMessageSourceTest.php b/tests/framework/i18n/DbMessageSourceTest.php
@@ -9,6 +9,7 @@
 
 use Yii;
 use yii\base\Event;
+use yii\console\ExitCode;
 use yii\db\Connection;
 use yii\i18n\DbMessageSource;
 use yii\i18n\I18N;
@@ -66,7 +67,7 @@ protected static function runConsoleAction($route, $params = [])
         ob_start();
         $result = Yii::$app->runAction($route, $params);
         echo 'Result is ' . $result;
-        if ($result !== \yii\console\Controller::EXIT_CODE_NORMAL) {
+        if ($result !== ExitCode::OK) {
             ob_end_flush();
         } else {
             ob_end_clean();

diff --git a/tests/framework/log/DbTargetTest.php b/tests/framework/log/DbTargetTest.php
@@ -8,6 +8,7 @@
 namespace yiiunit\framework\log;
 
 use Yii;
+use yii\console\ExitCode;
 use yii\db\Connection;
 use yii\db\Query;
 use yii\log\Logger;
@@ -57,7 +58,7 @@ protected static function runConsoleAction($route, $params = [])
         ob_start();
         $result = Yii::$app->runAction($route, $params);
         echo 'Result is ' . $result;
-        if ($result !== \yii\console\Controller::EXIT_CODE_NORMAL) {
+        if ($result !== ExitCode::OK) {
             ob_end_flush();
         } else {
             ob_end_clean();