Fixed delegator de-duple

Author: thomasvargiu

src/ServiceManager.php

@@ -361,8 +361,8 @@ public function configure(array $config)
             $this->factories = $config['factories'] + $this->factories;
         }
 
-        if (isset($config['delegators'])) {
-            $this->delegators = ArrayUtils::merge($this->delegators, $config['delegators']);
+        if (isset($config['delegators']) && ! empty($config['delegators'])) {
+            $this->mergeDelegators($config['delegators']);
         }
 
         if (isset($config['shared'])) {
@@ -736,6 +736,32 @@ private function createLazyServiceDelegatorFactory()
         return $this->lazyServicesDelegator;
     }
 
+    /**
+     * Merge delegators avoiding multiple same delegators for the same service.
+     * It works with strings and class instances.
+     * It's not possibile to de-duple anonymous functions
+     *
+     * @param string[][]|Factory\DelegatorFactoryInterface[][] $config
+     * @return string[][]|Factory\DelegatorFactoryInterface[][]
+     */
+    private function mergeDelegators(array $config): array
+    {
+        foreach($config as $key => $delegators) {
+            if (! isset($this->delegators[$key])) {
+                $this->delegators[$key] = $delegators;
+                continue;
+            }
+
+            foreach ($delegators as $delegator) {
+                if (! in_array($delegator, $this->delegators[$key], true)) {
+                    $this->delegators[$key][] = $delegator;
+                }
+            }
+        }
+
+        return $this->delegators;
+    }
+
     /**
      * Create aliases and factories for invokable classes.
      *

test/ServiceManagerTest.php

@@ -12,15 +12,27 @@
 use Psr\Container\ContainerInterface;
 use ReflectionObject;
 use stdClass;
+use Zend\ServiceManager\Exception\ServiceNotCreatedException;
+use Zend\ServiceManager\Exception\ServiceNotFoundException;
 use Zend\ServiceManager\Factory\AbstractFactoryInterface;
+use Zend\ServiceManager\Factory\ContainerException;
+use Zend\ServiceManager\Factory\DelegatorFactoryInterface;
 use Zend\ServiceManager\Factory\FactoryInterface;
 use Zend\ServiceManager\Factory\InvokableFactory;
+use Zend\ServiceManager\Proxy\LazyServiceFactory;
 use Zend\ServiceManager\ServiceManager;
 use ZendTest\ServiceManager\TestAsset\InvokableObject;
 use ZendTest\ServiceManager\TestAsset\SimpleServiceManager;
 
 use function get_class;
 
+interface DecorableInterface
+{}
+class DecorableClass implements DecorableInterface
+{
+
+}
+
 /**
  * @covers \Zend\ServiceManager\ServiceManager
  */
@@ -371,27 +383,46 @@ public function testResolvedAliasNoMatchingAbstractFactoryReturnsFalse()
      */
     public function testConfigureMultipleTimes()
     {
+        $delegatorFactory = new class {
+            public function __invoke(
+                ContainerInterface $container,
+                $name,
+                callable $callback
+            ) {
+                /** @var InvokableObject $instance */
+                $instance = $callback();
+                $inc = $instance->getOptions()['inc'] ?? 0;
+
+                return new InvokableObject(['inc' => ++$inc]);
+            }
+        };
+
         $config = [
+            'factories' => [
+                'Foo' => function () {
+                    return new InvokableObject();
+                },
+            ],
             'delegators' => [
-                'Foo' => 'FooDelegator',
+                'Foo' => [
+                    $delegatorFactory,
+                    LazyServiceFactory::class,
+                ],
             ],
             'lazy_services' => [
                 'class_map' => [
-                    'Foo' => 'Foo',
+                    'Foo' => InvokableObject::class,
                 ],
-            ]
+            ],
         ];
 
         $serviceManager = new ServiceManager($config);
         $serviceManager->configure($config);
 
-        $ref = new ReflectionObject($serviceManager);
-        $delegatorsProperty = $ref->getProperty('delegators');
-        $delegatorsProperty->setAccessible(true);
-        $lazyServicesProperty = $ref->getProperty('lazyServices');
-        $lazyServicesProperty->setAccessible(true);
+        /** @var InvokableObject $instance */
+        $instance = $serviceManager->get('Foo');
 
-        self::assertSame($config['delegators'], $delegatorsProperty->getValue($serviceManager));
-        self::assertSame($config['lazy_services'], $lazyServicesProperty->getValue($serviceManager));
+        self::assertInstanceOf(InvokableObject::class, $instance);
+        self::assertSame(1, $instance->getOptions()['inc']);
     }
 }