Skip to content

Commit 60f7620

Browse files
committed
MC-40111: Add support for Composer 2 for 2.3.7
-- fix merge conflict
1 parent 64fd1d7 commit 60f7620

File tree

2 files changed

+58
-56
lines changed

2 files changed

+58
-56
lines changed

composer.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"sort-packages": true
1212
},
1313
"require": {
14-
"php": "~7.3.0",
14+
"php": "~7.3.0||~7.4.0",
1515
"ext-bcmath": "*",
1616
"ext-ctype": "*",
1717
"ext-curl": "*",
@@ -30,14 +30,14 @@
3030
"lib-libxml": "*",
3131
"braintree/braintree_php": "3.35.0",
3232
"colinmollenhour/cache-backend-file": "~1.4.1",
33-
"colinmollenhour/cache-backend-redis": "1.10.6",
34-
"colinmollenhour/credis": "1.10.0",
33+
"colinmollenhour/cache-backend-redis": "1.11.0",
34+
"colinmollenhour/credis": "1.11.1",
3535
"colinmollenhour/php-redis-session-abstract": "~1.4.0",
3636
"composer/composer": "^1.9 || ^2.0",
3737
"elasticsearch/elasticsearch": "~2.0||~5.1||~6.1||~7.6",
3838
"guzzlehttp/guzzle": "^6.3.3",
3939
"laminas/laminas-captcha": "^2.7.1",
40-
"laminas/laminas-code": "~3.3.0",
40+
"laminas/laminas-code": "~3.4.1",
4141
"laminas/laminas-config": "^2.6.0",
4242
"laminas/laminas-console": "^2.6.0",
4343
"laminas/laminas-crypt": "^2.6.0",
@@ -70,7 +70,7 @@
7070
"magento/zendframework1": "~1.14.2",
7171
"monolog/monolog": "^1.17",
7272
"paragonie/sodium_compat": "^1.6",
73-
"pelago/emogrifier": "^2.0.0",
73+
"pelago/emogrifier": "^3.1.0",
7474
"php-amqplib/php-amqplib": "~2.7.0||~2.10.0",
7575
"phpseclib/mcrypt_compat": "1.0.8",
7676
"phpseclib/phpseclib": "2.0.*",
@@ -92,7 +92,7 @@
9292
"magento/magento2-functional-testing-framework": "^2.7",
9393
"pdepend/pdepend": "~2.7.1",
9494
"phpcompatibility/php-compatibility": "^9.3",
95-
"phpmd/phpmd": "@stable",
95+
"phpmd/phpmd": "^2.8.0",
9696
"phpstan/phpstan": ">=0.12.3 <=0.12.23",
9797
"phpunit/phpunit": "^9",
9898
"sebastian/phpcpd": "~5.0.0",

composer.lock

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

0 commit comments

Comments
 (0)