Merge pull request #30 from magento-extensibility/MAGETWO-25343-remove-theme-version

[Extensibility] MAGETWO-25343: Declaration of Components: XML VS composer.json - Removed version from theme.xml

Author: vpelipenko

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

@@ -6,7 +6,6 @@
 namespace Magento\Core\Model;
 
 use Magento\Framework\View\Design\ThemeInterface;
-use Magento\Framework\App\Filesystem\DirectoryList;
 
 /**
  * Theme model class
@@ -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()
@@ -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)

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

@@ -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

app/code/Magento/Core/Model/Theme/Domain/Virtual.php

@@ -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(),

app/code/Magento/Core/etc/module.xml

@@ -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>

app/code/Magento/Core/sql/core_setup/upgrade-2.0.0-2.0.1.php

@@ -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();

app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tab/General.php

@@ -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(),
@@ -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;

app/code/Magento/Theme/view/adminhtml/layout/adminhtml_system_design_theme_block.xml

@@ -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>

app/design/adminhtml/Magento/backend/theme.xml

@@ -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>

app/design/frontend/Magento/blank/theme.xml

@@ -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>

app/design/frontend/Magento/luma/theme.xml

@@ -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>