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

- removed non shared instances config in compiled mode
- arguments serialization placed to area operation

Author: dkvashninbay

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

@@ -64,14 +64,23 @@ public function testDoOperationEmptyPath()
     public function testDoOperationGlobalArea()
     {
         $path = 'path/to/codebase/';
+        $arguments = ['class' => []];
         $generatedConfig = [
-            'arguments' => [],
-            'nonShared' => [],
+            'arguments' => $arguments,
             'preferences' => [],
             'instanceTypes' => []
         ];
-        $definitions = new DefinitionsCollection();
-        $definitions->addDefinition('class', []);
+        $expectedConfig = [
+            'arguments' => array_map(
+                function ($arguments) {
+                    return serialize($arguments);
+                },
+                $arguments
+            ),
+            'preferences' => [],
+            'instanceTypes' => []
+        ];
+
         $areaOperation = new Area(
             $this->areaListMock,
             $this->areaInstancesNamesList,
@@ -86,7 +95,7 @@ public function testDoOperationGlobalArea()
         $this->areaInstancesNamesList->expects($this->once())
             ->method('getList')
             ->with($path)
-            ->willReturn(['class' => []]);
+            ->willReturn($arguments);
         $this->configReaderMock->expects($this->once())
             ->method('generateCachePerScope')
             ->with(
@@ -98,7 +107,7 @@ public function testDoOperationGlobalArea()
             ->method('write')
             ->with(
                 App\Area::AREA_GLOBAL,
-                $generatedConfig
+                $expectedConfig
             );
 
         $areaOperation->doOperation();

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

@@ -97,10 +97,6 @@ public function testGenerateCachePerScopeGlobal()
             ->method('getInstanceType')
             ->willReturnMap($this->getInstanceTypeMap($this->getVirtualTypes()));
 
-        $this->diContainerConfig->expects($this->any())
-            ->method('isShared')
-            ->willReturnMap($this->getExpectedNonShared());
-
         $this->diContainerConfig->expects($this->any())
             ->method('getPreference')
             ->willReturnMap($this->getPreferencesMap());
@@ -138,13 +134,9 @@ 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
+                'ConcreteType1' => ['resolved_argument1', 'resolved_argument2'],
+                'ConcreteType2' => ['resolved_argument1', 'resolved_argument2'],
+                'virtualType1' => ['resolved_argument1', 'resolved_argument2']
             ],
             'preferences' => $this->getPreferences(),
             'instanceTypes' => $this->getVirtualTypes(),
@@ -172,19 +164,6 @@ private function getVirtualTypes()
         return ['virtualType1' => 'ConcreteType1'];
     }
 
-    /**
-     * @return array
-     */
-    private function getExpectedNonShared()
-    {
-        return [
-            ['ConcreteType1', true],
-            ['ConcreteType2', false],
-            ['Interface1', true],
-            ['ThirdPartyInterface', false]
-        ];
-    }
-
     /**
      * @return array
      */

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

@@ -75,9 +75,17 @@ public function doOperation()
 
         $areaCodes = array_merge([App\Area::AREA_GLOBAL], $this->areaList->getCodes());
         foreach ($areaCodes as $areaCode) {
+            $config = $this->configReader->generateCachePerScope($definitionsCollection, $areaCode);
+
+            foreach ($config['arguments'] as $key => $value) {
+                if ($value !== null) {
+                    $config['arguments'][$key] = serialize($value);
+                }
+            }
+
             $this->configWriter->write(
                 $areaCode,
-                $this->configReader->generateCachePerScope($definitionsCollection, $areaCode)
+                $config
             );
         }
     }

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

@@ -82,16 +82,8 @@ public function generateCachePerScope(
 
         $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;
-            }
             $preference = $areaConfig->getPreference($instanceName);
             if ($instanceName !== $preference) {
                 $config['preferences'][$instanceName] = $preference;

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

@@ -16,11 +16,6 @@ class Compiled implements \Magento\Framework\ObjectManager\ConfigInterface
      */
     private $arguments;
 
-    /**
-     * @var array
-     */
-    private $nonShared;
-
     /**
      * @var array
      */
@@ -37,7 +32,6 @@ class Compiled implements \Magento\Framework\ObjectManager\ConfigInterface
     public function __construct($data)
     {
         $this->arguments = $data['arguments'];
-        $this->nonShared = $data['nonShared'];
         $this->virtualTypes = $data['instanceTypes'];
         $this->preferences = $data['preferences'];
     }
@@ -94,7 +88,7 @@ public function getArguments($type)
      */
     public function isShared($type)
     {
-        return !isset($this->nonShared[$type]);
+        return true;
     }
 
     /**
@@ -135,7 +129,6 @@ public function getPreference($type)
     public function extend(array $configuration)
     {
         $this->arguments = $configuration['arguments'];
-        $this->nonShared = $configuration['nonShared'];
         $this->virtualTypes = $configuration['instanceTypes'];
         $this->preferences = $configuration['preferences'];
     }