Hotfix #279

Author: thomasvargiu

src/ServiceManager.php

@@ -34,6 +34,7 @@
 use function spl_object_hash;
 use function sprintf;
 use function trigger_error;
+use Zend\Stdlib\ArrayUtils;
 
 /**
  * Service Manager.
@@ -362,7 +363,7 @@ public function configure(array $config)
         }
 
         if (isset($config['delegators'])) {
-            $this->delegators = array_merge_recursive($this->delegators, $config['delegators']);
+            $this->delegators = ArrayUtils::merge($this->delegators, $config['delegators']);
         }
 
         if (isset($config['shared'])) {
@@ -383,7 +384,7 @@ public function configure(array $config)
         // If lazy service configuration was provided, reset the lazy services
         // delegator factory.
         if (isset($config['lazy_services']) && ! empty($config['lazy_services'])) {
-            $this->lazyServices          = array_merge_recursive($this->lazyServices, $config['lazy_services']);
+            $this->lazyServices          = ArrayUtils::merge($this->lazyServices, $config['lazy_services']);
             $this->lazyServicesDelegator = null;
         }
 

test/ServiceManagerTest.php

@@ -10,6 +10,7 @@
 use DateTime;
 use PHPUnit\Framework\TestCase;
 use Psr\Container\ContainerInterface;
+use ReflectionObject;
 use stdClass;
 use Zend\ServiceManager\Factory\AbstractFactoryInterface;
 use Zend\ServiceManager\Factory\FactoryInterface;
@@ -363,4 +364,34 @@ public function testResolvedAliasNoMatchingAbstractFactoryReturnsFalse()
 
         self::assertFalse($serviceManager->has('Alias'));
     }
+
+    /**
+     * Hotfix #279
+     * @see https://github.com/zendframework/zend-servicemanager/issues/279
+     */
+    public function testConfigureMultipleTimes()
+    {
+        $config = [
+            'delegators' => [
+                'Foo' => 'FooDelegator',
+            ],
+            'lazy_services' => [
+                'class_map' => [
+                    'Foo' => 'Foo',
+                ],
+            ]
+        ];
+
+        $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);
+
+        self::assertSame($config['delegators'], $delegatorsProperty->getValue($serviceManager));
+        self::assertSame($config['lazy_services'], $lazyServicesProperty->getValue($serviceManager));
+    }
 }