Skip to content

Commit 4e8490b

Browse files
magento-teammagento-team
committed
Merge changes from 2.3.3-rc
2 parents ae32d4b + 4afd60e commit 4e8490b

File tree

21 files changed

+117
-72
lines changed

21 files changed

+117
-72
lines changed

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,13 @@
22
"name": "magento/module-bundle-sample-data",
33
"description": "N/A",
44
"require": {
5-
"php": "~7.1.3||~7.2.0",
5+
"php": "~7.1.3||~7.2.0||~7.3.0",
6+
"magento/framework": "102.0.*",
67
"magento/module-bundle": "100.3.*",
7-
"magento/module-sample-data": "100.3.*",
88
"magento/module-catalog-sample-data": "100.3.*",
9-
"magento/module-store": "101.0.*"
9+
"magento/module-store": "101.0.*",
10+
"magento/module-catalog": "103.0.*",
11+
"magento/module-eav": "102.0.*"
1012
},
1113
"type": "magento2-module",
1214
"license": [
@@ -21,5 +23,5 @@
2123
"Magento\\BundleSampleData\\": ""
2224
}
2325
},
24-
"version": "100.3.2"
26+
"version": "100.3.3"
2527
}

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,12 @@
22
"name": "magento/module-catalog-rule-sample-data",
33
"description": "N/A",
44
"require": {
5-
"php": "~7.1.3||~7.2.0",
5+
"php": "~7.1.3||~7.2.0||~7.3.0",
6+
"magento/framework": "102.0.*",
67
"magento/module-catalog-rule": "101.1.*",
7-
"magento/module-sample-data": "100.3.*"
8+
"magento/module-store": "101.0.*",
9+
"magento/module-customer": "102.0.*",
10+
"magento/module-catalog": "103.0.*"
811
},
912
"type": "magento2-module",
1013
"license": [
@@ -19,5 +22,5 @@
1922
"Magento\\CatalogRuleSampleData\\": ""
2023
}
2124
},
22-
"version": "100.3.2"
25+
"version": "100.3.3"
2326
}

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,11 @@
22
"name": "magento/module-catalog-sample-data",
33
"description": "N/A",
44
"require": {
5-
"php": "~7.1.3||~7.2.0",
6-
"magento/module-sample-data": "100.3.*"
5+
"php": "~7.1.3||~7.2.0||~7.3.0",
6+
"magento/framework": "102.0.*",
7+
"magento/module-store": "101.0.*",
8+
"magento/module-eav": "102.0.*",
9+
"magento/module-catalog": "103.0.*"
710
},
811
"type": "magento2-module",
912
"license": [
@@ -18,5 +21,5 @@
1821
"Magento\\CatalogSampleData\\": ""
1922
}
2023
},
21-
"version": "100.3.2"
24+
"version": "100.3.3"
2225
}

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,14 @@
22
"name": "magento/module-cms-sample-data",
33
"description": "N/A",
44
"require": {
5-
"php": "~7.1.3||~7.2.0",
5+
"php": "~7.1.3||~7.2.0||~7.3.0",
6+
"magento/framework": "102.0.*",
67
"magento/module-cms": "103.0.*",
7-
"magento/module-sample-data": "100.3.*",
88
"magento/module-theme-sample-data": "100.3.*",
9-
"magento/sample-data-media": "100.3.*"
9+
"magento/module-catalog-sample-data": "100.3.*",
10+
"magento/module-catalog": "103.0.*",
11+
"magento/module-store": "101.0.*",
12+
"magento/module-eav": "102.0.*"
1013
},
1114
"type": "magento2-module",
1215
"license": [
@@ -21,5 +24,5 @@
2124
"Magento\\CmsSampleData\\": ""
2225
}
2326
},
24-
"version": "100.3.2"
27+
"version": "100.3.3"
2528
}

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

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,15 @@
22
"name": "magento/module-configurable-sample-data",
33
"description": "N/A",
44
"require": {
5-
"php": "~7.1.3||~7.2.0",
5+
"php": "~7.1.3||~7.2.0||~7.3.0",
6+
"magento/framework": "102.0.*",
67
"magento/module-configurable-product": "100.3.*",
7-
"magento/module-sample-data": "100.3.*",
8-
"magento/module-product-links-sample-data": "100.3.*"
8+
"magento/module-product-links-sample-data": "100.3.*",
9+
"magento/module-indexer": "100.3.*",
10+
"magento/module-catalog-sample-data": "100.3.*",
11+
"magento/module-import-export": "100.3.*",
12+
"magento/module-eav": "102.0.*",
13+
"magento/module-catalog": "103.0.*"
914
},
1015
"type": "magento2-module",
1116
"license": [
@@ -20,5 +25,5 @@
2025
"Magento\\ConfigurableSampleData\\": ""
2126
}
2227
},
23-
"version": "100.3.2"
28+
"version": "100.3.3"
2429
}

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,11 @@
22
"name": "magento/module-customer-sample-data",
33
"description": "N/A",
44
"require": {
5-
"php": "~7.1.3||~7.2.0",
6-
"magento/module-sample-data": "100.3.*"
5+
"php": "~7.1.3||~7.2.0||~7.3.0",
6+
"magento/framework": "102.0.*",
7+
"magento/module-customer": "102.0.*",
8+
"magento/module-directory": "100.3.*",
9+
"magento/module-store": "101.0.*"
710
},
811
"type": "magento2-module",
912
"license": [
@@ -18,5 +21,5 @@
1821
"Magento\\CustomerSampleData\\": ""
1922
}
2023
},
21-
"version": "100.3.2"
24+
"version": "100.3.3"
2225
}

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@
22
"name": "magento/module-downloadable-sample-data",
33
"description": "N/A",
44
"require": {
5-
"php": "~7.1.3||~7.2.0",
6-
"magento/module-sample-data": "100.3.*",
5+
"php": "~7.1.3||~7.2.0||~7.3.0",
6+
"magento/framework": "102.0.*",
77
"magento/module-catalog-sample-data": "100.3.*",
88
"magento/module-downloadable": "100.3.*",
9-
"magento/sample-data-media": "100.3.*",
10-
"magento/module-store": "101.0.*"
9+
"magento/module-store": "101.0.*",
10+
"magento/module-eav": "102.0.*",
11+
"magento/module-catalog": "103.0.*"
1112
},
1213
"type": "magento2-module",
1314
"license": [
@@ -22,5 +23,5 @@
2223
"Magento\\DownloadableSampleData\\": ""
2324
}
2425
},
25-
"version": "100.3.2"
26+
"version": "100.3.3"
2627
}

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,13 @@
22
"name": "magento/module-grouped-product-sample-data",
33
"description": "N/A",
44
"require": {
5-
"php": "~7.1.3||~7.2.0",
6-
"magento/module-sample-data": "100.3.*",
5+
"php": "~7.1.3||~7.2.0||~7.3.0",
6+
"magento/framework": "102.0.*",
77
"magento/module-catalog-sample-data": "100.3.*",
88
"magento/module-grouped-product": "100.3.*",
9-
"magento/module-store": "101.0.*"
9+
"magento/module-store": "101.0.*",
10+
"magento/module-catalog": "103.0.*",
11+
"magento/module-eav": "102.0.*"
1012
},
1113
"type": "magento2-module",
1214
"license": [
@@ -21,5 +23,5 @@
2123
"Magento\\GroupedProductSampleData\\": ""
2224
}
2325
},
24-
"version": "100.3.2"
26+
"version": "100.3.3"
2527
}

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22
"name": "magento/module-msrp-sample-data",
33
"description": "N/A",
44
"require": {
5-
"php": "~7.1.3||~7.2.0",
6-
"magento/module-sample-data": "100.3.*",
7-
"magento/module-msrp": "100.3.*"
5+
"php": "~7.1.3||~7.2.0||~7.3.0",
6+
"magento/framework": "102.0.*",
7+
"magento/module-msrp": "100.3.*",
8+
"magento/module-customer": "102.0.*",
9+
"magento/module-catalog": "103.0.*"
810
},
911
"type": "magento2-module",
1012
"license": [
@@ -19,5 +21,5 @@
1921
"Magento\\MsrpSampleData\\": ""
2022
}
2123
},
22-
"version": "100.3.2"
24+
"version": "100.3.3"
2325
}

‎app/code/Magento/MsrpSampleData/etc/module.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<sequence>
1111
<module name="Magento_Msrp"/>
1212
<module name="Magento_SampleData"/>
13+
<module name="Magento_ConfigurableSampleData"/>
1314
</sequence>
1415
</module>
1516
</config>

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@
22
"name": "magento/module-offline-shipping-sample-data",
33
"description": "N/A",
44
"require": {
5-
"php": "~7.1.3||~7.2.0",
6-
"magento/module-sample-data": "100.3.*",
5+
"php": "~7.1.3||~7.2.0||~7.3.0",
6+
"magento/framework": "102.0.*",
77
"magento/module-offline-shipping": "100.3.*",
8-
"magento/module-directory": "100.3.*"
8+
"magento/module-directory": "100.3.*",
9+
"magento/module-config": "101.1.*",
10+
"magento/module-store": "101.0.*"
911
},
1012
"type": "magento2-module",
1113
"license": [
@@ -20,5 +22,5 @@
2022
"Magento\\OfflineShippingSampleData\\": ""
2123
}
2224
},
23-
"version": "100.3.2"
25+
"version": "100.3.3"
2426
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
"name": "magento/module-product-links-sample-data",
33
"description": "N/A",
44
"require": {
5-
"php": "~7.1.3||~7.2.0",
6-
"magento/module-catalog-sample-data": "100.3.*",
7-
"magento/module-sample-data": "100.3.*"
5+
"php": "~7.1.3||~7.2.0||~7.3.0",
6+
"magento/framework": "102.0.*",
7+
"magento/module-catalog": "103.0.*"
88
},
99
"type": "magento2-module",
1010
"license": [
@@ -19,5 +19,5 @@
1919
"Magento\\ProductLinksSampleData\\": ""
2020
}
2121
},
22-
"version": "100.3.2"
22+
"version": "100.3.3"
2323
}

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,12 @@
22
"name": "magento/module-review-sample-data",
33
"description": "N/A",
44
"require": {
5-
"php": "~7.1.3||~7.2.0",
6-
"magento/module-sample-data": "100.3.*",
7-
"magento/module-review": "100.3.*"
5+
"php": "~7.1.3||~7.2.0||~7.3.0",
6+
"magento/framework": "102.0.*",
7+
"magento/module-review": "100.3.*",
8+
"magento/module-customer": "102.0.*",
9+
"magento/module-catalog": "103.0.*",
10+
"magento/module-store": "101.0.*"
811
},
912
"type": "magento2-module",
1013
"license": [
@@ -19,5 +22,5 @@
1922
"Magento\\ReviewSampleData\\": ""
2023
}
2124
},
22-
"version": "100.3.2"
25+
"version": "100.3.3"
2326
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
"name": "magento/module-sales-rule-sample-data",
33
"description": "N/A",
44
"require": {
5-
"php": "~7.1.3||~7.2.0",
6-
"magento/module-sample-data": "100.3.*",
5+
"php": "~7.1.3||~7.2.0||~7.3.0",
6+
"magento/framework": "102.0.*",
77
"magento/module-catalog-rule-sample-data": "100.3.*",
88
"magento/module-sales-rule": "101.1.*",
99
"magento/module-eav": "102.0.*"
@@ -21,5 +21,5 @@
2121
"Magento\\SalesRuleSampleData\\": ""
2222
}
2323
},
24-
"version": "100.3.2"
24+
"version": "100.3.3"
2525
}

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

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,17 @@
22
"name": "magento/module-sales-sample-data",
33
"description": "N/A",
44
"require": {
5-
"php": "~7.1.3||~7.2.0",
5+
"php": "~7.1.3||~7.2.0||~7.3.0",
6+
"magento/framework": "102.0.*",
67
"magento/module-sales": "102.0.*",
7-
"magento/module-sample-data": "100.3.*",
8-
"magento/module-configurable-sample-data": "100.3.*"
8+
"magento/module-configurable-sample-data": "100.3.*",
9+
"magento/module-catalog-inventory": "100.3.*",
10+
"magento/module-customer": "102.0.*",
11+
"magento/module-catalog": "103.0.*",
12+
"magento/module-eav": "102.0.*",
13+
"magento/module-backend": "101.0.*",
14+
"magento/module-shipping": "100.3.*",
15+
"magento/module-store": "101.0.*"
916
},
1017
"type": "magento2-module",
1118
"license": [
@@ -20,5 +27,5 @@
2027
"Magento\\SalesSampleData\\": ""
2128
}
2229
},
23-
"version": "100.3.2"
30+
"version": "100.3.3"
2431
}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
"name": "magento/module-swatches-sample-data",
33
"description": "N/A",
44
"require": {
5-
"php": "~7.1.3||~7.2.0",
6-
"magento/module-swatches": "100.3.*",
7-
"magento/module-sample-data": "100.3.*",
8-
"magento/module-eav": "102.0.*"
5+
"php": "~7.1.3||~7.2.0||~7.3.0",
6+
"magento/framework": "102.0.*",
7+
"magento/module-eav": "102.0.*",
8+
"magento/module-catalog": "103.0.*"
99
},
1010
"type": "magento2-module",
1111
"license": [
@@ -20,5 +20,5 @@
2020
"Magento\\SwatchesSampleData\\": ""
2121
}
2222
},
23-
"version": "100.3.2"
23+
"version": "100.3.3"
2424
}

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22
"name": "magento/module-tax-sample-data",
33
"description": "N/A",
44
"require": {
5-
"php": "~7.1.3||~7.2.0",
5+
"php": "~7.1.3||~7.2.0||~7.3.0",
6+
"magento/framework": "102.0.*",
67
"magento/module-tax": "100.3.*",
7-
"magento/module-sample-data": "100.3.*"
8+
"magento/module-directory": "100.3.*"
89
},
910
"type": "magento2-module",
1011
"license": [
@@ -19,5 +20,5 @@
1920
"Magento\\TaxSampleData\\": ""
2021
}
2122
},
22-
"version": "100.3.2"
23+
"version": "100.3.3"
2324
}

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22
"name": "magento/module-theme-sample-data",
33
"description": "N/A",
44
"require": {
5-
"php": "~7.1.3||~7.2.0",
5+
"php": "~7.1.3||~7.2.0||~7.3.0",
6+
"magento/framework": "102.0.*",
67
"magento/module-theme": "101.0.*",
7-
"magento/module-sample-data": "100.3.*"
8+
"magento/module-store": "101.0.*"
89
},
910
"type": "magento2-module",
1011
"license": [
@@ -19,5 +20,5 @@
1920
"Magento\\ThemeSampleData\\": ""
2021
}
2122
},
22-
"version": "100.3.2"
23+
"version": "100.3.3"
2324
}

0 commit comments

Comments
 (0)