Skip to content

Commit e01edbc

Browse files
authored
Merge pull request #7411 from magento-trigger/AC-2001
[TR] Update references to internal dependencies to stable versions...
2 parents 5d2f685 + 05362d0 commit e01edbc

File tree

3 files changed

+22
-27
lines changed

3 files changed

+22
-27
lines changed

composer.json

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,12 @@
88
],
99
"config": {
1010
"preferred-install": "dist",
11-
"sort-packages": true
11+
"sort-packages": true,
12+
"allow-plugins": {
13+
"dealerdirect/phpcodesniffer-composer-installer": true,
14+
"laminas/laminas-dependency-plugin": true,
15+
"magento/*": true
16+
}
1217
},
1318
"require": {
1419
"php": "~7.4.0||~8.1.0",
@@ -63,8 +68,8 @@
6368
"league/flysystem-aws-s3-v3": "^2.0",
6469
"magento/composer": "~1.8.0",
6570
"magento/composer-dependency-version-audit-plugin": "~0.1",
66-
"magento/magento-composer-installer": "0.3.*@beta",
67-
"magento/zendframework1": "1.14.6-beta2 as 1.14.6",
71+
"magento/magento-composer-installer": ">=0.3.0",
72+
"magento/zendframework1": "~1.15.0",
6873
"monolog/monolog": "^2.3",
6974
"pelago/emogrifier": "^6.0.0",
7075
"php-amqplib/php-amqplib": "~3.1.0",

composer.lock

Lines changed: 13 additions & 23 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
@@ -34,7 +34,7 @@
3434
"laminas/laminas-stdlib": "^3.6.0",
3535
"laminas/laminas-uri": "^2.9.1",
3636
"laminas/laminas-validator": "^2.15.0",
37-
"magento/zendframework1": "1.14.6-beta2 as 1.14.6",
37+
"magento/zendframework1": "~1.15.0",
3838
"monolog/monolog": "^2.3",
3939
"ramsey/uuid": "~4.2.0",
4040
"symfony/console": "~4.4.0",

0 commit comments

Comments
 (0)