Skip to content

Commit 5b8a727

Browse files
author
Susan Wright
committed
Merge remote-tracking branch 'mainline/develop' into MAGETWO-36298
2 parents d6d68ba + feeb287 commit 5b8a727

File tree

102 files changed

+828
-805
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

102 files changed

+828
-805
lines changed

‎CHANGELOG.md

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,25 @@
1+
0.74.0-beta6
2+
=============
3+
* Framework improvements
4+
* Implemented a default exception handler for blocks
5+
* Updated the root composer.json file
6+
* Updated the setup tool to support different editions
7+
* Added an ability to operate with Sales & Checkout APIs as guests and registered users
8+
* Implemented the additional Sales & Checkout APIs for registered customers and guests
9+
* Added unit tests to cover Sales & Checkout services code
10+
* Various
11+
* Standardized the hierarchy of exceptions
12+
* Added bundle product API integration to Catalog
13+
* Fixed bugs
14+
* Fixed an issue where it was impossible to place an order using multiple address checkout
15+
* Fixed an issue where DB timestamp columns with current_timestamp on update were not handled correctly
16+
* Fixed an issue with FPT in partial invoices
17+
* Fixed a performance issue in benchmark test
18+
* Fixed the incorrect Exception class in the Magento_CurrencySymbol module
19+
* Fixed an issue by letting MySQL determine a database table type instead of MyISAM
20+
* Fixed an issue where test failures occurred when the database and the application were in different time zones
21+
* Fixed an issue where \Magento\Framework\Phrase omitted placeholder values if no renderer was set
22+
123
0.74.0-beta5
224
=============
325
* Various

‎app/code/Magento/AdminNotification/composer.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-store": "0.74.0-beta5",
7-
"magento/module-backend": "0.74.0-beta5",
8-
"magento/module-media-storage": "0.74.0-beta5",
9-
"magento/framework": "0.74.0-beta5",
6+
"magento/module-store": "0.74.0-beta6",
7+
"magento/module-backend": "0.74.0-beta6",
8+
"magento/module-media-storage": "0.74.0-beta6",
9+
"magento/framework": "0.74.0-beta6",
1010
"lib-libxml": "*",
1111
"magento/magento-composer-installer": "*"
1212
},
1313
"type": "magento2-module",
14-
"version": "0.74.0-beta5",
14+
"version": "0.74.0-beta6",
1515
"license": [
1616
"OSL-3.0",
1717
"AFL-3.0"

‎app/code/Magento/Authorization/composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
"description": "Authorization module provides access to Magento ACL functionality.",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-backend": "0.74.0-beta5",
7-
"magento/framework": "0.74.0-beta5",
6+
"magento/module-backend": "0.74.0-beta6",
7+
"magento/framework": "0.74.0-beta6",
88
"magento/magento-composer-installer": "*"
99
},
1010
"type": "magento2-module",
11-
"version": "0.74.0-beta5",
11+
"version": "0.74.0-beta6",
1212
"license": [
1313
"OSL-3.0",
1414
"AFL-3.0"

‎app/code/Magento/Backend/composer.json

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,27 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-store": "0.74.0-beta5",
7-
"magento/module-directory": "0.74.0-beta5",
8-
"magento/module-developer": "0.74.0-beta5",
9-
"magento/module-eav": "0.74.0-beta5",
10-
"magento/module-cron": "0.74.0-beta5",
11-
"magento/module-theme": "0.74.0-beta5",
12-
"magento/module-reports": "0.74.0-beta5",
13-
"magento/module-sales": "0.74.0-beta5",
14-
"magento/module-quote": "0.74.0-beta5",
15-
"magento/module-catalog": "0.74.0-beta5",
16-
"magento/module-user": "0.74.0-beta5",
17-
"magento/module-backup": "0.74.0-beta5",
18-
"magento/module-customer": "0.74.0-beta5",
19-
"magento/module-translation": "0.74.0-beta5",
20-
"magento/module-require-js": "0.74.0-beta5",
21-
"magento/module-config": "0.74.0-beta5",
22-
"magento/framework": "0.74.0-beta5",
6+
"magento/module-store": "0.74.0-beta6",
7+
"magento/module-directory": "0.74.0-beta6",
8+
"magento/module-developer": "0.74.0-beta6",
9+
"magento/module-eav": "0.74.0-beta6",
10+
"magento/module-cron": "0.74.0-beta6",
11+
"magento/module-theme": "0.74.0-beta6",
12+
"magento/module-reports": "0.74.0-beta6",
13+
"magento/module-sales": "0.74.0-beta6",
14+
"magento/module-quote": "0.74.0-beta6",
15+
"magento/module-catalog": "0.74.0-beta6",
16+
"magento/module-user": "0.74.0-beta6",
17+
"magento/module-backup": "0.74.0-beta6",
18+
"magento/module-customer": "0.74.0-beta6",
19+
"magento/module-translation": "0.74.0-beta6",
20+
"magento/module-require-js": "0.74.0-beta6",
21+
"magento/module-config": "0.74.0-beta6",
22+
"magento/framework": "0.74.0-beta6",
2323
"magento/magento-composer-installer": "*"
2424
},
2525
"type": "magento2-module",
26-
"version": "0.74.0-beta5",
26+
"version": "0.74.0-beta6",
2727
"license": [
2828
"OSL-3.0",
2929
"AFL-3.0"

‎app/code/Magento/Backup/composer.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-store": "0.74.0-beta5",
7-
"magento/module-backend": "0.74.0-beta5",
8-
"magento/module-cron": "0.74.0-beta5",
9-
"magento/framework": "0.74.0-beta5",
6+
"magento/module-store": "0.74.0-beta6",
7+
"magento/module-backend": "0.74.0-beta6",
8+
"magento/module-cron": "0.74.0-beta6",
9+
"magento/framework": "0.74.0-beta6",
1010
"magento/magento-composer-installer": "*"
1111
},
1212
"type": "magento2-module",
13-
"version": "0.74.0-beta5",
13+
"version": "0.74.0-beta6",
1414
"license": [
1515
"OSL-3.0",
1616
"AFL-3.0"

‎app/code/Magento/Bundle/composer.json

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,28 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-store": "0.74.0-beta5",
7-
"magento/module-catalog": "0.74.0-beta5",
8-
"magento/module-tax": "0.74.0-beta5",
9-
"magento/module-backend": "0.74.0-beta5",
10-
"magento/module-sales": "0.74.0-beta5",
11-
"magento/module-checkout": "0.74.0-beta5",
12-
"magento/module-catalog-inventory": "0.74.0-beta5",
13-
"magento/module-customer": "0.74.0-beta5",
14-
"magento/module-catalog-rule": "0.74.0-beta5",
15-
"magento/module-eav": "0.74.0-beta5",
16-
"magento/module-config": "0.74.0-beta5",
17-
"magento/module-gift-message": "0.74.0-beta5",
18-
"magento/framework": "0.74.0-beta5",
19-
"magento/module-quote": "0.74.0-beta5",
20-
"magento/module-media-storage": "0.74.0-beta5",
6+
"magento/module-store": "0.74.0-beta6",
7+
"magento/module-catalog": "0.74.0-beta6",
8+
"magento/module-tax": "0.74.0-beta6",
9+
"magento/module-backend": "0.74.0-beta6",
10+
"magento/module-sales": "0.74.0-beta6",
11+
"magento/module-checkout": "0.74.0-beta6",
12+
"magento/module-catalog-inventory": "0.74.0-beta6",
13+
"magento/module-customer": "0.74.0-beta6",
14+
"magento/module-catalog-rule": "0.74.0-beta6",
15+
"magento/module-eav": "0.74.0-beta6",
16+
"magento/module-config": "0.74.0-beta6",
17+
"magento/module-gift-message": "0.74.0-beta6",
18+
"magento/framework": "0.74.0-beta6",
19+
"magento/module-quote": "0.74.0-beta6",
20+
"magento/module-media-storage": "0.74.0-beta6",
2121
"magento/magento-composer-installer": "*"
2222
},
2323
"suggest": {
24-
"magento/module-webapi": "0.74.0-beta5"
24+
"magento/module-webapi": "0.74.0-beta6"
2525
},
2626
"type": "magento2-module",
27-
"version": "0.74.0-beta5",
27+
"version": "0.74.0-beta6",
2828
"license": [
2929
"OSL-3.0",
3030
"AFL-3.0"

‎app/code/Magento/CacheInvalidate/composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-page-cache": "0.74.0-beta5",
7-
"magento/framework": "0.74.0-beta5",
6+
"magento/module-page-cache": "0.74.0-beta6",
7+
"magento/framework": "0.74.0-beta6",
88
"magento/magento-composer-installer": "*"
99
},
1010
"type": "magento2-module",
11-
"version": "0.74.0-beta5",
11+
"version": "0.74.0-beta6",
1212
"license": [
1313
"OSL-3.0",
1414
"AFL-3.0"

‎app/code/Magento/Captcha/composer.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-store": "0.74.0-beta5",
7-
"magento/module-customer": "0.74.0-beta5",
8-
"magento/module-checkout": "0.74.0-beta5",
9-
"magento/module-backend": "0.74.0-beta5",
10-
"magento/framework": "0.74.0-beta5",
6+
"magento/module-store": "0.74.0-beta6",
7+
"magento/module-customer": "0.74.0-beta6",
8+
"magento/module-checkout": "0.74.0-beta6",
9+
"magento/module-backend": "0.74.0-beta6",
10+
"magento/framework": "0.74.0-beta6",
1111
"magento/magento-composer-installer": "*"
1212
},
1313
"type": "magento2-module",
14-
"version": "0.74.0-beta5",
14+
"version": "0.74.0-beta6",
1515
"license": [
1616
"OSL-3.0",
1717
"AFL-3.0"

‎app/code/Magento/Catalog/composer.json

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -3,37 +3,37 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-store": "0.74.0-beta5",
7-
"magento/module-eav": "0.74.0-beta5",
8-
"magento/module-cms": "0.74.0-beta5",
9-
"magento/module-indexer": "0.74.0-beta5",
10-
"magento/module-customer": "0.74.0-beta5",
11-
"magento/module-theme": "0.74.0-beta5",
12-
"magento/module-checkout": "0.74.0-beta5",
13-
"magento/module-log": "0.74.0-beta5",
14-
"magento/module-backend": "0.74.0-beta5",
15-
"magento/module-widget": "0.74.0-beta5",
16-
"magento/module-wishlist": "0.74.0-beta5",
17-
"magento/module-tax": "0.74.0-beta5",
18-
"magento/module-msrp": "0.74.0-beta5",
19-
"magento/module-catalog-inventory": "0.74.0-beta5",
20-
"magento/module-directory": "0.74.0-beta5",
21-
"magento/module-catalog-rule": "0.74.0-beta5",
22-
"magento/module-product-alert": "0.74.0-beta5",
23-
"magento/module-url-rewrite": "0.74.0-beta5",
24-
"magento/module-catalog-url-rewrite": "0.74.0-beta5",
25-
"magento/module-page-cache": "0.74.0-beta5",
26-
"magento/module-quote": "0.74.0-beta5",
27-
"magento/module-config": "0.74.0-beta5",
28-
"magento/module-media-storage": "0.74.0-beta5",
29-
"magento/framework": "0.74.0-beta5",
6+
"magento/module-store": "0.74.0-beta6",
7+
"magento/module-eav": "0.74.0-beta6",
8+
"magento/module-cms": "0.74.0-beta6",
9+
"magento/module-indexer": "0.74.0-beta6",
10+
"magento/module-customer": "0.74.0-beta6",
11+
"magento/module-theme": "0.74.0-beta6",
12+
"magento/module-checkout": "0.74.0-beta6",
13+
"magento/module-log": "0.74.0-beta6",
14+
"magento/module-backend": "0.74.0-beta6",
15+
"magento/module-widget": "0.74.0-beta6",
16+
"magento/module-wishlist": "0.74.0-beta6",
17+
"magento/module-tax": "0.74.0-beta6",
18+
"magento/module-msrp": "0.74.0-beta6",
19+
"magento/module-catalog-inventory": "0.74.0-beta6",
20+
"magento/module-directory": "0.74.0-beta6",
21+
"magento/module-catalog-rule": "0.74.0-beta6",
22+
"magento/module-product-alert": "0.74.0-beta6",
23+
"magento/module-url-rewrite": "0.74.0-beta6",
24+
"magento/module-catalog-url-rewrite": "0.74.0-beta6",
25+
"magento/module-page-cache": "0.74.0-beta6",
26+
"magento/module-quote": "0.74.0-beta6",
27+
"magento/module-config": "0.74.0-beta6",
28+
"magento/module-media-storage": "0.74.0-beta6",
29+
"magento/framework": "0.74.0-beta6",
3030
"magento/magento-composer-installer": "*"
3131
},
3232
"suggest": {
33-
"magento/module-cookie": "0.74.0-beta5"
33+
"magento/module-cookie": "0.74.0-beta6"
3434
},
3535
"type": "magento2-module",
36-
"version": "0.74.0-beta5",
36+
"version": "0.74.0-beta6",
3737
"license": [
3838
"OSL-3.0",
3939
"AFL-3.0"

‎app/code/Magento/CatalogImportExport/composer.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-catalog": "0.74.0-beta5",
7-
"magento/module-eav": "0.74.0-beta5",
8-
"magento/module-import-export": "0.74.0-beta5",
9-
"magento/module-indexer": "0.74.0-beta5",
10-
"magento/module-store": "0.74.0-beta5",
11-
"magento/module-catalog-inventory": "0.74.0-beta5",
12-
"magento/module-media-storage": "0.74.0-beta5",
13-
"magento/module-customer": "0.74.0-beta5",
14-
"magento/framework": "0.74.0-beta5",
6+
"magento/module-catalog": "0.74.0-beta6",
7+
"magento/module-eav": "0.74.0-beta6",
8+
"magento/module-import-export": "0.74.0-beta6",
9+
"magento/module-indexer": "0.74.0-beta6",
10+
"magento/module-store": "0.74.0-beta6",
11+
"magento/module-catalog-inventory": "0.74.0-beta6",
12+
"magento/module-media-storage": "0.74.0-beta6",
13+
"magento/module-customer": "0.74.0-beta6",
14+
"magento/framework": "0.74.0-beta6",
1515
"ext-ctype": "*",
1616
"magento/magento-composer-installer": "*"
1717
},
1818
"type": "magento2-module",
19-
"version": "0.74.0-beta5",
19+
"version": "0.74.0-beta6",
2020
"license": [
2121
"OSL-3.0",
2222
"AFL-3.0"

‎app/code/Magento/CatalogInventory/composer.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-config": "0.74.0-beta5",
7-
"magento/module-store": "0.74.0-beta5",
8-
"magento/module-catalog": "0.74.0-beta5",
9-
"magento/module-customer": "0.74.0-beta5",
10-
"magento/module-indexer": "0.74.0-beta5",
11-
"magento/module-eav": "0.74.0-beta5",
12-
"magento/module-quote": "0.74.0-beta5",
13-
"magento/framework": "0.74.0-beta5",
6+
"magento/module-config": "0.74.0-beta6",
7+
"magento/module-store": "0.74.0-beta6",
8+
"magento/module-catalog": "0.74.0-beta6",
9+
"magento/module-customer": "0.74.0-beta6",
10+
"magento/module-indexer": "0.74.0-beta6",
11+
"magento/module-eav": "0.74.0-beta6",
12+
"magento/module-quote": "0.74.0-beta6",
13+
"magento/framework": "0.74.0-beta6",
1414
"magento/magento-composer-installer": "*"
1515
},
1616
"type": "magento2-module",
17-
"version": "0.74.0-beta5",
17+
"version": "0.74.0-beta6",
1818
"license": [
1919
"OSL-3.0",
2020
"AFL-3.0"

‎app/code/Magento/CatalogRule/composer.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,19 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-store": "0.74.0-beta5",
7-
"magento/module-rule": "0.74.0-beta5",
8-
"magento/module-catalog": "0.74.0-beta5",
9-
"magento/module-customer": "0.74.0-beta5",
10-
"magento/module-backend": "0.74.0-beta5",
11-
"magento/module-eav": "0.74.0-beta5",
12-
"magento/module-indexer": "0.74.0-beta5",
13-
"magento/module-import-export": "0.74.0-beta5",
14-
"magento/framework": "0.74.0-beta5",
6+
"magento/module-store": "0.74.0-beta6",
7+
"magento/module-rule": "0.74.0-beta6",
8+
"magento/module-catalog": "0.74.0-beta6",
9+
"magento/module-customer": "0.74.0-beta6",
10+
"magento/module-backend": "0.74.0-beta6",
11+
"magento/module-eav": "0.74.0-beta6",
12+
"magento/module-indexer": "0.74.0-beta6",
13+
"magento/module-import-export": "0.74.0-beta6",
14+
"magento/framework": "0.74.0-beta6",
1515
"magento/magento-composer-installer": "*"
1616
},
1717
"type": "magento2-module",
18-
"version": "0.74.0-beta5",
18+
"version": "0.74.0-beta6",
1919
"license": [
2020
"OSL-3.0",
2121
"AFL-3.0"

‎app/code/Magento/CatalogSearch/composer.json

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-store": "0.74.0-beta5",
7-
"magento/module-catalog": "0.74.0-beta5",
8-
"magento/module-search": "0.74.0-beta5",
9-
"magento/module-customer": "0.74.0-beta5",
10-
"magento/module-directory": "0.74.0-beta5",
11-
"magento/module-indexer": "0.74.0-beta5",
12-
"magento/module-eav": "0.74.0-beta5",
13-
"magento/module-backend": "0.74.0-beta5",
14-
"magento/module-theme": "0.74.0-beta5",
15-
"magento/framework": "0.74.0-beta5",
6+
"magento/module-store": "0.74.0-beta6",
7+
"magento/module-catalog": "0.74.0-beta6",
8+
"magento/module-search": "0.74.0-beta6",
9+
"magento/module-customer": "0.74.0-beta6",
10+
"magento/module-directory": "0.74.0-beta6",
11+
"magento/module-indexer": "0.74.0-beta6",
12+
"magento/module-eav": "0.74.0-beta6",
13+
"magento/module-backend": "0.74.0-beta6",
14+
"magento/module-theme": "0.74.0-beta6",
15+
"magento/framework": "0.74.0-beta6",
1616
"magento/magento-composer-installer": "*"
1717
},
1818
"type": "magento2-module",
19-
"version": "0.74.0-beta5",
19+
"version": "0.74.0-beta6",
2020
"license": [
2121
"OSL-3.0",
2222
"AFL-3.0"

0 commit comments

Comments
 (0)