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 4a118f3 commit ffa3242
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
7 changes: 2 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
"require": {
"php": "^7.3 || ~8.0.0 || ~8.1.0",
"laminas/laminas-permissions-acl": "^2.6",
"laminas/laminas-zendframework-bridge": "^1.0",
"mezzio/mezzio-authorization": "^1.0",
"mezzio/mezzio-router": "^3.0",
"psr/container": "^1.0",
Expand All @@ -45,7 +44,8 @@
},
"conflict": {
"container-interop/container-interop": "<1.2.0",
"phpspec/prophecy": "<1.10.2"
"phpspec/prophecy": "<1.10.2",
"zendframework/zend-expressive-authorization-acl": "*"
},
"autoload": {
"psr-4": {
Expand All @@ -66,8 +66,5 @@
"cs-fix": "phpcbf",
"test": "phpunit --colors=always",
"test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
},
"replace": {
"zendframework/zend-expressive-authorization-acl": "^1.0.1"
}
}
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 ffa3242

Please sign in to comment.