firstly register op_service_providers and then boot them

laravel · Jul 31, 2024 · 6b7c52f · 6b7c52f
1 parent 3e72350
commit 6b7c52f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/ApplicationFactory.php b/src/ApplicationFactory.php
@@ -63,7 +63,6 @@ protected function getBootstrappers(Application $app): array
 
         $bootstrappers = $method->invoke($kernel);
 
-        // Replace RegisterProviders with OctaneRegisterProviders
         $replaceIndex = array_search(RegisterProviders::class, $bootstrappers, true);
         $bootstrappers = array_replace($bootstrappers, [$replaceIndex => OctaneRegisterProviders::class]);
 

diff --git a/src/Listeners/RegisterOperationServiceProviders.php b/src/Listeners/RegisterOperationServiceProviders.php
@@ -11,8 +11,15 @@ class RegisterOperationServiceProviders
      */
     public function handle($event): void
     {
+        $resolved_providers = [];
+
         foreach ($event->sandbox->make('config')->get('octane.op_service_providers', []) as $provider) {
-            $event->sandbox->register($provider);
+            $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);
         }
     }
 }