zendframework#6266 - Using ArrayUtils::merge() for merging construc…

…tor parameters
Ocramius · May 20, 2014 · f91cf8f · f91cf8f
1 parent 8652a92
commit f91cf8f
Showing 1 changed file with 13 additions and 11 deletions.
diff --git a/library/Zend/Mvc/Service/ServiceManagerConfig.php b/library/Zend/Mvc/Service/ServiceManagerConfig.php
@@ -16,6 +16,7 @@
 use Zend\ServiceManager\ServiceLocatorInterface;
 use Zend\ServiceManager\ServiceManager;
 use Zend\ServiceManager\ServiceManagerAwareInterface;
+use Zend\Stdlib\ArrayUtils;
 
 class ServiceManagerConfig extends Config
 {
@@ -119,16 +120,17 @@ public function __construct(array $configuration = array())
             return $serviceLocator;
         };
 
-        $configuration = array_replace_recursive(array(
-            'invokables'         => $this->invokables,
-            'factories'          => $this->factories,
-            'abstract_factories' => $this->abstractFactories,
-            'aliases'            => $this->aliases,
-            'shared'             => $this->shared,
-            'delegators'         => $this->delegators,
-            'initializers'       => $this->initializers,
-        ), $configuration);
-
-        parent::__construct($configuration);
+        parent::__construct(ArrayUtils::merge(
+            array(
+                'invokables'         => $this->invokables,
+                'factories'          => $this->factories,
+                'abstract_factories' => $this->abstractFactories,
+                'aliases'            => $this->aliases,
+                'shared'             => $this->shared,
+                'delegators'         => $this->delegators,
+                'initializers'       => $this->initializers,
+            ),
+            $configuration
+        ));
     }
 }