add fixes

paulbalandan · paulbalandan · commit e8b448f93279 · 2026-04-13T20:02:20.000+08:00
diff --git a/system/Commands/Cache/InfoCache.php b/system/Commands/Cache/InfoCache.php
@@ -63,7 +63,7 @@ public function run(array $params)
         if ($config->handler !== 'file') {
             CLI::error('This command only supports the file cache handler.');
 
-            return;
+            return EXIT_ERROR;
         }
 
         $cache  = CacheFactory::getHandler($config);
@@ -87,5 +87,7 @@ public function run(array $params)
         ];
 
         CLI::table($tbody, $thead);
+
+        return EXIT_SUCCESS;
     }
 }
diff --git a/system/Commands/Database/CreateDatabase.php b/system/Commands/Database/CreateDatabase.php
@@ -115,7 +115,7 @@ public function run(array $params)
                         CLI::error("Database \"{$dbName}\" already exists.", 'light_gray', 'red');
                         CLI::newLine();
 
-                        return;
+                        return EXIT_ERROR;
                     }
 
                     unset($dbName);
@@ -130,22 +130,26 @@ public function run(array $params)
                     CLI::error('Database creation failed.', 'light_gray', 'red');
                     CLI::newLine();
 
-                    return;
+                    return EXIT_ERROR;
                     // @codeCoverageIgnoreEnd
                 }
             } elseif (! Database::forge()->createDatabase($name)) {
                 // @codeCoverageIgnoreStart
                 CLI::error('Database creation failed.', 'light_gray', 'red');
                 CLI::newLine();
 
-                return;
+                return EXIT_ERROR;
                 // @codeCoverageIgnoreEnd
             }
 
             CLI::write("Database \"{$name}\" successfully created.", 'green');
             CLI::newLine();
+
+            return EXIT_SUCCESS;
         } catch (Throwable $e) {
             $this->showError($e);
+
+            return EXIT_ERROR;
         } finally {
             Factories::reset('config');
             Database::connect(null, false);
diff --git a/system/Commands/Database/Migrate.php b/system/Commands/Database/Migrate.php
@@ -99,9 +99,12 @@ public function run(array $params)
 
             CLI::write(lang('Migrations.migrated'), 'green');
 
+            return EXIT_SUCCESS;
             // @codeCoverageIgnoreStart
         } catch (Throwable $e) {
             $this->showError($e);
+
+            return EXIT_ERROR;
             // @codeCoverageIgnoreEnd
         }
     }
diff --git a/system/Commands/Database/MigrateRefresh.php b/system/Commands/Database/MigrateRefresh.php
@@ -79,16 +79,15 @@ public function run(array $params)
             $force = array_key_exists('f', $params) || CLI::getOption('f');
 
             if (! $force && CLI::prompt(lang('Migrations.refreshConfirm'), ['y', 'n']) === 'n') {
-                return;
+                return EXIT_ERROR;
             }
 
             $params['f'] = null;
             // @codeCoverageIgnoreEnd
         }
 
-        $this->withSignalsBlocked(function () use ($params): void {
-            $this->call('migrate:rollback', $params);
-            $this->call('migrate', $params);
-        });
+        return $this->withSignalsBlocked(
+            fn (): int => $this->call('migrate:rollback', $params) | $this->call('migrate', $params),
+        );
     }
 }
diff --git a/system/Commands/Database/MigrateRollback.php b/system/Commands/Database/MigrateRollback.php
@@ -77,7 +77,7 @@ public function run(array $params)
             $force = array_key_exists('f', $params) || CLI::getOption('f');
 
             if (! $force && CLI::prompt(lang('Migrations.rollBackConfirm'), ['y', 'n']) === 'n') {
-                return null;
+                return EXIT_ERROR;
             }
             // @codeCoverageIgnoreEnd
         }
@@ -101,12 +101,20 @@ public function run(array $params)
 
             CLI::write(lang('Migrations.rollingBack') . ' ' . $batch, 'yellow');
 
-            $this->withSignalsBlocked(static function () use ($runner, $batch): void {
+            $exit = $this->withSignalsBlocked(static function () use ($runner, $batch): int {
                 if (! $runner->regress($batch)) {
                     CLI::error(lang('Migrations.generalFault'), 'light_gray', 'red'); // @codeCoverageIgnore
+
+                    return EXIT_ERROR;
                 }
+
+                return EXIT_SUCCESS;
             });
 
+            if ($exit !== EXIT_SUCCESS) {
+                return $exit;
+            }
+
             $messages = $runner->getCliMessages();
 
             foreach ($messages as $message) {
@@ -115,12 +123,13 @@ public function run(array $params)
 
             CLI::write('Done rolling back migrations.', 'green');
 
+            return EXIT_SUCCESS;
             // @codeCoverageIgnoreStart
         } catch (Throwable $e) {
             $this->showError($e);
+
+            return EXIT_ERROR;
             // @codeCoverageIgnoreEnd
         }
-
-        return null;
     }
 }
diff --git a/system/Commands/Database/MigrateStatus.php b/system/Commands/Database/MigrateStatus.php
@@ -150,7 +150,7 @@ public function run(array $params)
             CLI::error(lang('Migrations.noneFound'), 'light_gray', 'red');
             CLI::newLine();
 
-            return;
+            return EXIT_ERROR;
             // @codeCoverageIgnoreEnd
         }
 
@@ -164,5 +164,7 @@ public function run(array $params)
         ];
 
         CLI::table($status, $headers);
+
+        return EXIT_SUCCESS;
     }
 }
diff --git a/system/Commands/Database/Seed.php b/system/Commands/Database/Seed.php
@@ -77,8 +77,12 @@ public function run(array $params)
 
         try {
             $seeder->call($seedName);
+
+            return EXIT_SUCCESS;
         } catch (Throwable $e) {
             $this->showError($e);
+
+            return EXIT_ERROR;
         }
     }
 }
diff --git a/system/Commands/Encryption/GenerateKey.php b/system/Commands/Encryption/GenerateKey.php
@@ -89,14 +89,14 @@ public function run(array $params)
             CLI::write($encodedKey, 'yellow');
             CLI::newLine();
 
-            return;
+            return EXIT_ERROR;
         }
 
         if (! $this->setNewEncryptionKey($encodedKey, $params)) {
             CLI::write('Error in setting new encryption key to .env file.', 'light_gray', 'red');
             CLI::newLine();
 
-            return;
+            return EXIT_ERROR;
         }
 
         // force DotEnv to reload the new env vars
@@ -107,6 +107,8 @@ public function run(array $params)
 
         CLI::write('Application\'s new encryption key was successfully set.', 'green');
         CLI::newLine();
+
+        return EXIT_SUCCESS;
     }
 
     /**
diff --git a/system/Commands/Generators/CellGenerator.php b/system/Commands/Generators/CellGenerator.php
@@ -102,6 +102,6 @@ public function run(array $params)
 
         $this->generateView($namespace . $viewName, $params);
 
-        return 0;
+        return EXIT_SUCCESS;
     }
 }
diff --git a/system/Commands/Generators/CommandGenerator.php b/system/Commands/Generators/CommandGenerator.php
@@ -86,6 +86,8 @@ public function run(array $params)
 
         $this->classNameLang = 'CLI.generator.className.command';
         $this->generateClass($params);
+
+        return EXIT_SUCCESS;
     }
 
     /**
diff --git a/system/Commands/Generators/ConfigGenerator.php b/system/Commands/Generators/ConfigGenerator.php
@@ -82,6 +82,8 @@ public function run(array $params)
 
         $this->classNameLang = 'CLI.generator.className.config';
         $this->generateClass($params);
+
+        return EXIT_SUCCESS;
     }
 
     /**
diff --git a/system/Commands/Generators/ControllerGenerator.php b/system/Commands/Generators/ControllerGenerator.php
@@ -88,6 +88,8 @@ public function run(array $params)
 
         $this->classNameLang = 'CLI.generator.className.controller';
         $this->generateClass($params);
+
+        return EXIT_SUCCESS;
     }
 
     /**
diff --git a/system/Commands/Generators/EntityGenerator.php b/system/Commands/Generators/EntityGenerator.php
@@ -82,5 +82,7 @@ public function run(array $params)
 
         $this->classNameLang = 'CLI.generator.className.entity';
         $this->generateClass($params);
+
+        return EXIT_SUCCESS;
     }
 }
diff --git a/system/Commands/Generators/FilterGenerator.php b/system/Commands/Generators/FilterGenerator.php
@@ -82,5 +82,7 @@ public function run(array $params)
 
         $this->classNameLang = 'CLI.generator.className.filter';
         $this->generateClass($params);
+
+        return EXIT_SUCCESS;
     }
 }
diff --git a/system/Commands/Generators/MigrationGenerator.php b/system/Commands/Generators/MigrationGenerator.php
@@ -93,6 +93,8 @@ public function run(array $params)
 
         $this->classNameLang = 'CLI.generator.className.migration';
         $this->generateClass($params);
+
+        return EXIT_SUCCESS;
     }
 
     /**
diff --git a/system/Commands/Generators/ModelGenerator.php b/system/Commands/Generators/ModelGenerator.php
@@ -86,6 +86,8 @@ public function run(array $params)
 
         $this->classNameLang = 'CLI.generator.className.model';
         $this->generateClass($params);
+
+        return EXIT_SUCCESS;
     }
 
     /**
diff --git a/system/Commands/Generators/ScaffoldGenerator.php b/system/Commands/Generators/ScaffoldGenerator.php
@@ -115,9 +115,13 @@ public function run(array $params)
         $class = $params[0] ?? CLI::getSegment(2);
 
         // Call those commands!
-        $this->call('make:controller', array_merge([$class], $controllerOpts, $options));
-        $this->call('make:model', array_merge([$class], $modelOpts, $options));
-        $this->call('make:migration', array_merge([$class], $options));
-        $this->call('make:seeder', array_merge([$class], $options));
+        $exit1 = $this->call('make:controller', array_merge([$class], $controllerOpts, $options));
+        $exit2 = $this->call('make:model', array_merge([$class], $modelOpts, $options));
+        $exit3 = $this->call('make:migration', array_merge([$class], $options));
+        $exit4 = $this->call('make:seeder', array_merge([$class], $options));
+
+        assert(is_int($exit1) && is_int($exit2) && is_int($exit3) && is_int($exit4));
+
+        return $exit1 | $exit2 | $exit3 | $exit4;
     }
 }
diff --git a/system/Commands/Generators/SeederGenerator.php b/system/Commands/Generators/SeederGenerator.php
@@ -82,5 +82,7 @@ public function run(array $params)
 
         $this->classNameLang = 'CLI.generator.className.seeder';
         $this->generateClass($params);
+
+        return EXIT_SUCCESS;
     }
 }
diff --git a/system/Commands/Generators/TestGenerator.php b/system/Commands/Generators/TestGenerator.php
@@ -89,6 +89,8 @@ public function run(array $params)
         $autoload->addNamespace('Tests', ROOTPATH . 'tests');
 
         $this->generateClass($params);
+
+        return EXIT_SUCCESS;
     }
 
     /**
diff --git a/system/Commands/Generators/TransformerGenerator.php b/system/Commands/Generators/TransformerGenerator.php
@@ -82,6 +82,8 @@ public function run(array $params)
 
         $this->classNameLang = 'CLI.generator.className.transformer';
         $this->generateClass($params);
+
+        return EXIT_SUCCESS;
     }
 
     /**
diff --git a/system/Commands/Generators/ValidationGenerator.php b/system/Commands/Generators/ValidationGenerator.php
@@ -82,5 +82,7 @@ public function run(array $params)
 
         $this->classNameLang = 'CLI.generator.className.validation';
         $this->generateClass($params);
+
+        return EXIT_SUCCESS;
     }
 }
diff --git a/system/Commands/Help.php b/system/Commands/Help.php
@@ -78,10 +78,12 @@ public function run(array $params)
         $commands = $this->commands->getCommands();
 
         if (! $this->commands->verifyCommand($command, $commands)) {
-            return;
+            return EXIT_ERROR;
         }
 
         $class = new $commands[$command]['class']($this->logger, $this->commands);
         $class->showHelp();
+
+        return EXIT_SUCCESS;
     }
 }
diff --git a/system/Commands/Server/Serve.php b/system/Commands/Server/Serve.php
@@ -113,7 +113,9 @@ public function run(array $params)
         if ($status !== EXIT_SUCCESS && $this->portOffset < $this->tries) {
             $this->portOffset++;
 
-            $this->run($params);
+            return $this->run($params);
         }
+
+        return $status;
     }
 }
diff --git a/system/Commands/Utilities/Environment.php b/system/Commands/Utilities/Environment.php
@@ -89,7 +89,7 @@ public function run(array $params)
             CLI::write(sprintf('Your environment is currently set as %s.', CLI::color(service('superglobals')->server('CI_ENVIRONMENT', ENVIRONMENT), 'green')));
             CLI::newLine();
 
-            return EXIT_ERROR;
+            return EXIT_SUCCESS;
         }
 
         $env = strtolower(array_shift($params));
diff --git a/system/Commands/Utilities/Namespaces.php b/system/Commands/Utilities/Namespaces.php
@@ -89,6 +89,8 @@ public function run(array $params)
         ];
 
         CLI::table($tbody, $thead);
+
+        return EXIT_SUCCESS;
     }
 
     private function outputAllNamespaces(array $params): array
diff --git a/system/Commands/Utilities/Publish.php b/system/Commands/Utilities/Publish.php
diff --git a/system/Commands/Utilities/Routes.php b/system/Commands/Utilities/Routes.php
diff --git a/tests/_support/Commands/AppInfo.php b/tests/_support/Commands/AppInfo.php
diff --git a/tests/_support/Commands/InvalidCommand.php b/tests/_support/Commands/InvalidCommand.php
diff --git a/tests/_support/Commands/LanguageCommand.php b/tests/_support/Commands/LanguageCommand.php
diff --git a/tests/_support/Commands/Unsuffixable.php b/tests/_support/Commands/Unsuffixable.php

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ public function run(array $params)`
`63`	`63`	`if ($config->handler !== 'file') {`
`64`	`64`	`CLI::error('This command only supports the file cache handler.');`
`65`	`65`
`66`		`- return;`
	`66`	`+ return EXIT_ERROR;`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`$cache = CacheFactory::getHandler($config);`
`@@ -87,5 +87,7 @@ public function run(array $params)`
`87`	`87`	`];`
`88`	`88`
`89`	`89`	`CLI::table($tbody, $thead);`
	`90`	`+`
	`91`	`+ return EXIT_SUCCESS;`
`90`	`92`	`}`
`91`	`93`	`}`
Original file line number	Diff line number	Diff line change
`@@ -99,9 +99,12 @@ public function run(array $params)`
`99`	`99`
`100`	`100`	`CLI::write(lang('Migrations.migrated'), 'green');`
`101`	`101`
	`102`	`+ return EXIT_SUCCESS;`
`102`	`103`	`// @codeCoverageIgnoreStart`
`103`	`104`	`} catch (Throwable $e) {`
`104`	`105`	`$this->showError($e);`
	`106`	`+`
	`107`	`+ return EXIT_ERROR;`
`105`	`108`	`// @codeCoverageIgnoreEnd`
`106`	`109`	`}`
`107`	`110`	`}`
Original file line number	Diff line number	Diff line change
`@@ -79,16 +79,15 @@ public function run(array $params)`
`79`	`79`	`$force = array_key_exists('f', $params) \|\| CLI::getOption('f');`
`80`	`80`
`81`	`81`	`if (! $force && CLI::prompt(lang('Migrations.refreshConfirm'), ['y', 'n']) === 'n') {`
`82`		`- return;`
	`82`	`+ return EXIT_ERROR;`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`$params['f'] = null;`
`86`	`86`	`// @codeCoverageIgnoreEnd`
`87`	`87`	`}`
`88`	`88`
`89`		`- $this->withSignalsBlocked(function () use ($params): void {`
`90`		`- $this->call('migrate:rollback', $params);`
`91`		`- $this->call('migrate', $params);`
`92`		`- });`
	`89`	`+ return $this->withSignalsBlocked(`
	`90`	`+ fn (): int => $this->call('migrate:rollback', $params) \| $this->call('migrate', $params),`
	`91`	`+ );`
`93`	`92`	`}`
`94`	`93`	`}`
Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,7 @@ public function run(array $params)`
`150`	`150`	`CLI::error(lang('Migrations.noneFound'), 'light_gray', 'red');`
`151`	`151`	`CLI::newLine();`
`152`	`152`
`153`		`- return;`
	`153`	`+ return EXIT_ERROR;`
`154`	`154`	`// @codeCoverageIgnoreEnd`
`155`	`155`	`}`
`156`	`156`
`@@ -164,5 +164,7 @@ public function run(array $params)`
`164`	`164`	`];`
`165`	`165`
`166`	`166`	`CLI::table($status, $headers);`
	`167`	`+`
	`168`	`+ return EXIT_SUCCESS;`
`167`	`169`	`}`
`168`	`170`	`}`
Original file line number	Diff line number	Diff line change
`@@ -77,8 +77,12 @@ public function run(array $params)`
`77`	`77`
`78`	`78`	`try {`
`79`	`79`	`$seeder->call($seedName);`
	`80`	`+`
	`81`	`+ return EXIT_SUCCESS;`
`80`	`82`	`} catch (Throwable $e) {`
`81`	`83`	`$this->showError($e);`
	`84`	`+`
	`85`	`+ return EXIT_ERROR;`
`82`	`86`	`}`
`83`	`87`	`}`
`84`	`88`	`}`
Original file line number	Diff line number	Diff line change
`@@ -89,14 +89,14 @@ public function run(array $params)`
`89`	`89`	`CLI::write($encodedKey, 'yellow');`
`90`	`90`	`CLI::newLine();`
`91`	`91`
`92`		`- return;`
	`92`	`+ return EXIT_ERROR;`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`if (! $this->setNewEncryptionKey($encodedKey, $params)) {`
`96`	`96`	`CLI::write('Error in setting new encryption key to .env file.', 'light_gray', 'red');`
`97`	`97`	`CLI::newLine();`
`98`	`98`
`99`		`- return;`
	`99`	`+ return EXIT_ERROR;`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`// force DotEnv to reload the new env vars`
`@@ -107,6 +107,8 @@ public function run(array $params)`
`107`	`107`
`108`	`108`	`CLI::write('Application\'s new encryption key was successfully set.', 'green');`
`109`	`109`	`CLI::newLine();`
	`110`	`+`
	`111`	`+ return EXIT_SUCCESS;`
`110`	`112`	`}`
`111`	`113`
`112`	`114`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -102,6 +102,6 @@ public function run(array $params)`
`102`	`102`
`103`	`103`	`$this->generateView($namespace . $viewName, $params);`
`104`	`104`
`105`		`- return 0;`
	`105`	`+ return EXIT_SUCCESS;`
`106`	`106`	`}`
`107`	`107`	`}`
Original file line number	Diff line number	Diff line change
`@@ -86,6 +86,8 @@ public function run(array $params)`
`86`	`86`
`87`	`87`	`$this->classNameLang = 'CLI.generator.className.command';`
`88`	`88`	`$this->generateClass($params);`
	`89`	`+`
	`90`	`+ return EXIT_SUCCESS;`
`89`	`91`	`}`
`90`	`92`
`91`	`93`	`/**`