Caching override injector for current override module

ray-di · Mar 28, 2023 · c058571 · c058571
1 parent 59ced62
commit c058571
Showing 1 changed file with 6 additions and 9 deletions.
diff --git a/src/Application.php b/src/Application.php
@@ -27,8 +27,7 @@ class Application extends \Illuminate\Foundation\Application
 
     private AbstractModule|null $overrideModule = null;
 
-    /** @var array<string, InjectorInterface> */
-    private array $overrideInjectorInstance = [];
+    private InjectorInterface|null $overrideInjectorInstance = null;
 
     public function __construct(string $basePath, AbstractInjectorContext $injectorContext)
     {
@@ -79,12 +78,13 @@ public function flush()
 
         $this->overrideModule = null;
         $this->abstractsResolvedByRay = [];
-        $this->overrideInjectorInstance = [];
+        $this->overrideInjectorInstance = null;
     }
 
     public function overrideModule(AbstractModule $module): void
     {
         $this->overrideModule = $module;
+        $this->overrideInjectorInstance = null;
     }
 
     private function getInjector(): InjectorInterface
@@ -93,15 +93,12 @@ private function getInjector(): InjectorInterface
             return $this->injector;
         }
 
-        $currentModuleString = spl_object_hash($this->overrideModule);
-
-        if (isset($this->overrideInjectorInstance[$currentModuleString])) {
-            return $this->overrideInjectorInstance[$currentModuleString];
+        if ($this->overrideInjectorInstance !== null) {
+            return $this->overrideInjectorInstance;
         }
 
         $injector = ContextInjector::getOverrideInstance($this->context, $this->overrideModule);
-        $newModuleString = spl_object_hash($this->overrideModule);
-        $this->overrideInjectorInstance[$newModuleString] = $injector;
+        $this->overrideInjectorInstance = $injector;
 
         return $injector;
     }