Skip to content

Commit

Permalink
Merge pull request #16 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 53fe9e0 + 4dea8f9 commit c9008e7
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 13 deletions.
7 changes: 2 additions & 5 deletions composer.json
Expand Up @@ -29,7 +29,6 @@
"require": {
"php": "^7.3 || ~8.0.0",
"laminas/laminas-permissions-rbac": "^2.5.1 || ^3.0",
"laminas/laminas-zendframework-bridge": "^1.0",
"mezzio/mezzio-authorization": "^1.0",
"mezzio/mezzio-router": "^3.0",
"psr/container": "^1.0",
Expand All @@ -46,7 +45,8 @@
},
"conflict": {
"container-interop/container-interop": "<1.2.0",
"phpspec/prophecy": "<1.10.2"
"phpspec/prophecy": "<1.10.2",
"zendframework/zend-expressive-authorization-rbac": "*"
},
"autoload": {
"psr-4": {
Expand All @@ -68,8 +68,5 @@
"test": "phpunit --colors=always",
"test-coverage": "phpunit --colors=always --coverage-clover clover.xml",
"static-analysis": "psalm --shepherd --stats"
},
"replace": {
"zendframework/zend-expressive-authorization-rbac": "^1.0.2"
}
}
17 changes: 9 additions & 8 deletions composer.lock

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

0 comments on commit c9008e7

Please sign in to comment.