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 6374451 commit 1f82d6a
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 @@ -29,7 +29,6 @@
},
"require": {
"php": "^7.3 || ~8.0.0 || ~8.1.0",
"laminas/laminas-zendframework-bridge": "^1.0",
"mezzio/mezzio-authentication": "^1.0",
"psr/container": "^1.0",
"psr/http-message": "^1.0.1",
Expand All @@ -42,7 +41,8 @@
"phpunit/phpunit": "^9.3"
},
"conflict": {
"container-interop/container-interop": "<1.2.0"
"container-interop/container-interop": "<1.2.0",
"zendframework/zend-expressive-authorization": "*"
},
"suggest": {
"mezzio/mezzio-authorization-acl": "^1.0; provides a laminas-permissions-acl-backed adapter",
Expand All @@ -67,8 +67,5 @@
"cs-fix": "phpcbf",
"test": "phpunit --colors=always",
"test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
},
"replace": {
"zendframework/zend-expressive-authorization": "^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 1f82d6a

Please sign in to comment.