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

dkvashninbay · dkvashninbay · commit 94817b3e03a7 · 2015-02-10T21:55:55.000+02:00
- changed arguments postprocessing order
- getInstanceType will be removed
diff --git a/dev/tools/Magento/Tools/Di/App/Compiler.php b/dev/tools/Magento/Tools/Di/App/Compiler.php
@@ -66,10 +66,10 @@ public function launch()
                 'Magento\Tools\Di\Compiler\Config\Chain\ModificationChain' => [
                     'arguments' => [
                         'modificationsList' => [
-                            'ArgumentsSerialization' =>
-                                ['instance' => 'Magento\Tools\Di\Compiler\Config\Chain\ArgumentsSerialization'],
                             'PreferencesResolving' =>
                                 ['instance' => 'Magento\Tools\Di\Compiler\Config\Chain\PreferencesResolving'],
+                            'ArgumentsSerialization' =>
+                                ['instance' => 'Magento\Tools\Di\Compiler\Config\Chain\ArgumentsSerialization'],
                         ]
                     ]
                 ]
diff --git a/lib/internal/Magento/Framework/ObjectManager/Factory/Compiled.php b/lib/internal/Magento/Framework/ObjectManager/Factory/Compiled.php
@@ -55,6 +55,7 @@ public function create($type, array $arguments = [])
     {
         /** @TODO get rid of ltrim() usage and place it to client code */
         $args = $this->config->getArguments($type);
+        $type = $this->config->getInstanceType($type);
         if ($args === null) {
             return new $type();
         }

Original file line number	Diff line number	Diff line change
`@@ -66,10 +66,10 @@ public function launch()`
`66`	`66`	`'Magento\Tools\Di\Compiler\Config\Chain\ModificationChain' => [`
`67`	`67`	`'arguments' => [`
`68`	`68`	`'modificationsList' => [`
`69`		`- 'ArgumentsSerialization' =>`
`70`		`- ['instance' => 'Magento\Tools\Di\Compiler\Config\Chain\ArgumentsSerialization'],`
`71`	`69`	`'PreferencesResolving' =>`
`72`	`70`	`['instance' => 'Magento\Tools\Di\Compiler\Config\Chain\PreferencesResolving'],`
	`71`	`+ 'ArgumentsSerialization' =>`
	`72`	`+ ['instance' => 'Magento\Tools\Di\Compiler\Config\Chain\ArgumentsSerialization'],`
`73`	`73`	`]`
`74`	`74`	`]`
`75`	`75`	`]`
Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,7 @@ public function create($type, array $arguments = [])`
`55`	`55`	`{`
`56`	`56`	`/** @TODO get rid of ltrim() usage and place it to client code */`
`57`	`57`	`$args = $this->config->getArguments($type);`
	`58`	`+ $type = $this->config->getInstanceType($type);`
`58`	`59`	`if ($args === null) {`
`59`	`60`	`return new $type();`
`60`	`61`	`}`