Skip to content

Commit

Permalink
Merge pull request #43 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
samsonasik authored Dec 8, 2021
2 parents c2a78ee + e836de4 commit ac5df56
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
5 changes: 2 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
"laminas/laminas-servicemanager": "^3.0.3",
"laminas/laminas-stdlib": "^3.3",
"laminas/laminas-view": "^2.13.1",
"laminas/laminas-zendframework-bridge": "^1.1",
"symfony/var-dumper": "^5.0.1 || ^6.0"
},
"require-dev": {
Expand Down Expand Up @@ -69,7 +68,7 @@
"test": "phpunit --colors=always",
"test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
},
"replace": {
"zendframework/zend-developer-tools": "^2.0.0"
"conflict": {
"zendframework/zend-developer-tools": "*"
}
}
4 changes: 2 additions & 2 deletions composer.lock

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

0 comments on commit ac5df56

Please sign in to comment.