Skip to content
This repository was archived by the owner on Apr 29, 2019. It is now read-only.

Commit 758f382

Browse files
author
Joan He
committed
Merge remote-tracking branch 'upstream/2.3-develop' into libs-upgrade
# Conflicts: # app/code/Magento/AdvancedPricingImportExport/composer.json # app/code/Magento/AdvancedSearch/composer.json # app/code/Magento/Amqp/composer.json # app/code/Magento/Analytics/composer.json # app/code/Magento/AsynchronousOperations/composer.json # app/code/Magento/Authorization/composer.json # app/code/Magento/Authorizenet/composer.json # app/code/Magento/Backend/composer.json # app/code/Magento/Backup/composer.json # app/code/Magento/Braintree/composer.json # app/code/Magento/Bundle/composer.json # app/code/Magento/BundleGraphQl/composer.json # app/code/Magento/BundleImportExport/composer.json # app/code/Magento/CacheInvalidate/composer.json # app/code/Magento/Captcha/composer.json # app/code/Magento/Catalog/composer.json # app/code/Magento/CatalogAnalytics/composer.json # app/code/Magento/CatalogGraphQl/composer.json # app/code/Magento/CatalogInventory/composer.json # app/code/Magento/CatalogRule/composer.json # app/code/Magento/CatalogRuleConfigurable/composer.json # app/code/Magento/CatalogSearch/composer.json # app/code/Magento/CatalogUrlRewrite/composer.json # app/code/Magento/CatalogUrlRewriteGraphQl/composer.json # app/code/Magento/CatalogWidget/composer.json # app/code/Magento/Checkout/composer.json # app/code/Magento/CheckoutAgreements/composer.json # app/code/Magento/Cms/composer.json # app/code/Magento/CmsUrlRewrite/composer.json # app/code/Magento/CmsUrlRewriteGraphQl/composer.json # app/code/Magento/Config/composer.json # app/code/Magento/ConfigurableImportExport/composer.json # app/code/Magento/ConfigurableProduct/composer.json # app/code/Magento/ConfigurableProductGraphQl/composer.json # app/code/Magento/ConfigurableProductSales/composer.json # app/code/Magento/Contact/composer.json # app/code/Magento/Cookie/composer.json # app/code/Magento/Cron/composer.json # app/code/Magento/CurrencySymbol/composer.json # app/code/Magento/Customer/composer.json # app/code/Magento/CustomerAnalytics/composer.json # app/code/Magento/CustomerGraphQl/composer.json # app/code/Magento/CustomerImportExport/composer.json # app/code/Magento/Deploy/composer.json # app/code/Magento/Developer/composer.json # app/code/Magento/Downloadable/composer.json # app/code/Magento/DownloadableGraphQl/composer.json # app/code/Magento/DownloadableImportExport/composer.json # app/code/Magento/Eav/composer.json # app/code/Magento/EavGraphQl/composer.json # app/code/Magento/Elasticsearch/composer.json # app/code/Magento/Email/composer.json # app/code/Magento/EncryptionKey/composer.json # app/code/Magento/GiftMessage/composer.json # app/code/Magento/GoogleAdwords/composer.json # app/code/Magento/GoogleAnalytics/composer.json # app/code/Magento/GoogleOptimizer/composer.json # app/code/Magento/GraphQl/composer.json # app/code/Magento/GroupedImportExport/composer.json # app/code/Magento/GroupedProduct/composer.json # app/code/Magento/GroupedProductGraphQl/composer.json # app/code/Magento/Indexer/composer.json # app/code/Magento/InstantPurchase/composer.json # app/code/Magento/Integration/composer.json # app/code/Magento/LayeredNavigation/composer.json # app/code/Magento/Marketplace/composer.json # app/code/Magento/MediaStorage/composer.json # app/code/Magento/Msrp/composer.json # app/code/Magento/Multishipping/composer.json # app/code/Magento/MysqlMq/composer.json # app/code/Magento/NewRelicReporting/composer.json # app/code/Magento/Newsletter/composer.json # app/code/Magento/OfflinePayments/composer.json # app/code/Magento/OfflineShipping/composer.json # app/code/Magento/PageCache/composer.json # app/code/Magento/Payment/composer.json # app/code/Magento/Persistent/composer.json # app/code/Magento/ProductAlert/composer.json # app/code/Magento/ProductVideo/composer.json # app/code/Magento/Quote/composer.json # app/code/Magento/QuoteAnalytics/composer.json # app/code/Magento/ReleaseNotification/composer.json # app/code/Magento/Reports/composer.json # app/code/Magento/RequireJs/composer.json # app/code/Magento/Review/composer.json # app/code/Magento/ReviewAnalytics/composer.json # app/code/Magento/Robots/composer.json # app/code/Magento/Rss/composer.json # app/code/Magento/Sales/composer.json # app/code/Magento/SalesAnalytics/composer.json # app/code/Magento/SalesInventory/composer.json # app/code/Magento/SalesRule/composer.json # app/code/Magento/SalesSequence/composer.json # app/code/Magento/SampleData/composer.json # app/code/Magento/Search/composer.json # app/code/Magento/Security/composer.json # app/code/Magento/SendFriend/composer.json # app/code/Magento/Signifyd/composer.json # app/code/Magento/Sitemap/composer.json # app/code/Magento/Store/composer.json # app/code/Magento/Swagger/composer.json # app/code/Magento/SwaggerWebapi/composer.json # app/code/Magento/SwaggerWebapiAsync/composer.json # app/code/Magento/Swatches/composer.json # app/code/Magento/SwatchesGraphQl/composer.json # app/code/Magento/SwatchesLayeredNavigation/composer.json # app/code/Magento/Tax/composer.json # app/code/Magento/TaxGraphQl/composer.json # app/code/Magento/TaxImportExport/composer.json # app/code/Magento/Theme/composer.json # app/code/Magento/Tinymce3/composer.json # app/code/Magento/Translation/composer.json # app/code/Magento/Ui/composer.json # app/code/Magento/Ups/composer.json # app/code/Magento/UrlRewrite/composer.json # app/code/Magento/UrlRewriteGraphQl/composer.json # app/code/Magento/User/composer.json # app/code/Magento/Variable/composer.json # app/code/Magento/Vault/composer.json # app/code/Magento/Version/composer.json # app/code/Magento/Webapi/composer.json # app/code/Magento/WebapiAsync/composer.json # app/code/Magento/WebapiSecurity/composer.json # app/code/Magento/Weee/composer.json # app/code/Magento/WeeeGraphQl/composer.json # app/code/Magento/Widget/composer.json # app/code/Magento/Wishlist/composer.json # app/code/Magento/WishlistAnalytics/composer.json # app/design/adminhtml/Magento/backend/composer.json # app/design/frontend/Magento/blank/composer.json # app/design/frontend/Magento/luma/composer.json # app/design/frontend/Magento/rush/composer.json # composer.lock # dev/tests/api-functional/_files/Magento/TestModuleIntegrationFromConfig/composer.json # dev/tests/api-functional/_files/Magento/TestModuleJoinDirectives/composer.json # dev/tests/integration/_files/Magento/TestModuleMessageQueueConfigOverride/composer.json # dev/tests/integration/_files/Magento/TestModuleMessageQueueConfiguration/composer.json # dev/tests/integration/_files/Magento/TestModuleSample/composer.json # dev/tests/integration/testsuite/Magento/Deploy/_files/zoom1/composer.json # dev/tests/integration/testsuite/Magento/Deploy/_files/zoom2/composer.json # dev/tests/integration/testsuite/Magento/Deploy/_files/zoom3/composer.json # dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/root/app/code/Magento/B/composer.json # dev/tests/integration/testsuite/Magento/Widget/_files/design/adminhtml/magento_basic/composer.json # lib/internal/Magento/Framework/Amqp/composer.json # lib/internal/Magento/Framework/Bulk/composer.json # lib/internal/Magento/Framework/MessageQueue/composer.json
2 parents 5999dfa + 81b10b7 commit 758f382

File tree

270 files changed

+11362
-3375
lines changed

Some content is hidden

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

270 files changed

+11362
-3375
lines changed

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

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,13 @@
77
"require": {
88
"php": "~7.1.3||~7.2.0",
99
"lib-libxml": "*",
10-
"magento/framework": "100.3.*",
11-
"magento/module-backend": "100.3.*",
12-
"magento/module-media-storage": "100.3.*",
13-
"magento/module-store": "100.3.*",
14-
"magento/module-ui": "100.3.*"
10+
"magento/framework": "*",
11+
"magento/module-backend": "*",
12+
"magento/module-media-storage": "*",
13+
"magento/module-store": "*",
14+
"magento/module-ui": "*"
1515
},
1616
"type": "magento2-module",
17-
"version": "100.3.0-dev",
1817
"license": [
1918
"OSL-3.0",
2019
"AFL-3.0"

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

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,16 @@
66
},
77
"require": {
88
"php": "~7.1.3||~7.2.0",
9-
"magento/framework": "100.3.*",
10-
"magento/module-catalog": "101.2.*",
11-
"magento/module-catalog-import-export": "100.3.*",
12-
"magento/module-catalog-inventory": "100.3.*",
13-
"magento/module-customer": "100.3.*",
14-
"magento/module-eav": "100.3.*",
15-
"magento/module-import-export": "100.3.*",
16-
"magento/module-store": "100.3.*"
9+
"magento/framework": "*",
10+
"magento/module-catalog": "*",
11+
"magento/module-catalog-import-export": "*",
12+
"magento/module-catalog-inventory": "*",
13+
"magento/module-customer": "*",
14+
"magento/module-eav": "*",
15+
"magento/module-import-export": "*",
16+
"magento/module-store": "*"
1717
},
1818
"type": "magento2-module",
19-
"version": "100.3.0-dev",
2019
"license": [
2120
"OSL-3.0",
2221
"AFL-3.0"

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

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,17 @@
55
"sort-packages": true
66
},
77
"require": {
8-
"magento/framework": "100.3.*",
9-
"magento/module-backend": "100.3.*",
10-
"magento/module-catalog": "101.2.*",
11-
"magento/module-catalog-search": "100.3.*",
12-
"magento/module-config": "100.3.*",
13-
"magento/module-customer": "100.3.*",
14-
"magento/module-search": "100.3.*",
15-
"magento/module-store": "100.3.*",
8+
"magento/framework": "*",
9+
"magento/module-backend": "*",
10+
"magento/module-catalog": "*",
11+
"magento/module-catalog-search": "*",
12+
"magento/module-config": "*",
13+
"magento/module-customer": "*",
14+
"magento/module-search": "*",
15+
"magento/module-store": "*",
1616
"php": "~7.1.3||~7.2.0"
1717
},
1818
"type": "magento2-module",
19-
"version": "100.3.0-dev",
2019
"license": [
2120
"proprietary"
2221
],

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,12 @@
55
"sort-packages": true
66
},
77
"require": {
8-
"magento/framework": "100.3.*",
9-
"magento/framework-amqp": "100.1.*",
10-
"magento/framework-message-queue": "100.3.*",
8+
"magento/framework": "*",
9+
"magento/framework-amqp": "*",
10+
"magento/framework-message-queue": "*",
1111
"php": "~7.1.3||~7.2.0"
1212
},
1313
"type": "magento2-module",
14-
"version": "100.3.0-dev",
1514
"license": [
1615
"proprietary"
1716
],

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

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,13 @@
33
"description": "N/A",
44
"require": {
55
"php": "~7.1.3||~7.2.0",
6-
"magento/module-backend": "100.3.*",
7-
"magento/module-config": "100.3.*",
8-
"magento/module-integration": "100.3.*",
9-
"magento/module-store": "100.3.*",
10-
"magento/framework": "100.3.*"
6+
"magento/module-backend": "*",
7+
"magento/module-config": "*",
8+
"magento/module-integration": "*",
9+
"magento/module-store": "*",
10+
"magento/framework": "*"
1111
},
1212
"type": "magento2-module",
13-
"version": "100.3.0-dev",
1413
"license": [
1514
"OSL-3.0",
1615
"AFL-3.0"

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

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,19 @@
55
"sort-packages": true
66
},
77
"require": {
8-
"magento/framework": "100.3.*",
9-
"magento/framework-bulk": "100.3.*",
10-
"magento/module-authorization": "100.3.*",
11-
"magento/module-backend": "100.3.*",
12-
"magento/module-ui": "100.3.*",
13-
"magento/module-user": "100.3.*",
8+
"magento/framework": "*",
9+
"magento/framework-bulk": "*",
10+
"magento/module-authorization": "*",
11+
"magento/module-backend": "*",
12+
"magento/module-ui": "*",
13+
"magento/module-user": "*",
1414
"php": "~7.1.3||~7.2.0"
1515
},
1616
"suggest": {
17-
"magento/module-admin-notification": "100.3.*",
18-
"magento/module-logging": "100.3.*"
17+
"magento/module-admin-notification": "*",
18+
"magento/module-logging": "*"
1919
},
2020
"type": "magento2-module",
21-
"version": "100.3.0-dev",
2221
"license": [
2322
"proprietary"
2423
],

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,10 @@
66
},
77
"require": {
88
"php": "~7.1.3||~7.2.0",
9-
"magento/framework": "100.3.*",
10-
"magento/module-backend": "100.3.*"
9+
"magento/framework": "*",
10+
"magento/module-backend": "*"
1111
},
1212
"type": "magento2-module",
13-
"version": "100.3.0-dev",
1413
"license": [
1514
"OSL-3.0",
1615
"AFL-3.0"

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

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,19 @@
66
},
77
"require": {
88
"php": "~7.1.3||~7.2.0",
9-
"magento/framework": "100.3.*",
10-
"magento/module-backend": "100.3.*",
11-
"magento/module-catalog": "101.2.*",
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.*"
9+
"magento/framework": "*",
10+
"magento/module-backend": "*",
11+
"magento/module-catalog": "*",
12+
"magento/module-checkout": "*",
13+
"magento/module-payment": "*",
14+
"magento/module-quote": "*",
15+
"magento/module-sales": "*",
16+
"magento/module-store": "*"
1717
},
1818
"suggest": {
19-
"magento/module-config": "100.3.*"
19+
"magento/module-config": "*"
2020
},
2121
"type": "magento2-module",
22-
"version": "100.3.0-dev",
2322
"license": [
2423
"proprietary"
2524
],

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

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,29 +6,28 @@
66
},
77
"require": {
88
"php": "~7.1.3||~7.2.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.*"
9+
"magento/framework": "*",
10+
"magento/module-backup": "*",
11+
"magento/module-catalog": "*",
12+
"magento/module-config": "*",
13+
"magento/module-customer": "*",
14+
"magento/module-developer": "*",
15+
"magento/module-directory": "*",
16+
"magento/module-eav": "*",
17+
"magento/module-quote": "*",
18+
"magento/module-reports": "*",
19+
"magento/module-require-js": "*",
20+
"magento/module-sales": "*",
21+
"magento/module-security": "*",
22+
"magento/module-store": "*",
23+
"magento/module-translation": "*",
24+
"magento/module-ui": "*",
25+
"magento/module-user": "*"
2626
},
2727
"suggest": {
28-
"magento/module-theme": "100.3.*"
28+
"magento/module-theme": "*"
2929
},
3030
"type": "magento2-module",
31-
"version": "100.3.0-dev",
3231
"license": [
3332
"OSL-3.0",
3433
"AFL-3.0"

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,12 @@
66
},
77
"require": {
88
"php": "~7.1.3||~7.2.0",
9-
"magento/framework": "100.3.*",
10-
"magento/module-backend": "100.3.*",
11-
"magento/module-cron": "100.3.*",
12-
"magento/module-store": "100.3.*"
9+
"magento/framework": "*",
10+
"magento/module-backend": "*",
11+
"magento/module-cron": "*",
12+
"magento/module-store": "*"
1313
},
1414
"type": "magento2-module",
15-
"version": "100.3.0-dev",
1615
"license": [
1716
"OSL-3.0",
1817
"AFL-3.0"

0 commit comments

Comments
 (0)