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

- added backslashes remove for arguments

Author: dkvashninbay

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

@@ -112,6 +112,8 @@ private function getPreferences()
                     'modificationsList' => [
                         'PreferencesResolving' =>
                             ['instance' => 'Magento\Tools\Di\Compiler\Config\Chain\PreferencesResolving'],
+                        'BackslashTrim' =>
+                            ['instance' => 'Magento\Tools\Di\Compiler\Config\Chain\BackslashTrim'],
                         'ArgumentsSerialization' =>
                             ['instance' => 'Magento\Tools\Di\Compiler\Config\Chain\ArgumentsSerialization'],
                     ]

dev/tests/unit/testsuite/Magento/Tools/Di/Compiler/Config/Chain/BackslashTrimTest.php

@@ -0,0 +1,75 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Tools\Di\Compiler\Config\Chain;
+
+class BackslashTrimTest extends \PHPUnit_Framework_TestCase
+{
+    public function testModifyArgumentsDoNotExist()
+    {
+        $inputConfig = [
+            'data' => []
+        ];
+        $modifier = new BackslashTrim();
+        $this->assertSame($inputConfig, $modifier->modify($inputConfig));
+    }
+
+    public function testModifyArguments()
+    {
+        $modifier = new BackslashTrim();
+        $this->assertEquals($this->getOutputConfig(), $modifier->modify($this->getInputConfig()));
+    }
+
+    /**
+     * Input config
+     *
+     * @return array
+     */
+    private function getInputConfig()
+    {
+        return [
+            'arguments' => [
+                '\\Class' => [
+                    'argument_type' => ['_i_' => '\\Class\\Dependency'],
+                    'argument_not_shared' => ['_ins_' => '\\Class\\Dependency'],
+                    'array' => [
+                        'argument_type' => ['_i_' => '\\Class\\Dependency'],
+                        'argument_not_shared' => ['_ins_' => '\\Class\\Dependency'],
+                        'array' => [
+                            'argument_type' => ['_i_' => '\\Class\\Dependency'],
+                            'argument_not_shared' => ['_ins_' => '\\Class\\Dependency'],
+                        ]
+                    ]
+                ]
+            ]
+        ];
+    }
+
+    /**
+     * Output config
+     *
+     * @return array
+     */
+    private function getOutputConfig()
+    {
+        return [
+            'arguments' => [
+                'Class' => [
+                    'argument_type' => ['_i_' => 'Class\\Dependency'],
+                    'argument_not_shared' => ['_ins_' => 'Class\\Dependency'],
+                    'array' => [
+                        'argument_type' => ['_i_' => 'Class\\Dependency'],
+                        'argument_not_shared' => ['_ins_' => 'Class\\Dependency'],
+                        'array' => [
+                            'argument_type' => ['_i_' => 'Class\\Dependency'],
+                            'argument_not_shared' => ['_ins_' => 'Class\\Dependency'],
+                        ]
+                    ]
+                ]
+            ]
+        ];
+    }
+}

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

@@ -68,6 +68,8 @@ public function launch()
                         'modificationsList' => [
                             'PreferencesResolving' =>
                                 ['instance' => 'Magento\Tools\Di\Compiler\Config\Chain\PreferencesResolving'],
+                            'BackslashTrim' =>
+                                ['instance' => 'Magento\Tools\Di\Compiler\Config\Chain\BackslashTrim'],
                             'ArgumentsSerialization' =>
                                 ['instance' => 'Magento\Tools\Di\Compiler\Config\Chain\ArgumentsSerialization'],
                         ]

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

@@ -0,0 +1,68 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Tools\Di\Compiler\Config\Chain;
+
+class BackslashTrim implements ModificationInterface
+{
+    /**
+     * Modifies input config
+     *
+     * @param array $config
+     * @return array
+     */
+    public function modify(array $config)
+    {
+        if (!isset($config['arguments'])) {
+            return $config;
+        }
+
+        $config['arguments'] = $this->resolveInstancesNames($config['arguments']);
+        $this->resolveArguments($config['arguments']);
+
+        return $config;
+    }
+
+    /**
+     * Resolves instances names
+     *
+     * @param array $arguments
+     * @return array
+     */
+    private function resolveInstancesNames(array $arguments)
+    {
+        $resolvedInstances = [];
+        foreach ($arguments as $instance => $constructor) {
+            $resolvedInstances[ltrim($instance, '\\')] = $constructor;
+        }
+
+        return $resolvedInstances;
+    }
+
+    /**
+     * Resolves instances arguments
+     *
+     * @param array $argument
+     */
+    private function resolveArguments(&$argument)
+    {
+        if (!is_array($argument)) {
+            return;
+        }
+
+        foreach ($argument as $key => &$value) {
+            if (in_array($key, ['_i_', '_ins_'])) {
+                $value = ltrim($value, '\\');
+                continue;
+            }
+
+            if (is_array($value)) {
+                $this->resolveArguments($value);
+            }
+        }
+        return;
+    }
+}