Merge remote-tracking branch 'origin/MAGETWO-31776-add-parent-element-theme' into MAGETWO-31776-add-parent-element-theme

Author: Bibu Mathew

app/code/Magento/Core/Model/Theme/Collection.php

@@ -268,15 +268,7 @@ protected function _getConfigModel($configPath)
         $relativeConfigPath = $this->_directory->getRelativePath($configPath);
         $configContent = $this->_directory->isExist($relativeConfigPath) ?
             $this->_directory->readFile($relativeConfigPath) : null;
-        $relativeComposerPath = dirname($relativeConfigPath) . '/composer.json';
-        $composerContent = $this->_directory->isExist($relativeComposerPath) ?
-            $this->_directory->readFile($relativeComposerPath) : null;
-        return $this->themeConfigFactory->create(
-            [
-                'configContent' => $configContent,
-                'composerContent' => $composerContent,
-            ]
-        );
+        return $this->themeConfigFactory->create(['configContent' => $configContent]);
     }
 
     /**

dev/tests/unit/testsuite/Magento/Framework/Config/ThemeTest.php

@@ -59,8 +59,7 @@ public function testDataGetter($themePath, $expected)
         $config = $this->objectManager->getObject(
             'Magento\Framework\Config\Theme',
             [
-                'configContent' => file_get_contents(__DIR__ . '/_files/area/' . $themePath . '/theme.xml'),
-                'composerContent' => file_get_contents(__DIR__ . '/_files/area/' . $themePath . '/composer.json'),
+                'configContent' => file_get_contents(__DIR__ . '/_files/area/' . $themePath . '/theme.xml')
             ]
         );
         $this->assertSame($expected['version'], $config->getThemeVersion());
@@ -89,15 +88,15 @@ public function dataGetterDataProvider()
                     'version' => '0.1.1',
                     'media' => ['preview_image' => ''],
                     'title' => 'Test',
-                    'parent' => ['Magento', 'default_default'],
+                    'parent' => ['default_default'],
                 ]]],
             [
                 'default_test2',
                 [[
                     'version' => '0.1.2',
                     'media' => ['preview_image' => ''],
                     'title' => 'Test2',
-                    'parent' => ['Magento', 'default_test'],
+                    'parent' => ['default_test'],
                 ]]],
             [
                 'test_default',
@@ -113,7 +112,7 @@ public function dataGetterDataProvider()
                     'version' => '0.1.4',
                     'media' => ['preview_image' => ''],
                     'title' => 'Default',
-                    'parent' => ['Magento', 'default_test2'],
+                    'parent' => ['default_test2'],
                 ]]],
         ];
     }

dev/tests/unit/testsuite/Magento/Framework/Config/_files/area/default_default/composer.json

@@ -6,6 +6,7 @@
 -->
 <theme xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../lib/internal/Magento/Framework/Config/etc/theme.xsd">
     <title>Default</title>
+    <version>0.1.0</version>
     <media>
         <preview_image>media/default_default.jpg</preview_image>
     </media>

dev/tests/unit/testsuite/Magento/Framework/Config/_files/area/default_default/theme.xml

@@ -6,6 +6,8 @@
 -->
 <theme xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../lib/internal/Magento/Framework/Config/etc/theme.xsd">
     <title>Test</title>
+    <version>0.1.1</version>
+    <parent>default_default</parent>
     <media>
         <preview_image />
     </media>

dev/tests/unit/testsuite/Magento/Framework/Config/_files/area/default_test/composer.json

@@ -6,4 +6,6 @@
 -->
 <theme xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../lib/internal/Magento/Framework/Config/etc/theme.xsd">
     <title>Test2</title>
+    <version>0.1.2</version>
+    <parent>default_test</parent>
 </theme>

dev/tests/unit/testsuite/Magento/Framework/Config/_files/area/default_test/theme.xml

@@ -6,6 +6,7 @@
 -->
 <theme xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../lib/internal/Magento/Framework/Config/etc/theme.xsd">
     <title>Default</title>
+    <version>0.1.3</version>
     <media>
         <preview_image>media/test_default.jpg</preview_image>
     </media>