Introduce operation scoped service providers

config/octane.php

@@ -119,6 +119,20 @@
         ],
     ],
 
+    /*
+    |--------------------------------------------------------------------------
+    | Operation Scoped ServiceProviders
+    |--------------------------------------------------------------------------
+    |
+    | Here you can list service providers which should be registered
+    | on start of each operation, rather than during boot process.
+    |
+    */
+
+    'op_service_providers' => [
+        //
+    ],
+
     /*
     |--------------------------------------------------------------------------
     | Warm / Flush Bindings

src/ApplicationFactory.php

@@ -45,7 +45,14 @@ public function bootstrap(Application $app, array $initialInstances = []): Appli
 
         $app->bootstrapWith($this->getBootstrappers($app));
 
-        $app->loadDeferredProviders();
+        // We will register all but operation scoped deferred providers right away so
+        // they are resolved once, during boot. Remaining operation providers will 
+        // be registered with classical approach, during the occasions of need.
+        foreach ($app->getDeferredServices() as $service => $provider) {
+            if (!in_array($provider, $app->make('config')->get('octane.op_service_providers', []))) {
+                $app->loadDeferredProvider($service);
+            }
+        }
 
         return $app;
     }
@@ -61,10 +68,15 @@ protected function getBootstrappers(Application $app): array
 
         $method->setAccessible(true);
 
+        $bootstrappers = $method->invoke($kernel);
+
+        $replaceIndex = array_search(RegisterProviders::class, $bootstrappers, true);
+        $bootstrappers = array_replace($bootstrappers, [$replaceIndex => OctaneRegisterProviders::class]);
+
         return $this->injectBootstrapperBefore(
-            RegisterProviders::class,
+            OctaneRegisterProviders::class,
             SetRequestForConsole::class,
-            $method->invoke($kernel)
+            $bootstrappers
         );
     }
 

src/Concerns/ProvidesDefaultConfigurationOptions.php

@@ -53,6 +53,7 @@ public static function prepareApplicationForNextOperation(): array
             \Laravel\Octane\Listeners\FlushMonologState::class,
             \Laravel\Octane\Listeners\FlushStrCache::class,
             \Laravel\Octane\Listeners\FlushTranslatorCache::class,
+            \Laravel\Octane\Listeners\RegisterOperationServiceProviders::class,
 
             // First-Party Packages...
             \Laravel\Octane\Listeners\PrepareInertiaForNextOperation::class,

src/Listeners/RegisterOperationServiceProviders.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace Laravel\Octane\Listeners;
+
+class RegisterOperationServiceProviders
+{
+    /**
+     * Handle the event.
+     *
+     * @param  mixed  $event
+     */
+    public function handle($event): void
+    {
+        $resolved_providers = [];
+
+        foreach ($event->sandbox->make('config')->get('octane.op_service_providers', []) as $provider) {
+            $provider = $event->sandbox->resolveProvider($provider);
+            if ($provider->isDeferred()) continue;
+            $resolved_providers[] = $event->sandbox->register($provider, boot: false);
+        }
+
+        // After all service providers have been registered, we will boot them.
+        foreach ($resolved_providers as $provider) {
+            $event->sandbox->bootProvider($provider);
+        }
+    }
+}

src/OctaneProviderRepository.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace Laravel\Octane;
+
+use Illuminate\Foundation\ProviderRepository;
+
+class OctaneProviderRepository extends ProviderRepository
+{
+    /**
+     * Register the application service providers.
+     *
+     * @param  array  $providers
+     * @return void
+     */
+    public function load(array $providers)
+    {
+        $manifest = $this->loadManifest();
+
+        // First we will load the service manifest, which contains information on all
+        // service providers registered with the application and which services it
+        // provides. This is used to know which services are "deferred" loaders.
+        if ($this->shouldRecompile($manifest, $providers)) {
+            $manifest = $this->compileManifest($providers);
+        }
+
+        // Next, we will register events to load the providers for each of the events
+        // that it has requested. This allows the service provider to defer itself
+        // while still getting automatically loaded when a certain event occurs.
+        foreach ($manifest['when'] as $provider => $events) {
+            $this->registerLoadEvents($provider, $events);
+        }
+
+        // We will register eagerly loaded providers, just like base ProviderRepository,
+        // except we will leave out the ones specified in op_service_providers array.
+        foreach ($manifest['eager'] as $provider) {
+            if (!in_array($provider, $this->app->make('config')->get('octane.op_service_providers', []))) {
+                $this->app->register($provider);
+            }
+        }
+
+        $this->app->addDeferredServices($manifest['deferred']);
+    }
+}

src/OctaneRegisterProviders.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace Laravel\Octane;
+
+use Illuminate\Contracts\Foundation\Application;
+use Laravel\Octane\OctaneProviderRepository;
+use Illuminate\Filesystem\FileSystem;
+use Illuminate\Foundation\Bootstrap\RegisterProviders;
+
+class OctaneRegisterProviders extends RegisterProviders
+{
+    /**
+     * Bootstrap the given application.
+     *
+     * @param  \Illuminate\Contracts\Foundation\Application  $app
+     * @return void
+     */
+    public function bootstrap(Application $app)
+    {
+        if (
+            !$app->bound('config_loaded_from_cache') ||
+            $app->make('config_loaded_from_cache') === false
+        ) {
+            $this->mergeAdditionalProviders($app);
+        }
+
+        $providerRepository = new OctaneProviderRepository($app, new FileSystem, $app->getCachedServicesPath());
+
+        $app->registerConfiguredProviders($providerRepository);
+    }
+}