MAGETWO-66796: Changed locator class name for ObjectManager #6778

Author: Oleksii Korshenko

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

@@ -32,7 +32,7 @@ class ObjectManagerFactory
      *
      * @var string
      */
-    protected $_locatorClassName = \Magento\Framework\ObjectManager\ObjectManager::class;
+    protected $_locatorClassName = \Magento\Framework\App\ObjectManager::class;
 
     /**
      * Config class name
@@ -169,7 +169,6 @@ public function create(array $arguments)
         $objectManager = new $this->_locatorClassName($this->factory, $diConfig, $sharedInstances);
 
         $this->factory->setObjectManager($objectManager);
-        ObjectManager::setInstance($objectManager);
 
         $generatorParams = $diConfig->getArguments(\Magento\Framework\Code\Generator::class);
         /** Arguments are stored in different format when DI config is compiled, thus require custom processing */