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

CHANGELOG.md

@@ -1,3 +1,39 @@
+0.74.0-beta11
+=============
+* Framework improvements:
+    * Improved component Bookmarks component in scope of Enhanced Data Grids on CMS
+    * Improved component Advanced Filtering component in scope of Enhanced Data Grids on CMS
+* Fixed bugs:
+    * Fixed an issue where incorrect keys in REST request body allowed the request to go through successfully
+    * Fixed an issue where interceptors were Generated with Invalid __wakeup() 
+    * Fixed an issue where redirect on the current page was not working in certain conditions
+    * Fixed an issue where first store could not be selected on frontend
+    * Fixed an issue with performance toolkit category creation
+    * Fixed an issue when columns 'Interval', 'Price Rule' had incorrect values in Coupon Usage report
+    * Fixed an issue where fatal error occured on Abandoned Carts report grid
+    * Fixed an issue where it was not possible to add product to shopping cart if Use Secure URLs in Frontend = Yes
+    * Fixed an issue where email was not required during Guest Checkout 
+    * Fixed broken ability to skip reindex in `bin/magento setup:performance:generate-fixtures` command
+    * Fixed an issue where `bin/magento indexer:reindex` command failed after `bin/magento setup:di:compile` was run
+    * Fixed bug with broken JS i18n
+    * Fixed an issue with wrong value at created_at updated_at fields after quote* save
+    * Fixed an issue where customer could not be created in backend after adding Image type attribute
+    * Fixed Sales InvoiceItem and Order data interfaces implementation
+    * Fixed an issue with performance toolkit medium profile
+    * Fixed an issue where Excel Formula Injection via CSV/XML export
+    * Fixed an issue where it was not possible to open the Customers page in backend
+    * Fixed an issue with internal server error after clicking Continue on Billing information
+    * Fixed an issue where it was not possible to place order with Fedex shipping method
+* Various changes:
+    * Magento Centinel Removal
+    * Removed ability to have multi-statement queries
+* Test coverage:
+    * Unit tests coverage
+    * Covered php code by unit tests after new checkout implementation
+* Github issues:
+    * [#424](https://github.com/magento/magento2/issues/424) -- Combine tier pricing messages into block sentences
+    * [#1300](https://github.com/magento/magento2/issues/1300), [#1311](https://github.com/magento/magento2/issues/1311), [#1313](https://github.com/magento/magento2/issues/1313) -- Creating product error with startdate
+
 0.74.0-beta10
 =============
 * Framework improvements:

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-beta10",
-        "magento/module-backend": "0.74.0-beta10",
-        "magento/module-media-storage": "0.74.0-beta10",
-        "magento/framework": "0.74.0-beta10",
+        "magento/module-store": "0.74.0-beta11",
+        "magento/module-backend": "0.74.0-beta11",
+        "magento/module-media-storage": "0.74.0-beta11",
+        "magento/framework": "0.74.0-beta11",
         "lib-libxml": "*",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.74.0-beta10",
+    "version": "0.74.0-beta11",
     "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-beta10",
-        "magento/framework": "0.74.0-beta10",
+        "magento/module-backend": "0.74.0-beta11",
+        "magento/framework": "0.74.0-beta11",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.74.0-beta10",
+    "version": "0.74.0-beta11",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/Backend/composer.json

@@ -3,27 +3,27 @@
     "description": "N/A",
     "require": {
         "php": "~5.5.0|~5.6.0",
-        "magento/module-store": "0.74.0-beta10",
-        "magento/module-directory": "0.74.0-beta10",
-        "magento/module-developer": "0.74.0-beta10",
-        "magento/module-eav": "0.74.0-beta10",
-        "magento/module-cron": "0.74.0-beta10",
-        "magento/module-theme": "0.74.0-beta10",
-        "magento/module-reports": "0.74.0-beta10",
-        "magento/module-sales": "0.74.0-beta10",
-        "magento/module-quote": "0.74.0-beta10",
-        "magento/module-catalog": "0.74.0-beta10",
-        "magento/module-user": "0.74.0-beta10",
-        "magento/module-backup": "0.74.0-beta10",
-        "magento/module-customer": "0.74.0-beta10",
-        "magento/module-translation": "0.74.0-beta10",
-        "magento/module-require-js": "0.74.0-beta10",
-        "magento/module-config": "0.74.0-beta10",
-        "magento/framework": "0.74.0-beta10",
+        "magento/module-store": "0.74.0-beta11",
+        "magento/module-directory": "0.74.0-beta11",
+        "magento/module-developer": "0.74.0-beta11",
+        "magento/module-eav": "0.74.0-beta11",
+        "magento/module-cron": "0.74.0-beta11",
+        "magento/module-theme": "0.74.0-beta11",
+        "magento/module-reports": "0.74.0-beta11",
+        "magento/module-sales": "0.74.0-beta11",
+        "magento/module-quote": "0.74.0-beta11",
+        "magento/module-catalog": "0.74.0-beta11",
+        "magento/module-user": "0.74.0-beta11",
+        "magento/module-backup": "0.74.0-beta11",
+        "magento/module-customer": "0.74.0-beta11",
+        "magento/module-translation": "0.74.0-beta11",
+        "magento/module-require-js": "0.74.0-beta11",
+        "magento/module-config": "0.74.0-beta11",
+        "magento/framework": "0.74.0-beta11",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.74.0-beta10",
+    "version": "0.74.0-beta11",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

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

@@ -8,6 +8,7 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="admin-1column" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
     <head>
         <title>Magento Admin</title>
+        <meta name="viewport" content="width=device-width"/>
         <link src="requirejs/require.js"/>
         <css src="extjs/resources/css/ext-all.css"/>
         <css src="extjs/resources/css/ytheme-magento.css"/>

app/code/Magento/Backup/composer.json

@@ -3,14 +3,14 @@
     "description": "N/A",
     "require": {
         "php": "~5.5.0|~5.6.0",
-        "magento/module-store": "0.74.0-beta10",
-        "magento/module-backend": "0.74.0-beta10",
-        "magento/module-cron": "0.74.0-beta10",
-        "magento/framework": "0.74.0-beta10",
+        "magento/module-store": "0.74.0-beta11",
+        "magento/module-backend": "0.74.0-beta11",
+        "magento/module-cron": "0.74.0-beta11",
+        "magento/framework": "0.74.0-beta11",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.74.0-beta10",
+    "version": "0.74.0-beta11",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/Bundle/composer.json

@@ -3,28 +3,28 @@
     "description": "N/A",
     "require": {
         "php": "~5.5.0|~5.6.0",
-        "magento/module-store": "0.74.0-beta10",
-        "magento/module-catalog": "0.74.0-beta10",
-        "magento/module-tax": "0.74.0-beta10",
-        "magento/module-backend": "0.74.0-beta10",
-        "magento/module-sales": "0.74.0-beta10",
-        "magento/module-checkout": "0.74.0-beta10",
-        "magento/module-catalog-inventory": "0.74.0-beta10",
-        "magento/module-customer": "0.74.0-beta10",
-        "magento/module-catalog-rule": "0.74.0-beta10",
-        "magento/module-eav": "0.74.0-beta10",
-        "magento/module-config": "0.74.0-beta10",
-        "magento/module-gift-message": "0.74.0-beta10",
-        "magento/framework": "0.74.0-beta10",
-        "magento/module-quote": "0.74.0-beta10",
-        "magento/module-media-storage": "0.74.0-beta10",
+        "magento/module-store": "0.74.0-beta11",
+        "magento/module-catalog": "0.74.0-beta11",
+        "magento/module-tax": "0.74.0-beta11",
+        "magento/module-backend": "0.74.0-beta11",
+        "magento/module-sales": "0.74.0-beta11",
+        "magento/module-checkout": "0.74.0-beta11",
+        "magento/module-catalog-inventory": "0.74.0-beta11",
+        "magento/module-customer": "0.74.0-beta11",
+        "magento/module-catalog-rule": "0.74.0-beta11",
+        "magento/module-eav": "0.74.0-beta11",
+        "magento/module-config": "0.74.0-beta11",
+        "magento/module-gift-message": "0.74.0-beta11",
+        "magento/framework": "0.74.0-beta11",
+        "magento/module-quote": "0.74.0-beta11",
+        "magento/module-media-storage": "0.74.0-beta11",
         "magento/magento-composer-installer": "*"
     },
     "suggest": {
-        "magento/module-webapi": "0.74.0-beta10"
+        "magento/module-webapi": "0.74.0-beta11"
     },
     "type": "magento2-module",
-    "version": "0.74.0-beta10",
+    "version": "0.74.0-beta11",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/CacheInvalidate/composer.json

@@ -3,12 +3,12 @@
     "description": "N/A",
     "require": {
         "php": "~5.5.0|~5.6.0",
-        "magento/module-page-cache": "0.74.0-beta10",
-        "magento/framework": "0.74.0-beta10",
+        "magento/module-page-cache": "0.74.0-beta11",
+        "magento/framework": "0.74.0-beta11",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.74.0-beta10",
+    "version": "0.74.0-beta11",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/Captcha/composer.json

@@ -3,16 +3,16 @@
     "description": "N/A",
     "require": {
         "php": "~5.5.0|~5.6.0",
-        "magento/module-store": "0.74.0-beta10",
-        "magento/module-customer": "0.74.0-beta10",
-        "magento/module-checkout": "0.74.0-beta10",
-        "magento/module-quote": "0.74.0-beta10",
-        "magento/module-backend": "0.74.0-beta10",
-        "magento/framework": "0.74.0-beta10",
+        "magento/module-store": "0.74.0-beta11",
+        "magento/module-customer": "0.74.0-beta11",
+        "magento/module-checkout": "0.74.0-beta11",
+        "magento/module-quote": "0.74.0-beta11",
+        "magento/module-backend": "0.74.0-beta11",
+        "magento/framework": "0.74.0-beta11",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.74.0-beta10",
+    "version": "0.74.0-beta11",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Category.php

@@ -132,7 +132,7 @@ public function getAfterElementHtml()
                     'id' => 'add_category_button',
                     'label' => $newCategoryCaption,
                     'title' => $newCategoryCaption,
-                    'onclick' => 'jQuery("#new-category").dialog("open")',
+                    'onclick' => 'jQuery("#new-category").trigger("openModal")',
                     'disabled' => $this->getDisabled(),
                 ]
             );

app/code/Magento/Catalog/Controller/Adminhtml/Product/ShowUpdateResult.php

@@ -6,26 +6,44 @@
  */
 namespace Magento\Catalog\Controller\Adminhtml\Product;
 
+use Magento\Catalog\Helper\Product\Composite;
+use Magento\Backend\Model\Session;
+use Magento\Backend\App\Action\Context;
+
 class ShowUpdateResult extends \Magento\Catalog\Controller\Adminhtml\Product
 {
+    /** @var Composite */
+    protected $productCompositeHelper;
+
+    /**
+     * @param Context $context
+     * @param Builder $productBuilder
+     * @param Composite $productCompositeHelper
+     */
+    public function __construct(
+        Context $context,
+        Builder $productBuilder,
+        Composite $productCompositeHelper
+    ) {
+        $this->productCompositeHelper = $productCompositeHelper;
+        parent::__construct($context, $productBuilder);
+    }
+
     /**
      * Show item update result from updateAction
      * in Wishlist and Cart controllers.
      *
-     * @return bool
+     * @return \Magento\Framework\View\Result\Layout
      */
     public function execute()
     {
-        $session = $this->_objectManager->get('Magento\Backend\Model\Session');
-        if ($session->hasCompositeProductResult()
-            && $session->getCompositeProductResult() instanceof \Magento\Framework\Object
+        $layout = false;
+        if ($this->_session->hasCompositeProductResult()
+            && $this->_session->getCompositeProductResult() instanceof \Magento\Framework\Object
         ) {
-            $this->_objectManager->get('Magento\Catalog\Helper\Product\Composite')
-                ->renderUpdateResult($session->getCompositeProductResult());
-            $session->unsCompositeProductResult();
-        } else {
-            $session->unsCompositeProductResult();
-            return false;
+            $layout = $this->productCompositeHelper->renderUpdateResult($this->_session->getCompositeProductResult());
         }
+        $this->_session->unsCompositeProductResult();
+        return $layout;
     }
 }