Resolve Circular dependency and Exceptions in Symfony container (#15)

fix: resolve circular dependencies
qossmic · Mar 28, 2024 · aecac14 · aecac14
1 parent b1e520f
commit aecac14
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 14 deletions.
diff --git a/config/services.php b/config/services.php
@@ -282,7 +282,7 @@
     $services
         ->set(LayerResolver::class)
         ->args([
-            '$layers' => param('layers'),
+            '$layersConfig' => param('layers'),
         ]);
     $services->alias(LayerResolverInterface::class, LayerResolver::class);
     $services

diff --git a/src/Core/Layer/LayerResolver.php b/src/Core/Layer/LayerResolver.php
@@ -16,25 +16,29 @@ class LayerResolver implements LayerResolverInterface
     /**
      * @var array<string, Collectable[]>
      */
-    private array $layers;
+    private array $layers = [];
+
+    private bool $initialized = false;
 
     /**
      * @var array<string, array<string, bool>>
      */
     private array $resolved = [];
 
     /**
-     * @param array<array{name?: string, collectors: array<array<string, string|array<string, string>>>}> $layers
-     *
-     * @throws InvalidLayerDefinitionException
+     * @param array<array{name?: string, collectors?: array<array<string, string|array<string, string>>>}> $layersConfig
      */
-    public function __construct(private readonly CollectorResolverInterface $collectorResolver, array $layers)
-    {
-        $this->initializeLayers($layers);
-    }
+    public function __construct(
+        private readonly CollectorResolverInterface $collectorResolver,
+        private readonly array $layersConfig,
+    ) {}
 
     public function getLayersForReference(TokenReferenceInterface $reference): array
     {
+        if (false === $this->initialized) {
+            $this->initializeLayers();
+        }
+
         $tokenName = $reference->getToken()->toString();
         if (array_key_exists($tokenName, $this->resolved)) {
             return $this->resolved[$tokenName];
@@ -64,6 +68,10 @@ public function getLayersForReference(TokenReferenceInterface $reference): array
 
     public function isReferenceInLayer(string $layer, TokenReferenceInterface $reference): bool
     {
+        if (false === $this->initialized) {
+            $this->initializeLayers();
+        }
+
         $tokenName = $reference->getToken()->toString();
         if (array_key_exists($tokenName, $this->resolved) && [] !== $this->resolved[$tokenName]) {
             return array_key_exists($layer, $this->resolved[$tokenName]);
@@ -86,18 +94,20 @@ public function isReferenceInLayer(string $layer, TokenReferenceInterface $refer
 
     public function has(string $layer): bool
     {
+        if (false === $this->initialized) {
+            $this->initializeLayers();
+        }
+
         return array_key_exists($layer, $this->layers);
     }
 
     /**
-     * @param array<array{name?: string, collectors?: array<array<string, string|array<string, string>>>}> $layers
-     *
      * @throws InvalidLayerDefinitionException
      */
-    private function initializeLayers(array $layers): void
+    private function initializeLayers(): void
     {
         $this->layers = [];
-        foreach ($layers as $layer) {
+        foreach ($this->layersConfig as $layer) {
             if (!array_key_exists('name', $layer)) {
                 throw InvalidLayerDefinitionException::missingName();
             }
@@ -120,5 +130,7 @@ private function initializeLayers(array $layers): void
         if ([] === $this->layers) {
             throw InvalidLayerDefinitionException::layerRequired();
         }
+
+        $this->initialized = true;
     }
 }
diff --git a/src/Core/Layer/LayerResolverInterface.php b/src/Core/Layer/LayerResolverInterface.php
@@ -27,5 +27,8 @@ public function getLayersForReference(TokenReferenceInterface $reference): array
      */
     public function isReferenceInLayer(string $layer, TokenReferenceInterface $reference): bool;
 
+    /**
+     * @throws InvalidLayerDefinitionException
+     */
     public function has(string $layer): bool;
 }
diff --git a/tests/Core/Layer/LayerResolverTest.php b/tests/Core/Layer/LayerResolverTest.php
@@ -78,10 +78,12 @@ public function testInvalidLayerConfigs(array $layers, string $exception, string
         $this->expectException($exception);
         $this->expectExceptionMessage($expectedMessage);
 
-        new LayerResolver(
+        $resolver = new LayerResolver(
             $this->createMock(CollectorResolverInterface::class),
             $layers
         );
+
+        $resolver->has('Anything');
     }
 
     public function testHas(): void