Merge pull request #372 from magento-extensibility/MAGETWO-48214-di-config

[Extensibility] MAGETWO-48214

Author: He, Joan(johe)

lib/internal/Magento/Framework/App/Config/Data.php

@@ -29,7 +29,8 @@ class Data implements DataInterface
      */
     public function __construct(MetadataProcessor $processor, array $data)
     {
-        $this->_data = $processor->process($data);
+        /** Clone the array to work around a kink in php7 that modifies the argument by reference */
+        $this->_data = $processor->process($this->arrayClone($data));
         $this->_source = $data;
     }
 
@@ -77,4 +78,19 @@ public function setValue($path, $value)
         }
         $currentElement[$lastKey] = $value;
     }
+
+    /**
+     * Copy array by value
+     *
+     * @param array $data
+     * @return array
+     */
+    private function arrayClone(array $data)
+    {
+        $clone = [];
+        foreach ($data as $key => $value) {
+            $clone[$key]= $value;
+        }
+        return $clone;
+    }
 }

setup/src/Magento/Setup/Module/Di/Compiler/Config/Chain/InterceptorSubstitution.php

@@ -38,12 +38,9 @@ public function modify(array $config)
         }
 
         $config['preferences'] = $this->resolvePreferences($config['preferences'], $interceptors);
-
-        $config['preferences'] = array_merge($config['preferences'], $interceptors);
+        $config['preferences'] = array_merge($interceptors, $config['preferences']);
         $config['instanceTypes'] = $this->resolvePreferences($config['instanceTypes'], $interceptors);
 
-
-
         return $config;
     }
 

setup/src/Magento/Setup/Test/Unit/Module/Di/Compiler/Config/Chain/InterceptorSubstitutionTest.php

@@ -24,6 +24,36 @@ public function testModifyArguments()
         $this->assertEquals($this->getOutputConfig(), $modifier->modify($this->getInputConfig()));
     }
 
+    public function testModifyPreferences()
+    {
+        $inputConfig = [
+            'arguments' => [
+                'ClassReplaced' => [],
+                'ClassReplacement' => [],
+                'ClassReplaced\Interceptor' => [],
+                'ClassReplacement\Interceptor' => []
+            ],
+            'preferences' => [
+                'ClassReplaced' => 'ClassReplacement'
+            ],
+            'instanceTypes' => []
+        ];
+
+        $outputConfig = [
+            'arguments' => [
+                'ClassReplaced\Interceptor' => [],
+                'ClassReplacement\Interceptor' => []
+            ],
+            'preferences' => [
+                'ClassReplaced' => 'ClassReplacement\Interceptor',
+                'ClassReplacement' => 'ClassReplacement\Interceptor'
+            ],
+            'instanceTypes' => []
+        ];
+
+        $modifier = new InterceptorSubstitution();
+        $this->assertEquals($outputConfig, $modifier->modify($inputConfig));
+    }
 
     /**
      * Input config