Skip to content

Commit c6e891d

Browse files
author
Oleksii Korshenko
authored
Merge pull request #1607 from magento-engcom/develop-prs
#11546 Add AuthenticationInterface to the public API by @navarr #11659 [TASK] Removed Typo in Paypal TestCase didgit => digit by @lewisvoncken #11649 #7915: customer objects are equal to eachother after observing event customer_save_after_data_object by @RomaKis #11587 #11586 Fix duplicated crontab 2>&1 expression by @adrian-martinez-interactiv4 #11609 Fix a typo by @ajpevers #11582 M2 11581 by @tzyganu #11452 #11328 : app:config:dump adds extra space every time in multiline array value by @adrian-martinez-interactiv4 #11457 Added carrier code to ID to distinguish shipping methods [port 2.3] by @peterjaap #10769 Fix: Keep packages sorted by @localheinz
2 parents e7c5bb5 + 7e773c5 commit c6e891d

File tree

257 files changed

+1737
-972
lines changed

Some content is hidden

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

257 files changed

+1737
-972
lines changed

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
{
22
"name": "magento/module-admin-notification",
33
"description": "N/A",
4+
"config": {
5+
"sort-packages": true
6+
},
47
"require": {
58
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
6-
"magento/module-store": "100.3.*",
9+
"lib-libxml": "*",
10+
"magento/framework": "100.3.*",
711
"magento/module-backend": "100.3.*",
812
"magento/module-media-storage": "100.3.*",
9-
"magento/framework": "100.3.*",
10-
"magento/module-ui": "100.3.*",
11-
"lib-libxml": "*"
13+
"magento/module-store": "100.3.*",
14+
"magento/module-ui": "100.3.*"
1215
},
1316
"type": "magento2-module",
1417
"version": "100.3.0-dev",

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
11
{
22
"name": "magento/module-advanced-pricing-import-export",
33
"description": "N/A",
4+
"config": {
5+
"sort-packages": true
6+
},
47
"require": {
58
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
9+
"magento/framework": "100.3.*",
610
"magento/module-catalog": "101.2.*",
11+
"magento/module-catalog-import-export": "100.3.*",
712
"magento/module-catalog-inventory": "100.3.*",
13+
"magento/module-customer": "100.3.*",
814
"magento/module-eav": "100.3.*",
915
"magento/module-import-export": "100.3.*",
10-
"magento/module-catalog-import-export": "100.3.*",
11-
"magento/module-customer": "100.3.*",
12-
"magento/module-store": "100.3.*",
13-
"magento/framework": "100.3.*"
16+
"magento/module-store": "100.3.*"
1417
},
1518
"type": "magento2-module",
1619
"version": "100.3.0-dev",

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
{
22
"name": "magento/module-authorization",
33
"description": "Authorization module provides access to Magento ACL functionality.",
4+
"config": {
5+
"sort-packages": true
6+
},
47
"require": {
58
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
6-
"magento/module-backend": "100.3.*",
7-
"magento/framework": "100.3.*"
9+
"magento/framework": "100.3.*",
10+
"magento/module-backend": "100.3.*"
811
},
912
"type": "magento2-module",
1013
"version": "100.3.0-dev",

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

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
11
{
22
"name": "magento/module-authorizenet",
33
"description": "N/A",
4+
"config": {
5+
"sort-packages": true
6+
},
47
"require": {
58
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
6-
"magento/module-sales": "100.3.*",
7-
"magento/module-store": "100.3.*",
8-
"magento/module-quote": "100.3.*",
9-
"magento/module-checkout": "100.3.*",
9+
"magento/framework": "100.3.*",
1010
"magento/module-backend": "100.3.*",
11-
"magento/module-payment": "100.3.*",
1211
"magento/module-catalog": "101.2.*",
13-
"magento/framework": "100.3.*"
12+
"magento/module-checkout": "100.3.*",
13+
"magento/module-payment": "100.3.*",
14+
"magento/module-quote": "100.3.*",
15+
"magento/module-sales": "100.3.*",
16+
"magento/module-store": "100.3.*"
1417
},
1518
"suggest": {
1619
"magento/module-config": "100.3.*"

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

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,28 @@
11
{
22
"name": "magento/module-backend",
33
"description": "N/A",
4+
"config": {
5+
"sort-packages": true
6+
},
47
"require": {
5-
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
6-
"magento/module-store": "100.3.*",
7-
"magento/module-directory": "100.3.*",
8-
"magento/module-developer": "100.3.*",
9-
"magento/module-eav": "100.3.*",
10-
"magento/module-reports": "100.3.*",
11-
"magento/module-sales": "100.3.*",
12-
"magento/module-quote": "100.3.*",
13-
"magento/module-catalog": "101.2.*",
14-
"magento/module-user": "100.3.*",
15-
"magento/module-security": "100.3.*",
16-
"magento/module-backup": "100.3.*",
17-
"magento/module-customer": "100.3.*",
18-
"magento/module-translation": "100.3.*",
19-
"magento/module-require-js": "100.3.*",
20-
"magento/module-config": "100.3.*",
21-
"magento/module-ui": "100.3.*",
22-
"magento/framework": "100.3.*"
8+
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
9+
"magento/framework": "100.3.*",
10+
"magento/module-backup": "100.3.*",
11+
"magento/module-catalog": "101.2.*",
12+
"magento/module-config": "100.3.*",
13+
"magento/module-customer": "100.3.*",
14+
"magento/module-developer": "100.3.*",
15+
"magento/module-directory": "100.3.*",
16+
"magento/module-eav": "100.3.*",
17+
"magento/module-quote": "100.3.*",
18+
"magento/module-reports": "100.3.*",
19+
"magento/module-require-js": "100.3.*",
20+
"magento/module-sales": "100.3.*",
21+
"magento/module-security": "100.3.*",
22+
"magento/module-store": "100.3.*",
23+
"magento/module-translation": "100.3.*",
24+
"magento/module-ui": "100.3.*",
25+
"magento/module-user": "100.3.*"
2326
},
2427
"suggest": {
2528
"magento/module-theme": "100.3.*"

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
{
22
"name": "magento/module-backup",
33
"description": "N/A",
4+
"config": {
5+
"sort-packages": true
6+
},
47
"require": {
58
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
6-
"magento/module-store": "100.3.*",
9+
"magento/framework": "100.3.*",
710
"magento/module-backend": "100.3.*",
811
"magento/module-cron": "100.3.*",
9-
"magento/framework": "100.3.*"
12+
"magento/module-store": "100.3.*"
1013
},
1114
"type": "magento2-module",
1215
"version": "100.3.0-dev",

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

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,26 @@
11
{
22
"name": "magento/module-braintree",
33
"description": "N/A",
4+
"config": {
5+
"sort-packages": true
6+
},
47
"require": {
58
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
9+
"braintree/braintree_php": "3.22.0",
610
"magento/framework": "100.3.*",
711
"magento/magento-composer-installer": "*",
12+
"magento/module-catalog": "101.2.*",
13+
"magento/module-backend": "100.3.*",
14+
"magento/module-checkout": "100.3.*",
815
"magento/module-config": "100.3.*",
16+
"magento/module-customer": "100.3.*",
917
"magento/module-directory": "100.3.*",
1018
"magento/module-payment": "100.3.*",
11-
"magento/module-checkout": "100.3.*",
12-
"magento/module-sales": "100.3.*",
13-
"magento/module-backend": "100.3.*",
14-
"magento/module-vault": "100.3.*",
15-
"magento/module-customer": "100.3.*",
16-
"magento/module-catalog": "101.2.*",
17-
"magento/module-quote": "100.3.*",
1819
"magento/module-paypal": "100.3.*",
20+
"magento/module-quote": "100.3.*",
21+
"magento/module-sales": "100.3.*",
1922
"magento/module-ui": "100.3.*",
20-
"braintree/braintree_php": "3.22.0"
23+
"magento/module-vault": "100.3.*"
2124
},
2225
"suggest": {
2326
"magento/module-checkout-agreements": "100.3.*",

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

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,26 @@
11
{
22
"name": "magento/module-bundle",
33
"description": "N/A",
4+
"config": {
5+
"sort-packages": true
6+
},
47
"require": {
58
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
6-
"magento/module-store": "100.3.*",
7-
"magento/module-catalog": "101.2.*",
8-
"magento/module-tax": "100.3.*",
9+
"magento/framework": "100.3.*",
910
"magento/module-backend": "100.3.*",
10-
"magento/module-sales": "100.3.*",
11-
"magento/module-checkout": "100.3.*",
11+
"magento/module-catalog": "101.2.*",
1212
"magento/module-catalog-inventory": "100.3.*",
13-
"magento/module-customer": "100.3.*",
1413
"magento/module-catalog-rule": "100.3.*",
15-
"magento/module-eav": "100.3.*",
14+
"magento/module-checkout": "100.3.*",
1615
"magento/module-config": "100.3.*",
16+
"magento/module-customer": "100.3.*",
17+
"magento/module-eav": "100.3.*",
1718
"magento/module-gift-message": "100.3.*",
18-
"magento/framework": "100.3.*",
19-
"magento/module-quote": "100.3.*",
2019
"magento/module-media-storage": "100.3.*",
20+
"magento/module-quote": "100.3.*",
21+
"magento/module-sales": "100.3.*",
22+
"magento/module-store": "100.3.*",
23+
"magento/module-tax": "100.3.*",
2124
"magento/module-ui": "100.3.*"
2225
},
2326
"suggest": {

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
{
22
"name": "magento/module-bundle-import-export",
33
"description": "N/A",
4+
"config": {
5+
"sort-packages": true
6+
},
47
"require": {
58
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
9+
"magento/framework": "100.3.*",
10+
"magento/module-bundle": "100.3.*",
611
"magento/module-catalog": "101.2.*",
7-
"magento/module-import-export": "100.3.*",
812
"magento/module-catalog-import-export": "100.3.*",
9-
"magento/module-bundle": "100.3.*",
1013
"magento/module-eav": "100.3.*",
11-
"magento/framework": "100.3.*"
14+
"magento/module-import-export": "100.3.*"
1215
},
1316
"type": "magento2-module",
1417
"version": "100.3.0-dev",

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
{
22
"name": "magento/module-cache-invalidate",
33
"description": "N/A",
4+
"config": {
5+
"sort-packages": true
6+
},
47
"require": {
58
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
6-
"magento/module-page-cache": "100.3.*",
7-
"magento/framework": "100.3.*"
9+
"magento/framework": "100.3.*",
10+
"magento/module-page-cache": "100.3.*"
811
},
912
"type": "magento2-module",
1013
"version": "100.3.0-dev",

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

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
11
{
22
"name": "magento/module-captcha",
33
"description": "N/A",
4+
"config": {
5+
"sort-packages": true
6+
},
47
"require": {
58
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
6-
"magento/module-store": "100.3.*",
7-
"magento/module-customer": "100.3.*",
8-
"magento/module-checkout": "100.3.*",
9-
"magento/module-backend": "100.3.*",
109
"magento/framework": "100.3.*",
11-
"zendframework/zend-db": "^2.8.2",
10+
"magento/module-backend": "100.3.*",
11+
"magento/module-checkout": "100.3.*",
12+
"magento/module-customer": "100.3.*",
13+
"magento/module-store": "100.3.*",
1214
"zendframework/zend-captcha": "^2.7.1",
15+
"zendframework/zend-db": "^2.8.2",
1316
"zendframework/zend-session": "^2.7.3"
1417
},
1518
"type": "magento2-module",

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

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,35 @@
11
{
22
"name": "magento/module-catalog",
33
"description": "N/A",
4+
"config": {
5+
"sort-packages": true
6+
},
47
"require": {
58
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
6-
"magento/module-store": "100.3.*",
7-
"magento/module-eav": "100.3.*",
8-
"magento/module-cms": "101.2.*",
9-
"magento/module-indexer": "100.3.*",
10-
"magento/module-customer": "100.3.*",
11-
"magento/module-theme": "100.3.*",
12-
"magento/module-checkout": "100.3.*",
9+
"magento/framework": "100.3.*",
1310
"magento/module-backend": "100.3.*",
14-
"magento/module-widget": "100.3.*",
15-
"magento/module-wishlist": "100.3.*",
16-
"magento/module-tax": "100.3.*",
17-
"magento/module-msrp": "100.3.*",
1811
"magento/module-catalog-inventory": "100.3.*",
19-
"magento/module-directory": "100.3.*",
2012
"magento/module-catalog-rule": "100.3.*",
21-
"magento/module-product-alert": "100.3.*",
22-
"magento/module-url-rewrite": "100.3.*",
2313
"magento/module-catalog-url-rewrite": "100.3.*",
24-
"magento/module-page-cache": "100.3.*",
25-
"magento/module-quote": "100.3.*",
14+
"magento/module-checkout": "100.3.*",
15+
"magento/module-cms": "101.2.*",
2616
"magento/module-config": "100.3.*",
17+
"magento/module-customer": "100.3.*",
18+
"magento/module-directory": "100.3.*",
19+
"magento/module-eav": "100.3.*",
20+
"magento/module-indexer": "100.3.*",
2721
"magento/module-media-storage": "100.3.*",
28-
"magento/framework": "100.3.*",
29-
"magento/module-ui": "100.3.*"
22+
"magento/module-msrp": "100.3.*",
23+
"magento/module-page-cache": "100.3.*",
24+
"magento/module-product-alert": "100.3.*",
25+
"magento/module-quote": "100.3.*",
26+
"magento/module-store": "100.3.*",
27+
"magento/module-tax": "100.3.*",
28+
"magento/module-theme": "100.3.*",
29+
"magento/module-ui": "100.3.*",
30+
"magento/module-url-rewrite": "100.3.*",
31+
"magento/module-widget": "100.3.*",
32+
"magento/module-wishlist": "100.3.*"
3033
},
3134
"suggest": {
3235
"magento/module-cookie": "100.3.*",

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

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,22 @@
11
{
22
"name": "magento/module-catalog-import-export",
33
"description": "N/A",
4+
"config": {
5+
"sort-packages": true
6+
},
47
"require": {
58
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
9+
"ext-ctype": "*",
10+
"magento/framework": "100.3.*",
611
"magento/module-catalog": "101.2.*",
12+
"magento/module-catalog-inventory": "100.3.*",
713
"magento/module-catalog-url-rewrite": "100.3.*",
14+
"magento/module-customer": "100.3.*",
815
"magento/module-eav": "100.3.*",
916
"magento/module-import-export": "100.3.*",
10-
"magento/module-store": "100.3.*",
11-
"magento/module-tax": "100.3.*",
12-
"magento/module-catalog-inventory": "100.3.*",
1317
"magento/module-media-storage": "100.3.*",
14-
"magento/module-customer": "100.3.*",
15-
"magento/framework": "100.3.*",
16-
"ext-ctype": "*"
18+
"magento/module-store": "100.3.*",
19+
"magento/module-tax": "100.3.*"
1720
},
1821
"type": "magento2-module",
1922
"version": "100.3.0-dev",

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
11
{
22
"name": "magento/module-catalog-inventory",
33
"description": "N/A",
4+
"config": {
5+
"sort-packages": true
6+
},
47
"require": {
58
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
6-
"magento/module-config": "100.3.*",
7-
"magento/module-store": "100.3.*",
9+
"magento/framework": "100.3.*",
810
"magento/module-catalog": "101.2.*",
11+
"magento/module-config": "100.3.*",
912
"magento/module-customer": "100.3.*",
1013
"magento/module-eav": "100.3.*",
1114
"magento/module-quote": "100.3.*",
12-
"magento/framework": "100.3.*",
15+
"magento/module-store": "100.3.*",
1316
"magento/module-ui": "100.3.*"
1417
},
1518
"type": "magento2-module",

0 commit comments

Comments
 (0)