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

Author: shiftedreality

app/code/Magento/Store/App/Config/Source/InitialConfigSource.php

@@ -9,6 +9,7 @@
 use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\App\DeploymentConfig\Reader;
 use Magento\Framework\DataObject;
+use Magento\Framework\DataObjectFactory;
 
 /**
  * Config source to retrieve configuration from files.
@@ -36,15 +37,28 @@ class InitialConfigSource implements ConfigSourceInterface
      */
     private $configType;
 
+    /**
+     * The DataObject factory.
+     *
+     * @var DataObjectFactory
+     */
+    private $dataObjectFactory;
+
     /**
      * @param Reader $reader The file reader
      * @param DeploymentConfig $deploymentConfig The deployment config reader
+     * @param DataObjectFactory $dataObjectFactory The DataObject factory
      * @param string $configType The config type
      */
-    public function __construct(Reader $reader, DeploymentConfig $deploymentConfig, $configType)
-    {
+    public function __construct(
+        Reader $reader,
+        DeploymentConfig $deploymentConfig,
+        DataObjectFactory $dataObjectFactory,
+        $configType
+    ) {
         $this->reader = $reader;
         $this->deploymentConfig = $deploymentConfig;
+        $this->dataObjectFactory = $dataObjectFactory;
         $this->configType = $configType;
     }
 
@@ -59,11 +73,13 @@ public function get($path = '')
          *
          * @see \Magento\Store\Model\Config\Importer To import store configs
          */
-        if ($this->deploymentConfig->isAvailable()) {
+        if (!$this->deploymentConfig->isAvailable()) {
             return [];
         }
 
-        $data = new DataObject($this->reader->load());
+        $data = $this->dataObjectFactory->create([
+            'data' => $this->reader->load()
+        ]);
 
         if ($path !== '' && $path !== null) {
             $path = '/' . ltrim($path, '/');

app/code/Magento/Store/Test/Unit/App/Config/Source/InitialConfigSourceTest.php

@@ -7,6 +7,8 @@
 
 use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\App\DeploymentConfig\Reader;
+use Magento\Framework\DataObject;
+use Magento\Framework\DataObjectFactory;
 use Magento\Store\App\Config\Source\InitialConfigSource;
 use PHPUnit_Framework_MockObject_MockObject as Mock;
 
@@ -25,6 +27,16 @@ class InitialConfigSourceTest extends \PHPUnit_Framework_TestCase
      */
     private $deploymentConfigMock;
 
+    /**
+     * @var DataObjectFactory|Mock
+     */
+    private $dataObjectFactory;
+
+    /**
+     * @var DataObject|Mock
+     */
+    private $dataObjectMock;
+
     /**
      * @var InitialConfigSource
      */
@@ -41,26 +53,56 @@ public function setUp()
         $this->deploymentConfigMock = $this->getMockBuilder(DeploymentConfig::class)
             ->disableOriginalConstructor()
             ->getMock();
+        $this->dataObjectFactory = $this->getMockBuilder(DataObjectFactory::class)
+            ->setMethods(['create'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->dataObjectMock = $this->getMockBuilder(DataObject::class)
+            ->disableOriginalConstructor()
+            ->getMock();
 
         $this->source = new InitialConfigSource(
             $this->readerMock,
             $this->deploymentConfigMock,
+            $this->dataObjectFactory,
             'configType'
         );
     }
 
-    public function testGet()
+    /**
+     * @param string $path
+     * @param array $data
+     * @param string|array $expected
+     * @dataProvider getDataProvider
+     */
+    public function testGet($path, $data, $expected)
     {
-        $path = 'path';
-
         $this->readerMock->expects($this->once())
             ->method('load')
-            ->willReturn(['configType' => [$path => 'value']]);
+            ->willReturn($data);
         $this->deploymentConfigMock->expects($this->once())
             ->method('isAvailable')
             ->willReturn(true);
+        $this->dataObjectFactory->expects($this->once())
+            ->method('create')
+            ->with(['data' => $data])
+            ->willReturn($this->dataObjectMock);
+        $this->dataObjectMock->expects($this->once())
+            ->method('getData')
+            ->willReturn($expected);
 
-        $this->assertEquals('value', $this->source->get($path));
+        $this->assertEquals($expected, $this->source->get($path));
+    }
+
+    /**
+     * @return array
+     */
+    public function getDataProvider()
+    {
+        return [
+            'simple path' => ['path', ['configType' => 'value'], 'value'],
+            'empty path' => ['', [], []]
+        ];
     }
 
     public function testGetNotInstalled()