Skip to content

Commit a1ab120

Browse files
vpelipenkovpelipenko
committed
Merge pull request #23 from magento-firedrakes/0.42.0-beta3
MAGETWO-31052: M2 GitHub Update (version 0.42.0-beta3)
2 parents b68900d + 8520c06 commit a1ab120

File tree

94 files changed

+761
-739
lines changed

Some content is hidden

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

94 files changed

+761
-739
lines changed

‎CHANGELOG.md

+22
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,25 @@
1+
0.42.0-beta3
2+
=============
3+
* Fixed bugs:
4+
* Fixed an issue where malicious JavaScript could be executed when adding new User Roles in the backend
5+
* Fixed an issue where incorrect output format was returned when invoking the Customer service
6+
* Fixed an issue where it was impossible to activate an integration after editing the URLs
7+
* Fixed an issue where incorrect class path was used in the ObjectManager calls
8+
* Fixed an issue where inconsistent Reflection classes were used for WebApi applications
9+
* Fixed an issue where the parent element was removed from theme.xml by mistake
10+
* API functional tests changes:
11+
* Moved API functional tests to CE repository
12+
* Various improvements:
13+
* Removed include-path from composer.json
14+
* GitHub requests:
15+
* [#876](https://github.com/magento/magento2/pull/876) -- [BUGFIX] Fixed german translation "Warenkorbrn"
16+
* [#880](https://github.com/magento/magento2/pull/880) -- Naming fix in DI compiler.php - rename binary to igbinary to stay consistent
17+
* [#913](https://github.com/magento/magento2/pull/913) -- Specify date fixture and fix expectations
18+
* [#874](https://github.com/magento/magento2/pull/874) -- Prevent special characters finding their way into layout handle due to SKU being used
19+
* [#903](https://github.com/magento/magento2/pull/903) -- Small cleanup refactoring
20+
* [#905](https://github.com/magento/magento2/pull/905), [#907](https://github.com/magento/magento2/pull/907), [#908](https://github.com/magento/magento2/pull/908) -- Change interpret() return value to conform with Layout\ReaderInterface
21+
* [#913](https://github.com/magento/magento2/pull/913) -- Specify date fixture and fix expectations
22+
123
0.42.0-beta2
224
=============
325
* Framework improvements:

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.4.11|~5.5.0",
6-
"magento/module-store": "0.42.0-beta2",
7-
"magento/module-core": "0.42.0-beta2",
8-
"magento/module-backend": "0.42.0-beta2",
9-
"magento/framework": "0.42.0-beta2",
6+
"magento/module-store": "0.42.0-beta3",
7+
"magento/module-core": "0.42.0-beta3",
8+
"magento/module-backend": "0.42.0-beta3",
9+
"magento/framework": "0.42.0-beta3",
1010
"lib-libxml": "*",
1111
"magento/magento-composer-installer": "*"
1212
},
1313
"type": "magento2-module",
14-
"version": "0.42.0-beta2",
14+
"version": "0.42.0-beta3",
1515
"license": [
1616
"OSL-3.0",
1717
"AFL-3.0"

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

+3-3
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.4.11|~5.5.0",
6-
"magento/module-backend": "0.42.0-beta2",
7-
"magento/framework": "0.42.0-beta2",
6+
"magento/module-backend": "0.42.0-beta3",
7+
"magento/framework": "0.42.0-beta3",
88
"magento/magento-composer-installer": "*"
99
},
1010
"type": "magento2-module",
11-
"version": "0.42.0-beta2",
11+
"version": "0.42.0-beta3",
1212
"license": [
1313
"OSL-3.0",
1414
"AFL-3.0"

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

+17-17
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,26 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.4.11|~5.5.0",
6-
"magento/module-store": "0.42.0-beta2",
7-
"magento/module-directory": "0.42.0-beta2",
8-
"magento/module-core": "0.42.0-beta2",
9-
"magento/module-eav": "0.42.0-beta2",
10-
"magento/module-cron": "0.42.0-beta2",
11-
"magento/module-theme": "0.42.0-beta2",
12-
"magento/module-reports": "0.42.0-beta2",
13-
"magento/module-sales": "0.42.0-beta2",
14-
"magento/module-catalog": "0.42.0-beta2",
15-
"magento/module-user": "0.42.0-beta2",
16-
"magento/module-backup": "0.42.0-beta2",
17-
"magento/module-email": "0.42.0-beta2",
18-
"magento/module-customer": "0.42.0-beta2",
19-
"magento/module-translation": "0.42.0-beta2",
20-
"magento/module-require-js": "0.42.0-beta2",
21-
"magento/framework": "0.42.0-beta2",
6+
"magento/module-store": "0.42.0-beta3",
7+
"magento/module-directory": "0.42.0-beta3",
8+
"magento/module-core": "0.42.0-beta3",
9+
"magento/module-eav": "0.42.0-beta3",
10+
"magento/module-cron": "0.42.0-beta3",
11+
"magento/module-theme": "0.42.0-beta3",
12+
"magento/module-reports": "0.42.0-beta3",
13+
"magento/module-sales": "0.42.0-beta3",
14+
"magento/module-catalog": "0.42.0-beta3",
15+
"magento/module-user": "0.42.0-beta3",
16+
"magento/module-backup": "0.42.0-beta3",
17+
"magento/module-email": "0.42.0-beta3",
18+
"magento/module-customer": "0.42.0-beta3",
19+
"magento/module-translation": "0.42.0-beta3",
20+
"magento/module-require-js": "0.42.0-beta3",
21+
"magento/framework": "0.42.0-beta3",
2222
"magento/magento-composer-installer": "*"
2323
},
2424
"type": "magento2-module",
25-
"version": "0.42.0-beta2",
25+
"version": "0.42.0-beta3",
2626
"license": [
2727
"OSL-3.0",
2828
"AFL-3.0"

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.4.11|~5.5.0",
6-
"magento/module-store": "0.42.0-beta2",
7-
"magento/module-core": "0.42.0-beta2",
8-
"magento/module-backend": "0.42.0-beta2",
9-
"magento/module-cron": "0.42.0-beta2",
10-
"magento/framework": "0.42.0-beta2",
6+
"magento/module-store": "0.42.0-beta3",
7+
"magento/module-core": "0.42.0-beta3",
8+
"magento/module-backend": "0.42.0-beta3",
9+
"magento/module-cron": "0.42.0-beta3",
10+
"magento/framework": "0.42.0-beta3",
1111
"magento/magento-composer-installer": "*"
1212
},
1313
"type": "magento2-module",
14-
"version": "0.42.0-beta2",
14+
"version": "0.42.0-beta3",
1515
"license": [
1616
"OSL-3.0",
1717
"AFL-3.0"

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

+15-15
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,24 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.4.11|~5.5.0",
6-
"magento/module-store": "0.42.0-beta2",
7-
"magento/module-catalog": "0.42.0-beta2",
8-
"magento/module-tax": "0.42.0-beta2",
9-
"magento/module-core": "0.42.0-beta2",
10-
"magento/module-backend": "0.42.0-beta2",
11-
"magento/module-sales": "0.42.0-beta2",
12-
"magento/module-checkout": "0.42.0-beta2",
13-
"magento/module-catalog-inventory": "0.42.0-beta2",
14-
"magento/module-customer": "0.42.0-beta2",
15-
"magento/module-catalog-rule": "0.42.0-beta2",
16-
"magento/module-eav": "0.42.0-beta2",
17-
"magento/module-gift-message": "0.42.0-beta2",
18-
"magento/framework": "0.42.0-beta2",
19-
"magento/module-webapi": "0.42.0-beta2",
6+
"magento/module-store": "0.42.0-beta3",
7+
"magento/module-catalog": "0.42.0-beta3",
8+
"magento/module-tax": "0.42.0-beta3",
9+
"magento/module-core": "0.42.0-beta3",
10+
"magento/module-backend": "0.42.0-beta3",
11+
"magento/module-sales": "0.42.0-beta3",
12+
"magento/module-checkout": "0.42.0-beta3",
13+
"magento/module-catalog-inventory": "0.42.0-beta3",
14+
"magento/module-customer": "0.42.0-beta3",
15+
"magento/module-catalog-rule": "0.42.0-beta3",
16+
"magento/module-eav": "0.42.0-beta3",
17+
"magento/module-gift-message": "0.42.0-beta3",
18+
"magento/framework": "0.42.0-beta3",
19+
"magento/module-webapi": "0.42.0-beta3",
2020
"magento/magento-composer-installer": "*"
2121
},
2222
"type": "magento2-module",
23-
"version": "0.42.0-beta2",
23+
"version": "0.42.0-beta3",
2424
"license": [
2525
"OSL-3.0",
2626
"AFL-3.0"

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

+7-7
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.4.11|~5.5.0",
6-
"magento/module-store": "0.42.0-beta2",
7-
"magento/module-customer": "0.42.0-beta2",
8-
"magento/module-checkout": "0.42.0-beta2",
9-
"magento/module-core": "0.42.0-beta2",
10-
"magento/module-backend": "0.42.0-beta2",
11-
"magento/framework": "0.42.0-beta2",
6+
"magento/module-store": "0.42.0-beta3",
7+
"magento/module-customer": "0.42.0-beta3",
8+
"magento/module-checkout": "0.42.0-beta3",
9+
"magento/module-core": "0.42.0-beta3",
10+
"magento/module-backend": "0.42.0-beta3",
11+
"magento/framework": "0.42.0-beta3",
1212
"magento/magento-composer-installer": "*"
1313
},
1414
"type": "magento2-module",
15-
"version": "0.42.0-beta2",
15+
"version": "0.42.0-beta3",
1616
"license": [
1717
"OSL-3.0",
1818
"AFL-3.0"

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

+24-24
Original file line numberDiff line numberDiff line change
@@ -3,33 +3,33 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.4.11|~5.5.0",
6-
"magento/module-store": "0.42.0-beta2",
7-
"magento/module-eav": "0.42.0-beta2",
8-
"magento/module-cms": "0.42.0-beta2",
9-
"magento/module-indexer": "0.42.0-beta2",
10-
"magento/module-customer": "0.42.0-beta2",
11-
"magento/module-core": "0.42.0-beta2",
12-
"magento/module-theme": "0.42.0-beta2",
13-
"magento/module-checkout": "0.42.0-beta2",
14-
"magento/module-log": "0.42.0-beta2",
15-
"magento/module-backend": "0.42.0-beta2",
16-
"magento/module-widget": "0.42.0-beta2",
17-
"magento/module-wishlist": "0.42.0-beta2",
18-
"magento/module-tax": "0.42.0-beta2",
19-
"magento/module-msrp": "0.42.0-beta2",
20-
"magento/module-catalog-inventory": "0.42.0-beta2",
21-
"magento/module-directory": "0.42.0-beta2",
22-
"magento/module-catalog-rule": "0.42.0-beta2",
23-
"magento/module-sales": "0.42.0-beta2",
24-
"magento/module-product-alert": "0.42.0-beta2",
25-
"magento/module-url-rewrite": "0.42.0-beta2",
26-
"magento/module-catalog-url-rewrite": "0.42.0-beta2",
27-
"magento/module-page-cache": "0.42.0-beta2",
28-
"magento/framework": "0.42.0-beta2",
6+
"magento/module-store": "0.42.0-beta3",
7+
"magento/module-eav": "0.42.0-beta3",
8+
"magento/module-cms": "0.42.0-beta3",
9+
"magento/module-indexer": "0.42.0-beta3",
10+
"magento/module-customer": "0.42.0-beta3",
11+
"magento/module-core": "0.42.0-beta3",
12+
"magento/module-theme": "0.42.0-beta3",
13+
"magento/module-checkout": "0.42.0-beta3",
14+
"magento/module-log": "0.42.0-beta3",
15+
"magento/module-backend": "0.42.0-beta3",
16+
"magento/module-widget": "0.42.0-beta3",
17+
"magento/module-wishlist": "0.42.0-beta3",
18+
"magento/module-tax": "0.42.0-beta3",
19+
"magento/module-msrp": "0.42.0-beta3",
20+
"magento/module-catalog-inventory": "0.42.0-beta3",
21+
"magento/module-directory": "0.42.0-beta3",
22+
"magento/module-catalog-rule": "0.42.0-beta3",
23+
"magento/module-sales": "0.42.0-beta3",
24+
"magento/module-product-alert": "0.42.0-beta3",
25+
"magento/module-url-rewrite": "0.42.0-beta3",
26+
"magento/module-catalog-url-rewrite": "0.42.0-beta3",
27+
"magento/module-page-cache": "0.42.0-beta3",
28+
"magento/framework": "0.42.0-beta3",
2929
"magento/magento-composer-installer": "*"
3030
},
3131
"type": "magento2-module",
32-
"version": "0.42.0-beta2",
32+
"version": "0.42.0-beta3",
3333
"license": [
3434
"OSL-3.0",
3535
"AFL-3.0"

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

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

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

+9-9
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.4.11|~5.5.0",
6-
"magento/module-store": "0.42.0-beta2",
7-
"magento/module-catalog": "0.42.0-beta2",
8-
"magento/module-customer": "0.42.0-beta2",
9-
"magento/module-backend": "0.42.0-beta2",
10-
"magento/module-indexer": "0.42.0-beta2",
11-
"magento/module-sales": "0.42.0-beta2",
12-
"magento/module-eav": "0.42.0-beta2",
13-
"magento/framework": "0.42.0-beta2",
6+
"magento/module-store": "0.42.0-beta3",
7+
"magento/module-catalog": "0.42.0-beta3",
8+
"magento/module-customer": "0.42.0-beta3",
9+
"magento/module-backend": "0.42.0-beta3",
10+
"magento/module-indexer": "0.42.0-beta3",
11+
"magento/module-sales": "0.42.0-beta3",
12+
"magento/module-eav": "0.42.0-beta3",
13+
"magento/framework": "0.42.0-beta3",
1414
"magento/magento-composer-installer": "*"
1515
},
1616
"type": "magento2-module",
17-
"version": "0.42.0-beta2",
17+
"version": "0.42.0-beta3",
1818
"license": [
1919
"OSL-3.0",
2020
"AFL-3.0"

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

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

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

+12-12
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,21 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.4.11|~5.5.0",
6-
"magento/module-store": "0.42.0-beta2",
7-
"magento/module-catalog": "0.42.0-beta2",
8-
"magento/module-search": "0.42.0-beta2",
9-
"magento/module-customer": "0.42.0-beta2",
10-
"magento/module-core": "0.42.0-beta2",
11-
"magento/module-directory": "0.42.0-beta2",
12-
"magento/module-indexer": "0.42.0-beta2",
13-
"magento/module-eav": "0.42.0-beta2",
14-
"magento/module-backend": "0.42.0-beta2",
15-
"magento/module-theme": "0.42.0-beta2",
16-
"magento/framework": "0.42.0-beta2",
6+
"magento/module-store": "0.42.0-beta3",
7+
"magento/module-catalog": "0.42.0-beta3",
8+
"magento/module-search": "0.42.0-beta3",
9+
"magento/module-customer": "0.42.0-beta3",
10+
"magento/module-core": "0.42.0-beta3",
11+
"magento/module-directory": "0.42.0-beta3",
12+
"magento/module-indexer": "0.42.0-beta3",
13+
"magento/module-eav": "0.42.0-beta3",
14+
"magento/module-backend": "0.42.0-beta3",
15+
"magento/module-theme": "0.42.0-beta3",
16+
"magento/framework": "0.42.0-beta3",
1717
"magento/magento-composer-installer": "*"
1818
},
1919
"type": "magento2-module",
20-
"version": "0.42.0-beta2",
20+
"version": "0.42.0-beta3",
2121
"license": [
2222
"OSL-3.0",
2323
"AFL-3.0"

0 commit comments

Comments
 (0)