Merge branch 'main' into fix/request-handler-route-wordpress

Author: Log1x

src/Roots/Acorn/Application.php

@@ -2,7 +2,6 @@
 
 namespace Roots\Acorn;
 
-use Composer\InstalledVersions;
 use Exception;
 use Illuminate\Contracts\Container\BindingResolutionException;
 use Illuminate\Foundation\Application as FoundationApplication;
@@ -58,7 +57,6 @@ public function __construct($basePath = null)
         $this->useEnvironmentPath($this->environmentPath());
 
         $this->registerGlobalHelpers();
-        $this->registerSupportHelpers();
 
         parent::__construct($basePath);
     }
@@ -123,18 +121,6 @@ protected function registerGlobalHelpers()
         require_once dirname(__DIR__, 2).'/Illuminate/Foundation/helpers.php';
     }
 
-    /**
-     * Load the support helper functions.
-     *
-     * @return void
-     */
-    protected function registerSupportHelpers()
-    {
-        $path = InstalledVersions::getInstallPath('illuminate/support');
-
-        require_once "{$path}/helpers.php";
-    }
-
     /**
      * Set paths that are configurable by the developer.
      *

src/Roots/Acorn/Application/Concerns/Bootable.php

@@ -15,16 +15,21 @@
 trait Bootable
 {
     /**
-     * Boot the application's service providers.
-     *
-     * @return $this
+     * The configuration used to boot the application.
      */
-    public function bootAcorn()
+    protected array $bootConfiguration = [];
+
+    /**
+     * Boot the application and handle the request.
+     */
+    public function bootAcorn(array $bootConfiguration = []): static
     {
         if ($this->isBooted()) {
             return $this;
         }
 
+        $this->bootConfiguration = $bootConfiguration;
+
         if (! defined('LARAVEL_START')) {
             define('LARAVEL_START', microtime(true));
         }
@@ -236,7 +241,7 @@ protected function registerRequestHandler(
     /**
      * Handle the request.
      */
-    public function handleRequest(\Illuminate\Http\Request $request): void
+    public function handleRequest(Request $request): void
     {
         $kernel = $this->make(HttpKernelContract::class);
 
@@ -248,4 +253,12 @@ public function handleRequest(\Illuminate\Http\Request $request): void
 
         exit((int) $response->isServerError());
     }
+  
+    /**
+     * Retrieve the boot configuration.
+     */
+    public function getBootConfiguration(): array
+    {
+        return $this->bootConfiguration;
+    }
 }

src/Roots/Acorn/Configuration/ApplicationBuilder.php

@@ -13,6 +13,11 @@ class ApplicationBuilder extends FoundationApplicationBuilder
 {
     use Paths;
 
+    /**
+     * The application builder configuration.
+     */
+    protected array $config = [];
+
     /**
      * Register the standard kernel classes for the application.
      *
@@ -81,6 +86,17 @@ public function withRouting(?Closure $using = null,
             $this->app->handleWordPressRequests();
         }
 
+        $this->config['routing'] = [
+            'web' => $web,
+            'api' => $api,
+            'commands' => $commands,
+            'channels' => $channels,
+            'pages' => $pages,
+            'health' => $health,
+            'apiPrefix' => $apiPrefix,
+            'wordpress' => $wordpress,
+        ];
+
         return $this;
     }
 
@@ -126,6 +142,11 @@ public function withProviders(array $providers = [], bool $withBootstrapProvider
                 : null
         );
 
+        $this->config['providers'] = [
+            ...$this->config['providers'] ?? [],
+            ...$providers,
+        ];
+
         return $this;
     }
 
@@ -146,6 +167,6 @@ public function create()
      */
     public function boot()
     {
-        return $this->app->bootAcorn();
+        return $this->app->bootAcorn($this->config);
     }
 }

src/Roots/Acorn/Console/Concerns/GetsFreshApplication.php

@@ -15,9 +15,23 @@ protected function getFreshApplication()
     {
         $application = get_class($app = Application::getInstance());
 
+        $config = $app->getBootConfiguration();
+
+        $routing = $config['routing'] ?? [];
+
         return $application::configure($app->basePath())
             ->withPaths(...$this->getApplicationPaths($app))
-            ->withRouting()
+            ->withProviders($config['providers'] ?? [])
+            ->withRouting(
+                web: $routing['web'] ?? null,
+                api: $routing['api'] ?? null,
+                commands: $routing['commands'] ?? null,
+                channels: $routing['channels'] ?? null,
+                pages: $routing['pages'] ?? null,
+                health: $routing['health'] ?? null,
+                apiPrefix: $routing['apiPrefix'] ?? 'api',
+                wordpress: $routing['wordpress'] ?? false,
+            )
             ->boot();
     }