diff --git a/app/code/Magento/Core/Model/Theme/Collection.php b/app/code/Magento/Core/Model/Theme/Collection.php
index a701c705509efba293872f0f9c94d350fb6e7e7e..2c5b5bebf46fc7d3dd2bfd110672d0a59234c26d 100644
--- a/app/code/Magento/Core/Model/Theme/Collection.php
+++ b/app/code/Magento/Core/Model/Theme/Collection.php
@@ -268,15 +268,7 @@ class Collection extends \Magento\Framework\Data\Collection implements ListInter
$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
index 99d77be7198b012e31fbfbc1aac0bb6c9d3c1dae..fcdf8670d433ff40f671ab13ea71d0925a97a3e7 100644
--- 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
index c8cbccb8002716e29e6065fe34c3c1502d56d7ca..8dbd7147f3a0d5f47cea8f0295863191d9ad2062 100644
--- 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
index a2492d0387d1a2e6cdbcfa417132c3e4b4127bd7..fccec3bf1557a74f15a4edc538dab0c88021fdc4 100644
--- 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/dev/tests/integration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/a_d/composer.json b/dev/tests/integration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/a_d/composer.json
deleted file mode 100644
index 5c53b1799e974daf55081c30e4d29d1e5419f38c..0000000000000000000000000000000000000000
--- a/dev/tests/integration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/a_d/composer.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "name": "magento/theme-frontend-a_d",
- "description": "N/A",
- "require": {
- "php": "~5.4.11|~5.5.0",
- "magento/framework": "0.1.0-alpha103",
- "magento/magento-composer-installer": "*"
- },
- "type": "magento2-theme",
- "version": "0.1.0"
-}
\ No newline at end of file
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/a_d/theme.xml b/dev/tests/integration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/a_d/theme.xml
index bf4573e346899a2eadbc1352539fbd3235819e05..e4992a3d538da5b29d46f2b323f97b8764080a0c 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/a_d/theme.xml
+++ b/dev/tests/integration/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/dev/tests/integration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/b_e/composer.json b/dev/tests/integration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/b_e/composer.json
deleted file mode 100644
index ce67f2ccc05ec09ddd00af751904c4cb90a8cde2..0000000000000000000000000000000000000000
--- a/dev/tests/integration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/b_e/composer.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "name": "magento/theme-fronend-b_e",
- "description": "N/A",
- "require": {
- "php": "~5.4.11|~5.5.0",
- "magento/framework": "0.1.0-alpha103",
- "magento/magento-composer-installer": "*"
- },
- "type": "magento2-theme",
- "version": "0.1.0"
-}
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/b_e/theme.xml b/dev/tests/integration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/b_e/theme.xml
index 200ba008ebf6c7410bc5399637090f355c23778f..b2a0f4f207047d874bed7b76b07fdec00a7826b7 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/b_e/theme.xml
+++ b/dev/tests/integration/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/dev/tests/integration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/magento_default/composer.json b/dev/tests/integration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/magento_default/composer.json
deleted file mode 100644
index 21b9e83b12f6dc2e0feaf6f135afd3b63a5edc5c..0000000000000000000000000000000000000000
--- a/dev/tests/integration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/magento_default/composer.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "name": "magento/theme-frontend-magento_default",
- "description": "N/A",
- "require": {
- "php": "~5.4.11|~5.5.0",
- "magento/framework": "0.1.0-alpha103",
- "magento/magento-composer-installer": "*"
- },
- "type": "magento2-theme",
- "version": "0.1.0"
-}
\ No newline at end of file
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/magento_default/theme.xml b/dev/tests/integration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/magento_default/theme.xml
index 09add6a375547b627dc4f76fa7d9410fc0ead2e0..1439ef8bb0ecb9bb93bd5bde2f356f3c869d8e76 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/magento_default/theme.xml
+++ b/dev/tests/integration/testsuite/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/dev/tests/integration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/magento_g/composer.json b/dev/tests/integration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/magento_g/composer.json
deleted file mode 100644
index 2a92e96f7f9df3a350f1888f641159a624dae457..0000000000000000000000000000000000000000
--- a/dev/tests/integration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/magento_g/composer.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "name": "magento/theme-frontend-magento_g",
- "description": "N/A",
- "require": {
- "php": "~5.4.11|~5.5.0",
- "magento/framework": "0.1.0-alpha103",
- "magento/theme-frontend-magento_default": "0.1.0",
- "magento/magento-composer-installer": "*"
- },
- "type": "magento2-theme",
- "version": "0.1.0"
-}
\ No newline at end of file
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/magento_g/theme.xml b/dev/tests/integration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/magento_g/theme.xml
index 8f159e923310376f456fc378d7e929a988b47f58..8806a5f9f3a00d707446b9d28db54a30dbc6599a 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/magento_g/theme.xml
+++ b/dev/tests/integration/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/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/adminhtml/Vendor/test/composer.json b/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/adminhtml/Vendor/test/composer.json
deleted file mode 100644
index e0b1310c81f8915e1d27687484d84a0a437074bf..0000000000000000000000000000000000000000
--- a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/adminhtml/Vendor/test/composer.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "name": "vendor/theme-adminhtml-test",
- "description": "N/A",
- "require": {
- "php": "~5.4.11|~5.5.0",
- "magento/framework": "0.1.0-alpha103",
- "magento/magento-composer-installer": "*"
- },
- "type": "magento2-theme",
- "version": "0.1.0"
-}
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/adminhtml/Vendor/test/theme.xml b/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/adminhtml/Vendor/test/theme.xml
index 4d36bb3939c909572b1ba37829ff71e26493150c..e5722862335bfa85cb23ec57e02d85c8098ba922 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/adminhtml/Vendor/test/theme.xml
+++ b/dev/tests/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/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/area_two/Vendor/theme_one/composer.json b/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/area_two/Vendor/theme_one/composer.json
deleted file mode 100644
index 8af3364ca100869e7d61be0175dfe9227738b8e6..0000000000000000000000000000000000000000
--- a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/area_two/Vendor/theme_one/composer.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "name": "vendor/theme-area_two-theme_one",
- "description": "N/A",
- "require": {
- "php": "~5.4.11|~5.5.0",
- "magento/framework": "0.1.0-alpha103",
- "magento/magento-composer-installer": "*"
- },
- "type": "magento2-theme",
- "version": "0.1.0"
-}
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/area_two/Vendor/theme_one/theme.xml b/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/area_two/Vendor/theme_one/theme.xml
index 35b907a58810eed2f37001f60ad4648b0e359e9e..2448d252117cb240190ff6480d4a31b2ba4872ec 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/area_two/Vendor/theme_one/theme.xml
+++ b/dev/tests/integration/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/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/design_area/Vendor/theme_one/composer.json b/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/design_area/Vendor/theme_one/composer.json
deleted file mode 100644
index 36bb9873b4165325dbaca97a0251f95c12690d01..0000000000000000000000000000000000000000
--- a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/design_area/Vendor/theme_one/composer.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "name": "vendor/theme-design_area-theme_one",
- "description": "N/A",
- "require": {
- "php": "~5.4.11|~5.5.0",
- "magento/framework": "0.1.0-alpha103",
- "magento/magento-composer-installer": "*"
- },
- "type": "magento2-theme",
- "version": "0.1.0"
-}
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/design_area/Vendor/theme_one/theme.xml b/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/design_area/Vendor/theme_one/theme.xml
index 35b907a58810eed2f37001f60ad4648b0e359e9e..2448d252117cb240190ff6480d4a31b2ba4872ec 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/design_area/Vendor/theme_one/theme.xml
+++ b/dev/tests/integration/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/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Magento/default/composer.json b/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Magento/default/composer.json
deleted file mode 100644
index edffe32afb571138ddef6171bc96d5e924eb2122..0000000000000000000000000000000000000000
--- a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Magento/default/composer.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "name": "magento/theme-frontend-default",
- "description": "N/A",
- "require": {
- "php": "~5.4.11|~5.5.0",
- "magento/framework": "0.1.0-alpha103",
- "magento/magento-composer-installer": "*"
- },
- "type": "magento2-theme",
- "version": "0.1.0"
-}
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Magento/default/theme.xml b/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Magento/default/theme.xml
index 4d36bb3939c909572b1ba37829ff71e26493150c..e5722862335bfa85cb23ec57e02d85c8098ba922 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Magento/default/theme.xml
+++ b/dev/tests/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/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Magento/default_iphone/composer.json b/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Magento/default_iphone/composer.json
deleted file mode 100644
index 755f0fa260b47bb20f1760b96c1759ad907a8130..0000000000000000000000000000000000000000
--- a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Magento/default_iphone/composer.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "name": "magento/theme-frontend-default_iphone",
- "description": "N/A",
- "require": {
- "php": "~5.4.11|~5.5.0",
- "magento/framework": "0.1.0-alpha103",
- "magento/theme-frontend-default": "0.1.0",
- "magento/magento-composer-installer": "*"
- },
- "type": "magento2-theme",
- "version": "0.1.0"
-}
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Magento/default_iphone/theme.xml b/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Magento/default_iphone/theme.xml
index 7c2be1b967c94dbfbdebd52ca30505dc13e7c7ef..bb3e1c3dd9d73c4905267d59ff9c3d87d9c253b7 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Magento/default_iphone/theme.xml
+++ b/dev/tests/integration/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/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/cache_test_theme/composer.json b/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/cache_test_theme/composer.json
deleted file mode 100644
index d9194e28829a74554459b83b32de31733d07e1e3..0000000000000000000000000000000000000000
--- a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/cache_test_theme/composer.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "name": "test/theme-frontend-cache_test_theme",
- "description": "N/A",
- "require": {
- "php": "~5.4.11|~5.5.0",
- "magento/framework": "0.1.0-alpha103",
- "magento/theme-frontend-default": "0.1.0",
- "magento/magento-composer-installer": "*"
- },
- "type": "magento2-theme",
- "version": "0.1.0"
-}
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/cache_test_theme/theme.xml b/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/cache_test_theme/theme.xml
index 2a4dc75e04571a88d3590b2bd67dda469e580a61..2c327724df699da625b917bf47cf4b3ac54f3b8e 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/cache_test_theme/theme.xml
+++ b/dev/tests/integration/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/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/default/composer.json b/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/default/composer.json
deleted file mode 100644
index b9fcee893aea1cf47a34489974d6cce940fd670f..0000000000000000000000000000000000000000
--- a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/default/composer.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "name": "test/theme-frontend-default",
- "description": "N/A",
- "require": {
- "php": "~5.4.11|~5.5.0",
- "magento/framework": "0.1.0-alpha103",
- "magento/magento-composer-installer": "*"
- },
- "type": "magento2-theme",
- "version": "0.1.0"
-}
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/default/theme.xml b/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/default/theme.xml
index 4d36bb3939c909572b1ba37829ff71e26493150c..e5722862335bfa85cb23ec57e02d85c8098ba922 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/default/theme.xml
+++ b/dev/tests/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/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/publication/composer.json b/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/publication/composer.json
deleted file mode 100644
index 212b2e18fee8c4221ce74521cdb1b14a8dae02c1..0000000000000000000000000000000000000000
--- a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/publication/composer.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "name": "test/theme-frontend-publication",
- "description": "N/A",
- "require": {
- "php": "~5.4.11|~5.5.0",
- "magento/framework": "0.1.0-alpha103",
- "magento/magento-composer-installer": "*"
- },
- "type": "magento2-theme",
- "version": "0.1.0"
-}
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/publication/theme.xml b/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/publication/theme.xml
index 4d36bb3939c909572b1ba37829ff71e26493150c..e5722862335bfa85cb23ec57e02d85c8098ba922 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/publication/theme.xml
+++ b/dev/tests/integration/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/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/test_theme/composer.json b/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/test_theme/composer.json
deleted file mode 100644
index 6a676c65acd9552edfe1c1730ea02518f5be5ef5..0000000000000000000000000000000000000000
--- a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/test_theme/composer.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "name": "test/theme-frontend-test_theme",
- "description": "N/A",
- "require": {
- "php": "~5.4.11|~5.5.0",
- "magento/framework": "0.1.0-alpha103",
- "test/theme-frontend-default": "0.1.0",
- "magento/magento-composer-installer": "*"
- },
- "type": "magento2-theme",
- "version": "0.1.0"
-}
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/test_theme/theme.xml b/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/test_theme/theme.xml
index 823175da977a89fa8698118ac3459d35693f1945..eb09dc4416ec484e2f693535ad8fa48f819027d2 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Test/test_theme/theme.xml
+++ b/dev/tests/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/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Vendor/custom_theme/composer.json b/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Vendor/custom_theme/composer.json
deleted file mode 100644
index 47ef65ebb8ae94d072d98bbb3873ce8461c17319..0000000000000000000000000000000000000000
--- a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Vendor/custom_theme/composer.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "name": "vendor/theme-frontend-custom_theme",
- "description": "N/A",
- "require": {
- "php": "~5.4.11|~5.5.0",
- "magento/framework": "0.1.0-alpha103",
- "vendor/theme-frontend-default": "0.1.0",
- "magento/magento-composer-installer": "*"
- },
- "type": "magento2-theme",
- "version": "0.1.0"
-}
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Vendor/custom_theme/theme.xml b/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Vendor/custom_theme/theme.xml
index a6f4b09878eca5816c7fb76786099a58893277e5..33dcec2bc554b0b5b89f22d75d3790041726eddc 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Vendor/custom_theme/theme.xml
+++ b/dev/tests/integration/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/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Vendor/default/composer.json b/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Vendor/default/composer.json
deleted file mode 100644
index 43b56cf8813125df32bb08183ecae06edc617b88..0000000000000000000000000000000000000000
--- a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Vendor/default/composer.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "name": "vendor/theme-frontend-default",
- "description": "N/A",
- "require": {
- "php": "~5.4.11|~5.5.0",
- "magento/framework": "0.1.0-alpha103",
- "magento/magento-composer-installer": "*"
- },
- "type": "magento2-theme",
- "version": "0.1.0"
-}
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Vendor/default/theme.xml b/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Vendor/default/theme.xml
index 4d36bb3939c909572b1ba37829ff71e26493150c..e5722862335bfa85cb23ec57e02d85c8098ba922 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Vendor/default/theme.xml
+++ b/dev/tests/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/dev/tests/integration/testsuite/Magento/DesignEditor/Model/_files/design/frontend/Vendor/test/composer.json b/dev/tests/integration/testsuite/Magento/DesignEditor/Model/_files/design/frontend/Vendor/test/composer.json
deleted file mode 100644
index 8bae49b8c1238983954c680b949b663ef29d6448..0000000000000000000000000000000000000000
--- a/dev/tests/integration/testsuite/Magento/DesignEditor/Model/_files/design/frontend/Vendor/test/composer.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "name": "vendor/theme-frontend-test",
- "description": "N/A",
- "require": {
- "php": "~5.4.11|~5.5.0",
- "magento/framework": "0.1.0-alpha103",
- "magento/magento-composer-installer": "*"
- },
- "type": "magento2-theme",
- "version": "0.1.0"
-}
diff --git a/dev/tests/integration/testsuite/Magento/DesignEditor/Model/_files/design/frontend/Vendor/test/theme.xml b/dev/tests/integration/testsuite/Magento/DesignEditor/Model/_files/design/frontend/Vendor/test/theme.xml
index 4d36bb3939c909572b1ba37829ff71e26493150c..e5722862335bfa85cb23ec57e02d85c8098ba922 100644
--- a/dev/tests/integration/testsuite/Magento/DesignEditor/Model/_files/design/frontend/Vendor/test/theme.xml
+++ b/dev/tests/integration/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/dev/tests/integration/testsuite/Magento/DesignEditor/Model/_files/design/frontend/Vendor/test_child/composer.json b/dev/tests/integration/testsuite/Magento/DesignEditor/Model/_files/design/frontend/Vendor/test_child/composer.json
deleted file mode 100644
index 99b057b589b20103b20cfb2fbdefe45907604e21..0000000000000000000000000000000000000000
--- a/dev/tests/integration/testsuite/Magento/DesignEditor/Model/_files/design/frontend/Vendor/test_child/composer.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "name": "vendor/theme-frontend-test_child",
- "description": "N/A",
- "require": {
- "php": "~5.4.11|~5.5.0",
- "magento/framework": "0.1.0-alpha103",
- "vendor/theme-frontend-test": "0.1.0",
- "magento/magento-composer-installer": "*"
- },
- "type": "magento2-theme",
- "version": "0.1.0"
-}
diff --git a/dev/tests/integration/testsuite/Magento/DesignEditor/Model/_files/design/frontend/Vendor/test_child/theme.xml b/dev/tests/integration/testsuite/Magento/DesignEditor/Model/_files/design/frontend/Vendor/test_child/theme.xml
index 34c933202e4d497d26f6d350ce026d00b52d7f5d..b288e8533aa86d85273c0fff89cc0b7976618b47 100644
--- a/dev/tests/integration/testsuite/Magento/DesignEditor/Model/_files/design/frontend/Vendor/test_child/theme.xml
+++ b/dev/tests/integration/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/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/adminhtml/test_default/composer.json b/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/adminhtml/test_default/composer.json
deleted file mode 100644
index ec400477fccf40419880cedde9be4d166fd9c481..0000000000000000000000000000000000000000
--- a/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/adminhtml/test_default/composer.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "name": "magento/theme-adminhtml-test_default",
- "description": "N/A",
- "require": {
- "php": "~5.4.11|~5.5.0",
- "magento/framework": "0.1.0-alpha103",
- "magento/magento-composer-installer": "*"
- },
- "type": "magento2-theme",
- "version": "0.1.0"
-}
diff --git a/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/adminhtml/test_default/theme.xml b/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/adminhtml/test_default/theme.xml
index 39de137ccc391e97f3f8b24d50568490075b0063..9558b4bd7f42abd9b9eabbd0ead0c8ccb3be1737 100644
--- a/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/adminhtml/test_default/theme.xml
+++ b/dev/tests/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/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/frontend/test_default/composer.json b/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/frontend/test_default/composer.json
deleted file mode 100644
index 5dec2b76fe7c77c74b88cbbc2871a68b8b5f01aa..0000000000000000000000000000000000000000
--- a/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/frontend/test_default/composer.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "name": "magento/theme-frontend-test_default",
- "description": "N/A",
- "require": {
- "php": "~5.4.11|~5.5.0",
- "magento/framework": "0.1.0-alpha103",
- "magento/magento-composer-installer": "*"
- },
- "type": "magento2-theme",
- "version": "0.1.0"
-}
diff --git a/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/frontend/test_default/theme.xml b/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/frontend/test_default/theme.xml
index 39de137ccc391e97f3f8b24d50568490075b0063..9558b4bd7f42abd9b9eabbd0ead0c8ccb3be1737 100644
--- a/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/frontend/test_default/theme.xml
+++ b/dev/tests/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>
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Less/_files/design/frontend/Test/default/composer.json b/dev/tests/integration/testsuite/Magento/Framework/Less/_files/design/frontend/Test/default/composer.json
deleted file mode 100644
index fe632e587767bd9ecfecaf62eab0f76345832518..0000000000000000000000000000000000000000
--- a/dev/tests/integration/testsuite/Magento/Framework/Less/_files/design/frontend/Test/default/composer.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "name": "test/theme-frontend-default",
- "description": "N/A",
- "require": {
- "php": "~5.4.11|~5.5.0",
- "magento/framework": "0.1.0-alpha103",
- "test/theme-frontend-parent": "0.1.0",
- "magento/magento-composer-installer": "*"
- },
- "type": "magento2-theme",
- "version": "0.1.0"
-}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Less/_files/design/frontend/Test/default/theme.xml b/dev/tests/integration/testsuite/Magento/Framework/Less/_files/design/frontend/Test/default/theme.xml
index cf106a2c455a9989b51e7574cb383bbb4dcb2f16..03ea43d6efcc297f738817cdaf183b7761465062 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Less/_files/design/frontend/Test/default/theme.xml
+++ b/dev/tests/integration/testsuite/Magento/Framework/Less/_files/design/frontend/Test/default/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>Test Default</title>
+ <version>0.1.0</version>
+ <parent>Test/parent</parent>
</theme>
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Less/_files/design/frontend/Test/parent/composer.json b/dev/tests/integration/testsuite/Magento/Framework/Less/_files/design/frontend/Test/parent/composer.json
deleted file mode 100644
index 906eda7d63b30f85513219afe19f84b463e6d331..0000000000000000000000000000000000000000
--- a/dev/tests/integration/testsuite/Magento/Framework/Less/_files/design/frontend/Test/parent/composer.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "name": "test/theme-frontend-parent",
- "description": "N/A",
- "require": {
- "php": "~5.4.11|~5.5.0",
- "magento/framework": "0.1.0-alpha103",
- "magento/magento-composer-installer": "*"
- },
- "type": "magento2-theme",
- "version": "0.1.0"
-}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Less/_files/design/frontend/Test/parent/theme.xml b/dev/tests/integration/testsuite/Magento/Framework/Less/_files/design/frontend/Test/parent/theme.xml
index 29741cef40151f5888da8947017f4cc03ee151a0..1b6c47d87f4313e56553080e33bac4e66aa0a9b0 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Less/_files/design/frontend/Test/parent/theme.xml
+++ b/dev/tests/integration/testsuite/Magento/Framework/Less/_files/design/frontend/Test/parent/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>Test Parent</title>
+ <version>0.1.0</version>
</theme>
diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/_files/fallback/design/frontend/Vendor/custom_theme/composer.json b/dev/tests/integration/testsuite/Magento/Framework/View/_files/fallback/design/frontend/Vendor/custom_theme/composer.json
deleted file mode 100644
index 47ef65ebb8ae94d072d98bbb3873ce8461c17319..0000000000000000000000000000000000000000
--- a/dev/tests/integration/testsuite/Magento/Framework/View/_files/fallback/design/frontend/Vendor/custom_theme/composer.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "name": "vendor/theme-frontend-custom_theme",
- "description": "N/A",
- "require": {
- "php": "~5.4.11|~5.5.0",
- "magento/framework": "0.1.0-alpha103",
- "vendor/theme-frontend-default": "0.1.0",
- "magento/magento-composer-installer": "*"
- },
- "type": "magento2-theme",
- "version": "0.1.0"
-}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/_files/fallback/design/frontend/Vendor/custom_theme/theme.xml b/dev/tests/integration/testsuite/Magento/Framework/View/_files/fallback/design/frontend/Vendor/custom_theme/theme.xml
index 8f325c92f8a21e1c8ce6f28fc653d9d38fd103c7..ae3845771861b92974e86b959b5114f819654b15 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/View/_files/fallback/design/frontend/Vendor/custom_theme/theme.xml
+++ b/dev/tests/integration/testsuite/Magento/Framework/View/_files/fallback/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/dev/tests/integration/testsuite/Magento/Framework/View/_files/fallback/design/frontend/Vendor/custom_theme2/composer.json b/dev/tests/integration/testsuite/Magento/Framework/View/_files/fallback/design/frontend/Vendor/custom_theme2/composer.json
deleted file mode 100644
index 958cc1528d7083be035cc6bb04964cb006970389..0000000000000000000000000000000000000000
--- a/dev/tests/integration/testsuite/Magento/Framework/View/_files/fallback/design/frontend/Vendor/custom_theme2/composer.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "name": "vendor/theme-frontend-custom_theme2",
- "description": "N/A",
- "require": {
- "php": "~5.4.11|~5.5.0",
- "magento/framework": "0.1.0-alpha103",
- "vendor/theme-frontend-custom_theme": "0.1.0",
- "magento/magento-composer-installer": "*"
- },
- "type": "magento2-theme",
- "version": "0.1.0"
-}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/_files/fallback/design/frontend/Vendor/custom_theme2/theme.xml b/dev/tests/integration/testsuite/Magento/Framework/View/_files/fallback/design/frontend/Vendor/custom_theme2/theme.xml
index f32748d54c2481b30c85801ced0df905d5fd0e25..1b3787057a31851fe631c5778c7145bededae86d 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/View/_files/fallback/design/frontend/Vendor/custom_theme2/theme.xml
+++ b/dev/tests/integration/testsuite/Magento/Framework/View/_files/fallback/design/frontend/Vendor/custom_theme2/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 2</title>
+ <version>0.1.0</version>
+ <parent>Vendor/custom_theme</parent>
</theme>
diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/_files/fallback/design/frontend/Vendor/default/composer.json b/dev/tests/integration/testsuite/Magento/Framework/View/_files/fallback/design/frontend/Vendor/default/composer.json
deleted file mode 100644
index 43b56cf8813125df32bb08183ecae06edc617b88..0000000000000000000000000000000000000000
--- a/dev/tests/integration/testsuite/Magento/Framework/View/_files/fallback/design/frontend/Vendor/default/composer.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "name": "vendor/theme-frontend-default",
- "description": "N/A",
- "require": {
- "php": "~5.4.11|~5.5.0",
- "magento/framework": "0.1.0-alpha103",
- "magento/magento-composer-installer": "*"
- },
- "type": "magento2-theme",
- "version": "0.1.0"
-}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/_files/fallback/design/frontend/Vendor/default/theme.xml b/dev/tests/integration/testsuite/Magento/Framework/View/_files/fallback/design/frontend/Vendor/default/theme.xml
index 6792f0a9e01593c527a547290920e29632fc54e5..f8326ac05adfb618634665e48e649596b88338fa 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/View/_files/fallback/design/frontend/Vendor/default/theme.xml
+++ b/dev/tests/integration/testsuite/Magento/Framework/View/_files/fallback/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/dev/tests/integration/testsuite/Magento/Framework/View/_files/fallback/design/frontend/Vendor/standalone_theme/composer.json b/dev/tests/integration/testsuite/Magento/Framework/View/_files/fallback/design/frontend/Vendor/standalone_theme/composer.json
deleted file mode 100644
index 120bd0a03bdeb04ffbf4b9a37a4304332cc653f0..0000000000000000000000000000000000000000
--- a/dev/tests/integration/testsuite/Magento/Framework/View/_files/fallback/design/frontend/Vendor/standalone_theme/composer.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "name": "vendor/theme-frontend-standalone_theme",
- "description": "N/A",
- "require": {
- "php": "~5.4.11|~5.5.0",
- "magento/framework": "0.1.0-alpha103",
- "magento/magento-composer-installer": "*"
- },
- "type": "magento2-theme",
- "version": "0.1.0"
-}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/_files/fallback/design/frontend/Vendor/standalone_theme/theme.xml b/dev/tests/integration/testsuite/Magento/Framework/View/_files/fallback/design/frontend/Vendor/standalone_theme/theme.xml
index 2eb88818b368071ab5b0038d36aee50e4dd4761d..b2b52b4ec063b3bfb0a157aed6808aeee48898f0 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/View/_files/fallback/design/frontend/Vendor/standalone_theme/theme.xml
+++ b/dev/tests/integration/testsuite/Magento/Framework/View/_files/fallback/design/frontend/Vendor/standalone_theme/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>Standalone Theme</title>
+ <version>0.1.0</version>
</theme>
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Config/ThemeTest.php b/dev/tests/unit/testsuite/Magento/Framework/Config/ThemeTest.php
index 0b5febc294861bc74f55f484953bb1ede8c79712..2ce2b838c280cb2b4dc537cb464725e2974a6785 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Config/ThemeTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Config/ThemeTest.php
@@ -59,8 +59,7 @@ class ThemeTest extends \PHPUnit_Framework_TestCase
$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,7 +88,7 @@ class ThemeTest extends \PHPUnit_Framework_TestCase
'version' => '0.1.1',
'media' => ['preview_image' => ''],
'title' => 'Test',
- 'parent' => ['Magento', 'default_default'],
+ 'parent' => ['default_default'],
]]],
[
'default_test2',
@@ -97,7 +96,7 @@ class ThemeTest extends \PHPUnit_Framework_TestCase
'version' => '0.1.2',
'media' => ['preview_image' => ''],
'title' => 'Test2',
- 'parent' => ['Magento', 'default_test'],
+ 'parent' => ['default_test'],
]]],
[
'test_default',
@@ -113,7 +112,7 @@ class ThemeTest extends \PHPUnit_Framework_TestCase
'version' => '0.1.4',
'media' => ['preview_image' => ''],
'title' => 'Default',
- 'parent' => ['Magento', 'default_test2'],
+ 'parent' => ['default_test2'],
]]],
];
}
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Config/_files/area/default_default/composer.json b/dev/tests/unit/testsuite/Magento/Framework/Config/_files/area/default_default/composer.json
deleted file mode 100644
index 12d0e925d13dcc5bd2b3c362a5d2193fd0eb8cae..0000000000000000000000000000000000000000
--- a/dev/tests/unit/testsuite/Magento/Framework/Config/_files/area/default_default/composer.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "name": "magento/theme-area-default_default",
- "description": "N/A",
- "require": {
- "php": "~5.4.11|~5.5.0",
- "magento/framework": "0.1.0-alpha103",
- "magento/magento-composer-installer": "*"
- },
- "type": "magento2-theme",
- "version": "0.1.0"
-}
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Config/_files/area/default_default/theme.xml b/dev/tests/unit/testsuite/Magento/Framework/Config/_files/area/default_default/theme.xml
index ba4077b3f8d80a05f506bfa92809dfcadceaa6fa..016d7474c78025adde571d5efefcc0726b0ab668 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Config/_files/area/default_default/theme.xml
+++ b/dev/tests/unit/testsuite/Magento/Framework/Config/_files/area/default_default/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.0</version>
<media>
<preview_image>media/default_default.jpg</preview_image>
</media>
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Config/_files/area/default_test/composer.json b/dev/tests/unit/testsuite/Magento/Framework/Config/_files/area/default_test/composer.json
deleted file mode 100644
index d7700221ad92e660dc7cdeaf42838c3ffa064a67..0000000000000000000000000000000000000000
--- a/dev/tests/unit/testsuite/Magento/Framework/Config/_files/area/default_test/composer.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "name": "magento/theme-area-default_test",
- "description": "N/A",
- "require": {
- "php": "~5.4.11|~5.5.0",
- "magento/framework": "0.1.0-alpha103",
- "magento/theme-area-default_default": "0.1.0",
- "magento/magento-composer-installer": "*"
- },
- "type": "magento2-theme",
- "version": "0.1.1"
-}
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Config/_files/area/default_test/theme.xml b/dev/tests/unit/testsuite/Magento/Framework/Config/_files/area/default_test/theme.xml
index 4b45f4cf3afd53e6d2150df125898509bf900698..4a37f22a66b9c982ab28bf560ebe7c7ded1c6e45 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Config/_files/area/default_test/theme.xml
+++ b/dev/tests/unit/testsuite/Magento/Framework/Config/_files/area/default_test/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>
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Config/_files/area/default_test2/composer.json b/dev/tests/unit/testsuite/Magento/Framework/Config/_files/area/default_test2/composer.json
deleted file mode 100644
index b74a4b53c2c045b9939ce8aed08ac406b909db93..0000000000000000000000000000000000000000
--- a/dev/tests/unit/testsuite/Magento/Framework/Config/_files/area/default_test2/composer.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "name": "magento/theme-area-default_test2",
- "description": "N/A",
- "require": {
- "php": "~5.4.11|~5.5.0",
- "magento/framework": "0.1.0-alpha103",
- "magento/theme-area-default_test": "0.1.1",
- "magento/magento-composer-installer": "*"
- },
- "type": "magento2-theme",
- "version": "0.1.2"
-}
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Config/_files/area/default_test2/theme.xml b/dev/tests/unit/testsuite/Magento/Framework/Config/_files/area/default_test2/theme.xml
index 8a05f46f4ff3f83fef0260d2c76488085d41b2ff..3d80ff8c6643edd21becdbd33900adf04a20f362 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Config/_files/area/default_test2/theme.xml
+++ b/dev/tests/unit/testsuite/Magento/Framework/Config/_files/area/default_test2/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>Test2</title>
+ <version>0.1.2</version>
+ <parent>default_test</parent>
</theme>
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Config/_files/area/test_default/composer.json b/dev/tests/unit/testsuite/Magento/Framework/Config/_files/area/test_default/composer.json
deleted file mode 100644
index bfb7334208a44f165d7ef53a7e465b5a34d168a2..0000000000000000000000000000000000000000
--- a/dev/tests/unit/testsuite/Magento/Framework/Config/_files/area/test_default/composer.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "name": "magento/theme-area-test_default",
- "description": "N/A",
- "require": {
- "php": "~5.4.11|~5.5.0",
- "magento/framework": "0.1.0-alpha103",
- "magento/magento-composer-installer": "*"
- },
- "type": "magento2-theme",
- "version": "0.1.3"
-}
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Config/_files/area/test_default/theme.xml b/dev/tests/unit/testsuite/Magento/Framework/Config/_files/area/test_default/theme.xml
index b6d0a4f8542fe295a9cb0a806365ad4a953a2730..03bb65f624e0101b0e6f84843185079f293973d5 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Config/_files/area/test_default/theme.xml
+++ b/dev/tests/unit/testsuite/Magento/Framework/Config/_files/area/test_default/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>
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Config/_files/area/test_external_package_descendant/composer.json b/dev/tests/unit/testsuite/Magento/Framework/Config/_files/area/test_external_package_descendant/composer.json
deleted file mode 100644
index 930bd7d484a93cd3b1683c26ecdf07884e43b5f5..0000000000000000000000000000000000000000
--- a/dev/tests/unit/testsuite/Magento/Framework/Config/_files/area/test_external_package_descendant/composer.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "name": "magento/theme-area-test_external_package_descendant",
- "description": "N/A",
- "require": {
- "php": "~5.4.11|~5.5.0",
- "magento/framework": "0.1.0-alpha103",
- "magento/theme-area-default_test2": "0.1.0",
- "magento/magento-composer-installer": "*"
- },
- "type": "magento2-theme",
- "version": "0.1.4"
-}
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Config/_files/area/test_external_package_descendant/theme.xml b/dev/tests/unit/testsuite/Magento/Framework/Config/_files/area/test_external_package_descendant/theme.xml
index ab7f0b15b5bb28cf42c09c944c9a4bf184c743af..e9f31bb6ab658e53ea9fb7941a99135627de523b 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Config/_files/area/test_external_package_descendant/theme.xml
+++ b/dev/tests/unit/testsuite/Magento/Framework/Config/_files/area/test_external_package_descendant/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>Default</title>
+ <version>0.1.4</version>
+ <parent>default_test2</parent>
</theme>
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Config/_files/theme_invalid.xml b/dev/tests/unit/testsuite/Magento/Framework/Config/_files/theme_invalid.xml
index e412f8be77301edd88bdb2302ed29d89e05eba02..06694c1b770d9e86393bd1bb33b914e295ddfaf1 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Config/_files/theme_invalid.xml
+++ b/dev/tests/unit/testsuite/Magento/Framework/Config/_files/theme_invalid.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-alpha108</version>
</theme>
diff --git a/lib/internal/Magento/Framework/Config/Theme.php b/lib/internal/Magento/Framework/Config/Theme.php
index eae6b0afde5986449ed99d12bd1b70eb360c7d18..11933f4920bdbfd3ddfdd894b7ce1ed575cd5637 100644
--- a/lib/internal/Magento/Framework/Config/Theme.php
+++ b/lib/internal/Magento/Framework/Config/Theme.php
@@ -28,13 +28,10 @@ class Theme
* Constructor
*
* @param string $configContent
- * @param string $composerContent
*/
- public function __construct(
- $configContent = null,
- $composerContent = null
- ) {
- $this->_data = $this->_extractData($configContent, $composerContent);
+ public function __construct($configContent = null)
+ {
+ $this->_data = $this->_extractData($configContent);
}
/**
@@ -48,13 +45,12 @@ class Theme
}
/**
- * Extract configuration data from theme.xml and composer.json
+ * Extract configuration data from theme.xml
*
* @param string $configContent
- * @param string $composerContent
* @return array
*/
- protected function _extractData($configContent, $composerContent)
+ protected function _extractData($configContent)
{
$data = [
'version' => null,
@@ -69,20 +65,16 @@ class Theme
// todo: validation of the document
/** @var $themeNode \DOMElement */
$themeNode = $dom->getElementsByTagName('theme')->item(0);
- $data['title'] = $themeNode->getElementsByTagName('title')->item(0)->nodeValue;
+ $themeTitleNode = $themeNode->getElementsByTagName('title')->item(0);
+ $data['title'] = $themeTitleNode ? $themeTitleNode->nodeValue : null;
/** @var $mediaNode \DOMElement */
$mediaNode = $themeNode->getElementsByTagName('media')->item(0);
$previewImage = $mediaNode ? $mediaNode->getElementsByTagName('preview_image')->item(0)->nodeValue : '';
$data['media']['preview_image'] = $previewImage;
- }
-
- if (!empty($composerContent)) {
- $json = json_decode($composerContent);
- $package = new Package($json);
- $data['version'] = $package->get('version');
- $parents = (array)$package->get('require', '/.+\/theme-/');
- $parents = empty($parents) ? null : array_keys($parents);
- $data['parent'] = empty($parents) ? null : array_shift($parents);
+ $themeVersionNode = $themeNode->getElementsByTagName('version')->item(0);
+ $data['version'] = $themeVersionNode ? $themeVersionNode->nodeValue : null;
+ $themeParentNode = $themeNode->getElementsByTagName('parent')->item(0);
+ $data['parent'] = $themeParentNode ? $themeParentNode->nodeValue : null;
}
return $data;
@@ -129,28 +121,6 @@ class Theme
if (!$parentTheme) {
return null;
}
- $parent = $this->parseThemeName($parentTheme);
- return [ucfirst($parent['vendor']), $parent['name']];
- }
-
- /**
- * Parse theme name
- *
- * @param string $themeName
- * @return array|null Return array if theme name is in the right format, otherwise null is returned, for example:
- * [
- * 'vendor' => 'magento',
- * 'area' => 'frontend',
- * 'name' => 'luma'
- * ]
- */
- private function parseThemeName($themeName)
- {
- preg_match('/(?<vendor>.+)\/theme-(?<area>.+)-(?<name>.+)/', $themeName, $matches);
- return [
- 'vendor' => $matches['vendor'],
- 'area' => $matches['area'],
- 'name' => $matches['name'],
- ];
+ return explode(self::THEME_PATH_SEPARATOR, $parentTheme);
}
}
diff --git a/lib/internal/Magento/Framework/Config/etc/theme.xsd b/lib/internal/Magento/Framework/Config/etc/theme.xsd
index ece5036373a8d3f2c1ad6cfacc283bcc45f28343..e61da57b8842af921471fc019f22001aefb303fd 100644
--- a/lib/internal/Magento/Framework/Config/etc/theme.xsd
+++ b/lib/internal/Magento/Framework/Config/etc/theme.xsd
@@ -15,6 +15,8 @@
<xs:complexType>
<xs:sequence>
<xs:element name="title" type="title"/>
+ <xs:element name="version" type="version"/>
+ <xs:element name="parent" type="parent_theme" minOccurs="0"/>
<xs:element name="media" type="media" minOccurs="0"/>
</xs:sequence>
</xs:complexType>
@@ -26,6 +28,18 @@
</xs:restriction>
</xs:simpleType>
+ <!-- Short theme name: '<theme>'. Fully-qualified theme name: '<path>/<theme>'. -->
+ <xs:simpleType name="parent_theme">
+ <xs:restriction base="xs:string">
+ <xs:pattern value="([^/]+/)?[^/]+"></xs:pattern>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="version">
+ <xs:restriction base="xs:string">
+ <xs:pattern value="(\d+.\d+.\d+(\-[a-zA-Z0-9]+)?)|\*"></xs:pattern>
+ </xs:restriction>
+ </xs:simpleType>
<xs:complexType name="media">
<xs:sequence>