Merge remote-tracking branch 'mainline/develop' into FearlessKiwis-MAGETWO-32896-Sales-Immut-2

Author: Mike Weis

CHANGELOG.md

@@ -1,3 +1,116 @@
+0.42.0-beta9
+=============
+* Framework Improvements:
+    * Layout Models are moved from Core module to appropriate modules
+    * View components are moved from Core to Theme module
+    * Rest of theme related configuration files are refactored
+    * StoreManagerInterface is moved from Framework to App folder
+    * ZF1 controller libraries are updated
+    * Class definitions in multi-tenant mode are removed
+    * DI configuration became more optimal: OM cached configuration uses the general pattern for all argument types in application
+    * Varnish 4 configuration is updated
+    * Layout Processing became more fast
+    * HTML response minified
+    * App Components and Specific Helper Components are moved from the Magento_Core Module
+* UI improvements:
+    * Add to cart operation became asynchronous and doesn`t reload page (AJAX call)
+* Fixed Defects:
+    * When Inline Translation is enabled, JQuery buttons for translate were broken
+    * Base URL has invalid place inside Magento Admin Address on "Web Configuration" step of installation wizard
+    * Inability of submit Product from keyboard while Product Creation
+    * Sold products aren't displayed in Bestsellers
+    * Compiled definitions can cause unexpected errors compared to runtime definitions
+* Accessibility improvements:
+    * WAI-ARIA attributes are added to Frontend Layered Navigation and Customer Dropdown, Frontend Product Page Tabs, Frontend Cart Summary collapsible panels, Frontend forms and notifications, Frontend Checkout pages
+* Tests improvements:
+    * Added mechanism of replacing 3-rd party credentials in functional tests
+    * Update of end-to-end tests for create product, update product, promoted product, out of stock product, create product with new category, unassign products on category, create backend customer with injectable test
+* Various improvements:
+    * JS template engine became unified on Backend and Frontend
+    * Increased unit test coverage for Magento/Indexer module
+    * Version number info became accessible at a public URL
+* GitHub requests:
+    * [#1027](https://github.com/magento/magento2/issues/1027) -- Can't add new subctegory
+    * [#921](https://github.com/magento/magento2/issues/921) -- Change resource ids from Magento_Adminhtml::* to Magento_Backend
+
+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:
+    * Added Varnish 4 support 
+    * Added CSS minification 
+    * Improved the performance toolkit 
+* Fixed bugs:
+    * Fixed an issue where the compiler for the single tenant mode did not resolve Repositories 
+    * Fixed an issue where the "Select all" mass action on the Customers page did not select all customers 
+    * Fixed an issue where values for a customer  attribute of multiple-select type were not saved
+    * Fixed an issue where the parental wakeup() method was not called in interceptors
+    * Fixed an issue where bundle products with the same configurations added from different pages were displayed in the wishlist as separate items 
+    * Fixed an issue where the number of items added to the wishlist was not displayed on certain pages
+    * Fixed an issue where logging was broken 
+    * Fixed an issue where it was impossible to use \Magento\Customer\Model\Resource\AddressRepository::getList with predefined direction(sortOrder) 
+    * Fixed an issue where editing a product from wishlist led caused a fatal error 
+    * Fixed an issue where the redirect link to continue shopping was absent in the success message after adding product to a wishlist 
+    * Fixed an issue where HTML tags where displayed in product prices on the Customer's Wishlist page in Admin
+    * Fixed an issue where the Name and Email fields were not automatically when creating an email using the Email to Friend functionality
+    * Fixed an issue with the redirect after searching product in a customer wishlist in Admin
+    * Fixed an issue where a configurable product did not go out of stock when last subitem of some option was sold
+    * Fixed an issue with varnish config generation for multiple IPs in access list field
+    * Fixed the wrong di.xml in the Magento_Developer module
+    * Fixed an issue where changes were not saved when default billing/shipping address was not selected in customer addresses 
+    * Fixed the issue where the Update Qty button looked disabled during a partial invoice creation
+    * Fixed an issue where the creation date was not displayed in invoices and credit memo grids
+    * Fixed an issue where it was impossible to install Magento_Quote on PHP 5.6 
+    * Fixed an issue that changes are not saved when default billing/shipping address is unchecked in customer addresses
+    * Fixed an issue where "Update Qty" button looks disabled while creating partial invoice
+    * Fixed an issue where date created column is not populated in invoices and credit memo grid
+    * Fixed an issue with installation of Magento_Quote module on PHP 5.6
+    * Fixed an issue with wrong link "File Permission Help"
+    * Fixed an issue where dev/tools are broken when DI compiler is used due to skipped by the compiler dev/tools/Magento folder
+* Framework improvements:
+    * JavaScript testsuites divided into frontend, backend and lib suites 
+    * Implemented image compression on server side upload
+    * Implemented frontend page resources sorting 
+    * Removed the Magic __call method usage in templates
+    * Introduced Jasmine + PhantomJS JavaScript testing infrastructure
+    * Removed support of PHP 5.4
+* Setup Tool improvements:
+    * Added tools for enabling/disabling modules: "module-enable --modules=Module_One,Module_Two, module-disable --modules=Module_One,Module_Two"
+    * Added help option for displaying list of available modules: "help module-list"
+* GitHub requests :
+    * [#593](https://github.com/magento/magento2/issues/593) -- Allow to use "0" as customer group
+    * [#804](https://github.com/magento/magento2/issues/804) -- Comment about VAT number displayed under different field in Customer Configuration
+    
 0.42.0-beta6
 =============
 * Various improvements:

Gruntfile.js

@@ -9,7 +9,9 @@ module.exports = function (grunt) {
 
     //  Required plugins
     //  _____________________________________________
-    var specRunner = require('./dev/tests/js/framework/spec_runner')(grunt);
+
+    var specRunner = require('./dev/tests/js/framework/spec_runner')(grunt),
+        svgo = require('imagemin-svgo');
 
     require('./dev/tools/grunt/tasks/mage-minify')(grunt);
 
@@ -21,8 +23,6 @@ module.exports = function (grunt) {
         pattern: ['grunt-*', '!grunt-template-jasmine-requirejs']
     });
 
-    var svgo = require('imagemin-svgo');
-
     //  Configuration
     //  _____________________________________________
 
@@ -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'
@@ -126,6 +126,23 @@ module.exports = function (grunt) {
         }
     };
 
+    //  Banners
+    //  ---------------------------------------------
+
+    var banner = {
+        firstLine: 'Copyright © <%= grunt.template.today("yyyy") %> Magento. All rights reserved.',
+        secondLine: 'See COPYING.txt for license details.',
+        css: function(){
+            return '/**\n * ' + this.firstLine + '\n * ' + this.secondLine + '\n */\n';
+        },
+        less: function(){
+            return '// /**\n//  * ' + this.firstLine + '\n//  * ' + this.secondLine + '\n//  */\n';
+        },
+        html: function(){
+            return '<!--\n/**\n * ' + this.firstLine + '\n * ' + this.secondLine + '\n */\n-->\n';
+        }
+    };
+
     //  Tasks
     //  _____________________________________________
 
@@ -135,6 +152,7 @@ module.exports = function (grunt) {
         path: path,
         theme: theme,
         combo: combo,
+        banner: banner,
 
         //  Execution into cmd
         //  ---------------------------------------------
@@ -318,7 +336,8 @@ module.exports = function (grunt) {
 
         cssmin: {
             options: {
-                report: 'gzip'
+                report: 'gzip',
+                keepSpecialComments: 0
             },
             setup: {
                 files: {
@@ -342,6 +361,47 @@ module.exports = function (grunt) {
             }
         },
 
+        //  Banners
+        //  ---------------------------------------------
+
+        usebanner: {
+            options: {
+                position: 'top',
+                linebreak: true
+            },
+            setup: {
+                options: {
+                    banner: banner.css()
+                },
+                files: {
+                    src: '<%= path.css.setup %>/*.css'
+                }
+            },
+            documentationCss: {
+                options: {
+                    banner: banner.css()
+                },
+                files: {
+                    src: '<%= path.doc %>/**/*.css'
+                }
+            },
+            documentationLess: {
+                options: {
+                    banner: banner.less()
+                },
+                files: {
+                    src: '<%= path.doc %>/**/*.less'
+                }
+            },
+            documentationHtml: {
+                options: {
+                    banner: banner.html()
+                },
+                files: {
+                    src: '<%= path.doc %>/**/*.html'
+                }
+            }
+        },
 
         //  Watches files for changes and runs tasks based on the changed files
         //  ---------------------------------------------
@@ -537,6 +597,12 @@ module.exports = function (grunt) {
         'clean:pub'
     ]);
 
+    grunt.registerTask('documentation-banners', [
+        'usebanner:documentationCss',
+        'usebanner:documentationLess',
+        'usebanner:documentationHtml'
+    ]);
+
     //  Production
     //  ---------------------------------------------
 
@@ -545,7 +611,8 @@ module.exports = function (grunt) {
             grunt.task.run([
                 'less:' + component,
                 'autoprefixer:' + component,
-                'cssmin:' + component
+                'cssmin:' + component,
+                'usebanner:' + component
             ]);
         }
         if (component == undefined) {

app/code/Magento/AdminNotification/Block/System/Messages/UnreadMessagePopup.php

@@ -66,7 +66,7 @@ public function getUnreadMessages()
     /**
      * Retrieve popup title
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getPopupTitle()
     {

app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/AjaxMarkAsRead.php

@@ -15,7 +15,7 @@ class AjaxMarkAsRead extends \Magento\AdminNotification\Controller\Adminhtml\Not
      */
     public function execute()
     {
-        if (!$this->getRequest()->getPost()) {
+        if (!$this->getRequest()->getPostValue()) {
             return;
         }
         $notificationId = (int)$this->getRequest()->getPost('id');

app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MarkAsRead.php

@@ -22,7 +22,7 @@ public function execute()
                     $notificationId
                 );
                 $this->messageManager->addSuccess(__('The message has been marked as Read.'));
-            } catch (\Magento\Framework\Model\Exception $e) {
+            } catch (\Magento\Framework\Exception\LocalizedException $e) {
                 $this->messageManager->addError($e->getMessage());
             } catch (\Exception $e) {
                 $this->messageManager->addException(

app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MassMarkAsRead.php

@@ -27,7 +27,7 @@ public function execute()
                 $this->messageManager->addSuccess(
                     __('A total of %1 record(s) have been marked as Read.', count($ids))
                 );
-            } catch (\Magento\Framework\Model\Exception $e) {
+            } catch (\Magento\Framework\Exception\LocalizedException $e) {
                 $this->messageManager->addError($e->getMessage());
             } catch (\Exception $e) {
                 $this->messageManager->addException(

app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MassRemove.php

@@ -25,7 +25,7 @@ public function execute()
                     }
                 }
                 $this->messageManager->addSuccess(__('Total of %1 record(s) have been removed.', count($ids)));
-            } catch (\Magento\Framework\Model\Exception $e) {
+            } catch (\Magento\Framework\Exception\LocalizedException $e) {
                 $this->messageManager->addError($e->getMessage());
             } catch (\Exception $e) {
                 $this->messageManager->addException($e, __("We couldn't remove the messages because of an error."));

app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/Remove.php

@@ -24,7 +24,7 @@ public function execute()
             try {
                 $model->setIsRemove(1)->save();
                 $this->messageManager->addSuccess(__('The message has been removed.'));
-            } catch (\Magento\Framework\Model\Exception $e) {
+            } catch (\Magento\Framework\Exception\LocalizedException $e) {
                 $this->messageManager->addError($e->getMessage());
             } catch (\Exception $e) {
                 $this->messageManager->addException($e, __("We couldn't remove the messages because of an error."));

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

@@ -9,6 +9,7 @@
  * AdminNotification Feed model
  *
  * @author      Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Feed extends \Magento\Framework\Model\AbstractModel
 {
@@ -50,16 +51,29 @@ class Feed extends \Magento\Framework\Model\AbstractModel
      */
     protected $_deploymentConfig;
 
+    /**
+     * @var \Magento\Framework\App\ProductMetadataInterface
+     */
+    protected $productMetadata;
+
+    /**
+     * @var \Magento\Framework\UrlInterface
+     */
+    protected $urlBuilder;
+
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Backend\App\ConfigInterface $backendConfig
-     * @param \Magento\AdminNotification\Model\InboxFactory $inboxFactory
-     * @param \Magento\Framework\Model\Resource\AbstractResource $resource
+     * @param InboxFactory $inboxFactory
+     * @param \Magento\Framework\HTTP\Adapter\CurlFactory $curlFactory
      * @param \Magento\Framework\App\DeploymentConfig $deploymentConfig
+     * @param \Magento\Framework\App\ProductMetadataInterface $productMetadata
+     * @param \Magento\Framework\UrlInterface $urlBuilder
+     * @param \Magento\Framework\Model\Resource\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\Db $resourceCollection
-     * @param \Magento\Framework\HTTP\Adapter\curlFactory $curlFactory
      * @param array $data
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -68,15 +82,19 @@ public function __construct(
         \Magento\AdminNotification\Model\InboxFactory $inboxFactory,
         \Magento\Framework\HTTP\Adapter\CurlFactory $curlFactory,
         \Magento\Framework\App\DeploymentConfig $deploymentConfig,
+        \Magento\Framework\App\ProductMetadataInterface $productMetadata,
+        \Magento\Framework\UrlInterface $urlBuilder,
         \Magento\Framework\Model\Resource\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\Db $resourceCollection = null,
         array $data = []
     ) {
         parent::__construct($context, $registry, $resource, $resourceCollection, $data);
-        $this->_backendConfig = $backendConfig;
-        $this->_inboxFactory = $inboxFactory;
-        $this->curlFactory = $curlFactory;
+        $this->_backendConfig    = $backendConfig;
+        $this->_inboxFactory     = $inboxFactory;
+        $this->curlFactory       = $curlFactory;
         $this->_deploymentConfig = $deploymentConfig;
+        $this->productMetadata   = $productMetadata;
+        $this->urlBuilder        = $urlBuilder;
     }
 
     /**
@@ -191,7 +209,15 @@ public function setLastUpdate()
     public function getFeedData()
     {
         $curl = $this->curlFactory->create();
-        $curl->setConfig(['timeout' => 2]);
+        $curl->setConfig(
+            [
+                'timeout'   => 2,
+                'useragent' => $this->productMetadata->getName()
+                    . '/' . $this->productMetadata->getVersion()
+                    . ' (' . $this->productMetadata->getEdition() . ')',
+                'referer'   => $this->urlBuilder->getUrl('*/*/*')
+            ]
+        );
         $curl->write(\Zend_Http_Client::GET, $this->getFeedUrl(), '1.0');
         $data = $curl->read();
         if ($data === false) {