Remove duplicate delgators for all services

mergeDelegators' documentation says that it merges delegators avoiding multiple same delegators for the same service. However, from experimenting with it, duplicates were allowed, as best as I could tell. So, I've created this small patch to ensure that duplicates are removed, along with a covering test for it to verify the change. Signed-off-by: Matthew Setter <[email protected]>
laminas · Dec 13, 2024 · ed56555 · ed56555
1 parent 340409a
commit ed56555
Show file tree

Hide file tree

Showing 2 changed files with 26 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,30 @@ 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");
+        $property->setAccessible(true);
+        $delegators = $property->getValue($serviceManager);
+        self::assertSame(
+            [
+                DateTime::class => [
+                    DelegatorFactory::class,
+                ],
+            ],
+            $delegators
+        );
+    }
+
     public function testResolvedAliasFromAbstractFactory(): void
     {
         $abstractFactory = $this->createMock(AbstractFactoryInterface::class);