Skip to content

Commit

Permalink
Merge pull request #24 from PowerKiKi/drop-bridge
Browse files Browse the repository at this point in the history
Drop `laminas/laminas-zendframework-bridge` and `zendframework/*` compatibility
  • Loading branch information
Ocramius committed Dec 6, 2021
2 parents b7b0702 + 5a86080 commit 9bb3781
Show file tree
Hide file tree
Showing 2 changed files with 87 additions and 12 deletions.
5 changes: 2 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
"php": "^7.3 || ~8.0.0",
"laminas/laminas-config-aggregator": "^1.1",
"laminas/laminas-stdlib": "^3.1",
"laminas/laminas-zendframework-bridge": "^1.0",
"symfony/dependency-injection": "^3.4.36 || ^4.4.2 || ^5.0"
},
"require-dev": {
Expand Down Expand Up @@ -52,7 +51,7 @@
"test": "phpunit --colors=always",
"test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
},
"replace": {
"zendframework/zend-config-aggregator-parameters": "^1.2.0"
"conflict": {
"zendframework/zend-config-aggregator-parameters": "*"
}
}
94 changes: 85 additions & 9 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 9bb3781

Please sign in to comment.