Merge remote-tracking branch 'remotes/origin/MAGETWO-32782' into develop

Author: Kostiantyn Poida

app/code/Magento/Backend/etc/di.xml

@@ -12,7 +12,6 @@
     <preference for="Magento\Backend\Model\Config\Structure\SearchInterface" type="Magento\Backend\Model\Config\Structure" />
     <preference for="Magento\Backend\Model\Config\Backend\File\RequestData\RequestDataInterface" type="Magento\Backend\Model\Config\Backend\File\RequestData" />
     <preference for="Magento\Backend\Model\Auth\Credential\StorageInterface" type="Magento\User\Model\User" />
-    <preference for="Magento\Adminhtml\Helper\Data" type="Magento\Backend\Helper\Data" />
     <preference for="Magento\Backend\App\ConfigInterface" type="Magento\Backend\App\Config" />
     <preference for="Magento\Backend\Model\UrlInterface" type="Magento\Backend\Model\Url" />
     <preference for="Magento\Backend\Block\Widget\Button\ToolbarInterface" type="Magento\Backend\Block\Widget\Button\Toolbar" />

app/code/Magento/Core/etc/di.xml

@@ -14,14 +14,12 @@
     <preference for="Magento\Framework\Authorization\PolicyInterface" type="Magento\Framework\Authorization\Policy\DefaultPolicy" />
     <preference for="Magento\Framework\Authorization\RoleLocatorInterface" type="Magento\Framework\Authorization\RoleLocator\DefaultRoleLocator" />
     <preference for="Magento\Framework\Session\SessionManagerInterface" type="Magento\Framework\Session\Generic" />
-    <preference for="Magento\Core\Model\DataService\ConfigInterface" type="Magento\Core\Model\DataService\Config" />
     <preference for="Magento\Framework\App\Config\ScopeConfigInterface" type="Magento\Framework\App\Config" />
     <preference for="Magento\Framework\App\Config\ReinitableConfigInterface" type="Magento\Framework\App\ReinitableConfig" />
     <preference for="Magento\Framework\App\Config\MutableScopeConfigInterface" type="Magento\Framework\App\MutableScopeConfig" />
     <preference for="Magento\Framework\App\Config\Storage\WriterInterface" type="Magento\Framework\App\Config\Storage\Writer" />
     <preference for="Magento\Framework\View\Design\Theme\FileInterface" type="Magento\Core\Model\Theme\File" />
     <preference for="Magento\Framework\Config\ConverterInterface" type="Magento\Framework\Config\Converter\Dom"/>
-    <preference for="Magento\Core\Model\Url\SecurityInfoInterface" type="Magento\Core\Model\Url\SecurityInfo\Proxy" />
     <preference for="Magento\Framework\App\DefaultPathInterface" type="Magento\Framework\App\DefaultPath\DefaultPath" />
     <preference for="Magento\Framework\Encryption\EncryptorInterface" type="Magento\Framework\Encryption\Encryptor" />
     <preference for="Magento\Framework\Filter\Encrypt\AdapterInterface" type="Magento\Framework\Filter\Encrypt\Basic" />

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

@@ -5,6 +5,9 @@
  */
 namespace Magento\Tools\Di\Compiler\Config;
 
+use Magento\Framework\App\Area;
+use Magento\Tools\Di\Definition\Collection;
+
 class ReaderTest extends \PHPUnit_Framework_TestCase
 {
     /**
@@ -54,6 +57,9 @@ protected function setUp()
             false
         );
         $this->argumentsResolver = $this->getMock('Magento\Tools\Di\Compiler\ArgumentsResolver', [], [], '', false);
+        $this->argumentsResolverFactory->expects($this->any())
+            ->method('create')
+            ->willReturn($this->argumentsResolver);
         $this->classReaderDecorator = $this->getMock(
             'Magento\Tools\Di\Code\Reader\ClassReaderDecorator',
             [],
@@ -72,71 +78,182 @@ protected function setUp()
         );
     }
 
-    public function testGenerateCachePerScopeExtends()
+    public function testGenerateCachePerScopeGlobal()
     {
-        $definitionsCollection = $this->getMock('Magento\Tools\Di\Definition\Collection', [], [], '', false);
-        $this->diContainerConfig->expects($this->once())
-            ->method('extend')
-            ->with([]);
-        $this->configLoader->expects($this->once())
-            ->method('load')
-            ->with('areaCode')
-            ->willReturn([]);
-
-        $this->argumentsResolverFactory->expects($this->once())
-            ->method('create')
-            ->with($this->diContainerConfig)
-            ->willReturn($this->argumentsResolver);
-        $definitionsCollection->expects($this->exactly(2))
-            ->method('getInstancesNamesList')
-            ->willReturn(['instanceType1'], ['instanceType2']);
-        $definitionsCollection->expects($this->once())
-            ->method('getInstanceArguments')
-            ->willReturnMap([
-                ['instanceType1', null],
-                ['instanceType2', ['arg1', 'arg2']],
-            ]);
-        $this->typeReader->expects($this->exactly(3))
-            ->method('isConcrete')
-            ->willReturnMap([
-                ['instanceType1', true],
-                ['instanceType2', false],
-                ['originalType1', true],
-                ['originalType2', false],
-            ]);
-        $this->argumentsResolver->expects($this->exactly(2))
-            ->method('getResolvedConstructorArguments')
-            ->willReturnMap([
-                ['instanceType1', 'resolvedConstructor1'],
-                ['instanceVirtualType1', 'resolvedConstructor2'],
-            ]);
-        $this->diContainerConfig->expects($this->exactly(2))
+        $definitionCollection = $this->getDefinitionsCollection();
+        $this->diContainerConfig->expects($this->any())
             ->method('getVirtualTypes')
-            ->willReturn(['instanceVirtualType1' => 1, 'instanceVirtualType2' => 2]);
-        $this->diContainerConfig->expects($this->exactly(4))
+            ->willReturn($this->getVirtualTypes());
+        $this->diContainerConfig->expects($this->any())
+            ->method('getPreferences')
+            ->willReturn($this->getPreferences());
+
+        $getResolvedConstructorArgumentsMap = $this->getResolvedVirtualConstructorArgumentsMap(
+            $definitionCollection,
+            $this->getVirtualTypes()
+        );
+
+        $this->diContainerConfig->expects($this->any())
             ->method('getInstanceType')
-            ->willReturnMap([
-                ['instanceVirtualType1', 'originalType1'],
-                ['instanceVirtualType2', 'originalType2'],
-            ]);
-        $definitionsCollection->expects($this->exactly(2))
-            ->method('hasInstance')
-            ->willReturn('');
-        $this->classReaderDecorator->expects($this->once())
-            ->method('getConstructor')
-            ->willReturn('constructor');
-        $this->diContainerConfig->expects($this->once())
+            ->willReturnMap($this->getInstanceTypeMap($this->getVirtualTypes()));
+
+        $this->diContainerConfig->expects($this->any())
             ->method('isShared')
-            ->willReturnMap([
-                ['instanceType1', true],
-                ['instanceType2', false],
-            ]);
-        $this->diContainerConfig->expects($this->once())
+            ->willReturnMap($this->getExpectedNonShared());
+
+        $this->diContainerConfig->expects($this->any())
             ->method('getPreference')
-            ->willReturnMap([
-                ['instanceType1', 'instanceType1ss'],
-                ['instanceType2', 'instanceType2'],
-            ]);
-        $this->model->generateCachePerScope($definitionsCollection, 'areaCode');
+            ->willReturnMap($this->getPreferencesMap());
+
+        $isConcreteMap = [];
+        foreach($definitionCollection->getInstancesNamesList() as $instanceType) {
+            $isConcreteMap[] = [$instanceType, strpos($instanceType, 'Interface') === false];
+
+            $getResolvedConstructorArgumentsMap[] = [
+                $instanceType,
+                $definitionCollection->getInstanceArguments($instanceType),
+                $this->getResolvedArguments(
+                    $definitionCollection->getInstanceArguments($instanceType)
+                )
+            ];
+        }
+
+        $this->typeReader->expects($this->any())
+            ->method('isConcrete')
+            ->willReturnMap($isConcreteMap);
+        $this->argumentsResolver->expects($this->any())
+            ->method('getResolvedConstructorArguments')
+            ->willReturnMap($getResolvedConstructorArgumentsMap);
+
+        $this->assertEquals(
+            $this->getExpectedGlobalConfig(),
+            $this->model->generateCachePerScope($definitionCollection, Area::AREA_GLOBAL)
+        );
+    }
+
+    /**
+     * @return array
+     */
+    private function getExpectedGlobalConfig()
+    {
+        return [
+            'arguments' => [
+                'ConcreteType1' => serialize(['resolved_argument1', 'resolved_argument2']),
+                'ConcreteType2' => serialize(['resolved_argument1', 'resolved_argument2']),
+                'virtualType1' => serialize(['resolved_argument1', 'resolved_argument2'])
+            ],
+            'nonShared' => [
+                'ConcreteType2' => true,
+                'ThirdPartyInterface' => true
+            ],
+            'preferences' => $this->getPreferences(),
+            'instanceTypes' => $this->getVirtualTypes(),
+        ];
+    }
+
+    /**
+     * @return Collection
+     */
+    private function getDefinitionsCollection()
+    {
+        $definitionCollection = new Collection();
+        $definitionCollection->addDefinition('ConcreteType1', ['argument1', 'argument2']);
+        $definitionCollection->addDefinition('ConcreteType2', ['argument1', 'argument2']);
+        $definitionCollection->addDefinition('Interface1', [null]);
+
+        return $definitionCollection;
+    }
+
+    /**
+     * @return array
+     */
+    private function getVirtualTypes()
+    {
+        return ['virtualType1' => 'ConcreteType1'];
+    }
+
+    /**
+     * @return array
+     */
+    private function getExpectedNonShared()
+    {
+        return [
+            ['ConcreteType1', true],
+            ['ConcreteType2', false],
+            ['Interface1', true],
+            ['ThirdPartyInterface', false]
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    private function getPreferences()
+    {
+        return [
+            'Interface1' => 'ConcreteType1',
+            'ThirdPartyInterface' => 'ConcreteType2'
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    private function getPreferencesMap()
+    {
+        return [
+            ['ConcreteType1', 'ConcreteType1'],
+            ['ConcreteType2', 'ConcreteType2'],
+            ['Interface1', 'ConcreteType1'],
+            ['ThirdPartyInterface', 'ConcreteType2']
+        ];
+    }
+
+    /**
+     * @param array $arguments
+     * @return array|null
+     */
+    private function getResolvedArguments($arguments)
+    {
+        return empty($arguments) ? null : array_map(
+            function($argument) {
+                return 'resolved_' . $argument;
+            },
+            $arguments
+        );
+    }
+
+    /**
+     * @param array $virtualTypes
+     * @return array
+     */
+    private function getInstanceTypeMap($virtualTypes)
+    {
+        $getInstanceTypeMap = [];
+        foreach ($virtualTypes as $virtualType => $concreteType) {
+            $getInstanceTypeMap[] = [$virtualType, $concreteType];
+        }
+
+        return $getInstanceTypeMap;
+    }
+
+    /**
+     * @param Collection $definitionCollection
+     * @param array $virtualTypes
+     * @return array
+     */
+    private function getResolvedVirtualConstructorArgumentsMap(Collection $definitionCollection, array $virtualTypes)
+    {
+        $getResolvedConstructorArgumentsMap = [];
+        foreach ($virtualTypes as $virtualType => $concreteType) {
+            $getResolvedConstructorArgumentsMap[] = [
+                $virtualType,
+                $definitionCollection->getInstanceArguments($concreteType),
+                $this->getResolvedArguments(
+                    $definitionCollection->getInstanceArguments($concreteType)
+                )
+            ];
+        }
+        return $getResolvedConstructorArgumentsMap;
     }
 }

dev/tools/Magento/Tools/Di/Code/Reader/ClassesScanner.php

@@ -41,7 +41,7 @@ public function getList($path)
         }
         $classes = [];
         $recursiveIterator = new \RecursiveIteratorIterator(
-            new \RecursiveDirectoryIterator($realPath),
+            new \RecursiveDirectoryIterator($realPath, \FilesystemIterator::FOLLOW_SYMLINKS),
             \RecursiveIteratorIterator::SELF_FIRST
         );
         /** @var $fileItem \SplFileInfo */

dev/tools/Magento/Tools/Di/Compiler/Config/Reader.php

@@ -49,7 +49,7 @@ class Reader
      * @param Type $typeReader
      */
     public function __construct(
-        \Magento\Framework\ObjectManager\ConfigInterface $diContainerConfig,
+        ConfigInterface $diContainerConfig,
         App\ObjectManager\ConfigLoader $configLoader,
         ArgumentsResolverFactory $argumentsResolverFactory,
         ClassReaderDecorator $classReaderDecorator,
@@ -80,12 +80,15 @@ public function generateCachePerScope(
         }
 
         $config = [];
+        
+        $this->fillThirdPartyInterfaces($areaConfig, $definitionsCollection);
         $config['arguments'] = $this->getConfigForScope($definitionsCollection, $areaConfig);
         foreach ($config['arguments'] as $key => $value) {
             if ($value !== null) {
                 $config['arguments'][$key] = serialize($value);
             }
         }
+
         foreach ($definitionsCollection->getInstancesNamesList() as $instanceName) {
             if (!$areaConfig->isShared($instanceName)) {
                 $config['nonShared'][$instanceName] = true;
@@ -95,6 +98,7 @@ public function generateCachePerScope(
                 $config['preferences'][$instanceName] = $preference;
             }
         }
+
         foreach (array_keys($areaConfig->getVirtualTypes()) as $virtualType) {
             $config['instanceTypes'][$virtualType] = $areaConfig->getInstanceType($virtualType);
         }
@@ -140,4 +144,23 @@ private function getConfigForScope(DefinitionsCollection $definitionsCollection,
         }
         return $constructors;
     }
+
+    /**
+     * Returns preferences for third party code
+     *
+     * @param ConfigInterface $config
+     * @param DefinitionsCollection $definitionsCollection
+     */
+    private function fillThirdPartyInterfaces(ConfigInterface $config, DefinitionsCollection $definitionsCollection)
+    {
+        $definedInstances = $definitionsCollection->getInstancesNamesList();
+
+        foreach ($config->getPreferences() as $interface => $preference) {
+            if (in_array($interface, $definedInstances)) {
+                continue;
+            }
+
+            $definitionsCollection->addDefinition($interface, []);
+        }
+    }
 }

dev/tools/Magento/Tools/Di/Definition/Collection.php

@@ -33,7 +33,7 @@ public function getCollection()
      *
      * @return void
      */
-    public function initialize($definitions)
+    public function initialize(array $definitions)
     {
         $this->definitions = $definitions;
     }
@@ -54,7 +54,7 @@ public function addCollection(Collection $collection)
      * Add new definition for instance
      *
      * @param string $instance
-     * @param array $arguments
+     * @param array|null $arguments
      *
      * @return void
      */
@@ -63,11 +63,11 @@ public function addDefinition($instance, $arguments = [])
         $this->definitions[$instance] = $arguments;
     }
 
-    /**
+    /**+
      * Returns instance arguments
      *
      * @param string $instanceName
-     * @return null
+     * @return null|array
      */
     public function getInstanceArguments($instanceName)
     {

lib/internal/Magento/Framework/ObjectManager/Config/Compiled.php

@@ -145,4 +145,14 @@ public function getVirtualTypes()
     {
         return $this->virtualTypes;
     }
+
+    /**
+     * Returns list on preferences
+     *
+     * @return array
+     */
+    public function getPreferences()
+    {
+        return $this->preferences;
+    }
 }