Performance: adds application snapshot and minimizes App::make

src/ApplicationGateway.php

@@ -14,9 +14,7 @@
 
 class ApplicationGateway
 {
-    use DispatchesEvents;
-
-    public function __construct(protected Application $app, protected Application $sandbox)
+    public function __construct(protected OctaneEventDispatcher $dispatcher, protected Application $snapshot, protected Application $sandbox)
     {
     }
 
@@ -27,14 +25,14 @@ public function handle(Request $request): Response
     {
         $request->enableHttpMethodParameterOverride();
 
-        $this->dispatchEvent($this->sandbox, new RequestReceived($this->app, $this->sandbox, $request));
+        $this->dispatcher->dispatchEvent(new RequestReceived($this->snapshot, $this->sandbox, $request));
 
         if (Octane::hasRouteFor($request->getMethod(), '/'.$request->path())) {
             return Octane::invokeRoute($request, $request->getMethod(), '/'.$request->path());
         }
 
-        return tap($this->sandbox->make(Kernel::class)->handle($request), function ($response) use ($request) {
-            $this->dispatchEvent($this->sandbox, new RequestHandled($this->sandbox, $request, $response));
+        return tap($this->snapshot->initialInstance(Kernel::class)->handle($request), function ($response) use ($request) {
+            $this->dispatcher->dispatchEvent(new RequestHandled($this->sandbox, $request, $response));
         });
     }
 
@@ -43,9 +41,9 @@ public function handle(Request $request): Response
      */
     public function terminate(Request $request, Response $response): void
     {
-        $this->sandbox->make(Kernel::class)->terminate($request, $response);
+        $this->snapshot->initialInstance(Kernel::class)->terminate($request, $response);
 
-        $this->dispatchEvent($this->sandbox, new RequestTerminated($this->app, $this->sandbox, $request, $response));
+        $this->dispatcher->dispatchEvent(new RequestTerminated($this->snapshot, $this->sandbox, $request, $response));
 
         $route = $request->route();
 

src/ApplicationSnapshot.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace Laravel\Octane;
+
+use Illuminate\Container\Container;
+use Illuminate\Foundation\Application;
+use Illuminate\Support\Facades\Facade;
+
+// this class creates a snapshot of the app container at a specific point in time.
+// We can later reset all properties of the app to those of the snapshot
+// This allows 'cloning' the original app without having to create a new instance
+class ApplicationSnapshot extends Application
+{
+    public static function createSnapshotFrom(Application $app): ApplicationSnapshot
+    {
+        $previousInstance = Container::getInstance();
+        $snapshot = new ApplicationSnapshot;
+        foreach (get_object_vars($app) as $key => $value) {
+            $snapshot->$key = $value;
+        }
+        Container::setInstance($previousInstance);
+
+        return $snapshot;
+    }
+
+    public function loadSnapshotInto(Application $app): void
+    {
+        foreach (get_object_vars($this) as $key => $value) {
+            $app->$key = $value;
+        }
+        Facade::clearResolvedInstances();
+    }
+
+    // fast access to an original app instance
+    public function initialInstance(string $abstract)
+    {
+        if (! array_key_exists($abstract, $this->resolved)) {
+            return null;
+        }
+
+        return $this->instances[$abstract] ?? $this->bindings[$abstract]['concrete']();
+    }
+}

src/Concerns/ProvidesDefaultConfigurationOptions.php

@@ -17,7 +17,7 @@ public static function prepareApplicationForNextRequest(): array
             \Laravel\Octane\Listeners\EnforceRequestScheme::class,
             \Laravel\Octane\Listeners\EnsureRequestServerPortMatchesScheme::class,
             \Laravel\Octane\Listeners\GiveNewRequestInstanceToApplication::class,
-            \Laravel\Octane\Listeners\GiveNewRequestInstanceToPaginator::class,
+            \Laravel\Octane\Listeners\ForgetViewEngines::class,
         ];
     }
 
@@ -29,22 +29,9 @@ public static function prepareApplicationForNextOperation(): array
         return [
             \Laravel\Octane\Listeners\CreateConfigurationSandbox::class,
             \Laravel\Octane\Listeners\CreateUrlGeneratorSandbox::class,
-            \Laravel\Octane\Listeners\GiveNewApplicationInstanceToAuthorizationGate::class,
-            \Laravel\Octane\Listeners\GiveNewApplicationInstanceToBroadcastManager::class,
-            \Laravel\Octane\Listeners\GiveNewApplicationInstanceToDatabaseManager::class,
-            \Laravel\Octane\Listeners\GiveNewApplicationInstanceToDatabaseSessionHandler::class,
-            \Laravel\Octane\Listeners\GiveNewApplicationInstanceToFilesystemManager::class,
-            \Laravel\Octane\Listeners\GiveNewApplicationInstanceToHttpKernel::class,
             \Laravel\Octane\Listeners\GiveNewApplicationInstanceToLogManager::class,
             \Laravel\Octane\Listeners\GiveNewApplicationInstanceToMailManager::class,
             \Laravel\Octane\Listeners\GiveNewApplicationInstanceToNotificationChannelManager::class,
-            \Laravel\Octane\Listeners\GiveNewApplicationInstanceToPipelineHub::class,
-            \Laravel\Octane\Listeners\GiveNewApplicationInstanceToCacheManager::class,
-            \Laravel\Octane\Listeners\GiveNewApplicationInstanceToSessionManager::class,
-            \Laravel\Octane\Listeners\GiveNewApplicationInstanceToQueueManager::class,
-            \Laravel\Octane\Listeners\GiveNewApplicationInstanceToRouter::class,
-            \Laravel\Octane\Listeners\GiveNewApplicationInstanceToValidationFactory::class,
-            \Laravel\Octane\Listeners\GiveNewApplicationInstanceToViewFactory::class,
             \Laravel\Octane\Listeners\FlushDatabaseRecordModificationState::class,
             \Laravel\Octane\Listeners\FlushDatabaseQueryLog::class,
             \Laravel\Octane\Listeners\RefreshQueryDurationHandling::class,

src/Listeners/CreateConfigurationSandbox.php

@@ -5,12 +5,17 @@
 class CreateConfigurationSandbox
 {
     /**
-     * Handle the event.
-     *
-     * @param  mixed  $event
+     * @var \Illuminate\Config\Repository
      */
+    private $config;
+
+    public function __construct()
+    {
+        $this->config = app('config');
+    }
+
     public function handle($event): void
     {
-        $event->sandbox->instance('config', clone $event->sandbox['config']);
+        $event->sandbox->instance('config', clone $this->config);
     }
 }

src/Listeners/CreateUrlGeneratorSandbox.php

@@ -2,15 +2,27 @@
 
 namespace Laravel\Octane\Listeners;
 
+use Illuminate\Routing\UrlGenerator;
+
 class CreateUrlGeneratorSandbox
 {
+    /**
+     * @var UrlGenerator
+     */
+    private $url;
+
+    public function __construct()
+    {
+        $this->url = app('url');
+    }
+
     /**
      * Handle the event.
      *
      * @param  mixed  $event
      */
     public function handle($event): void
     {
-        $event->sandbox->instance('url', clone $event->sandbox['url']);
+        $event->sandbox->instance('url', clone $this->url);
     }
 }

src/Listeners/EnforceRequestScheme.php

@@ -2,20 +2,30 @@
 
 namespace Laravel\Octane\Listeners;
 
+use Illuminate\Routing\UrlGenerator;
+
 class EnforceRequestScheme
 {
     /**
-     * Handle the event.
-     *
-     * @param  mixed  $event
+     * @var UrlGenerator
      */
+    private $url;
+
+    private bool $octaneHttps;
+
+    public function __construct()
+    {
+        $this->octaneHttps = (bool) config('octane.https');
+        $this->url = app('url');
+    }
+
     public function handle($event): void
     {
-        if (! $event->sandbox->make('config')->get('octane.https')) {
+        if (! $this->octaneHttps) {
             return;
         }
 
-        $event->sandbox->make('url')->forceScheme('https');
+        $this->url->forceScheme('https');
 
         $event->request->server->set('HTTPS', 'on');
     }

src/Listeners/EnsureRequestServerPortMatchesScheme.php

@@ -4,11 +4,6 @@
 
 class EnsureRequestServerPortMatchesScheme
 {
-    /**
-     * Handle the event.
-     *
-     * @param  mixed  $event
-     */
     public function handle($event): void
     {
         $port = $event->request->getPort();

src/Listeners/FlushArrayCache.php

@@ -4,15 +4,27 @@
 
 class FlushArrayCache
 {
+    /**
+     * @var ?\Illuminate\Cache\ArrayStore
+     */
+    private $arrayCache = null;
+
+    public function __construct()
+    {
+        if (app()->make('config')->get('cache.stores.array')) {
+            $this->arrayCache = app()->make('cache')->store('array');
+        }
+    }
+
     /**
      * Handle the event.
      *
      * @param  mixed  $event
      */
     public function handle($event): void
     {
-        if (config('cache.stores.array')) {
-            $event->sandbox->make('cache')->store('array')->flush();
+        if ($this->arrayCache) {
+            $this->arrayCache->flush();
         }
     }
 }

src/Listeners/FlushAuthenticationState.php

@@ -4,22 +4,31 @@
 
 class FlushAuthenticationState
 {
+    /**
+     * @var ?\Illuminate\Auth\AuthManager
+     */
+    private $auth = null;
+
+    public function __construct()
+    {
+        if (app()->resolved('auth.driver')) {
+            app()->forgetInstance('auth.driver');
+        }
+
+        if (app()->resolved('auth')) {
+            $this->auth = app()->make('auth');
+        }
+    }
+
     /**
      * Handle the event.
      *
      * @param  mixed  $event
      */
     public function handle($event): void
     {
-        if ($event->sandbox->resolved('auth.driver')) {
-            $event->sandbox->forgetInstance('auth.driver');
-        }
-
-        if ($event->sandbox->resolved('auth')) {
-            with($event->sandbox->make('auth'), function ($auth) use ($event) {
-                $auth->setApplication($event->sandbox);
-                $auth->forgetGuards();
-            });
+        if ($this->auth) {
+            $this->auth->forgetGuards();
         }
     }
 }

src/Listeners/FlushDatabaseQueryLog.php

@@ -4,18 +4,30 @@
 
 class FlushDatabaseQueryLog
 {
+    /**
+     * @var ?\Illuminate\Database\DatabaseManager
+     */
+    private $db = null;
+
+    public function __construct()
+    {
+        if (app()->resolved('db')) {
+            $this->db = app()->make('db');
+        }
+    }
+
     /**
      * Handle the event.
      *
      * @param  mixed  $event
      */
     public function handle($event): void
     {
-        if (! $event->sandbox->resolved('db')) {
+        if (! $this->db) {
             return;
         }
 
-        foreach ($event->sandbox->make('db')->getConnections() as $connection) {
+        foreach ($this->db->getConnections() as $connection) {
             $connection->flushQueryLog();
         }
     }

src/Listeners/FlushDatabaseRecordModificationState.php

@@ -4,18 +4,30 @@
 
 class FlushDatabaseRecordModificationState
 {
+    /**
+     * @var ?\Illuminate\Database\DatabaseManager
+     */
+    private $db = null;
+
+    public function __construct()
+    {
+        if (app()->resolved('db')) {
+            $this->db = app()->make('db');
+        }
+    }
+
     /**
      * Handle the event.
      *
      * @param  mixed  $event
      */
     public function handle($event): void
     {
-        if (! $event->sandbox->resolved('db')) {
+        if (! $this->db) {
             return;
         }
 
-        foreach ($event->sandbox->make('db')->getConnections() as $connection) {
+        foreach ($this->db->getConnections() as $connection) {
             $connection->forgetRecordModificationState();
         }
     }