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

Conflicts:
	dev/tests/functional/tests/app/Magento/Customer/Test/Repository/CustomerInjectable.php

Author: Dmytro Aponasenko

CHANGELOG.md

@@ -1,3 +1,55 @@
+0.42.0-beta5
+=============
+* UI improvements:
+    * Updated the design of Enable Cookies CMS page
+    * Implemented UI improvements for Widgets
+    * Fixed the "Help Us to Keep Magento Healthy Report All Bugs (ver. #)" link Magento Admin
+    * Various UI improvements
+* Various improvements:
+    * Implemented Sales Quote as a standalone Magento module
+    * Performed custom EAV entities code and DB tables cleanup
+    * Eliminating remnants of the Core module:
+        * Moved Application Emulation from the Magento_Core module to the Magento_Store module
+        * Moved Validator Factory from the Magento_Core module to the Magento Framework
+    * Added static integrity test for composer.json files
+    * Added PHPMD and PHPCS annotations to the codebase
+* Tests improvements:
+    * Added MVP tag to the functional tests
+    * Created acceptance functional test suite
+    * Replaced end-to-end tests for url rewrite creation, CMS page creation, category creation, review creation, customer frontend creation, and tax rule creation with injectable tests
+    * Automated test cases for downloadable products with taxes
+* Fixed bugs:
+    * Fixed an issue where the Discounts and Coupons RSS Feed had incorrect title
+    * Fixed an issue where a wrong special price expiration date was displayed in RSS
+    * Fixed an issue in the Import functionality where imported files disappeared after the Check Data operation
+    * Fixed an issue where the Unsubscribe link in the Newsletter was broken
+    * Fixed an issue where stock status changed incorrectly after import
+    * Fixed an issue where selected filters and exclude did not work during Export
+    * Fixed an issue where tax details order was different on order/invoice/refund create and view pages (
+    * Fixed a typo in the getCalculationAlgorithm public function
+    * Fixed an issue where the incorrect value of Subtotal Including Tax was displayed in invoices
+    * Fixed an issue where tax details were not displayed on a new order
+    * Improved pricing performance using caching
+    * Fixed an issue where CsvImportHandler tests still referring to links from Tax module instead of TaxImportExport module
+    * Fixed an issue where an exception was thrown instead of 404 if altering the url for a product with required configuration on the storefront
+    * Fixed an issue where the title of successfully placed order page (was empty
+    * Fixed an issue where certain fields were not disabled by default on the website scope in System configuration as expected
+    * Fixed an issue where third party interfaces were not supported by single-tenant compiler
+    * Eliminated the 'protocol' parameter from the ReadInterface and WriteInterface
+* GitHub requests:
+    * [#979](https://github.com/magento/magento2/pull/979) -- Adding OSL license file name
+    * [#978](https://github.com/magento/magento2/pull/978) -- Added ignore rule for media assets in wysiwyg directory
+    * [#877](https://github.com/magento/magento2/pull/877) -- Made Topmenu HTML Editable
+    * [#906](https://github.com/magento/magento2/pull/906) -- Add tests for View\Layout\Reader\Block and slight refactoring
+    * [#682](https://github.com/magento/magento2/issues/682) -- \Magento\Framework\Pricing\PriceCurrencyInterface depends on Magento application code
+    * [#581](https://github.com/magento/magento2/issues/581) -- About ByPercent.php under different currencies
+    * [#964](https://github.com/magento/magento2/pull/964) -- Improving documentation for jMeter performance tests
+    * [#871](https://github.com/magento/magento2/issues/871) -- Replace Symfony2/Yaml in composer
+    * [#990](https://github.com/magento/magento2/pull/990) -- add @see annotation before class to make it recognizable by IDE
+    * [#988](https://github.com/magento/magento2/pull/988) -- Prevent Varnish from creating cache variations of static files
+* Framework improvements:
+    * Improved unit and integration tests coverage
+
 0.42.0-beta4
 =============
 * Various improvements:

Gruntfile.js

@@ -11,6 +11,8 @@ module.exports = function (grunt) {
     // Require
     // --------------------------------------
 
+    require('./dev/tools/grunt/tasks/mage-minify')(grunt);
+
     // Time how long tasks take. Can help when optimizing build times
     require('time-grunt')(grunt);
 
@@ -33,7 +35,10 @@ module.exports = function (grunt) {
                 blank: 'app/design/frontend/Magento/blank',
                 luma: 'app/design/frontend/luma'
             },
-            doc: 'lib/web/css/docs'
+            doc: 'lib/web/css/docs',
+            uglify: {
+                legacy: 'lib/web/legacy-build.min.js'
+            }
         },
         doc: {
             styleName: 'docs'
@@ -110,7 +115,7 @@ module.exports = function (grunt) {
             },
             documentation: {
                 files: {
-                    '<%= config.path.doc %>/<%= config.doc.styleName %>.css': "<%= config.path.doc %>/source/<%= config.doc.styleName %>.less"
+                    '<%= config.path.doc %>/<%= config.doc.styleName %>.css': '<%= config.path.doc %>/source/<%= config.doc.styleName %>.less'
                 }
             }
         },
@@ -131,10 +136,40 @@ module.exports = function (grunt) {
                     '<%= config.path.doc %>': '<%= config.path.doc %>/source' // Todo UI: Check out JS for Styledocco
                 }
             }
-        }
+        },
 
+        'mage-minify': {
+            legacy: {
+                options: {
+                    type: 'yui-js',
+                    tempPath: 'var/cache/',
+                    options: ['--nomunge=true']
+                },
+                files: {
+                    '<%= config.path.uglify.legacy %>': [
+                        'lib/web/prototype/prototype.js',
+                        'lib/web/prototype/window.js',
+                        'lib/web/scriptaculous/builder.js',
+                        'lib/web/scriptaculous/effects.js',
+                        'lib/web/lib/ccard.js',
+                        'lib/web/prototype/validation.js',
+                        'lib/web/varien/js.js',
+                        'lib/web/mage/adminhtml/varienLoader.js',
+                        'lib/web/mage/adminhtml/tools.js'
+                    ]
+                }
+            }
+        }
     });
 
+    /**
+     * Creates build of a legacy files.
+     * Mostly prototype dependant libraries.
+     */
+    grunt.registerTask('legacy-build', [
+        'mage-minify:legacy'
+    ]);
+
     // Default task
     // --------------------------------------
     grunt.registerTask('default', []); // ToDo UI: define default tasks

app/code/Magento/AdminNotification/composer.json

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

app/code/Magento/AdminNotification/view/adminhtml/requirejs-config.js

@@ -6,10 +6,8 @@
 var config = {
     map: {
         '*': {
-            systemMessageDialog: 'Magento_AdminNotification/system/notification'
+            systemMessageDialog: 'Magento_AdminNotification/system/notification',
+            toolbarEntry:   'Magento_AdminNotification/toolbar_entry'
         }
-    },
-    deps: [
-        "Magento_AdminNotification/toolbar_entry"
-    ]
+    }
 };

app/code/Magento/AdminNotification/view/adminhtml/templates/notification/window.phtml

@@ -12,7 +12,7 @@
  * @see \Magento\AdminNotification\Block\Window
  */
 ?>
-<div class="fade critical-notification">
+<div data-mage-init='{"modalPopup": {}}' class="fade critical-notification">
     <div class="popup popup-<?php echo preg_replace('#[^a-z0-9]+#', '-', strtolower($this->getSeverityText())) ?>">
         <div class="popup-inner">
             <header class="popup-header">

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

@@ -9,7 +9,7 @@
 ?>
 <?php /** @var $this \Magento\AdminNotification\Block\ToolbarEntry */ ?>
 <?php $notificationCount = $this->getUnreadNotificationCount(); ?>
-<div class="notifications-summary" data-notification-count="<?php echo $this->escapeHtml($notificationCount); ?>">
+<div data-mage-init='{"toolbarEntry": {}}' class="notifications-summary" data-notification-count="<?php echo $this->escapeHtml($notificationCount); ?>">
     <?php if ($notificationCount > 0) : ?>
         <a href="<?php echo $this->getUrl('adminhtml/notification/index'); ?>" class="action notifications-action" data-mage-init='{"dropdown":{}}' title="<?php echo __('Notifications'); ?>" data-toggle="dropdown">
             <span class="text"><?php echo __('Notifications'); ?></span>

app/code/Magento/AdminNotification/view/adminhtml/web/toolbar_entry.js

@@ -4,106 +4,105 @@
  */
 define([
     "jquery",
-    "jquery/ui"
+    "jquery/ui",
+    "domReady!"
 ], function($){
     'use strict';
 
-    $(document).ready(function() {
-        // Mark notification as read via AJAX call
-        var markNotificationAsRead = function(notificationId) {
-            var requestUrl = $('.notifications-summary .dropdown-menu').attr('data-mark-as-read-url');
-            $.ajax({
-                url: requestUrl,
-                type: 'POST',
-                dataType: 'json',
-                data: {
-                    id: notificationId
-                },
-                showLoader: false
-            });
-        };
-        var notificationCount = $('.notifications-summary').attr('data-notification-count');
-        // Remove notification from the list
-        var removeNotificationFromList = function(notificationEntry) {
-            notificationEntry.remove();
-            notificationCount--;
-            $('.notifications-summary').attr('data-notification-count', notificationCount);
-
-            if (notificationCount == 0) {
-                // Change appearance of the bubble and its behavior when the last notification is removed
-                $('.notifications-summary .dropdown-menu').remove();
-                var notificationIcon = $('.notifications-summary .notifications-icon');
-                notificationIcon.removeAttr('data-toggle');
-                notificationIcon.off('click.dropdown');
-                $('.notifications-action .counter').text('');
-                $('.notifications-action .counter').hide();
-            } else {
-                $('.notifications-action .counter').text(notificationCount);
-                // Modify caption of the 'See All' link
-                var actionElement = $('.notifications-summary .dropdown-menu .last .action-more');
-                actionElement.text(actionElement.text().replace(/\d+/, notificationCount));
-            }
-        };
-
-        // Show popup with notification details
-        var showNotificationDetails = function(notificationEntry) {
-            var popupElement = notificationEntry.find('.notifications-dialog-content').clone();
-            var notificationId = notificationEntry.attr('data-notification-id');
-            var dialogClassSeverity = 'notifications-entry-dialog';
-            if (notificationEntry.attr('data-notification-severity')) {
-                dialogClassSeverity = 'notifications-entry-dialog notifications-entry-dialog-critical';
-            }
-            popupElement.dialog({
-                title: popupElement.attr('data-title'),
-                minWidth: 500,
-                modal: true,
-                dialogClass: dialogClassSeverity,
-                buttons: [
-                    {
-                        text: popupElement.attr('data-acknowledge-caption'),
-                        'class': 'action-acknowledge primary',
-                        click: function(event) {
-                            markNotificationAsRead(notificationId);
-                            removeNotificationFromList(notificationEntry);
-                            $(this).dialog('close');
-                        }
-                    },
-                    {
-                        text: popupElement.attr('data-cancel-caption'),
-                        'class': 'action-cancel',
-                        click: function(event) {
-                            $(this).dialog('close');
-                        }
-                    }
-                ]
-            });
-            popupElement.parent().attr('aria-live','assertive');
-            popupElement.dialog('open');
-        };
-
-        // Show notification description when corresponding item is clicked
-        $('.notifications-summary .dropdown-menu .notifications-entry').on('click.showNotification', function(event) {
-            // hide notification dropdown
-            $('.notifications-summary .notifications-icon').trigger('click.dropdown');
-            showNotificationDetails($(this));
-            event.stopPropagation();
-        });
-
-        // Remove corresponding notification from the list and mark it as read
-        $('.notifications-close').on('click.removeNotification', function(event) {
-            var notificationEntry = $(this).closest('.notifications-entry')
-            var notificationId = notificationEntry.attr('data-notification-id');
-            markNotificationAsRead(notificationId);
-            removeNotificationFromList(notificationEntry);
-            event.stopPropagation();
+    // Mark notification as read via AJAX call
+    var markNotificationAsRead = function(notificationId) {
+        var requestUrl = $('.notifications-summary .dropdown-menu').attr('data-mark-as-read-url');
+        $.ajax({
+            url: requestUrl,
+            type: 'POST',
+            dataType: 'json',
+            data: {
+                id: notificationId
+            },
+            showLoader: false
         });
+    };
+    var notificationCount = $('.notifications-summary').attr('data-notification-count');
+    // Remove notification from the list
+    var removeNotificationFromList = function(notificationEntry) {
+        notificationEntry.remove();
+        notificationCount--;
+        $('.notifications-summary').attr('data-notification-count', notificationCount);
 
-        // Hide notifications bubble
         if (notificationCount == 0) {
+            // Change appearance of the bubble and its behavior when the last notification is removed
+            $('.notifications-summary .dropdown-menu').remove();
+            var notificationIcon = $('.notifications-summary .notifications-icon');
+            notificationIcon.removeAttr('data-toggle');
+            notificationIcon.off('click.dropdown');
+            $('.notifications-action .counter').text('');
             $('.notifications-action .counter').hide();
         } else {
-            $('.notifications-action .counter').show();
+            $('.notifications-action .counter').text(notificationCount);
+            // Modify caption of the 'See All' link
+            var actionElement = $('.notifications-summary .dropdown-menu .last .action-more');
+            actionElement.text(actionElement.text().replace(/\d+/, notificationCount));
+        }
+    };
+
+    // Show popup with notification details
+    var showNotificationDetails = function(notificationEntry) {
+        var popupElement = notificationEntry.find('.notifications-dialog-content').clone();
+        var notificationId = notificationEntry.attr('data-notification-id');
+        var dialogClassSeverity = 'notifications-entry-dialog';
+        if (notificationEntry.attr('data-notification-severity')) {
+            dialogClassSeverity = 'notifications-entry-dialog notifications-entry-dialog-critical';
         }
+        popupElement.dialog({
+            title: popupElement.attr('data-title'),
+            minWidth: 500,
+            modal: true,
+            dialogClass: dialogClassSeverity,
+            buttons: [
+                {
+                    text: popupElement.attr('data-acknowledge-caption'),
+                    'class': 'action-acknowledge primary',
+                    click: function(event) {
+                        markNotificationAsRead(notificationId);
+                        removeNotificationFromList(notificationEntry);
+                        $(this).dialog('close');
+                    }
+                },
+                {
+                    text: popupElement.attr('data-cancel-caption'),
+                    'class': 'action-cancel',
+                    click: function(event) {
+                        $(this).dialog('close');
+                    }
+                }
+            ]
+        });
+        popupElement.parent().attr('aria-live','assertive');
+        popupElement.dialog('open');
+    };
+
+    // Show notification description when corresponding item is clicked
+    $('.notifications-summary .dropdown-menu .notifications-entry').on('click.showNotification', function(event) {
+        // hide notification dropdown
+        $('.notifications-summary .notifications-icon').trigger('click.dropdown');
+        showNotificationDetails($(this));
+        event.stopPropagation();
+    });
+
+    // Remove corresponding notification from the list and mark it as read
+    $('.notifications-close').on('click.removeNotification', function(event) {
+        var notificationEntry = $(this).closest('.notifications-entry')
+        var notificationId = notificationEntry.attr('data-notification-id');
+        markNotificationAsRead(notificationId);
+        removeNotificationFromList(notificationEntry);
+        event.stopPropagation();
     });
 
+    // Hide notifications bubble
+    if (notificationCount == 0) {
+        $('.notifications-action .counter').hide();
+    } else {
+        $('.notifications-action .counter').show();
+    }
+    
 });

app/code/Magento/Authorization/composer.json

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