Skip to content

Commit a826722

Browse files
authored
Merge pull request #6471 from magento-trigger/MC-39996
[trigger] MC-39996: Add composer2 support
2 parents c72ba52 + 6a8b7fb commit a826722

File tree

3 files changed

+36
-34
lines changed

3 files changed

+36
-34
lines changed

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
"colinmollenhour/cache-backend-redis": "1.11.0",
3333
"colinmollenhour/credis": "1.11.1",
3434
"colinmollenhour/php-redis-session-abstract": "~1.4.0",
35-
"composer/composer": "^1.9",
36-
"magento/magento-composer-installer": ">=0.1.11",
35+
"composer/composer": "^1.9 || ^2.0",
36+
"magento/magento-composer-installer": "^0.1.11",
3737
"elasticsearch/elasticsearch": "~7.7.0",
3838
"guzzlehttp/guzzle": "^6.3.3",
3939
"laminas/laminas-captcha": "^2.7.1",

composer.lock

Lines changed: 33 additions & 31 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/internal/Magento/Framework/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"ext-xsl": "*",
2424
"lib-libxml": "*",
2525
"colinmollenhour/php-redis-session-abstract": "~1.4.0",
26-
"composer/composer": "^1.9",
26+
"composer/composer": "^1.9 || ^2.0",
2727
"guzzlehttp/guzzle": "^6.3.3",
2828
"laminas/laminas-code": "~3.4.1",
2929
"laminas/laminas-crypt": "^2.6.0",

0 commit comments

Comments
 (0)