Skip to content

Commit

Permalink
Merge pull request #30 from magento-extensibility/MAGETWO-25343-remov…
Browse files Browse the repository at this point in the history
…e-theme-version

[Extensibility] MAGETWO-25343: Declaration of Components: XML VS composer.json - Removed version from theme.xml
  • Loading branch information
vpelipenko committed Jan 16, 2015
2 parents 2f89843 + 985cf7f commit 415a139
Show file tree
Hide file tree
Showing 56 changed files with 27 additions and 160 deletions.
3 changes: 0 additions & 3 deletions app/code/Magento/Core/Model/Theme.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
namespace Magento\Core\Model;

use Magento\Framework\View\Design\ThemeInterface;
use Magento\Framework\App\Filesystem\DirectoryList;

/**
* Theme model class
Expand All @@ -15,7 +14,6 @@
* @method string getParentThemePath()
* @method string getParentId()
* @method string getThemeTitle()
* @method string getThemeVersion()
* @method string getPreviewImage()
* @method bool getIsFeatured()
* @method int getThemeId()
Expand All @@ -27,7 +25,6 @@
* @method ThemeInterface setPackageCode(string $packageCode)
* @method ThemeInterface setThemeCode(string $themeCode)
* @method ThemeInterface setThemePath(string $themePath)
* @method ThemeInterface setThemeVersion(string $themeVersion)
* @method ThemeInterface setThemeTitle(string $themeTitle)
* @method ThemeInterface setType(int $type)
* @method ThemeInterface setCode(string $code)
Expand Down
1 change: 0 additions & 1 deletion app/code/Magento/Core/Model/Theme/Collection.php
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,6 @@ public function _prepareConfigurationData($configPath)
'area' => $pathData['area'],
'theme_path' => $themePath,
'code' => $themeCode,
'theme_version' => $themeConfig->getThemeVersion(),
'theme_title' => $themeConfig->getThemeTitle(),
'preview_image' => $media['preview_image'] ? $media['preview_image'] : null,
'parent_theme_path' => $parentPath
Expand Down
1 change: 0 additions & 1 deletion app/code/Magento/Core/Model/Theme/Domain/Virtual.php
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,6 @@ protected function _createStagingTheme()
[
'parent_id' => $this->_theme->getId(),
'theme_path' => null,
'theme_version' => $this->_theme->getThemeVersion(),
'theme_title' => sprintf('%s - Staging', $this->_theme->getThemeTitle()),
'preview_image' => $this->_theme->getPreviewImage(),
'is_featured' => $this->_theme->getIsFeatured(),
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Core/etc/module.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
*/
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Module/etc/module.xsd">
<module name="Magento_Core" schema_version="2.0.0">
<module name="Magento_Core" schema_version="2.0.1">
</module>
</config>
21 changes: 21 additions & 0 deletions app/code/Magento/Core/sql/core_setup/upgrade-2.0.0-2.0.1.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?php
/**
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/

/* @var $installer \Magento\Setup\Module\SetupModule */
$installer = $this;

$installer->startSetup();
$connection = $installer->getConnection();

/**
* Remove column 'theme_version' from 'core_theme'
*/
$connection->dropColumn(
$installer->getTable('core_theme'),
'theme_version'
);

$installer->endSetup();
Original file line number Diff line number Diff line change
Expand Up @@ -155,18 +155,6 @@ protected function _addThemeFieldset($form, $formData, ThemeInterface $theme)
);
}

$themeFieldset->addField(
'theme_version',
$this->_getFieldTextType(),
[
'label' => __('Theme Version'),
'title' => __('Theme Version'),
'name' => 'theme_version',
'required' => $this->_isFieldAttrRequired(),
'note' => $this->_filterFieldNote(__('Example: 0.0.0.1 or 123.1.0.25-alpha1'))
]
);

$themeFieldset->addField(
'theme_title',
$this->_getFieldTextType(),
Expand Down Expand Up @@ -282,7 +270,6 @@ public function canShowTab()
protected function _getDefaults()
{
$defaults = [];
$defaults['theme_version'] = '0.0.0.1';
$defaults['theme_title'] = __('New Theme');

return $defaults;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,14 +52,6 @@
<argument name="column_css_class" xsi:type="string">theme-path</argument>
</arguments>
</block>
<block class="Magento\Backend\Block\Widget\Grid\Column" as="theme_version">
<arguments>
<argument name="header" xsi:type="string" translate="true">Theme Version</argument>
<argument name="index" xsi:type="string">theme_version</argument>
<argument name="filter_index" xsi:type="string">main_table.theme_version</argument>
<argument name="column_css_class" xsi:type="string">theme-version</argument>
</arguments>
</block>
</block>
</block>
</referenceBlock>
Expand Down
1 change: 0 additions & 1 deletion app/design/adminhtml/Magento/backend/theme.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,4 @@
-->
<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>
1 change: 0 additions & 1 deletion app/design/frontend/Magento/blank/theme.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
-->
<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>
Expand Down
1 change: 0 additions & 1 deletion app/design/frontend/Magento/luma/theme.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
-->
<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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ protected function _getThemeData()
'theme_code' => 'theme',
'package_code' => 'package',
'theme_path' => 'package/theme',
'theme_version' => '0.1.0',
'parent_theme' => null,
'is_featured' => true,
'preview_image' => '',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,6 @@ public static function getThemeList()
'parent_id' => '0',
'theme_path' => 'test/default',
'code' => 'test/default',
'theme_version' => '0.1.0',
'theme_title' => 'Test',
'preview_image' => 'test_default.jpg',
'is_featured' => '1',
Expand All @@ -257,7 +256,6 @@ public static function getThemeList()
'parent_id' => '0',
'theme_path' => 'test/pro',
'code' => 'test/pro',
'theme_version' => '0.1.0',
'theme_title' => 'Professional Test',
'preview_image' => 'test_default.jpg',
'is_featured' => '1',
Expand All @@ -268,7 +266,6 @@ public static function getThemeList()
'parent_id' => '0',
'theme_path' => 'test/fixed1',
'code' => 'test/fixed1',
'theme_version' => '0.1.0',
'theme_title' => 'Theme test 1',
'preview_image' => 'test_default.jpg',
'is_featured' => '1',
Expand All @@ -279,7 +276,6 @@ public static function getThemeList()
'parent_id' => '0',
'theme_path' => 'test/fixed2',
'code' => 'test/fixed2',
'theme_version' => '0.1.0',
'theme_title' => 'Theme test 2',
'preview_image' => 'test_default.jpg',
'is_featured' => '1',
Expand All @@ -290,7 +286,6 @@ public static function getThemeList()
'parent_id' => '0',
'theme_path' => 'test/fixed3',
'code' => 'test/fixed3',
'theme_version' => '0.1.0',
'theme_title' => 'Theme test 3',
'preview_image' => 'test_default.jpg',
'is_featured' => '1',
Expand All @@ -310,7 +305,6 @@ public static function getInheritedThemeList()
'parent_id' => '0',
'theme_path' => 'test1/test1',
'code' => 'test1/test1',
'theme_version' => '0.1.0',
'theme_title' => 'Test1',
'preview_image' => 'test1_test1.jpg',
'is_featured' => '1',
Expand All @@ -321,7 +315,6 @@ public static function getInheritedThemeList()
'parent_id' => 'area51/test1/test1',
'theme_path' => 'test1/test2',
'code' => 'test1/test2',
'theme_version' => '0.1.0',
'theme_title' => 'Test2',
'preview_image' => 'test1_test2.jpg',
'is_featured' => '1',
Expand All @@ -332,7 +325,6 @@ public static function getInheritedThemeList()
'parent_id' => 'area51/test1/test2',
'theme_path' => 'test1/test3',
'code' => 'test1/test3',
'theme_version' => '0.1.0',
'theme_title' => 'Test3',
'preview_image' => 'test1_test3.jpg',
'is_featured' => '1',
Expand All @@ -343,7 +335,6 @@ public static function getInheritedThemeList()
'parent_id' => 'area51/test1/test0',
'theme_path' => 'test1/test4',
'code' => 'test1/test4',
'theme_version' => '0.1.0',
'theme_title' => 'Test4',
'preview_image' => 'test1_test4.jpg',
'is_featured' => '1',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@ public function expectedThemeDataFromConfiguration()
'expectedData' => [
'area' => 'frontend',
'theme_title' => 'Default',
'theme_version' => '0.1.0',
'parent_id' => null,
'parent_theme_path' => null,
'theme_path' => 'Magento/default',
Expand Down Expand Up @@ -105,7 +104,6 @@ public function testHasThemeInCollection()
[
'area' => 'space_area',
'theme_title' => 'Space theme',
'theme_version' => '0.1.0',
'parent_id' => null,
'is_featured' => false,
'theme_path' => 'default_space',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,23 +16,20 @@ class VirtualTest extends \PHPUnit_Framework_TestCase
'physical' => [
'parent_id' => null,
'theme_path' => 'test/test',
'theme_version' => '0.1.0',
'theme_title' => 'Test physical theme',
'area' => \Magento\Framework\App\Area::AREA_FRONTEND,
'type' => ThemeInterface::TYPE_PHYSICAL,
],
'virtual' => [
'parent_id' => null,
'theme_path' => '',
'theme_version' => '0.1.0',
'theme_title' => 'Test virtual theme',
'area' => \Magento\Framework\App\Area::AREA_FRONTEND,
'type' => ThemeInterface::TYPE_VIRTUAL,
],
'staging' => [
'parent_id' => null,
'theme_path' => '',
'theme_version' => '0.1.0',
'theme_title' => 'Test staging theme',
'area' => \Magento\Framework\App\Area::AREA_FRONTEND,
'type' => ThemeInterface::TYPE_STAGING,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,4 @@
-->
<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>
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,4 @@
-->
<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>
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,4 @@
-->
<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>
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,5 @@
-->
<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>
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public function testCrud()
);
$themeModel->setData($this->_getThemeValidData());

$crud = new \Magento\TestFramework\Entity($themeModel, ['theme_version' => '0.1.0']);
$crud = new \Magento\TestFramework\Entity($themeModel, []);
$crud->testCrud();
}

Expand All @@ -34,7 +34,6 @@ protected function _getThemeValidData()
return [
'area' => 'space_area',
'theme_title' => 'Space theme',
'theme_version' => '0.1.0',
'parent_id' => null,
'is_featured' => false,
'theme_path' => 'default/space',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,4 @@
-->
<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>
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,4 @@
-->
<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>
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,4 @@
-->
<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>
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,4 @@
-->
<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>
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,5 @@
<media>
<preview_image>images/preview_image.jpg</preview_image>
</media>
<version>0.1.0</version>
<parent>Magento/default</parent>
</theme>
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,5 @@
-->
<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>
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,4 @@
-->
<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>
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,4 @@
-->
<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>
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,5 @@
-->
<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>
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,5 @@
-->
<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>
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,4 @@
-->
<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>
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@
$theme = $objectManager->create('Magento\Framework\View\Design\ThemeInterface');
$theme->setThemePath(
'test/test'
)->setThemeVersion(
'0.1.0'
)->setArea(
'frontend'
)->setThemeTitle(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,4 @@
-->
<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>
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,5 @@
-->
<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>
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
'area' => 'frontend',
'parent_id' => null,
'theme_path' => 'Magento/blank',
'theme_version' => '0.1.0',
'theme_title' => 'Default',
'preview_image' => 'media/preview_image.jpg',
'is_featured' => '0',
Expand Down
Loading

0 comments on commit 415a139

Please sign in to comment.