Skip to content

Commit

Permalink
Merge pull request #13 from fabiang/remove-zf-bridge
Browse files Browse the repository at this point in the history
Removed `laminas/laminas-zendframework-bridge` dependency
  • Loading branch information
Ocramius authored Jun 28, 2022
2 parents 128ee75 + e219aa1 commit f06de78
Show file tree
Hide file tree
Showing 4 changed files with 623 additions and 544 deletions.
12 changes: 7 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,10 @@
"forum": "https://discourse.laminas.dev"
},
"config": {
"sort-packages": true
"sort-packages": true,
"allow-plugins": {
"dealerdirect/phpcodesniffer-composer-installer": true
}
},
"extra": {
"laminas": {
Expand All @@ -32,8 +35,7 @@
"laminas/laminas-modulemanager": "^2.7.2",
"laminas/laminas-mvc": "^2.7.15 || ^3.0.2",
"laminas/laminas-servicemanager": "^2.7.6 || ^3.1",
"laminas/laminas-stdlib": "^2.7.7 || ^3.0.1",
"laminas/laminas-zendframework-bridge": "^1.0"
"laminas/laminas-stdlib": "^2.7.7 || ^3.0.1"
},
"require-dev": {
"laminas/laminas-coding-standard": "~2.3.0",
Expand Down Expand Up @@ -63,7 +65,7 @@
"test": "phpunit --colors=always",
"test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
},
"replace": {
"zfcampus/zf-versioning": "^1.3.0"
"conflict": {
"zfcampus/zf-versioning": "*"
}
}
Loading

0 comments on commit f06de78

Please sign in to comment.