MAGETWO-69535: Error during importing new list of scopes through shared file

Author: shiftedreality

app/code/Magento/Store/Model/Config/Importer.php

@@ -84,8 +84,8 @@ public function __construct(
     public function import(array $data)
     {
         $actions = [
-            ProcessorFactory::TYPE_DELETE,
             ProcessorFactory::TYPE_CREATE,
+            ProcessorFactory::TYPE_DELETE,
             ProcessorFactory::TYPE_UPDATE
         ];
         $messages = ['Stores were processed'];

app/code/Magento/Store/Model/Config/Importer/Processor/Create.php

@@ -125,15 +125,20 @@ public function run(array $data)
     private function createWebsites(array $items, array $data)
     {
         foreach ($items as $websiteData) {
-            unset($websiteData['website_id']);
+            $groupId = $websiteData['default_group_id'];
+
+            unset(
+                $websiteData['website_id'],
+                $websiteData['default_group_id']
+            );
 
             $website = $this->websiteFactory->create();
             $website->setData($websiteData);
             $website->getResource()->save($website);
 
-            $website->getResource()->addCommitCallback(function () use ($website, $data) {
+            $website->getResource()->addCommitCallback(function () use ($website, $data, $groupId) {
                 $website->setDefaultGroupId(
-                    $this->detectGroupById($data, $website->getDefaultGroupId())->getId()
+                    $this->detectGroupById($data, $groupId)->getId()
                 );
                 $website->getResource()->save($website);
             });

app/code/Magento/Store/etc/di.xml

@@ -346,11 +346,10 @@
             </argument>
         </arguments>
     </virtualType>
-    <virtualType name="scopesConfigInitialDataProvider" type="Magento\Framework\App\Config\InitialConfigSource">
+    <virtualType name="scopesConfigInitialDataProvider" type="Magento\Store\App\Config\InitialConfigSource">
         <arguments>
             <argument name="reader" xsi:type="object">Magento\Framework\App\DeploymentConfig\Reader</argument>
             <argument name="configType" xsi:type="const">Magento\Store\App\Config\Type\Scopes::CONFIG_TYPE</argument>
-            <argument name="fileKey" xsi:type="const">Magento\Framework\Config\File\ConfigFilePool::APP_CONFIG</argument>
         </arguments>
     </virtualType>
     <type name="Magento\Deploy\Console\Command\App\ApplicationDumpCommand">