Skip to content

Commit f06de78

Browse files
authored
Merge pull request #13 from fabiang/remove-zf-bridge
Removed `laminas/laminas-zendframework-bridge` dependency
2 parents 128ee75 + e219aa1 commit f06de78

4 files changed

Lines changed: 623 additions & 544 deletions

File tree

composer.json

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,10 @@
1818
"forum": "https://discourse.laminas.dev"
1919
},
2020
"config": {
21-
"sort-packages": true
21+
"sort-packages": true,
22+
"allow-plugins": {
23+
"dealerdirect/phpcodesniffer-composer-installer": true
24+
}
2225
},
2326
"extra": {
2427
"laminas": {
@@ -32,8 +35,7 @@
3235
"laminas/laminas-modulemanager": "^2.7.2",
3336
"laminas/laminas-mvc": "^2.7.15 || ^3.0.2",
3437
"laminas/laminas-servicemanager": "^2.7.6 || ^3.1",
35-
"laminas/laminas-stdlib": "^2.7.7 || ^3.0.1",
36-
"laminas/laminas-zendframework-bridge": "^1.0"
38+
"laminas/laminas-stdlib": "^2.7.7 || ^3.0.1"
3739
},
3840
"require-dev": {
3941
"laminas/laminas-coding-standard": "~2.3.0",
@@ -63,7 +65,7 @@
6365
"test": "phpunit --colors=always",
6466
"test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
6567
},
66-
"replace": {
67-
"zfcampus/zf-versioning": "^1.3.0"
68+
"conflict": {
69+
"zfcampus/zf-versioning": "*"
6870
}
6971
}

0 commit comments

Comments
 (0)