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

magento · Apr 28, 2015 · 5b8a727 · 5b8a727
2 parents d6d68ba + feeb287
commit 5b8a727
Show file tree

Hide file tree

Showing 102 changed files with 828 additions and 805 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,25 @@
+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

diff --git a/app/code/Magento/AdminNotification/composer.json b/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-beta5",
-        "magento/module-backend": "0.74.0-beta5",
-        "magento/module-media-storage": "0.74.0-beta5",
-        "magento/framework": "0.74.0-beta5",
+        "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-beta5",
+    "version": "0.74.0-beta6",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

diff --git a/app/code/Magento/Authorization/composer.json b/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-beta5",
-        "magento/framework": "0.74.0-beta5",
+        "magento/module-backend": "0.74.0-beta6",
+        "magento/framework": "0.74.0-beta6",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.74.0-beta5",
+    "version": "0.74.0-beta6",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

diff --git a/app/code/Magento/Backend/composer.json b/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-beta5",
-        "magento/module-directory": "0.74.0-beta5",
-        "magento/module-developer": "0.74.0-beta5",
-        "magento/module-eav": "0.74.0-beta5",
-        "magento/module-cron": "0.74.0-beta5",
-        "magento/module-theme": "0.74.0-beta5",
-        "magento/module-reports": "0.74.0-beta5",
-        "magento/module-sales": "0.74.0-beta5",
-        "magento/module-quote": "0.74.0-beta5",
-        "magento/module-catalog": "0.74.0-beta5",
-        "magento/module-user": "0.74.0-beta5",
-        "magento/module-backup": "0.74.0-beta5",
-        "magento/module-customer": "0.74.0-beta5",
-        "magento/module-translation": "0.74.0-beta5",
-        "magento/module-require-js": "0.74.0-beta5",
-        "magento/module-config": "0.74.0-beta5",
-        "magento/framework": "0.74.0-beta5",
+        "magento/module-store": "0.74.0-beta6",
+        "magento/module-directory": "0.74.0-beta6",
+        "magento/module-developer": "0.74.0-beta6",
+        "magento/module-eav": "0.74.0-beta6",
+        "magento/module-cron": "0.74.0-beta6",
+        "magento/module-theme": "0.74.0-beta6",
+        "magento/module-reports": "0.74.0-beta6",
+        "magento/module-sales": "0.74.0-beta6",
+        "magento/module-quote": "0.74.0-beta6",
+        "magento/module-catalog": "0.74.0-beta6",
+        "magento/module-user": "0.74.0-beta6",
+        "magento/module-backup": "0.74.0-beta6",
+        "magento/module-customer": "0.74.0-beta6",
+        "magento/module-translation": "0.74.0-beta6",
+        "magento/module-require-js": "0.74.0-beta6",
+        "magento/module-config": "0.74.0-beta6",
+        "magento/framework": "0.74.0-beta6",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.74.0-beta5",
+    "version": "0.74.0-beta6",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

diff --git a/app/code/Magento/Backup/composer.json b/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-beta5",
-        "magento/module-backend": "0.74.0-beta5",
-        "magento/module-cron": "0.74.0-beta5",
-        "magento/framework": "0.74.0-beta5",
+        "magento/module-store": "0.74.0-beta6",
+        "magento/module-backend": "0.74.0-beta6",
+        "magento/module-cron": "0.74.0-beta6",
+        "magento/framework": "0.74.0-beta6",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.74.0-beta5",
+    "version": "0.74.0-beta6",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

diff --git a/app/code/Magento/Bundle/composer.json b/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-beta5",
-        "magento/module-catalog": "0.74.0-beta5",
-        "magento/module-tax": "0.74.0-beta5",
-        "magento/module-backend": "0.74.0-beta5",
-        "magento/module-sales": "0.74.0-beta5",
-        "magento/module-checkout": "0.74.0-beta5",
-        "magento/module-catalog-inventory": "0.74.0-beta5",
-        "magento/module-customer": "0.74.0-beta5",
-        "magento/module-catalog-rule": "0.74.0-beta5",
-        "magento/module-eav": "0.74.0-beta5",
-        "magento/module-config": "0.74.0-beta5",
-        "magento/module-gift-message": "0.74.0-beta5",
-        "magento/framework": "0.74.0-beta5",
-        "magento/module-quote": "0.74.0-beta5",
-        "magento/module-media-storage": "0.74.0-beta5",
+        "magento/module-store": "0.74.0-beta6",
+        "magento/module-catalog": "0.74.0-beta6",
+        "magento/module-tax": "0.74.0-beta6",
+        "magento/module-backend": "0.74.0-beta6",
+        "magento/module-sales": "0.74.0-beta6",
+        "magento/module-checkout": "0.74.0-beta6",
+        "magento/module-catalog-inventory": "0.74.0-beta6",
+        "magento/module-customer": "0.74.0-beta6",
+        "magento/module-catalog-rule": "0.74.0-beta6",
+        "magento/module-eav": "0.74.0-beta6",
+        "magento/module-config": "0.74.0-beta6",
+        "magento/module-gift-message": "0.74.0-beta6",
+        "magento/framework": "0.74.0-beta6",
+        "magento/module-quote": "0.74.0-beta6",
+        "magento/module-media-storage": "0.74.0-beta6",
         "magento/magento-composer-installer": "*"
     },
     "suggest": {
-        "magento/module-webapi": "0.74.0-beta5"
+        "magento/module-webapi": "0.74.0-beta6"
     },
     "type": "magento2-module",
-    "version": "0.74.0-beta5",
+    "version": "0.74.0-beta6",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

diff --git a/app/code/Magento/CacheInvalidate/composer.json b/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-beta5",
-        "magento/framework": "0.74.0-beta5",
+        "magento/module-page-cache": "0.74.0-beta6",
+        "magento/framework": "0.74.0-beta6",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.74.0-beta5",
+    "version": "0.74.0-beta6",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

diff --git a/app/code/Magento/Captcha/composer.json b/app/code/Magento/Captcha/composer.json
@@ -3,15 +3,15 @@
     "description": "N/A",
     "require": {
         "php": "~5.5.0|~5.6.0",
-        "magento/module-store": "0.74.0-beta5",
-        "magento/module-customer": "0.74.0-beta5",
-        "magento/module-checkout": "0.74.0-beta5",
-        "magento/module-backend": "0.74.0-beta5",
-        "magento/framework": "0.74.0-beta5",
+        "magento/module-store": "0.74.0-beta6",
+        "magento/module-customer": "0.74.0-beta6",
+        "magento/module-checkout": "0.74.0-beta6",
+        "magento/module-backend": "0.74.0-beta6",
+        "magento/framework": "0.74.0-beta6",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.74.0-beta5",
+    "version": "0.74.0-beta6",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

diff --git a/app/code/Magento/Catalog/composer.json b/app/code/Magento/Catalog/composer.json
@@ -3,37 +3,37 @@
     "description": "N/A",
     "require": {
         "php": "~5.5.0|~5.6.0",
-        "magento/module-store": "0.74.0-beta5",
-        "magento/module-eav": "0.74.0-beta5",
-        "magento/module-cms": "0.74.0-beta5",
-        "magento/module-indexer": "0.74.0-beta5",
-        "magento/module-customer": "0.74.0-beta5",
-        "magento/module-theme": "0.74.0-beta5",
-        "magento/module-checkout": "0.74.0-beta5",
-        "magento/module-log": "0.74.0-beta5",
-        "magento/module-backend": "0.74.0-beta5",
-        "magento/module-widget": "0.74.0-beta5",
-        "magento/module-wishlist": "0.74.0-beta5",
-        "magento/module-tax": "0.74.0-beta5",
-        "magento/module-msrp": "0.74.0-beta5",
-        "magento/module-catalog-inventory": "0.74.0-beta5",
-        "magento/module-directory": "0.74.0-beta5",
-        "magento/module-catalog-rule": "0.74.0-beta5",
-        "magento/module-product-alert": "0.74.0-beta5",
-        "magento/module-url-rewrite": "0.74.0-beta5",
-        "magento/module-catalog-url-rewrite": "0.74.0-beta5",
-        "magento/module-page-cache": "0.74.0-beta5",
-        "magento/module-quote": "0.74.0-beta5",
-        "magento/module-config": "0.74.0-beta5",
-        "magento/module-media-storage": "0.74.0-beta5",
-        "magento/framework": "0.74.0-beta5",
+        "magento/module-store": "0.74.0-beta6",
+        "magento/module-eav": "0.74.0-beta6",
+        "magento/module-cms": "0.74.0-beta6",
+        "magento/module-indexer": "0.74.0-beta6",
+        "magento/module-customer": "0.74.0-beta6",
+        "magento/module-theme": "0.74.0-beta6",
+        "magento/module-checkout": "0.74.0-beta6",
+        "magento/module-log": "0.74.0-beta6",
+        "magento/module-backend": "0.74.0-beta6",
+        "magento/module-widget": "0.74.0-beta6",
+        "magento/module-wishlist": "0.74.0-beta6",
+        "magento/module-tax": "0.74.0-beta6",
+        "magento/module-msrp": "0.74.0-beta6",
+        "magento/module-catalog-inventory": "0.74.0-beta6",
+        "magento/module-directory": "0.74.0-beta6",
+        "magento/module-catalog-rule": "0.74.0-beta6",
+        "magento/module-product-alert": "0.74.0-beta6",
+        "magento/module-url-rewrite": "0.74.0-beta6",
+        "magento/module-catalog-url-rewrite": "0.74.0-beta6",
+        "magento/module-page-cache": "0.74.0-beta6",
+        "magento/module-quote": "0.74.0-beta6",
+        "magento/module-config": "0.74.0-beta6",
+        "magento/module-media-storage": "0.74.0-beta6",
+        "magento/framework": "0.74.0-beta6",
         "magento/magento-composer-installer": "*"
     },
     "suggest": {
-        "magento/module-cookie": "0.74.0-beta5"
+        "magento/module-cookie": "0.74.0-beta6"
     },
     "type": "magento2-module",
-    "version": "0.74.0-beta5",
+    "version": "0.74.0-beta6",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

diff --git a/app/code/Magento/CatalogImportExport/composer.json b/app/code/Magento/CatalogImportExport/composer.json
@@ -3,20 +3,20 @@
     "description": "N/A",
     "require": {
         "php": "~5.5.0|~5.6.0",
-        "magento/module-catalog": "0.74.0-beta5",
-        "magento/module-eav": "0.74.0-beta5",
-        "magento/module-import-export": "0.74.0-beta5",
-        "magento/module-indexer": "0.74.0-beta5",
-        "magento/module-store": "0.74.0-beta5",
-        "magento/module-catalog-inventory": "0.74.0-beta5",
-        "magento/module-media-storage": "0.74.0-beta5",
-        "magento/module-customer": "0.74.0-beta5",
-        "magento/framework": "0.74.0-beta5",
+        "magento/module-catalog": "0.74.0-beta6",
+        "magento/module-eav": "0.74.0-beta6",
+        "magento/module-import-export": "0.74.0-beta6",
+        "magento/module-indexer": "0.74.0-beta6",
+        "magento/module-store": "0.74.0-beta6",
+        "magento/module-catalog-inventory": "0.74.0-beta6",
+        "magento/module-media-storage": "0.74.0-beta6",
+        "magento/module-customer": "0.74.0-beta6",
+        "magento/framework": "0.74.0-beta6",
         "ext-ctype": "*",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.74.0-beta5",
+    "version": "0.74.0-beta6",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

diff --git a/app/code/Magento/CatalogInventory/composer.json b/app/code/Magento/CatalogInventory/composer.json
@@ -3,18 +3,18 @@
     "description": "N/A",
     "require": {
         "php": "~5.5.0|~5.6.0",
-        "magento/module-config": "0.74.0-beta5",
-        "magento/module-store": "0.74.0-beta5",
-        "magento/module-catalog": "0.74.0-beta5",
-        "magento/module-customer": "0.74.0-beta5",
-        "magento/module-indexer": "0.74.0-beta5",
-        "magento/module-eav": "0.74.0-beta5",
-        "magento/module-quote": "0.74.0-beta5",
-        "magento/framework": "0.74.0-beta5",
+        "magento/module-config": "0.74.0-beta6",
+        "magento/module-store": "0.74.0-beta6",
+        "magento/module-catalog": "0.74.0-beta6",
+        "magento/module-customer": "0.74.0-beta6",
+        "magento/module-indexer": "0.74.0-beta6",
+        "magento/module-eav": "0.74.0-beta6",
+        "magento/module-quote": "0.74.0-beta6",
+        "magento/framework": "0.74.0-beta6",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.74.0-beta5",
+    "version": "0.74.0-beta6",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

diff --git a/app/code/Magento/CatalogRule/composer.json b/app/code/Magento/CatalogRule/composer.json
@@ -3,19 +3,19 @@
     "description": "N/A",
     "require": {
         "php": "~5.5.0|~5.6.0",
-        "magento/module-store": "0.74.0-beta5",
-        "magento/module-rule": "0.74.0-beta5",
-        "magento/module-catalog": "0.74.0-beta5",
-        "magento/module-customer": "0.74.0-beta5",
-        "magento/module-backend": "0.74.0-beta5",
-        "magento/module-eav": "0.74.0-beta5",
-        "magento/module-indexer": "0.74.0-beta5",
-        "magento/module-import-export": "0.74.0-beta5",
-        "magento/framework": "0.74.0-beta5",
+        "magento/module-store": "0.74.0-beta6",
+        "magento/module-rule": "0.74.0-beta6",
+        "magento/module-catalog": "0.74.0-beta6",
+        "magento/module-customer": "0.74.0-beta6",
+        "magento/module-backend": "0.74.0-beta6",
+        "magento/module-eav": "0.74.0-beta6",
+        "magento/module-indexer": "0.74.0-beta6",
+        "magento/module-import-export": "0.74.0-beta6",
+        "magento/framework": "0.74.0-beta6",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.74.0-beta5",
+    "version": "0.74.0-beta6",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

diff --git a/app/code/Magento/CatalogSearch/composer.json b/app/code/Magento/CatalogSearch/composer.json
@@ -3,20 +3,20 @@
     "description": "N/A",
     "require": {
         "php": "~5.5.0|~5.6.0",
-        "magento/module-store": "0.74.0-beta5",
-        "magento/module-catalog": "0.74.0-beta5",
-        "magento/module-search": "0.74.0-beta5",
-        "magento/module-customer": "0.74.0-beta5",
-        "magento/module-directory": "0.74.0-beta5",
-        "magento/module-indexer": "0.74.0-beta5",
-        "magento/module-eav": "0.74.0-beta5",
-        "magento/module-backend": "0.74.0-beta5",
-        "magento/module-theme": "0.74.0-beta5",
-        "magento/framework": "0.74.0-beta5",
+        "magento/module-store": "0.74.0-beta6",
+        "magento/module-catalog": "0.74.0-beta6",
+        "magento/module-search": "0.74.0-beta6",
+        "magento/module-customer": "0.74.0-beta6",
+        "magento/module-directory": "0.74.0-beta6",
+        "magento/module-indexer": "0.74.0-beta6",
+        "magento/module-eav": "0.74.0-beta6",
+        "magento/module-backend": "0.74.0-beta6",
+        "magento/module-theme": "0.74.0-beta6",
+        "magento/framework": "0.74.0-beta6",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.74.0-beta5",
+    "version": "0.74.0-beta6",
     "license": [
         "OSL-3.0",
         "AFL-3.0"