Skip to content

Commit 9b2862d

Browse files
authored
Merge pull request #6665 from magento-trigger/MC-40111
[TR] Add support for Composer 2 for 2.3.7
2 parents 1444857 + ceae56e commit 9b2862d

File tree

8 files changed

+923
-218
lines changed

8 files changed

+923
-218
lines changed

composer.json

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,6 @@
1010
"preferred-install": "dist",
1111
"sort-packages": true
1212
},
13-
"repositories": [
14-
{
15-
"type": "vcs",
16-
"url": "https://github.com/magento-commerce/magento2-functional-testing-framework"
17-
}
18-
],
1913
"require": {
2014
"php": "~7.3.0||~7.4.0",
2115
"ext-bcmath": "*",
@@ -39,7 +33,7 @@
3933
"colinmollenhour/cache-backend-redis": "1.11.0",
4034
"colinmollenhour/credis": "1.11.1",
4135
"colinmollenhour/php-redis-session-abstract": "~1.4.0",
42-
"composer/composer": "^1.9",
36+
"composer/composer": "^1.9 || ^2.0",
4337
"elasticsearch/elasticsearch": "~2.0||~5.1||~6.1||~7.6",
4438
"guzzlehttp/guzzle": "^6.3.3",
4539
"laminas/laminas-captcha": "^2.7.1",
@@ -48,7 +42,7 @@
4842
"laminas/laminas-console": "^2.6.0",
4943
"laminas/laminas-crypt": "^2.6.0",
5044
"laminas/laminas-db": "^2.8.2",
51-
"laminas/laminas-dependency-plugin": "^1.0",
45+
"laminas/laminas-dependency-plugin": "^1.0 || ^2.0",
5246
"laminas/laminas-di": "^2.6.1",
5347
"laminas/laminas-eventmanager": "^3.0.0",
5448
"laminas/laminas-feed": "^2.9.0",
@@ -71,7 +65,7 @@
7165
"laminas/laminas-uri": "^2.5.1",
7266
"laminas/laminas-validator": "^2.6.0",
7367
"laminas/laminas-view": "~2.11.2",
74-
"magento/composer": "~1.6.0",
68+
"magento/composer": "~1.6.0||~1.7.0",
7569
"magento/magento-composer-installer": ">=0.1.11",
7670
"magento/zendframework1": "~1.14.2",
7771
"monolog/monolog": "^1.17",
@@ -91,11 +85,11 @@
9185
},
9286
"require-dev": {
9387
"allure-framework/allure-phpunit": "~1.2.0",
94-
"dealerdirect/phpcodesniffer-composer-installer": "^0.5.0",
88+
"dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
9589
"friendsofphp/php-cs-fixer": "~2.16.0",
9690
"lusitanian/oauth": "~0.8.10",
9791
"magento/magento-coding-standard": "*",
98-
"magento/magento2-functional-testing-framework": "MQE-2501-php74-dev",
92+
"magento/magento2-functional-testing-framework": "^2.7",
9993
"pdepend/pdepend": "~2.7.1",
10094
"phpcompatibility/php-compatibility": "^9.3",
10195
"phpmd/phpmd": "^2.8.0",

0 commit comments

Comments
 (0)