Merge remote-tracking branch 'origin/master' into email-sending-events

Conflicts:
	app/code/Magento/Sales/Model/Order/Email/Sender/CreditmemoCommentSender.php
	app/code/Magento/Sales/Model/Order/Email/Sender/CreditmemoSender.php
	app/code/Magento/Sales/Model/Order/Email/Sender/InvoiceCommentSender.php
	app/code/Magento/Sales/Model/Order/Email/Sender/InvoiceSender.php
	app/code/Magento/Sales/Model/Order/Email/Sender/OrderCommentSender.php
	app/code/Magento/Sales/Model/Order/Email/Sender/OrderSender.php
	app/code/Magento/Sales/Model/Order/Email/Sender/ShipmentCommentSender.php
	app/code/Magento/Sales/Model/Order/Email/Sender/ShipmentSender.php
	app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/AbstractSenderTest.php
	app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/CreditmemoCommentSenderTest.php
	app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/CreditmemoSenderTest.php
	app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/InvoiceCommentSenderTest.php
	app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/InvoiceSenderTest.php
	app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/OrderCommentSenderTest.php
	app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/OrderSenderTest.php
	app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/ShipmentCommentSenderTest.php
	app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/ShipmentSenderTest.php

Author: kristof-ringleff

CHANGELOG.md

@@ -1,36 +1,94 @@
+0.74.0-beta6
+=============
+* Framework improvements
+    * Implemented a default exception handler for blocks
+    * Updated the root composer.json file
+    * Updated the setup tool to support different editions
+    * Added an ability to operate with Sales & Checkout APIs as guests and registered users
+    * Implemented the additional Sales & Checkout APIs for registered customers and guests
+    * Added unit tests to cover Sales & Checkout services code
+* Various
+    * Standardized the hierarchy of exceptions
+    * Added bundle product API integration to Catalog
+* Fixed bugs
+    * Fixed an issue where it was impossible to place an order using multiple address checkout
+    * Fixed an issue where DB timestamp columns with current_timestamp on update were not handled correctly
+    * Fixed an issue with FPT in partial invoices
+    * Fixed a performance issue in benchmark test
+    * Fixed the incorrect Exception class in the Magento_CurrencySymbol module
+    * Fixed an issue by letting MySQL determine a database table type instead of MyISAM
+    * Fixed an issue where test failures occurred when the database and the application were in different time zones
+    * Fixed an issue where \Magento\Framework\Phrase omitted placeholder values if no renderer was set
+
+0.74.0-beta5
+=============
+* Various
+    * Added the new methods/fields in the Catalog Product Data Object
+    * Improved the Nginx configuration sample file for better web-server responsiveness and security
+    * Implemented the new look & feel for Create New Order page
+    * Removed the redundant DB constraints for cascade operations related to order management
+    * Implemented the mechanism of asynchronous email notifications after creation of Orders, Invoices, Shipments and Credit Memos
+    * Moved the join logic on application level in order to make DB separation possible in Reports component
+    * Implemented the TTL and event approaches of cache invalidation, introduced the full and the partial Varnish Cache flush
+    * Moved all Setup commands to Magento CLI
+    * Exposed CMS API as Web API
+* Fixed bugs:
+    * Unexpected response for API "/V1/customers/password" service
+    * Can’t include a third-party link to frontend section via layout
+    * Specified details for Grouped product are lost after adding to wishlist
+    * Impossible to configure products in customer wishlist in Admin Panel
+    * Adding the product from wishlist to cart if more than one store view exists
+    * Specified product field custom options is not displayed in wishlist in Admin Panel
+    * Checkout doesn't work with JS bundling enabled in production mode
+    * Issue with price excluding tax when selecting downloadable links
+    * Undefined index warning in case the frontend cache information is missing in configuration file
+    * "New Order" email is not sent to customer after placing order via API service
+    * 503 error when placing order with multiple shipping addresses if mail transport doesn't exist
+    * Broken words for fields with long labels all over the Admin Panel
+    * Issue with saving 'is_virtual' flag in quote
+    * "Void" button available after "Deny Payment" operation
+    * Uninstall logic did not clean cache properly
+    * Obsolete code tests did not cover Tests folders
+    * Random fail of Magento\Log\Test\Unit\Model\VisitorTest
+* GitHub issues:
+   * [#1149] (https://github.com/magento/magento2/issues/1149) -- Checkout Grand Total amount miscalculation
+   * [#1165] (https://github.com/magento/magento2/pull/1165) -- Fix typos
+   * [#1182] (https://github.com/magento/magento2/pull/1182) -- Update system.xml for 'fix' sortOrder in adminhtml
+   * [#1186] (https://github.com/magento/magento2/pull/1186) -- SalesSequence: Fixed composer installer dependency
+
 0.74.0-beta4
 =============
 * Various
-   * Implemented the getDefaultResult method, to be able to catch exceptions in FrontController and redirect user to the correct page
-   * The getDefaultResult method is invoked to return default result of action execution within controllers. It can be used to generate the ‘execute’ method result in action controllers
-   * Eliminated the unused exceptions. Exceptions that weren't linked to any logic were also eliminated and replaced with LocalizedException or its child classes
-   * Refactored all controllers where possible: the default exception handling logic moved to FrontController. Controllers that cannot be refactored do not conflict with the new logic
+    * Implemented the getDefaultResult method, to be able to catch exceptions in FrontController and redirect user to the correct page
+    * The getDefaultResult method is invoked to return default result of action execution within controllers. It can be used to generate the ‘execute’ method result in action controllers
+    * Eliminated the unused exceptions. Exceptions that weren't linked to any logic were also eliminated and replaced with LocalizedException or its child classes
+    * Refactored all controllers where possible: the default exception handling logic moved to FrontController. Controllers that cannot be refactored do not conflict with the new logic
 * Framework:
-   * Created Magento Console to perform CLI actions
-   * Introduced a new SalesSequence module that is responsible for documents numeration management across the Order Management System
-   * Implemented the mechanism of asynchronous indexing of sales entities grids
+    * Created Magento Console to perform CLI actions
+    * Introduced a new SalesSequence module that is responsible for documents numeration management across the Order Management System
+    * Implemented the mechanism of asynchronous indexing of sales entities grids
 * Setup
-   * Added the ConfigOption and ConfigOptionsList classes to be used by modules to manage deployment configuration
-   * Moved all existing segments logic to new classes
-   * Added the config:set command, which enables deployment configuration management
-   * Removed the old 'install-configuration' tool
+    * Added the ConfigOption and ConfigOptionsList classes to be used by modules to manage deployment configuration
+    * Moved all existing segments logic to new classes
+    * Added the config:set command, which enables deployment configuration management
+    * Removed the old 'install-configuration' tool
 * Functional tests:
-   * Fixed functional test for order placement from backend
-   * Replaced the end-to-end test for a product with MAP with an injectable test
+    * Fixed functional test for order placement from backend
+    * Replaced the end-to-end test for a product with MAP with an injectable test
 * Design
-   * Updated the Blank and Luma themes to enable theme (not only library) variables overriding in the _theme.less file of any inherited theme. Included LESS code standards to the UI Library documentation
+    * Updated the Blank and Luma themes to enable theme (not only library) variables overriding in the _theme.less file of any inherited theme. Included LESS code standards to the UI Library documentation
 * Fixed bugs:
-   * Fixed an issue where composite products could not be added to the order from the Recently Viewed Products section
-   * Fixed an issue where not all .js files were added to a bundle
-   * Fixed an issue where it was possible to save an incorrect IP value in the Developer Client Restriction field
-   * Fixed an issue where a raw DB error was thrown when trying to enter a custom variable with duplicated variable code
+    * Fixed an issue where composite products could not be added to the order from the Recently Viewed Products section
+    * Fixed an issue where not all .js files were added to a bundle
+    * Fixed an issue where it was possible to save an incorrect IP value in the Developer Client Restriction field
+    * Fixed an issue where a raw DB error was thrown when trying to enter a custom variable with duplicated variable code
 
 0.74.0-beta3
 =============
 * API
-   * The orders were extended with the gift messages
-   * The page and block data and repository interfaces
-   * Updated the public API list
+    * The orders were extended with the gift messages
+    * The page and block data and repository interfaces
+    * Updated the public API list
 * Framework improvements
     * Improved the profile generator 
     * Introduced the new environment for Jasmine tests
@@ -54,7 +112,7 @@
     * Fixed the Navigation Menu items on Admin Area
     * Various unit and integration tests bugs
 * GitHub issues and requests
-    [#675] (https://github.com/magento/magento2/issues/675) -- Fix for Textarea element cols and rows #675
+    * [#675] (https://github.com/magento/magento2/issues/675) -- Fix for Textarea element cols and rows #675
 
 0.74.0-beta2
 =============

app/code/Magento/AdminNotification/Setup/InstallSchema.php

@@ -45,7 +45,7 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
             'date_added',
             \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
             null,
-            ['nullable' => false],
+            ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT],
             'Create date'
         )->addColumn(
             'title',
@@ -112,7 +112,7 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
             'created_at',
             \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
             null,
-            ['nullable' => false],
+            ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT],
             'Create date'
         )->setComment(
             'Admin System Messages'

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

app/code/Magento/Authorization/Setup/InstallSchema.php

@@ -138,7 +138,6 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
                 'role_id',
                 $installer->getTable('authorization_role'),
                 'role_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
                 \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
             )->setComment(
                 'Admin Rule Table'

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-beta4",
-        "magento/framework": "0.74.0-beta4",
+        "magento/module-backend": "0.74.0-beta6",
+        "magento/framework": "0.74.0-beta6",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.74.0-beta4",
+    "version": "0.74.0-beta6",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

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

@@ -66,7 +66,7 @@ public function getHtml()
                 'From'
             ) . '" value="' . $this->getEscapedValue(
                 'from'
-            ) . '" class="input-text no-changes"  ' . $this->getUiId(
+            ) . '" class="input-text admin__control-text no-changes"  ' . $this->getUiId(
                 'filter',
                 $this->_getHtmlName(),
                 'from'
@@ -81,7 +81,7 @@ public function getHtml()
                 'To'
             ) . '" value="' . $this->getEscapedValue(
                 'to'
-            ) . '" class="input-text no-changes" ' . $this->getUiId(
+            ) . '" class="input-text admin__control-text no-changes" ' . $this->getUiId(
                 'filter',
                 $this->_getHtmlName(),
                 'to'

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

@@ -28,7 +28,7 @@ public function getHtml()
                 'From'
             ) . '" value="' . $this->getEscapedValue(
                 'from'
-            ) . '" class="input-text no-changes" ' . $this->getUiId(
+            ) . '" class="input-text admin__control-text no-changes" ' . $this->getUiId(
                 'filter',
                 $this->_getHtmlName(),
                 'from'
@@ -43,7 +43,7 @@ public function getHtml()
                 'To'
             ) . '" value="' . $this->getEscapedValue(
                 'to'
-            ) . '" class="input-text no-changes" ' . $this->getUiId(
+            ) . '" class="input-text admin__control-text no-changes" ' . $this->getUiId(
                 'filter',
                 $this->_getHtmlName(),
                 'to'

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

@@ -66,7 +66,7 @@ public function getHtml()
         $html = '<select name="' . $this->_getHtmlName() . '" id="' . $this->_getHtmlId() . '"' . $this->getUiId(
             'filter',
             $this->_getHtmlName()
-        ) . 'class="no-changes">';
+        ) . 'class="admin__control-select no-changes">';
         $value = $this->getValue();
         foreach ($this->_getOptions() as $option) {
             if (is_array($option['value'])) {

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

@@ -23,7 +23,7 @@ public function getHtml()
             $this->_getHtmlId() .
             '" value="' .
             $this->getEscapedValue() .
-            '" class="input-text no-changes"' .
+            '" class="input-text admin__control-text no-changes"' .
             $this->getUiId(
                 'filter',
                 $this->_getHtmlName()

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

@@ -44,7 +44,7 @@ public function getHtml()
             array_unshift($options, ['value' => '', 'label' => '']);
         }
         $html = sprintf(
-            '<select name="%s" id="%s" class="no-changes" %s>%s</select>',
+            '<select name="%s" id="%s" class="admin__control-select no-changes" %s>%s</select>',
             $this->_getHtmlName(),
             $this->_getHtmlId(),
             $this->getUiId('filter', $this->_getHtmlName()),