Skip to content

Commit 9bb3781

Browse files
authored
Merge pull request #24 from PowerKiKi/drop-bridge
Drop `laminas/laminas-zendframework-bridge` and `zendframework/*` compatibility
2 parents b7b0702 + 5a86080 commit 9bb3781

File tree

2 files changed

+87
-12
lines changed

2 files changed

+87
-12
lines changed

composer.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
"php": "^7.3 || ~8.0.0",
2121
"laminas/laminas-config-aggregator": "^1.1",
2222
"laminas/laminas-stdlib": "^3.1",
23-
"laminas/laminas-zendframework-bridge": "^1.0",
2423
"symfony/dependency-injection": "^3.4.36 || ^4.4.2 || ^5.0"
2524
},
2625
"require-dev": {
@@ -52,7 +51,7 @@
5251
"test": "phpunit --colors=always",
5352
"test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
5453
},
55-
"replace": {
56-
"zendframework/zend-config-aggregator-parameters": "^1.2.0"
54+
"conflict": {
55+
"zendframework/zend-config-aggregator-parameters": "*"
5756
}
5857
}

composer.lock

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

0 commit comments

Comments
 (0)