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

- fixed refactoring bug

Author: dkvashninbay

dev/tests/unit/testsuite/Magento/Framework/App/FactoryStub.php

@@ -25,12 +25,12 @@ public function __construct($config, $objectManager = null, $definitions = null,
     /**
      * Create instance with call time arguments
      *
-     * @param string $type
+     * @param string $requestedType
      * @param array $arguments
      * @return object
      * @throws \BadMethodCallException
      */
-    public function create($type, array $arguments = [])
+    public function create($requestedType, array $arguments = [])
     {
         throw new \BadMethodCallException(__METHOD__);
     }

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

@@ -45,17 +45,17 @@ public function __construct(
     /**
      * Create instance with call time arguments
      *
-     * @param string $type
+     * @param string $requestedType
      * @param array $arguments
      * @return object
      * @throws \Exception
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
-    public function create($type, array $arguments = [])
+    public function create($requestedType, array $arguments = [])
     {
         /** @TODO get rid of ltrim() usage and place it to client code */
-        $args = $this->config->getArguments($type);
-        $type = $this->config->getInstanceType($type);
+        $args = $this->config->getArguments($requestedType);
+        $type = $this->config->getInstanceType($requestedType);
         if ($args === null) {
             return new $type();
         }

lib/internal/Magento/Framework/ObjectManager/Factory/Dynamic/Developer.php

@@ -60,31 +60,31 @@ protected function _resolveArguments($requestedType, array $parameters, array $a
     /**
      * Create instance with call time arguments
      *
-     * @param string $type
+     * @param string $requestedType
      * @param array $arguments
      * @return object
      * @throws \Exception
      *
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
-    public function create($type, array $arguments = [])
+    public function create($requestedType, array $arguments = [])
     {
-        $type = $this->config->getInstanceType($type);
+        $type = $this->config->getInstanceType($requestedType);
         $parameters = $this->definitions->getParameters($type);
         if ($parameters == null) {
             return new $type();
         }
-        if (isset($this->creationStack[$type])) {
+        if (isset($this->creationStack[$requestedType])) {
             $lastFound = end($this->creationStack);
             $this->creationStack = [];
-            throw new \LogicException("Circular dependency: {$type} depends on {$lastFound} and vice versa.");
+            throw new \LogicException("Circular dependency: {$requestedType} depends on {$lastFound} and vice versa.");
         }
-        $this->creationStack[$type] = $type;
+        $this->creationStack[$requestedType] = $requestedType;
         try {
-            $args = $this->_resolveArguments($type, $parameters, $arguments);
-            unset($this->creationStack[$type]);
+            $args = $this->_resolveArguments($requestedType, $parameters, $arguments);
+            unset($this->creationStack[$requestedType]);
         } catch (\Exception $e) {
-            unset($this->creationStack[$type]);
+            unset($this->creationStack[$requestedType]);
             throw $e;
         }
 

lib/internal/Magento/Framework/ObjectManager/Factory/Dynamic/Production.php

@@ -46,21 +46,21 @@ protected function _resolveArguments($requestedType, array $parameters, array $a
     /**
      * Create instance with call time arguments
      *
-     * @param string $type
+     * @param string $requestedType
      * @param array $arguments
      *
      * @return object
      *
      * @throws \Exception
      */
-    public function create($type, array $arguments = [])
+    public function create($requestedType, array $arguments = [])
     {
-        $type = $this->config->getInstanceType($type);
+        $type = $this->config->getInstanceType($requestedType);
         $parameters = $this->definitions->getParameters($type);
         if ($parameters == null) {
             return new $type();
         }
-        $args = $this->_resolveArguments($type, $parameters, $arguments);
+        $args = $this->_resolveArguments($requestedType, $parameters, $arguments);
 
         return $this->createObject($type, $args);
     }

lib/internal/Magento/Framework/ObjectManager/FactoryInterface.php

@@ -10,11 +10,11 @@ interface FactoryInterface
     /**
      * Create instance with call time arguments
      *
-     * @param string $type
+     * @param string $requestedType
      * @param array $arguments
      * @return object
      * @throws \LogicException
      * @throws \BadMethodCallException
      */
-    public function create($type, array $arguments = []);
+    public function create($requestedType, array $arguments = []);
 }

lib/internal/Magento/Framework/ObjectManager/Profiler/FactoryDecorator.php

@@ -41,10 +41,10 @@ public function setObjectManager(\Magento\Framework\ObjectManagerInterface $obje
     /**
      * {@inheritdoc}
      */
-    public function create($type, array $arguments = [])
+    public function create($requestedType, array $arguments = [])
     {
-        $this->log->startCreating($type);
-        $result = $this->subject->create($type, $arguments);
+        $this->log->startCreating($requestedType);
+        $result = $this->subject->create($requestedType, $arguments);
         $loggerClassName = get_class($result) . "\\Logger";
         $wrappedResult = new $loggerClassName($result, $this->log);
         $this->log->stopCreating($result);