Merge remote-tracking branch 'mainline/develop' into develop

Author: mazhalai

CHANGELOG.md

@@ -1,3 +1,34 @@
+0.42.0-beta8
+=============
+* Various improvements:
+    * Existing Builders were replaced with DataFactories in Customer and Tax modules
+    * Refactored controller actions in the Checkout and CMS modules
+    * Increased coverage with static tests for `.phtml` files
+    * Moved Cookie related functionality from `Theme` and `Core` modules into a new `Cookie` module
+    * Moved minfication configuration settings to the `View` library level
+* UI improvements:
+    * Restyled installation wizard
+    * Prepared styles for Dashboard in the Backend area
+* Framework improvements:
+    * Added `setCustomAttribute` and `setCustomAttributes` methods to `ExtensibleDataInterface`
+    * Added setter methods to data object interfaces
+    * Replaced `Builders` with `Factories`
+    * Added `DataObjectHelper.php` which contains the common set of methods of all builders
+    * Refactored `__()` to return `Phrase` object
+    * Allowed usage of `LocalizedException` on the framework's library level
+    * Added expiration/lifetime management of frontend resources
+    * Unified MTF configurations format for Framework, TestCase variations and TestCase scenario configurations
+* Fixed bugs:
+    * Fixed an issue with product reviews list paging
+    * Fixed an issue where sold products were not displayed in Bestsellers
+    * Fixed an issue with image rendering on the CMS page on Frontend when `webserver rewrites = no`
+* GitHub requests:
+    * [#790](https://github.com/magento/magento2/issues/790) -- Magento API fails in a CGI env (zf1 issue)
+    * [#909](https://github.com/magento/magento2/issues/909) -- Manage Titles in popup window front-end issue
+    * [#996](https://github.com/magento/magento2/issues/996) -- Pager block should support url "fragment".
+    * [#985](https://github.com/magento/magento2/pull/985) -- Allow camelcase in vendorname for menus
+    * [#1025](https://github.com/magento/magento2/pull/1025) -- Wrong parameter for getting base url for 'media' path in "Image" form element.
+
 0.42.0-beta7
 =============
 * Various improvements:

app/code/Magento/AdminNotification/Model/System/Message/Baseurl.php

@@ -8,6 +8,8 @@
 
 namespace Magento\AdminNotification\Model\System\Message;
 
+use Magento\Store\Model\Store;
+
 class Baseurl implements \Magento\Framework\Notification\MessageInterface
 {
     /**
@@ -56,9 +58,9 @@ public function __construct(
     protected function _getConfigUrl()
     {
         $output = '';
-        $defaultUnsecure = $this->_config->getValue(\Magento\Store\Model\Store::XML_PATH_UNSECURE_BASE_URL, 'default');
+        $defaultUnsecure = $this->_config->getValue(Store::XML_PATH_UNSECURE_BASE_URL, 'default');
 
-        $defaultSecure = $this->_config->getValue(\Magento\Store\Model\Store::XML_PATH_SECURE_BASE_URL, 'default');
+        $defaultSecure = $this->_config->getValue(Store::XML_PATH_SECURE_BASE_URL, 'default');
 
         if ($defaultSecure == \Magento\Store\Model\Store::BASE_URL_PLACEHOLDER ||
             $defaultUnsecure == \Magento\Store\Model\Store::BASE_URL_PLACEHOLDER

app/code/Magento/AdminNotification/Model/System/Message/Security.php

@@ -8,6 +8,8 @@
 
 namespace Magento\AdminNotification\Model\System\Message;
 
+use Magento\Store\Model\Store;
+
 class Security implements \Magento\Framework\Notification\MessageInterface
 {
     /**
@@ -93,7 +95,7 @@ private function _canShowNotification()
      */
     private function _isFileAccessible()
     {
-        $unsecureBaseURL = $this->_config->getValue(\Magento\Store\Model\Store::XML_PATH_UNSECURE_BASE_URL, 'default');
+        $unsecureBaseURL = $this->_config->getValue(Store::XML_PATH_UNSECURE_BASE_URL, 'default');
 
         /** @var $http \Magento\Framework\HTTP\Adapter\Curl */
         $http = $this->_curlFactory->create();

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.42.0-beta7",
-        "magento/module-core": "0.42.0-beta7",
-        "magento/module-backend": "0.42.0-beta7",
-        "magento/framework": "0.42.0-beta7",
+        "magento/module-store": "0.42.0-beta8",
+        "magento/module-core": "0.42.0-beta8",
+        "magento/module-backend": "0.42.0-beta8",
+        "magento/framework": "0.42.0-beta8",
         "lib-libxml": "*",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.42.0-beta7",
+    "version": "0.42.0-beta8",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/AdminNotification/view/adminhtml/templates/toolbar_entry.phtml

@@ -24,7 +24,7 @@
                 <strong class="notifications-entry-title"><?php echo $block->escapeHtml($notification->getTitle()); ?></strong>
                 <span class="notifications-entry-description"><?php echo $block->escapeHtml($notification->getDescription()); ?></span>
                 <time class="notifications-entry-time"><?php echo $block->escapeHtml($block->formatNotificationDate($notification->getDateAdded())); ?></time>
-                <button class="action close notifications-close"><span><?php echo __('Close'); ?></span></button>
+                <button type="button" class="action close notifications-close"><span><?php echo __('Close'); ?></span></button>
                 <div class="notifications-dialog-content" data-title="<?php echo __('Notification'); ?>" data-cancel-caption="<?php echo  __('Cancel'); ?>" data-acknowledge-caption="<?php echo __('Acknowledge'); ?>">
                     <strong class="notifications-entry-title"><?php echo $block->escapeHtml($notification->getTitle()); ?></strong>
                     <span class="notifications-entry-description"><?php echo $block->escapeHtml($notification->getDescription()); ?></span>

app/code/Magento/AdminNotification/view/adminhtml/web/system/notification.js

@@ -2,45 +2,60 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-/*jshint jquery:true*/
 define([
-    "jquery",
-    "jquery/ui",
-    "jquery/template"
-], function($){
-
-    $.template(
-        'systemMessageDialog',
-        '<li class="{{if severity == 1}}error{{else}}warning{{/if}}">{{html text}}</li>'
-    );
+    'jquery',
+    'mage/template',
+    'jquery/ui'
+], function ($, mageTemplate) {
+    'use strict';
 
     $.widget('mage.systemMessageDialog', $.ui.dialog, {
         options: {
-            systemMessageTemplate: 'systemMessageDialog'
+            systemMessageTemplate:
+                '<% _.each(data.items, function(item) { %>' +
+                    '<li class="<% if (item.severity == 1) { %>error<% } else { %>warning<% } %>">' +
+                        '<%= item.text %>' +
+                    '</li>' +
+                '<% }); %>'
         },
-        open: function(severity) {
+
+        open: function (severity) {
             var superMethod = $.proxy(this._super, this);
+
             $.ajax({
                 url: this.options.ajaxUrl,
                 type: 'GET',
-                data: {severity: severity}
-            }).done($.proxy(function(data) {
+                data: {
+                    severity: severity
+                }
+            }).done($.proxy(function (data) {
+                var tmpl = mageTemplate(this.options.systemMessageTemplate, {
+                    data: {
+                        items: data
+                    }
+                });
+
+                tmpl = $(tmpl);
+
                 this.element.html(
-                    $('<ul />', {'class': "message-system-list"}).append(
-                        $.tmpl(this.options.systemMessageTemplate, data)
-                    )
+                    $('<ul />', {
+                        'class': 'message-system-list'
+                    }).append(tmpl)
                 ).trigger('contentUpdated');
+
                 superMethod();
             }, this));
+
             return this;
         }
     });
 
-    $(document).ready(function(){
-        $('#system_messages .message-system-short .error').on('click', function() {
+    $(document).ready(function () {
+        $('#system_messages .message-system-short .error').on('click', function () {
             $('#message-system-all').systemMessageDialog('open', 1);
         });
-        $('#system_messages .message-system-short .warning').on('click', function() {
+
+        $('#system_messages .message-system-short .warning').on('click', function () {
             $('#message-system-all').systemMessageDialog('open', 2);
         });
     });

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.42.0-beta7",
-        "magento/framework": "0.42.0-beta7",
+        "magento/module-backend": "0.42.0-beta8",
+        "magento/framework": "0.42.0-beta8",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.42.0-beta7",
+    "version": "0.42.0-beta8",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/Backend/App/AbstractAction.php

@@ -72,7 +72,7 @@ abstract class AbstractAction extends \Magento\Framework\App\Action\Action
     protected $_canUseBaseUrl;
 
     /**
-     * @var \Magento\Core\App\Action\FormKeyValidator
+     * @var \Magento\Framework\Data\Form\FormKey\Validator
      */
     protected $_formKeyValidator;
 

app/code/Magento/Backend/App/Action/Context.php

@@ -32,7 +32,7 @@ class Context extends \Magento\Framework\App\Action\Context
     protected $_backendUrl;
 
     /**
-     * @var \Magento\Core\App\Action\FormKeyValidator
+     * @var \Magento\Framework\Data\Form\FormKey\Validator
      */
     protected $_formKeyValidator;
 
@@ -66,7 +66,7 @@ class Context extends \Magento\Framework\App\Action\Context
      * @param \Magento\Backend\Model\Auth $auth
      * @param \Magento\Backend\Helper\Data $helper
      * @param \Magento\Backend\Model\UrlInterface $backendUrl
-     * @param \Magento\Core\App\Action\FormKeyValidator $formKeyValidator
+     * @param \Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator
      * @param \Magento\Framework\Locale\ResolverInterface $localeResolver
      * @param bool $canUseBaseUrl
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
@@ -86,7 +86,7 @@ public function __construct(
         \Magento\Backend\Model\Auth $auth,
         \Magento\Backend\Helper\Data $helper,
         \Magento\Backend\Model\UrlInterface $backendUrl,
-        \Magento\Core\App\Action\FormKeyValidator $formKeyValidator,
+        \Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator,
         \Magento\Framework\Locale\ResolverInterface $localeResolver,
         $canUseBaseUrl = false
     ) {
@@ -146,7 +146,7 @@ public function getCanUseBaseUrl()
     }
 
     /**
-     * @return \Magento\Core\App\Action\FormKeyValidator
+     * @return \Magento\Framework\Data\Form\FormKey\Validator
      */
     public function getFormKeyValidator()
     {

app/code/Magento/Backend/App/Router.php

@@ -8,7 +8,7 @@
  */
 namespace Magento\Backend\App;
 
-class Router extends \Magento\Core\App\Router\Base
+class Router extends \Magento\Framework\App\Router\Base
 {
     /**
      * @var \Magento\Backend\App\ConfigInterface
@@ -53,11 +53,9 @@ class Router extends \Magento\Core\App\Router\Base
      * @param \Magento\Framework\App\ResponseFactory $responseFactory
      * @param \Magento\Framework\App\Route\ConfigInterface $routeConfig
      * @param \Magento\Framework\UrlInterface $url
-     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @param \Magento\Framework\Url\SecurityInfoInterface $urlSecurityInfo
      * @param string $routerId
      * @param \Magento\Framework\Code\NameBuilder $nameBuilder
+     * @param \Magento\Framework\App\Router\PathConfigInterface $pathConfig
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $coreConfig
      * @param \Magento\Backend\App\ConfigInterface $backendConfig
      *
@@ -70,11 +68,9 @@ public function __construct(
         \Magento\Framework\App\ResponseFactory $responseFactory,
         \Magento\Framework\App\Route\ConfigInterface $routeConfig,
         \Magento\Framework\UrlInterface $url,
-        \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-        \Magento\Framework\Url\SecurityInfoInterface $urlSecurityInfo,
         $routerId,
         \Magento\Framework\Code\NameBuilder $nameBuilder,
+        \Magento\Framework\App\Router\PathConfigInterface $pathConfig,
         \Magento\Framework\App\Config\ScopeConfigInterface $coreConfig,
         \Magento\Backend\App\ConfigInterface $backendConfig
     ) {
@@ -85,11 +81,9 @@ public function __construct(
             $responseFactory,
             $routeConfig,
             $url,
-            $storeManager,
-            $scopeConfig,
-            $urlSecurityInfo,
             $routerId,
-            $nameBuilder
+            $nameBuilder,
+            $pathConfig
         );
         $this->_coreConfig = $coreConfig;
         $this->_backendConfig = $backendConfig;