refactor: move code from spark to Boot class

Author: kenjis

spark

@@ -80,41 +80,5 @@ $paths = new Config\Paths();
 
 // LOAD THE FRAMEWORK BOOTSTRAP FILE
 require $paths->systemDirectory . '/Boot.php';
-CodeIgniter\Boot::BootSpark($paths);
 
-/*
- * ---------------------------------------------------------------
- * GRAB OUR CODEIGNITER INSTANCE
- * ---------------------------------------------------------------
- */
-
-$app = Config\Services::codeigniter();
-$app->initialize();
-
-/*
- * ---------------------------------------------------------------
- * GRAB OUR CONSOLE
- * ---------------------------------------------------------------
- */
-
-$console = new CodeIgniter\CLI\Console();
-
-// SHOW HEADER
-// Show basic information before we do anything else.
-if (is_int($suppress = array_search('--no-header', $_SERVER['argv'], true))) {
-    unset($_SERVER['argv'][$suppress]); // @codeCoverageIgnore
-    $suppress = true;
-}
-
-$console->showHeader($suppress);
-
-/*
- *---------------------------------------------------------------
- * EXECUTE THE COMMAND
- *---------------------------------------------------------------
- */
-
-// fire off the command in the main framework.
-$exit = $console->run();
-
-exit(is_int($exit) ? $exit : EXIT_SUCCESS);
+exit(CodeIgniter\Boot::BootSpark($paths));

system/Boot.php

@@ -14,6 +14,7 @@
 namespace CodeIgniter;
 
 use CodeIgniter\Cache\FactoriesCache;
+use CodeIgniter\CLI\Console;
 use CodeIgniter\Config\DotEnv;
 use Config\Autoload;
 use Config\Cache;
@@ -73,8 +74,10 @@ public static function bootWeb(Paths $paths): int
 
     /**
      * Used by `spark`
+     *
+     * @return int Exit code.
      */
-    public static function bootSpark(Paths $paths): void
+    public static function bootSpark(Paths $paths): int
     {
         static::definePathConstants($paths);
         if (! defined('APP_NAMESPACE')) {
@@ -90,6 +93,11 @@ public static function bootSpark(Paths $paths): void
         static::loadAutoloader();
         static::setExceptionHandler();
         static::initializeKint();
+
+        static::initializeCodeIgniter();
+        $console = static::initializeConsole();
+
+        return static::runCommand($console);
     }
 
     /**
@@ -299,4 +307,27 @@ protected static function saveConfigCache(FactoriesCache $factoriesCache): void
     {
         $factoriesCache->save('config');
     }
+
+    protected static function initializeConsole(): Console
+    {
+        $console = new Console();
+
+        // Show basic information before we do anything else.
+        // @phpstan-ignore-next-line
+        if (is_int($suppress = array_search('--no-header', $_SERVER['argv'], true))) {
+            unset($_SERVER['argv'][$suppress]); // @phpstan-ignore-line
+            $suppress = true;
+        }
+
+        $console->showHeader($suppress);
+
+        return $console;
+    }
+
+    protected static function runCommand(Console $console): int
+    {
+        $exit = $console->run();
+
+        return is_int($exit) ? $exit : EXIT_SUCCESS;
+    }
 }