Merge remote-tracking branch 'origin/MAGETWO-31484-variable-module' into develop

Conflicts:
	composer.lock
	dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_namespaces.php
	setup/src/Magento/Setup/Model/Installer.php

Author: Dale Sikkema

Gruntfile.js

@@ -35,10 +35,10 @@ module.exports = function (grunt) {
         tmpSource: 'var/view_preprocessed/source/',
         tmp: 'var',
         css: {
-            setup: 'setup/pub/magento/setup/css'
+            setup: 'setup/pub/styles'
         },
         less: {
-            setup: 'setup/module/Magento/Setup/styles'
+            setup: 'setup/view/styles'
         },
         uglify: {
             legacy: 'lib/web/legacy-build.min.js'

app/code/Magento/Backend/etc/acl.xml

@@ -39,9 +39,7 @@
                     <resource id="Magento_Backend::tools" title="Tools" sortOrder="50">
                         <resource id="Magento_Backend::cache" title="Cache Management"  sortOrder="10" />
                     </resource>
-                    <resource id="Magento_Backend::system_other_settings" title="Other Settings"  sortOrder="80">
-                        <resource id="Magento_Backend::variable" title="Custom Variables"  sortOrder="20" />
-                    </resource>
+                    <resource id="Magento_Backend::system_other_settings" title="Other Settings"  sortOrder="80" />
                 </resource>
             </resource>
         </resources>

app/code/Magento/Backend/etc/adminhtml/menu.xml

@@ -9,7 +9,6 @@
     <menu>
         <add id="Magento_Backend::system_design_schedule" title="Schedule" module="Magento_Backend" sortOrder="30" parent="Magento_Backend::system_design" action="adminhtml/system_design" resource="Magento_Backend::schedule"/>
         <add id="Magento_Backend::system_currency" title="Currency" module="Magento_Backend" sortOrder="30" parent="Magento_Backend::stores" action="adminhtml/system_currency" resource="Magento_CurrencySymbol::system_currency"/>
-        <add id="Magento_Backend::system_variable" title="Custom Variables" module="Magento_Backend" sortOrder="20" parent="Magento_Backend::system_other_settings" action="adminhtml/system_variable" resource="Magento_Backend::variable"/>
         <add id="Magento_Backend::system_store" title="All Stores" module="Magento_Core" sortOrder="10" parent="Magento_Backend::stores_settings" action="adminhtml/system_store/" resource="Magento_Backend::store"/>
         <add id="Magento_Backend::dashboard" title="Dashboard" module="Magento_Backend" sortOrder="10" action="adminhtml/dashboard" resource="Magento_Backend::dashboard"/>
         <add id="Magento_Backend::system" title="System" module="Magento_Backend" sortOrder="80" resource="Magento_Backend::system"/>

app/code/Magento/Backend/view/adminhtml/web/js/bootstrap/editor.js

@@ -4,6 +4,6 @@
  * See COPYING.txt for license details.
  */
 require([
-    "Magento_Backend/variables",
+    "Magento_Variable/variables",
     "mage/adminhtml/browser"
 ]);

app/code/Magento/CatalogSearch/view/frontend/templates/advanced/link.phtml

@@ -11,6 +11,6 @@ $helper = $this->helper('Magento\CatalogSearch\Helper\Data');
 ?>
 <div class="nested">
     <a class="action advanced" href="<?php echo $helper->getAdvancedSearchUrl(); ?>">
-        <?php echo __('Advanced Search (Modified Again)'); ?>
+        <?php echo __('Advanced Search'); ?>
     </a>
 </div>

app/code/Magento/Cms/Model/Wysiwyg/Config.php

@@ -51,7 +51,7 @@ class Config extends \Magento\Framework\Object
     protected $_assetRepo;
 
     /**
-     * @var \Magento\Core\Model\Variable\Config
+     * @var \Magento\Variable\Model\Variable\Config
      */
     protected $_variableConfig;
 
@@ -94,7 +94,7 @@ class Config extends \Magento\Framework\Object
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param \Magento\Framework\AuthorizationInterface $authorization
      * @param \Magento\Framework\View\Asset\Repository $assetRepo
-     * @param \Magento\Core\Model\Variable\Config $variableConfig
+     * @param \Magento\Variable\Model\Variable\Config $variableConfig
      * @param \Magento\Widget\Model\Widget\Config $widgetConfig
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
@@ -107,7 +107,7 @@ public function __construct(
         \Magento\Framework\Event\ManagerInterface $eventManager,
         \Magento\Framework\AuthorizationInterface $authorization,
         \Magento\Framework\View\Asset\Repository $assetRepo,
-        \Magento\Core\Model\Variable\Config $variableConfig,
+        \Magento\Variable\Model\Variable\Config $variableConfig,
         \Magento\Widget\Model\Widget\Config $widgetConfig,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         \Magento\Store\Model\StoreManagerInterface $storeManager,

app/code/Magento/Cms/composer.json

@@ -11,6 +11,7 @@
         "magento/module-catalog": "0.42.0-beta9",
         "magento/module-email": "0.42.0-beta9",
         "magento/module-ui": "0.42.0-beta9",
+        "magento/module-variable": "0.42.0-beta9",
         "magento/framework": "0.42.0-beta9",
         "magento/magento-composer-installer": "*"
     },

app/code/Magento/Core/composer.json

@@ -4,7 +4,6 @@
     "require": {
         "php": "~5.5.0|~5.6.0",
         "magento/module-store": "0.42.0-beta9",
-        "magento/module-backend": "0.42.0-beta9",
         "magento/framework": "0.42.0-beta9",
         "lib-libxml": "*",
         "magento/magento-composer-installer": "*"

app/code/Magento/Core/sql/core_setup/install-2.0.0.php

@@ -118,107 +118,6 @@
 );
 $connection->createTable($table);
 
-/**
- * Create table 'core_variable'
- */
-$table = $connection->newTable(
-    $installer->getTable('core_variable')
-)->addColumn(
-    'variable_id',
-    \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-    null,
-    ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-    'Variable Id'
-)->addColumn(
-    'code',
-    \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-    255,
-    [],
-    'Variable Code'
-)->addColumn(
-    'name',
-    \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-    255,
-    [],
-    'Variable Name'
-)->addIndex(
-    $installer->getIdxName(
-        'core_variable',
-        ['code'],
-        \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-    ),
-    ['code'],
-    ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-)->setComment(
-    'Variables'
-);
-$connection->createTable($table);
-
-/**
- * Create table 'core_variable_value'
- */
-$table = $connection->newTable(
-    $installer->getTable('core_variable_value')
-)->addColumn(
-    'value_id',
-    \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-    null,
-    ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-    'Variable Value Id'
-)->addColumn(
-    'variable_id',
-    \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-    null,
-    ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-    'Variable Id'
-)->addColumn(
-    'store_id',
-    \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-    null,
-    ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-    'Store Id'
-)->addColumn(
-    'plain_value',
-    \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-    '64k',
-    [],
-    'Plain Text Value'
-)->addColumn(
-    'html_value',
-    \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-    '64k',
-    [],
-    'Html Value'
-)->addIndex(
-    $installer->getIdxName(
-        'core_variable_value',
-        ['variable_id', 'store_id'],
-        \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-    ),
-    ['variable_id', 'store_id'],
-    ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE]
-)->addIndex(
-    $installer->getIdxName('core_variable_value', ['store_id']),
-    ['store_id']
-)->addForeignKey(
-    $installer->getFkName('core_variable_value', 'store_id', 'store', 'store_id'),
-    'store_id',
-    $installer->getTable('store'),
-    'store_id',
-    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
-    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-)->addForeignKey(
-    $installer->getFkName('core_variable_value', 'variable_id', 'core_variable', 'variable_id'),
-    'variable_id',
-    $installer->getTable('core_variable'),
-    'variable_id',
-    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
-    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-)->setComment(
-    'Variable Value'
-);
-$connection->createTable($table);
-
 /**
  * Create table 'core_cache'
  */

app/code/Magento/Email/Block/Adminhtml/Template/Edit/Form.php

@@ -17,23 +17,23 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
     protected $_variables;
 
     /**
-     * @var \Magento\Core\Model\VariableFactory
+     * @var \Magento\Variable\Model\VariableFactory
      */
     protected $_variableFactory;
 
     /**
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Framework\Data\FormFactory $formFactory
-     * @param \Magento\Core\Model\VariableFactory $variableFactory
+     * @param \Magento\Variable\Model\VariableFactory $variableFactory
      * @param \Magento\Email\Model\Source\Variables $variables
      * @param array $data
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
         \Magento\Framework\Registry $registry,
         \Magento\Framework\Data\FormFactory $formFactory,
-        \Magento\Core\Model\VariableFactory $variableFactory,
+        \Magento\Variable\Model\VariableFactory $variableFactory,
         \Magento\Email\Model\Source\Variables $variables,
         array $data = []
     ) {