MAGETWO-33080: Preferences, Shared Instance creation and Compiled Factory optimization

- modification chain moved

Author: dkvashninbay

dev/tests/unit/testsuite/Magento/Tools/Di/App/CompilerTest.php

@@ -107,7 +107,7 @@ private function getPreferences()
                     'Magento\Tools\Di\Compiler\Log\Writer\WriterInterface' =>
                         'Magento\Tools\Di\Compiler\Log\Writer\Console'
                 ],
-            'Magento\Tools\Di\Compiler\Config\Chain\ModificationChain' => [
+            'Magento\Tools\Di\Compiler\Config\ModificationChain' => [
                 'arguments' => [
                     'modificationsList' => [
                         'PreferencesResolving' =>

dev/tests/unit/testsuite/Magento/Tools/Di/App/Task/AreaTest.php

@@ -34,7 +34,7 @@ class AreaTest extends \PHPUnit_Framework_TestCase
     private $configWriterMock;
 
     /**
-     * @var Config\Chain\ModificationChain | \PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Tools\Di\Compiler\Config\ModificationChain | \PHPUnit_Framework_MockObject_MockObject
      */
     private $configChain;
 
@@ -52,7 +52,7 @@ protected function setUp()
         $this->configWriterMock = $this->getMockBuilder('Magento\Tools\Di\Compiler\Config\WriterInterface')
             ->disableOriginalConstructor()
             ->getMock();
-        $this->configChain = $this->getMockBuilder('Magento\Tools\Di\Compiler\Config\Chain\ModificationChain')
+        $this->configChain = $this->getMockBuilder('Magento\Tools\Di\Compiler\Config\ModificationChain')
             ->disableOriginalConstructor()
             ->getMock();
     }

dev/tests/unit/testsuite/Magento/Tools/Di/Compiler/Config/Chain/ModificationChainTest.php renamed to dev/tests/unit/testsuite/Magento/Tools/Di/Compiler/Config/ModificationChainTest.php

@@ -4,16 +4,16 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Tools\Di\Compiler\Config\Chain;
+namespace Magento\Tools\Di\Compiler\Config;
 
 class ModificationChainTest extends \PHPUnit_Framework_TestCase
 {
     public function testConstructor()
     {
         $modificationsList = [];
-        $modificationsList[] = $this->getMockBuilder('Magento\Tools\Di\Compiler\Config\Chain\ModificationInterface')
+        $modificationsList[] = $this->getMockBuilder('Magento\Tools\Di\Compiler\Config\ModificationInterface')
             ->getMock();
-        $modificationsList[] = $this->getMockBuilder('Magento\Tools\Di\Compiler\Config\Chain\ModificationInterface')
+        $modificationsList[] = $this->getMockBuilder('Magento\Tools\Di\Compiler\Config\ModificationInterface')
             ->getMock();
 
         new ModificationChain($modificationsList);
@@ -23,9 +23,9 @@ public function testConstructorException()
     {
         $this->setExpectedException('InvalidArgumentException', 'Wrong modifier provided');
         $modificationsList = [];
-        $modificationsList[] = $this->getMockBuilder('Magento\Tools\Di\Compiler\Config\Chain\ModificationInterface')
+        $modificationsList[] = $this->getMockBuilder('Magento\Tools\Di\Compiler\Config\ModificationInterface')
             ->getMock();
-        $modificationsList[] = $this->getMockBuilder('Magento\Tools\Di\Compiler\Config\Chain\ModificationInterface')
+        $modificationsList[] = $this->getMockBuilder('Magento\Tools\Di\Compiler\Config\ModificationInterface')
             ->getMock();
         $modificationsList[] = 'banana';
 
@@ -46,9 +46,9 @@ public function testModify()
             'data' => [1, 2, 3, 1, 1]
         ];
 
-        $modifier1 = $this->getMockBuilder('Magento\Tools\Di\Compiler\Config\Chain\ModificationInterface')
+        $modifier1 = $this->getMockBuilder('Magento\Tools\Di\Compiler\Config\ModificationInterface')
             ->getMock();
-        $modifier2 = $this->getMockBuilder('Magento\Tools\Di\Compiler\Config\Chain\ModificationInterface')
+        $modifier2 = $this->getMockBuilder('Magento\Tools\Di\Compiler\Config\ModificationInterface')
             ->getMock();
 
         $modificationsList = [$modifier1, $modifier2];

dev/tools/Magento/Tools/Di/App/Compiler.php

@@ -63,7 +63,7 @@ public function launch()
                     'Magento\Tools\Di\Compiler\Log\Writer\WriterInterface' =>
                         'Magento\Tools\Di\Compiler\Log\Writer\Console'
                 ],
-                'Magento\Tools\Di\Compiler\Config\Chain\ModificationChain' => [
+                'Magento\Tools\Di\Compiler\Config\ModificationChain' => [
                     'arguments' => [
                         'modificationsList' => [
                             'PreferencesResolving' =>

dev/tools/Magento/Tools/Di/App/Task/Operation/Area.php

@@ -39,7 +39,7 @@ class Area implements OperationInterface
     private $data = [];
 
     /**
-     * @var Config\Chain\ModificationChain
+     * @var \Magento\Tools\Di\Compiler\Config\ModificationChain
      */
     private $modificationChain;
 
@@ -48,15 +48,15 @@ class Area implements OperationInterface
      * @param \Magento\Tools\Di\Code\Reader\InstancesNamesList\Area $areaInstancesNamesList
      * @param Config\Reader $configReader
      * @param Config\WriterInterface $configWriter
-     * @param Config\Chain\ModificationChain $modificationChain
+     * @param \Magento\Tools\Di\Compiler\Config\ModificationChain $modificationChain
      * @param array $data
      */
     public function __construct(
         App\AreaList $areaList,
         \Magento\Tools\Di\Code\Reader\InstancesNamesList\Area $areaInstancesNamesList,
         Config\Reader $configReader,
         Config\WriterInterface $configWriter,
-        Config\Chain\ModificationChain $modificationChain,
+        Config\ModificationChain $modificationChain,
         $data = []
     ) {
         $this->areaList = $areaList;

dev/tools/Magento/Tools/Di/Compiler/Config/Chain/ArgumentsSerialization.php

@@ -6,6 +6,8 @@
 
 namespace Magento\Tools\Di\Compiler\Config\Chain;
 
+use Magento\Tools\Di\Compiler\Config\ModificationInterface;
+
 class ArgumentsSerialization implements ModificationInterface
 {
     /**

dev/tools/Magento/Tools/Di/Compiler/Config/Chain/BackslashTrim.php

@@ -6,6 +6,8 @@
 
 namespace Magento\Tools\Di\Compiler\Config\Chain;
 
+use Magento\Tools\Di\Compiler\Config\ModificationInterface;
+
 class BackslashTrim implements ModificationInterface
 {
     /**

dev/tools/Magento/Tools/Di/Compiler/Config/Chain/PreferencesResolving.php

@@ -6,6 +6,8 @@
 
 namespace Magento\Tools\Di\Compiler\Config\Chain;
 
+use Magento\Tools\Di\Compiler\Config\ModificationInterface;
+
 class PreferencesResolving implements ModificationInterface
 {
     /**

dev/tools/Magento/Tools/Di/Compiler/Config/Chain/ModificationChain.php renamed to dev/tools/Magento/Tools/Di/Compiler/Config/ModificationChain.php

@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Tools\Di\Compiler\Config\Chain;
+namespace Magento\Tools\Di\Compiler\Config;
 
 class ModificationChain implements ModificationInterface
 {

dev/tools/Magento/Tools/Di/Compiler/Config/Chain/ModificationInterface.php renamed to dev/tools/Magento/Tools/Di/Compiler/Config/ModificationInterface.php

@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Tools\Di\Compiler\Config\Chain;
+namespace Magento\Tools\Di\Compiler\Config;
 
 interface ModificationInterface
 {