Skip to content

Commit c32358a

Browse files
authored
MC-42131: MCP can't be installed with Magento 2.3.7 due to the composer dependencies conflict (#26)
1 parent f1355ef commit c32358a

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
"name": "magento/magento-cloud-patches",
33
"description": "Provides critical fixes for Magento 2 Enterprise Edition",
44
"type": "magento2-component",
5-
"version": "1.0.9",
5+
"version": "1.0.10",
66
"license": "OSL-3.0",
77
"require": {
88
"php": "^7.0",
99
"ext-json": "*",
1010
"composer/composer": "@stable",
11-
"composer/semver": "^1.5",
11+
"composer/semver": "^1.5||^2.0||^3.0",
1212
"symfony/config": "^3.3||^4.4||^5.1",
1313
"symfony/console": "^2.6||^4.0||^5.1",
1414
"symfony/dependency-injection": "^3.3||^4.3||^5.1",

src/Test/Functional/Acceptance/Acceptance73Cest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,10 @@ protected function patchesDataProvider(): array
2424
['templateVersion' => '2.3.4', 'magentoVersion' => '2.3.4-p2'],
2525
['templateVersion' => '2.3.5', 'magentoVersion' => '2.3.5'],
2626
['templateVersion' => '2.3.5', 'magentoVersion' => '2.3.5-p1'],
27+
['templateVersion' => '2.3.5', 'magentoVersion' => '2.3.5-p2'],
2728
['templateVersion' => '2.3.6', 'magentoVersion' => '2.3.6'],
29+
['templateVersion' => '2.3.6', 'magentoVersion' => '2.3.6-p1'],
30+
['templateVersion' => '2.3.6', 'magentoVersion' => '2.3.7'],
2831
['templateVersion' => '2.4.0', 'magentoVersion' => '2.4.0'],
2932
];
3033
}

src/Test/Functional/Acceptance/AcceptanceCest.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,10 @@ protected function patchesDataProvider(): array
5151
return [
5252
['templateVersion' => '2.4.0', 'magentoVersion' => '2.4.0'],
5353
['templateVersion' => '2.4.0', 'magentoVersion' => '2.4.0-p1'],
54-
['templateVersion' => '2.4.1'],
54+
['templateVersion' => '2.4.1', 'magentoVersion' => '2.4.1'],
55+
['templateVersion' => '2.4.1', 'magentoVersion' => '2.4.1-p1'],
56+
['templateVersion' => '2.4.2', 'magentoVersion' => '2.4.2'],
57+
['templateVersion' => '2.4.2', 'magentoVersion' => '2.4.2-p1'],
5558
['templateVersion' => 'master'],
5659
];
5760
}

0 commit comments

Comments
 (0)