Dynamic initializer discovery fix

tempestphp · May 30, 2024 · 05f000d · 05f000d
1 parent 8f7ffcb
commit 05f000d
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/src/Container/GenericContainer.php b/src/Container/GenericContainer.php
@@ -45,11 +45,23 @@ public function setInitializers(array $initializers): self
         return $this;
     }
 
+    public function setDynamicInitializers(array $dynamicInitializers): self
+    {
+        $this->dynamicInitializers = new ArrayIterator($dynamicInitializers);
+
+        return $this;
+    }
+
     public function getInitializers(): array
     {
         return $this->initializers->getArrayCopy();
     }
 
+    public function getDynamicInitializers(): array
+    {
+        return $this->dynamicInitializers->getArrayCopy();
+    }
+
     public function register(string $className, callable $definition): self
     {
         $this->definitions[$className] = $definition;

diff --git a/src/Discovery/InitializerDiscovery.php b/src/Discovery/InitializerDiscovery.php
@@ -42,14 +42,20 @@ public function hasCache(): bool
 
     public function storeCache(): void
     {
-        file_put_contents(self::CACHE_PATH, serialize($this->container->getInitializers()));
+        file_put_contents(self::CACHE_PATH, serialize(
+            [
+                'initializers' => $this->container->getInitializers(),
+                'dynamic_initializers' => $this->container->getDynamicInitializers(),
+            ],
+        ));
     }
 
     public function restoreCache(Container $container): void
     {
-        $initializers = unserialize(file_get_contents(self::CACHE_PATH));
+        $data = unserialize(file_get_contents(self::CACHE_PATH));
 
-        $this->container->setInitializers($initializers);
+        $this->container->setInitializers($data['initializers'] ?? []);
+        $this->container->setDynamicInitializers($data['dynamic_initializers'] ?? []);
     }
 
     public function destroyCache(): void