Skip to content

Commit

Permalink
Merge pull request #25 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 authored Dec 3, 2021
2 parents d7d63a5 + b15b448 commit 39f3dcb
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
"php": "^7.3 || ~8.0.0",
"laminas/laminas-servicemanager": "^3.3.0",
"laminas/laminas-stdlib": "^3.0",
"laminas/laminas-zendframework-bridge": "^1.0",
"psr/log": "^1.1.2"
},
"require-dev": {
Expand Down Expand Up @@ -77,7 +76,7 @@
"test": "phpunit --colors=always",
"test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
},
"replace": {
"zendframework/zend-log": "^2.12.0"
"conflict": {
"zendframework/zend-log": "*"
}
}

0 comments on commit 39f3dcb

Please sign in to comment.