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

Conflicts:
	app/etc/di.xml
	dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
	dev/tests/unit/testsuite/Magento/Framework/View/LayoutTest.php
	dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/TranslatorTest.php
	dev/tests/unit/testsuite/Magento/Theme/Model/Config/CustomizationTest.php
	dev/tests/unit/testsuite/Magento/Theme/Model/CopyServiceTest.php
	dev/tests/unit/testsuite/Magento/Widget/Model/Resource/Layout/Link/CollectionTest.php
	dev/tests/unit/testsuite/Magento/Widget/Model/Resource/Layout/Update/CollectionTest.php
	lib/internal/Magento/Framework/View/Model/Layout/Merge.php

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

@@ -21,7 +21,7 @@ class Baseurl implements \Magento\Framework\Notification\MessageInterface
     protected $_config;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -32,13 +32,13 @@ class Baseurl implements \Magento\Framework\Notification\MessageInterface
 
     /**
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $config
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\UrlInterface $urlBuilder
      * @param \Magento\Framework\App\Config\ValueFactory $configValueFactory
      */
     public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $config,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\UrlInterface $urlBuilder,
         \Magento\Framework\App\Config\ValueFactory $configValueFactory
     ) {

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

@@ -69,7 +69,7 @@ public function getIdentity()
     public function isDisplayed()
     {
         return $this->_authorization->isAllowed(
-            'Magento_Adminhtml::cache'
+            'Magento_Backend::cache'
         ) && count(
             $this->_getCacheTypesForRefresh()
         ) > 0;

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/etc/acl.xml

@@ -8,9 +8,9 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
     <acl>
         <resources>
-            <resource id="Magento_Adminhtml::admin">
-                <resource id="Magento_Adminhtml::system">
-                    <resource id="Magento_Adminhtml::system_other_settings">
+            <resource id="Magento_Backend::admin">
+                <resource id="Magento_Backend::system">
+                    <resource id="Magento_Backend::system_other_settings">
                         <resource id="Magento_AdminNotification::adminnotification" title="Notifications" sortOrder="10">
                             <resource id="Magento_AdminNotification::show_toolbar" title="Show Toolbar" sortOrder="10" />
                             <resource id="Magento_AdminNotification::show_list" title="Show List" sortOrder="20" />

app/code/Magento/AdminNotification/etc/adminhtml/routes.xml

@@ -8,7 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/App/etc/routes.xsd">
     <router id="admin">
         <route id="adminhtml">
-            <module name="Magento_AdminNotification" before="Magento_Adminhtml" />
+            <module name="Magento_AdminNotification" before="Magento_Backend" />
         </route>
     </router>
 </config>

app/code/Magento/AdminNotification/view/adminhtml/layout/default.xml

@@ -7,7 +7,7 @@
 -->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
     <head>
-        <css src="Magento_Core::prototype/magento.css"/>
+        <css src="Magento_Theme::prototype/magento.css"/>
     </head>
     <body>
         <referenceContainer name="notifications">

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/Authorization/data/authorization_setup/data-install-2.0.0.php

@@ -47,14 +47,14 @@
     $this->createRules()->setData(
         [
             'role_id' => $admGroupRole->getId(),
-            'resource_id' => 'Magento_Adminhtml::all',
+            'resource_id' => 'Magento_Backend::all',
             'privileges' => null,
             'permission' => 'allow',
         ]
     )->save();
 } else {
     /** @var \Magento\Authorization\Model\Rules $rule */
     foreach ($rulesCollection as $rule) {
-        $rule->setData('resource_id', 'Magento_Adminhtml::all')->save();
+        $rule->setData('resource_id', 'Magento_Backend::all')->save();
     }
 }

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

@@ -53,7 +53,7 @@ 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\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Framework\Url\SecurityInfoInterface $urlSecurityInfo
      * @param string $routerId
@@ -70,7 +70,7 @@ public function __construct(
         \Magento\Framework\App\ResponseFactory $responseFactory,
         \Magento\Framework\App\Route\ConfigInterface $routeConfig,
         \Magento\Framework\UrlInterface $url,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         \Magento\Framework\Url\SecurityInfoInterface $urlSecurityInfo,
         $routerId,

app/code/Magento/Backend/Block/Dashboard.php

@@ -31,7 +31,7 @@ protected function _prepareLayout()
 
         $this->addChild('sales', 'Magento\Backend\Block\Dashboard\Sales');
 
-        if ($this->_scopeConfig->getValue(self::XML_PATH_ENABLE_CHARTS, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)) {
+        if ($this->_scopeConfig->getValue(self::XML_PATH_ENABLE_CHARTS, \Magento\Store\Model\ScopeInterface::SCOPE_STORE)) {
             $block = $this->getLayout()->createBlock('Magento\Backend\Block\Dashboard\Diagrams');
         } else {
             $block = $this->getLayout()->createBlock(

app/code/Magento/Backend/Block/Dashboard/Graph.php

@@ -210,7 +210,7 @@ public function getChartUrl($directUrl = true)
 
         $timezoneLocal = $this->_scopeConfig->getValue(
             $this->_localeDate->getDefaultTimezonePath(),
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
 
         list($dateStart, $dateEnd) = $this->_collectionFactory->create()->getDateRange(

app/code/Magento/Backend/Block/Page/Header.php

@@ -80,6 +80,6 @@ public function getLogoutLink()
      */
     public function displayNoscriptNotice()
     {
-        return $this->_scopeConfig->getValue('web/browser_capabilities/javascript', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+        return $this->_scopeConfig->getValue('web/browser_capabilities/javascript', \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
     }
 }

app/code/Magento/Backend/Block/Page/Notices.php

@@ -22,7 +22,7 @@ class Notices extends \Magento\Backend\Block\Template
      */
     public function displayNoscriptNotice()
     {
-        return $this->_scopeConfig->getValue('web/browser_capabilities/javascript', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+        return $this->_scopeConfig->getValue('web/browser_capabilities/javascript', \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
     }
 
     /**
@@ -32,6 +32,6 @@ public function displayNoscriptNotice()
      */
     public function displayDemoNotice()
     {
-        return $this->_scopeConfig->getValue('design/head/demonotice', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+        return $this->_scopeConfig->getValue('design/head/demonotice', \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
     }
 }

app/code/Magento/Backend/Block/System/Config/Form/Field/Select/Allowspecific.php

@@ -22,9 +22,9 @@ class Allowspecific extends \Magento\Framework\Data\Form\Element\Select
      */
     public function getAfterElementHtml()
     {
-        $javaScript = "\n            <script type=\"text/javascript\">\n                Event.observe('{$this->getHtmlId()}', 'change', function(){\n                    specific=\$('{$this
+        $javaScript = "\n            <script type=\"text/javascript\">require(['prototype'], function(){\n                Event.observe('{$this->getHtmlId()}', 'change', function(){\n                    specific=\$('{$this
             ->getHtmlId()}').value;\n                    \$('{$this
-            ->_getSpecificCountryElementId()}').disabled = (!specific || specific!=1);\n                });\n            </script>";
+            ->_getSpecificCountryElementId()}').disabled = (!specific || specific!=1);\n                });\n            });</script>";
         return $javaScript . parent::getAfterElementHtml();
     }
 

app/code/Magento/Backend/Block/System/Config/Form/Fieldset/Modules/DisableOutput.php

@@ -69,7 +69,7 @@ public function render(\Magento\Framework\Data\Form\Element\AbstractElement $ele
         sort($modules);
 
         foreach ($modules as $moduleName) {
-            if ($moduleName === 'Magento_Adminhtml' || $moduleName === 'Magento_Backend') {
+            if ($moduleName === 'Magento_Backend') {
                 continue;
             }
             $html .= $this->_getFieldHtml($element, $moduleName);

app/code/Magento/Backend/Block/System/Store/Store.php

@@ -15,7 +15,7 @@ class Store extends \Magento\Backend\Block\Widget\Grid\Container
     /**
      * @var string
      */
-    protected $_blockGroup = 'Magento_Adminhtml';
+    protected $_blockGroup = 'Magento_Backend';
 
     /**
      * @return void

app/code/Magento/Backend/Block/Template.php

@@ -79,7 +79,7 @@ public function isOutputEnabled($moduleName = null)
 
         return !$this->_scopeConfig->isSetFlag(
             'advanced/modules_disable_output/' . $moduleName,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
     }
 

app/code/Magento/Backend/Block/Template/Context.php

@@ -66,7 +66,7 @@ class Context extends \Magento\Framework\View\Element\Template\Context
      * @param \Magento\Framework\View\FileSystem $viewFileSystem
      * @param \Magento\Framework\View\TemplateEnginePool $enginePool
      * @param \Magento\Framework\App\State $appState
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\View\Page\Config $pageConfig
      * @param \Magento\Framework\AuthorizationInterface $authorization
      * @param \Magento\Backend\Model\Session $backendSession
@@ -99,7 +99,7 @@ public function __construct(
         \Magento\Framework\View\FileSystem $viewFileSystem,
         \Magento\Framework\View\TemplateEnginePool $enginePool,
         \Magento\Framework\App\State $appState,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\View\Page\Config $pageConfig,
         \Magento\Framework\AuthorizationInterface $authorization,
         \Magento\Backend\Model\Session $backendSession,
@@ -143,7 +143,7 @@ public function __construct(
     /**
      * Get store manager
      *
-     * @return \Magento\Framework\Store\StoreManagerInterface
+     * @return \Magento\Store\Model\StoreManagerInterface
      */
     public function getStoreManager()
     {

app/code/Magento/Backend/Block/Widget/Context.php

@@ -49,7 +49,7 @@ class Context extends \Magento\Backend\Block\Template\Context
      * @param \Magento\Framework\View\FileSystem $viewFileSystem
      * @param \Magento\Framework\View\TemplateEnginePool $enginePool
      * @param \Magento\Framework\App\State $appState
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\AuthorizationInterface $authorization
      * @param \Magento\Backend\Model\Session $backendSession
      * @param \Magento\Framework\Math\Random $mathRandom
@@ -84,7 +84,7 @@ public function __construct(
         \Magento\Framework\View\FileSystem $viewFileSystem,
         \Magento\Framework\View\TemplateEnginePool $enginePool,
         \Magento\Framework\App\State $appState,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\View\Page\Config $pageConfig,
         \Magento\Framework\AuthorizationInterface $authorization,
         \Magento\Backend\Model\Session $backendSession,

app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Date.php

@@ -203,7 +203,7 @@ protected function _convertDate($date, $locale)
             $dateObj->setTimezone(
                 $this->_scopeConfig->getValue(
                     $this->_localeDate->getDefaultTimezonePath(),
-                    \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE
                 )
             );