Skip to content

Commit 49f85dc

Browse files
committed
Merge remote-tracking branch 'origin/AC-7420_v1' into Hammer_Regression_issues_04Jan22
2 parents 872ef01 + 21bf93d commit 49f85dc

File tree

3 files changed

+471
-446
lines changed

3 files changed

+471
-446
lines changed

composer.json

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,16 @@
1414
"preferred-install": "dist",
1515
"sort-packages": true
1616
},
17+
"repositories": [
18+
{
19+
"type": "vcs",
20+
"url": "https://github.com/magento/composer"
21+
},
22+
{
23+
"type": "vcs",
24+
"url": "https://github.com/wikimedia/less.php"
25+
}
26+
],
1727
"require": {
1828
"php": "~8.1.0||~8.2.0",
1929
"ext-bcmath": "*",
@@ -65,15 +75,15 @@
6575
"laminas/laminas-validator": "^2.23",
6676
"league/flysystem": "^2.4",
6777
"league/flysystem-aws-s3-v3": "^2.4",
68-
"magento/composer": "^1.9.0-beta1",
78+
"magento/composer": "dev-develop",
6979
"magento/composer-dependency-version-audit-plugin": "^0.1",
7080
"magento/magento-composer-installer": ">=0.4.0-beta1",
7181
"magento/zend-cache": "^1.16",
7282
"magento/zend-db": "^1.16",
7383
"magento/zend-pdf": "^1.16",
7484
"monolog/monolog": "^2.7",
7585
"opensearch-project/opensearch-php": "^1.0 || ^2.0, <2.0.1",
76-
"pelago/emogrifier": "^6.0.0",
86+
"pelago/emogrifier": "^7.0",
7787
"php-amqplib/php-amqplib": "^3.2",
7888
"phpseclib/mcrypt_compat": "^2.0",
7989
"phpseclib/phpseclib": "^3.0",
@@ -86,7 +96,7 @@
8696
"tubalmartin/cssmin": "^4.1",
8797
"web-token/jwt-framework": "^3.1",
8898
"webonyx/graphql-php": "^14.11",
89-
"wikimedia/less.php": "^3.0"
99+
"wikimedia/less.php": "dev-main"
90100
},
91101
"require-dev": {
92102
"allure-framework/allure-phpunit": "^2",

0 commit comments

Comments
 (0)