Skip to content

Commit

Permalink
qa: remove laminas/laminas-zendframework-bridge and conflict with z…
Browse files Browse the repository at this point in the history
…endframework pendant

Signed-off-by: Maximilian Bösing <[email protected]>
  • Loading branch information
boesing committed Sep 13, 2021
1 parent f8d84c5 commit 35898df
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
5 changes: 2 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
"require": {
"php": "^7.3 || ~8.0.0 || ~8.1.0",
"ext-json": "*",
"laminas/laminas-zendframework-bridge": "^1.0",
"symfony/console": "^2.8 || ^3.0 || ^4.0 || ^5.0"
},
"require-dev": {
Expand Down Expand Up @@ -53,7 +52,7 @@
"test": "phpunit --colors=always",
"test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
},
"replace": {
"zendframework/zend-expressive-migration": "^0.1.4"
"conflict": {
"zendframework/zend-expressive-migration": "*"
}
}
3 changes: 2 additions & 1 deletion composer.lock

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

0 comments on commit 35898df

Please sign in to comment.