fix acorn router not being loaded when WP_CLI is active

broskees · Jun 12, 2023 · 5d1bb21 · 5d1bb21
1 parent d63c4f5
commit 5d1bb21
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/src/Roots/Acorn/Bootloader.php b/src/Roots/Acorn/Bootloader.php
@@ -111,10 +111,6 @@ public function boot($callback = null)
         }
 
         if (Env::get('ACORN_ENABLE_EXPIRIMENTAL_ROUTER')) {
-            $app->singleton(
-                \Illuminate\Contracts\Http\Kernel::class,
-                \Roots\Acorn\Http\Kernel::class
-            );
             return $this->bootHttp($app);
         }
 
@@ -261,12 +257,14 @@ public function getApplication(): ApplicationContract
 
         $this->app->singleton(
             \Illuminate\Contracts\Http\Kernel::class,
-            $this->app->config->get('kernels.http', \Roots\Acorn\Kernel::class)
+            Env::get('ACORN_ENABLE_EXPIRIMENTAL_ROUTER')
+                ? \Roots\Acorn\Http\Kernel::class
+                : \Roots\Acorn\Kernel::class
         );
 
         $this->app->singleton(
             \Illuminate\Contracts\Console\Kernel::class,
-            $this->app->config->get('kernels.console', \Roots\Acorn\Console\Kernel::class)
+            \Roots\Acorn\Console\Kernel::class
         );
 
         $this->app->singleton(