Merge pull request #251 from settermjd/fix-bug-in-delegator-list-crea…

…tion Remove duplicate delgators for all services
laminas · Dec 19, 2024 · 6873b9e · 6873b9e
2 parents 9ccfbfc + d734c7d
commit 6873b9e
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 2 deletions.
diff --git a/src/ServiceManager.php b/src/ServiceManager.php
@@ -705,8 +705,7 @@ private function mergeDelegators(array $config): array
     {
         foreach ($config as $key => $delegators) {
             if (! array_key_exists($key, $this->delegators)) {
-                $this->delegators[$key] = $delegators;
-                continue;
+                $this->delegators[$key] = [];
             }
 
             foreach ($delegators as $delegator) {

diff --git a/test/ServiceManagerTest.php b/test/ServiceManagerTest.php
@@ -5,6 +5,7 @@
 namespace LaminasTest\ServiceManager;
 
 use DateTime;
+use Laminas\ContainerConfigTest\TestAsset\DelegatorFactory;
 use Laminas\ServiceManager\Factory\AbstractFactoryInterface;
 use Laminas\ServiceManager\Factory\FactoryInterface;
 use Laminas\ServiceManager\Factory\InvokableFactory;
@@ -372,6 +373,29 @@ public function testFactoryMayBeStaticMethodDescribedByCallableString(): void
         self::assertEquals(stdClass::class, $serviceManager->get(stdClass::class)::class);
     }
 
+    public function testDuplicateDelegatorsAreRemoved(): void
+    {
+        $dependencies   = [
+            'delegators' => [
+                DateTime::class => [
+                    DelegatorFactory::class,
+                    DelegatorFactory::class,
+                ],
+            ],
+        ];
+        $serviceManager = new ServiceManager($dependencies);
+        $property       = new ReflectionProperty(ServiceManager::class, "delegators");
+        $delegators     = $property->getValue($serviceManager);
+        self::assertSame(
+            [
+                DateTime::class => [
+                    DelegatorFactory::class,
+                ],
+            ],
+            $delegators
+        );
+    }
+
     public function testResolvedAliasFromAbstractFactory(): void
     {
         $abstractFactory = $this->createMock(AbstractFactoryInterface::class);