Merge remote-tracking branch 'origin/MAGETWO-33080' into MAGETWO-33080

Author: dkvashninbay

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

@@ -53,7 +53,7 @@ public static function setInstance(\Magento\Framework\ObjectManagerInterface $ob
     public function __construct(
         FactoryInterface $factory,
         \Magento\Framework\ObjectManager\ConfigInterface $config,
-        array $sharedInstances = []
+        array &$sharedInstances = []
     ) {
         parent::__construct($factory, $config, $sharedInstances);
         self::$_instance = $this;

lib/internal/Magento/Framework/Code/Reader/SourceArgumentsReader.php

@@ -64,7 +64,8 @@ public function getConstructorArgumentTypes(\ReflectionClass $class, $inherited
         }
         $arguments = explode(',', $arguments);
         foreach ($arguments as $key => &$argument) {
-            $argument = $this->removeDefaultValue($argument);
+            $argument = $this->removeToken($argument, '=');
+            $argument = $this->removeToken($argument, '&');
             $argument = $this->resolveNamespaces($argument, $availableNamespaces);
         }
         unset($argument);
@@ -102,11 +103,12 @@ protected function resolveNamespaces($argument, $availableNamespaces)
      * Remove default value from argument.
      *
      * @param string $argument
+     * @param string $token
      * @return string
      */
-    protected function removeDefaultValue($argument)
+    protected function removeToken($argument, $token)
     {
-        $position = strpos($argument, '=');
+        $position = strpos($argument, $token);
         if (is_numeric($position)) {
             return substr($argument, 0, $position);
         }

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

@@ -36,7 +36,7 @@ class ObjectManager implements \Magento\Framework\ObjectManagerInterface
      * @param ConfigInterface $config
      * @param array &$sharedInstances
      */
-    public function __construct(FactoryInterface $factory, ConfigInterface $config, array &$sharedInstances)
+    public function __construct(FactoryInterface $factory, ConfigInterface $config, &$sharedInstances = [])
     {
         $this->_config = $config;
         $this->_factory = $factory;