Merge branch 'develop-mainline' into MAGETWO-34647

Author: akaplya

CHANGELOG.md

@@ -1,3 +1,61 @@
+0.74.0-beta4
+=============
+* Various
+   * Implemented the getDefaultResult method, to be able to catch exceptions in FrontController and redirect user to the correct page
+   * The getDefaultResult method is invoked to return default result of action execution within controllers. It can be used to generate the ‘execute’ method result in action controllers
+   * Eliminated the unused exceptions. Exceptions that weren't linked to any logic were also eliminated and replaced with LocalizedException or its child classes
+   * Refactored all controllers where possible: the default exception handling logic moved to FrontController. Controllers that cannot be refactored do not conflict with the new logic
+* Framework:
+   * Created Magento Console to perform CLI actions
+   * Introduced a new SalesSequence module that is responsible for documents numeration management across the Order Management System
+   * Implemented the mechanism of asynchronous indexing of sales entities grids
+* Setup
+   * Added the ConfigOption and ConfigOptionsList classes to be used by modules to manage deployment configuration
+   * Moved all existing segments logic to new classes
+   * Added the config:set command, which enables deployment configuration management
+   * Removed the old 'install-configuration' tool
+* Functional tests:
+   * Fixed functional test for order placement from backend
+   * Replaced the end-to-end test for a product with MAP with an injectable test
+* Design
+   * Updated the Blank and Luma themes to enable theme (not only library) variables overriding in the _theme.less file of any inherited theme. Included LESS code standards to the UI Library documentation
+* Fixed bugs:
+   * Fixed an issue where composite products could not be added to the order from the Recently Viewed Products section
+   * Fixed an issue where not all .js files were added to a bundle
+   * Fixed an issue where it was possible to save an incorrect IP value in the Developer Client Restriction field
+   * Fixed an issue where a raw DB error was thrown when trying to enter a custom variable with duplicated variable code
+
+0.74.0-beta3
+=============
+* API
+   * The orders were extended with the gift messages
+   * The page and block data and repository interfaces
+   * Updated the public API list
+* Framework improvements
+    * Improved the profile generator 
+    * Introduced the new environment for Jasmine tests
+* Design
+    * Inverted the new admin area styles scope, clean up the old styles
+    * New Side Panels on Admin Area
+* Various
+    * Asynchronous indexing for sales grids
+    * Advanced Mini Cart
+    * The HTML minification management on Admin Area
+    * Minor UI improvements
+    * The GitHub contribution process was updated in the README.md file
+* Fixed bugs
+    * Fixed the assets deployment tool with the minification
+    * Fixed the JMeter scenario for the performance toolkit
+    * Fixed the static files caching on Varnish
+    * Fixed Admin user creation with the duplicated email or name (incorrect URL)
+    * Fixed the link on Reset password email for secure URL case
+    * Fixed the configured product adding from the wish-list to shopping cart
+    * Fixed the long labels display on Admin Area
+    * Fixed the Navigation Menu items on Admin Area
+    * Various unit and integration tests bugs
+* GitHub issues and requests
+    [#675] (https://github.com/magento/magento2/issues/675) -- Fix for Textarea element cols and rows #675
+
 0.74.0-beta2
 =============
 * Fixed bugs

app/code/Magento/AdminNotification/Model/Feed.php

@@ -5,6 +5,8 @@
  */
 namespace Magento\AdminNotification\Model;
 
+use Magento\Framework\Config\ConfigOptionsList;
+
 /**
  * AdminNotification Feed model
  *
@@ -135,7 +137,7 @@ public function checkUpdate()
 
         $feedXml = $this->getFeedData();
 
-        $installDate = strtotime($this->_deploymentConfig->get('install/date'));
+        $installDate = strtotime($this->_deploymentConfig->get(ConfigOptionsList::CONFIG_PATH_INSTALL_DATE));
 
         if ($feedXml && $feedXml->channel && $feedXml->channel->item) {
             foreach ($feedXml->channel->item as $item) {

app/code/Magento/AdminNotification/Test/Unit/Model/FeedTest.php

@@ -7,6 +7,7 @@
 namespace Magento\AdminNotification\Test\Unit\Model;
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Framework\Config\ConfigOptionsList;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -140,7 +141,8 @@ public function testCheckUpdate($callInbox, $curlRequest)
         $this->backendConfig->expects($this->at(1))->method('getValue')
             ->will($this->returnValue('http://feed.magento.com'));
         $this->deploymentConfig->expects($this->once())->method('get')
-            ->with('install/date')->will($this->returnValue('Sat, 6 Sep 2014 16:46:11 UTC'));
+            ->with(ConfigOptionsList::CONFIG_PATH_INSTALL_DATE)
+            ->will($this->returnValue('Sat, 6 Sep 2014 16:46:11 UTC'));
         if ($callInbox) {
             $this->inboxFactory->expects($this->once())->method('create')
                 ->will(($this->returnValue($this->inboxModel)));

app/code/Magento/AdminNotification/composer.json

@@ -3,15 +3,15 @@
     "description": "N/A",
     "require": {
         "php": "~5.5.0|~5.6.0",
-        "magento/module-store": "0.74.0-beta2",
-        "magento/module-backend": "0.74.0-beta2",
-        "magento/module-media-storage": "0.74.0-beta2",
-        "magento/framework": "0.74.0-beta2",
+        "magento/module-store": "0.74.0-beta4",
+        "magento/module-backend": "0.74.0-beta4",
+        "magento/module-media-storage": "0.74.0-beta4",
+        "magento/framework": "0.74.0-beta4",
         "lib-libxml": "*",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.74.0-beta2",
+    "version": "0.74.0-beta4",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/Authorization/composer.json

@@ -3,12 +3,12 @@
     "description": "Authorization module provides access to Magento ACL functionality.",
     "require": {
         "php": "~5.5.0|~5.6.0",
-        "magento/module-backend": "0.74.0-beta2",
-        "magento/framework": "0.74.0-beta2",
+        "magento/module-backend": "0.74.0-beta4",
+        "magento/framework": "0.74.0-beta4",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.74.0-beta2",
+    "version": "0.74.0-beta4",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/Backend/App/Area/FrontNameResolver.php

@@ -7,6 +7,7 @@
  */
 namespace Magento\Backend\App\Area;
 
+use Magento\Backend\Setup\ConfigOptionsList;
 use Magento\Framework\App\DeploymentConfig;
 
 class FrontNameResolver implements \Magento\Framework\App\Area\FrontNameResolverInterface
@@ -15,8 +16,6 @@ class FrontNameResolver implements \Magento\Framework\App\Area\FrontNameResolver
 
     const XML_PATH_CUSTOM_ADMIN_PATH = 'admin/url/custom_path';
 
-    const PARAM_BACKEND_FRONT_NAME = 'backend/frontName';
-
     /**
      * Backend area code
      */
@@ -46,7 +45,7 @@ class FrontNameResolver implements \Magento\Framework\App\Area\FrontNameResolver
     public function __construct(\Magento\Backend\App\Config $config, DeploymentConfig $deploymentConfig)
     {
         $this->config = $config;
-        $this->defaultFrontName = $deploymentConfig->get(self::PARAM_BACKEND_FRONT_NAME);
+        $this->defaultFrontName = $deploymentConfig->get(ConfigOptionsList::CONFIG_PATH_BACKEND_FRONTNAME);
     }
 
     /**

app/code/Magento/Backend/Helper/Dashboard/Data.php

@@ -6,6 +6,7 @@
 namespace Magento\Backend\Helper\Dashboard;
 
 use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\Config\ConfigOptionsList;
 
 /**
  * Data helper for dashboard
@@ -22,11 +23,6 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      */
     protected $_installDate;
 
-    /**
-     * Configuration key to installation date
-     */
-    const INSTALL_DATE = 'install/date';
-
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
      */
@@ -45,7 +41,7 @@ public function __construct(
         parent::__construct(
             $context
         );
-        $this->_installDate = $deploymentConfig->get(self::INSTALL_DATE);
+        $this->_installDate = $deploymentConfig->get(ConfigOptionsList::CONFIG_PATH_INSTALL_DATE);
         $this->_storeManager = $storeManager;
     }
 

app/code/Magento/Backend/Setup/ConfigOptionsList.php

@@ -0,0 +1,74 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Backend\Setup;
+
+use Magento\Framework\Config\Data\ConfigData;
+use Magento\Framework\Config\File\ConfigFilePool;
+use Magento\Framework\Setup\ConfigOptionsListInterface;
+use Magento\Framework\Setup\Option\TextConfigOption;
+use Magento\Framework\App\DeploymentConfig;
+
+/*
+ * Deployment configuration options needed for Backend module
+ */
+class ConfigOptionsList implements ConfigOptionsListInterface
+{
+    /**
+     * Input key for the options
+     */
+    const INPUT_KEY_BACKEND_FRONTNAME = 'backend_frontname';
+
+    /**
+     * Path to the values in the deployment config
+     */
+    const CONFIG_PATH_BACKEND_FRONTNAME = 'backend/frontName';
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getOptions()
+    {
+        return [
+            new TextConfigOption(
+                self::INPUT_KEY_BACKEND_FRONTNAME,
+                TextConfigOption::FRONTEND_WIZARD_TEXT,
+                self::CONFIG_PATH_BACKEND_FRONTNAME,
+                'Backend frontname',
+                'admin'
+            )
+        ];
+    }
+
+    /**
+     * {@inheritdoc}
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function createConfig(array $options, DeploymentConfig $deploymentConfig)
+    {
+        $configData = new ConfigData(ConfigFilePool::APP_CONFIG);
+
+        if (isset($options[self::INPUT_KEY_BACKEND_FRONTNAME])) {
+            $configData->set(self::CONFIG_PATH_BACKEND_FRONTNAME, $options[self::INPUT_KEY_BACKEND_FRONTNAME]);
+        }
+
+        return [$configData];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function validate(array $options)
+    {
+        $errors = [];
+        if (isset($options[self::INPUT_KEY_BACKEND_FRONTNAME])
+            && !preg_match('/^[a-zA-Z0-9_]+$/', $options[self::INPUT_KEY_BACKEND_FRONTNAME])
+        ) {
+            $errors[] = "Invalid backend frontname '{$options[self::INPUT_KEY_BACKEND_FRONTNAME]}'";
+        }
+
+        return $errors;
+    }
+}

app/code/Magento/Backend/Test/Unit/App/Area/FrontNameResolverTest.php

@@ -6,6 +6,7 @@
 namespace Magento\Backend\Test\Unit\App\Area;
 
 use Magento\Backend\App\Area\FrontNameResolver;
+use Magento\Backend\Setup\ConfigOptionsList;
 
 class FrontNameResolverTest extends \PHPUnit_Framework_TestCase
 {
@@ -29,10 +30,10 @@ protected function setUp()
         $deploymentConfigMock = $this->getMock('\Magento\Framework\App\DeploymentConfig', [], [], '', false);
         $deploymentConfigMock->expects($this->once())
             ->method('get')
-            ->with(FrontNameResolver::PARAM_BACKEND_FRONT_NAME)
+            ->with(ConfigOptionsList::CONFIG_PATH_BACKEND_FRONTNAME)
             ->will($this->returnValue($this->_defaultFrontName));
         $this->_configMock = $this->getMock('\Magento\Backend\App\Config', [], [], '', false);
-        $this->_model = new \Magento\Backend\App\Area\FrontNameResolver($this->_configMock, $deploymentConfigMock);
+        $this->_model = new FrontNameResolver($this->_configMock, $deploymentConfigMock);
     }
 
     public function testIfCustomPathUsed()

app/code/Magento/Backend/Test/Unit/Setup/ConfigOptionsListTest.php

@@ -0,0 +1,93 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Backend\Test\Unit\Setup;
+
+use Magento\Backend\Setup\ConfigOptionsList;
+use Magento\Framework\Config\File\ConfigFilePool;
+
+class ConfigOptionsListTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var ConfigOptionsList
+     */
+    private $object;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\App\DeploymentConfig
+     */
+    private $deploymentConfig;
+
+    protected function setUp()
+    {
+        $this->object = new ConfigOptionsList();
+        $this->deploymentConfig = $this->getMock('Magento\Framework\App\DeploymentConfig', [], [], '', false);
+    }
+
+    public function testGetOptions()
+    {
+        $options = $this->object->getOptions();
+        $this->assertInternalType('array', $options);
+        foreach ($options as $option) {
+            $this->assertInstanceOf('\Magento\Framework\Setup\Option\AbstractConfigOption', $option);
+        }
+    }
+
+    public function testCreateConfig()
+    {
+        $options = [ConfigOptionsList::INPUT_KEY_BACKEND_FRONTNAME => 'admin'];
+        $actualConfig = $this->object->createConfig($options, $this->deploymentConfig);
+
+        $expectedData = [
+            [
+                'file' => ConfigFilePool::APP_CONFIG,
+                'segment' => 'backend',
+                'data' => [
+                    'backend' => ['frontName' => 'admin']
+                ]
+            ]
+        ];
+
+        $this->assertInternalType('array', $actualConfig);
+        /** @var \Magento\Framework\Config\Data\ConfigData $config */
+        foreach ($actualConfig as $i => $config) {
+            $this->assertInstanceOf('\Magento\Framework\Config\Data\ConfigData', $config);
+            $this->assertSame($expectedData[$i]['file'], $config->getFileKey());
+            $this->assertSame($expectedData[$i]['data'], $config->getData());
+        }
+    }
+
+    public function testValidate()
+    {
+        $options = [ConfigOptionsList::INPUT_KEY_BACKEND_FRONTNAME => 'admin'];
+        $errors = $this->object->validate($options);
+        $this->assertEmpty($errors);
+    }
+
+    /**
+     * @param array $options
+     * @param string $expectedError
+     * @dataProvider validateInvalidDataProvider
+     */
+    public function testValidateInvalid(array $options, $expectedError)
+    {
+        $errors = $this->object->validate($options);
+        $this->assertSame([$expectedError], $errors);
+    }
+
+    /**
+     * @return array
+     */
+    public function validateInvalidDataProvider()
+    {
+        return [
+            [[ConfigOptionsList::INPUT_KEY_BACKEND_FRONTNAME => '**'], "Invalid backend frontname '**'"],
+            [
+                [ConfigOptionsList::INPUT_KEY_BACKEND_FRONTNAME => 'invalid frontname'],
+                "Invalid backend frontname 'invalid frontname'"
+            ],
+        ];
+    }
+}