MAGETWO-34528: Contribution of Sprint 24 Work to Mainline

- fixing incorrect merge

Author: mazhalai

app/code/Magento/Version/etc/module.xml

@@ -6,6 +6,6 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Module/etc/module.xsd">
-    <module name="Magento_Version" schema_version="2.0.0">
+    <module name="Magento_Version" setup_version="2.0.0">
     </module>
 </config>

setup/src/Magento/Setup/Model/Installer.php

@@ -595,7 +595,7 @@ private function setupModuleRegistry(SchemaSetupInterface $setup)
      */
     public function installSchema()
     {
-        $setup = $this->getObjectManager()->create('Magento\Setup\Module\Setup', ['resource' => $this->resource]);
+        $setup = $this->objectManagerProvider->get()->create('Magento\Setup\Module\Setup', ['resource' => $this->resource]);
         $this->setupModuleRegistry($setup);
         $this->log->log('Schema creation/updates:');
         $this->handleDBSchemaData($setup, 'schema');
@@ -609,7 +609,7 @@ public function installSchema()
      */
     public function installDataFixtures()
     {
-        $setup = $this->getObjectManager()->create('Magento\Setup\Module\DataSetup');
+        $setup = $this->objectManagerProvider->get()->create('Magento\Setup\Module\DataSetup');
         $this->checkInstallationFilePermissions();
         $this->log->log('Data install/update:');
         $this->handleDBSchemaData($setup, 'data');
@@ -724,7 +724,8 @@ public function installUserConfig($data)
      */
     private function installOrderIncrementPrefix($orderIncrementPrefix)
     {
-        $setup = $this->objectManagerProvider->create('Magento\Setup\Module\Setup', ['resource' => $this->resource]);
+        $setup = $this->objectManagerProvider->get()->create('Magento\Setup\Module\Setup',
+            ['resource' => $this->resource]);
         $dbConnection = $setup->getConnection();
 
         // get entity_type_id for order
@@ -767,7 +768,8 @@ private function installOrderIncrementPrefix($orderIncrementPrefix)
     public function installAdminUser($data)
     {
         $this->assertDeploymentConfigExists();
-        $setup = $this->objectManagerProvider->create('Magento\Setup\Module\Setup', ['resource' => $this->resource]);
+        $setup = $this->objectManagerProvider->get()->create('Magento\Setup\Module\Setup',
+            ['resource' => $this->resource]);
         $adminAccount = $this->adminAccountFactory->create($setup, (array)$data);
         $adminAccount->save();
     }
@@ -1015,7 +1017,7 @@ private function getSchemaDataHandler($moduleName, $type)
                         && $className !== self::SCHEMA_INSTALL) {
                         throw  new \Magento\Setup\Exception($className . ' must implement \\' . self::SCHEMA_INSTALL);
                     } else {
-                        return $this->objectManagerProvider->create($className);
+                        return $this->objectManagerProvider->get()->create($className);
                     }
                 }
                 break;
@@ -1027,7 +1029,7 @@ private function getSchemaDataHandler($moduleName, $type)
                     ) {
                         throw  new \Magento\Setup\Exception($className . ' must implement \\' . self::SCHEMA_UPGRADE);
                     } else {
-                        return $this->objectManagerProvider->create($className);
+                        return $this->objectManagerProvider->get()->create($className);
                     }
                 }
                 break;
@@ -1038,7 +1040,7 @@ private function getSchemaDataHandler($moduleName, $type)
                         && $className !== self::SCHEMA_INSTALL) {
                         throw  new \Magento\Setup\Exception($className . ' must implement \\' . self::SCHEMA_INSTALL);
                     } else {
-                        return $this->objectManagerProvider->create($className);
+                        return $this->objectManagerProvider->get()->create($className);
                     }
                 }
                 break;
@@ -1050,7 +1052,7 @@ private function getSchemaDataHandler($moduleName, $type)
                     ) {
                         throw  new \Magento\Setup\Exception($className . ' must implement \\' . self::DATA_INSTALL);
                     } else {
-                        return $this->objectManagerProvider->create($className);
+                        return $this->objectManagerProvider->get()->create($className);
                     }
                 }
                 break;
@@ -1062,7 +1064,7 @@ private function getSchemaDataHandler($moduleName, $type)
                     ) {
                         throw  new \Magento\Setup\Exception($className . ' must implement \\' . self::DATA_UPGRADE);
                     } else {
-                        return $this->objectManagerProvider->create($className);
+                        return $this->objectManagerProvider->get()->create($className);
                     }
                 }
                 break;