Merge pull request #16 from magento-extensibility/MAGETWO-31776-add-p…

…arent-element-theme [Extensibility] Magetwo 31776 add parent element theme
magento · Jan 8, 2015 · 2353daf · 2353daf
2 parents a398195 + e0bb974
commit 2353daf
Show file tree

Hide file tree

Showing 68 changed files with 78 additions and 398 deletions.
diff --git a/app/code/Magento/Core/Model/Theme/Collection.php b/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]);
     }
 
     /**

diff --git a/app/design/adminhtml/Magento/backend/theme.xml b/app/design/adminhtml/Magento/backend/theme.xml
@@ -5,4 +5,5 @@
 -->
 <theme xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Config/etc/theme.xsd">
     <title>Magento 2 backend</title>
+    <version>0.1.0</version>
 </theme>
diff --git a/app/design/frontend/Magento/blank/theme.xml b/app/design/frontend/Magento/blank/theme.xml
@@ -5,6 +5,7 @@
 -->
 <theme xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Config/etc/theme.xsd">
     <title>Magento Blank</title>
+    <version>0.1.0</version>
     <media>
         <preview_image>media/preview.jpg</preview_image>
     </media>

diff --git a/app/design/frontend/Magento/luma/theme.xml b/app/design/frontend/Magento/luma/theme.xml
@@ -5,6 +5,8 @@
 -->
 <theme xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Config/etc/theme.xsd">
     <title>Magento Luma</title>
+    <version>0.1.0</version>
+    <parent>Magento/blank</parent>
     <media>
         <preview_image>media/preview.jpg</preview_image>
     </media>

diff --git a/...ration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/a_d/composer.json b/...ration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/a_d/composer.json
diff --git a/...ntegration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/a_d/theme.xml b/...ntegration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/a_d/theme.xml
@@ -6,4 +6,5 @@
 -->
 <theme xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../../../../lib/internal/Magento/Framework/Config/etc/theme.xsd">
     <title>Theme D</title>
+    <version>0.1.0</version>
 </theme>
diff --git a/...ration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/b_e/composer.json b/...ration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/b_e/composer.json
diff --git a/...ntegration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/b_e/theme.xml b/...ntegration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/b_e/theme.xml
@@ -6,4 +6,5 @@
 -->
 <theme xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../../../../lib/internal/Magento/Framework/Config/etc/theme.xsd">
     <title>Theme E</title>
+    <version>0.1.0</version>
 </theme>
diff --git a/...uite/Magento/Core/Model/Theme/Source/_files/design/frontend/magento_default/composer.json b/...uite/Magento/Core/Model/Theme/Source/_files/design/frontend/magento_default/composer.json
diff --git a/...estsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/magento_default/theme.xml b/...estsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/magento_default/theme.xml
@@ -6,4 +6,5 @@
 -->
 <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>
 </theme>
diff --git a/.../testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/magento_g/composer.json b/.../testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/magento_g/composer.json
diff --git a/...tion/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/magento_g/theme.xml b/...tion/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/magento_g/theme.xml
@@ -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>Theme G</title>
+    <version>0.1.0</version>
+    <parent>Magento/default</parent>
 </theme>
diff --git a/...ntegration/testsuite/Magento/Core/Model/_files/design/adminhtml/Vendor/test/composer.json b/...ntegration/testsuite/Magento/Core/Model/_files/design/adminhtml/Vendor/test/composer.json
diff --git a/...ts/integration/testsuite/Magento/Core/Model/_files/design/adminhtml/Vendor/test/theme.xml b/...ts/integration/testsuite/Magento/Core/Model/_files/design/adminhtml/Vendor/test/theme.xml
@@ -5,4 +5,5 @@
 -->
 <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>
 </theme>
diff --git a/...ration/testsuite/Magento/Core/Model/_files/design/area_two/Vendor/theme_one/composer.json b/...ration/testsuite/Magento/Core/Model/_files/design/area_two/Vendor/theme_one/composer.json
diff --git a/...ntegration/testsuite/Magento/Core/Model/_files/design/area_two/Vendor/theme_one/theme.xml b/...ntegration/testsuite/Magento/Core/Model/_files/design/area_two/Vendor/theme_one/theme.xml
@@ -5,4 +5,5 @@
 -->
 <theme xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../../../lib/internal/Magento/Framework/Config/etc/theme.xsd">
     <title>Theme One</title>
+    <version>0.1.0</version>
 </theme>
diff --git a/...ion/testsuite/Magento/Core/Model/_files/design/design_area/Vendor/theme_one/composer.json b/...ion/testsuite/Magento/Core/Model/_files/design/design_area/Vendor/theme_one/composer.json
diff --git a/...gration/testsuite/Magento/Core/Model/_files/design/design_area/Vendor/theme_one/theme.xml b/...gration/testsuite/Magento/Core/Model/_files/design/design_area/Vendor/theme_one/theme.xml
@@ -5,4 +5,5 @@
 -->
 <theme xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../../../lib/internal/Magento/Framework/Config/etc/theme.xsd">
     <title>Theme One</title>
+    <version>0.1.0</version>
 </theme>
diff --git a/...gration/testsuite/Magento/Core/Model/_files/design/frontend/Magento/default/composer.json b/...gration/testsuite/Magento/Core/Model/_files/design/frontend/Magento/default/composer.json
diff --git a/...integration/testsuite/Magento/Core/Model/_files/design/frontend/Magento/default/theme.xml b/...integration/testsuite/Magento/Core/Model/_files/design/frontend/Magento/default/theme.xml
@@ -5,4 +5,5 @@
 -->
 <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>
 </theme>
diff --git a/.../testsuite/Magento/Core/Model/_files/design/frontend/Magento/default_iphone/composer.json b/.../testsuite/Magento/Core/Model/_files/design/frontend/Magento/default_iphone/composer.json
diff --git a/...tion/testsuite/Magento/Core/Model/_files/design/frontend/Magento/default_iphone/theme.xml b/...tion/testsuite/Magento/Core/Model/_files/design/frontend/Magento/default_iphone/theme.xml
@@ -8,4 +8,6 @@
     <media>
         <preview_image>images/preview_image.jpg</preview_image>
     </media>
+    <version>0.1.0</version>
+    <parent>Magento/default</parent>
 </theme>
diff --git a/...n/testsuite/Magento/Core/Model/_files/design/frontend/Test/cache_test_theme/composer.json b/...n/testsuite/Magento/Core/Model/_files/design/frontend/Test/cache_test_theme/composer.json
diff --git a/...ation/testsuite/Magento/Core/Model/_files/design/frontend/Test/cache_test_theme/theme.xml b/...ation/testsuite/Magento/Core/Model/_files/design/frontend/Test/cache_test_theme/theme.xml
@@ -5,4 +5,6 @@
 -->
 <theme xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../../../lib/internal/Magento/Framework/Config/etc/theme.xsd">
     <title>Cache Test Theme</title>
+    <version>0.1.0</version>
+    <parent>Test/default</parent>
 </theme>
diff --git a/...ntegration/testsuite/Magento/Core/Model/_files/design/frontend/Test/default/composer.json b/...ntegration/testsuite/Magento/Core/Model/_files/design/frontend/Test/default/composer.json
diff --git a/...ts/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/default/theme.xml b/...ts/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/default/theme.xml
@@ -5,4 +5,5 @@
 -->
 <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>
 </theme>
diff --git a/...ration/testsuite/Magento/Core/Model/_files/design/frontend/Test/publication/composer.json b/...ration/testsuite/Magento/Core/Model/_files/design/frontend/Test/publication/composer.json
diff --git a/...ntegration/testsuite/Magento/Core/Model/_files/design/frontend/Test/publication/theme.xml b/...ntegration/testsuite/Magento/Core/Model/_files/design/frontend/Test/publication/theme.xml
@@ -5,4 +5,5 @@
 -->
 <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>
 </theme>
diff --git a/...gration/testsuite/Magento/Core/Model/_files/design/frontend/Test/test_theme/composer.json b/...gration/testsuite/Magento/Core/Model/_files/design/frontend/Test/test_theme/composer.json
diff --git a/...integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/test_theme/theme.xml b/...integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/test_theme/theme.xml
@@ -5,4 +5,6 @@
 -->
 <theme xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../../../lib/internal/Magento/Framework/Config/etc/theme.xsd">
     <title>Test Theme</title>
+    <version>0.1.0</version>
+    <parent>Test/default</parent>
 </theme>
diff --git a/...ion/testsuite/Magento/Core/Model/_files/design/frontend/Vendor/custom_theme/composer.json b/...ion/testsuite/Magento/Core/Model/_files/design/frontend/Vendor/custom_theme/composer.json
diff --git a/...gration/testsuite/Magento/Core/Model/_files/design/frontend/Vendor/custom_theme/theme.xml b/...gration/testsuite/Magento/Core/Model/_files/design/frontend/Vendor/custom_theme/theme.xml
@@ -5,4 +5,6 @@
 -->
 <theme xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../../../lib/internal/Magento/Framework/Config/etc/theme.xsd">
     <title>Custom Theme</title>
+    <version>0.1.0</version>
+    <parent>Vendor/default</parent>
 </theme>
diff --git a/...egration/testsuite/Magento/Core/Model/_files/design/frontend/Vendor/default/composer.json b/...egration/testsuite/Magento/Core/Model/_files/design/frontend/Vendor/default/composer.json
diff --git a/.../integration/testsuite/Magento/Core/Model/_files/design/frontend/Vendor/default/theme.xml b/.../integration/testsuite/Magento/Core/Model/_files/design/frontend/Vendor/default/theme.xml
@@ -5,4 +5,5 @@
 -->
 <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>
 </theme>
diff --git a/...ion/testsuite/Magento/DesignEditor/Model/_files/design/frontend/Vendor/test/composer.json b/...ion/testsuite/Magento/DesignEditor/Model/_files/design/frontend/Vendor/test/composer.json
diff --git a/...gration/testsuite/Magento/DesignEditor/Model/_files/design/frontend/Vendor/test/theme.xml b/...gration/testsuite/Magento/DesignEditor/Model/_files/design/frontend/Vendor/test/theme.xml
@@ -5,4 +5,5 @@
 -->
 <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>
 </theme>
diff --git a/...stsuite/Magento/DesignEditor/Model/_files/design/frontend/Vendor/test_child/composer.json b/...stsuite/Magento/DesignEditor/Model/_files/design/frontend/Vendor/test_child/composer.json
diff --git a/...n/testsuite/Magento/DesignEditor/Model/_files/design/frontend/Vendor/test_child/theme.xml b/...n/testsuite/Magento/DesignEditor/Model/_files/design/frontend/Vendor/test_child/theme.xml
@@ -5,4 +5,6 @@
 -->
 <theme xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../../../lib/internal/Magento/Framework/Config/etc/theme.xsd">
     <title>Default Child</title>
+    <version>0.1.0</version>
+    <parent>Vendor/test</parent>
 </theme>
diff --git a/...egration/testsuite/Magento/Email/Model/_files/design/adminhtml/test_default/composer.json b/...egration/testsuite/Magento/Email/Model/_files/design/adminhtml/test_default/composer.json
diff --git a/.../integration/testsuite/Magento/Email/Model/_files/design/adminhtml/test_default/theme.xml b/.../integration/testsuite/Magento/Email/Model/_files/design/adminhtml/test_default/theme.xml
@@ -6,4 +6,5 @@
 -->
 <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>
 </theme>
diff --git a/...tegration/testsuite/Magento/Email/Model/_files/design/frontend/test_default/composer.json b/...tegration/testsuite/Magento/Email/Model/_files/design/frontend/test_default/composer.json
diff --git a/...s/integration/testsuite/Magento/Email/Model/_files/design/frontend/test_default/theme.xml b/...s/integration/testsuite/Magento/Email/Model/_files/design/frontend/test_default/theme.xml
@@ -6,4 +6,5 @@
 -->
 <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>
 </theme>