Skip to content
This repository was archived by the owner on Nov 22, 2024. It is now read-only.

Commit 711f518

Browse files
authored
Merge pull request #14 from PowerKiKi/drop-bridge
Drop `laminas/laminas-zendframework-bridge` and `zendframework/*` compatibility
2 parents b9a687c + 2ec097b commit 711f518

File tree

2 files changed

+15
-14
lines changed

2 files changed

+15
-14
lines changed

composer.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@
2626
"laminas/laminas-loader": "^2.7",
2727
"laminas/laminas-math": "^3.3",
2828
"laminas/laminas-stdlib": "^3.2",
29-
"laminas/laminas-uri": "^2.8",
30-
"laminas/laminas-zendframework-bridge": "^1.0"
29+
"laminas/laminas-uri": "^2.8"
3130
},
3231
"require-dev": {
3332
"laminas/laminas-coding-standard": "~1.0.0",
@@ -46,7 +45,7 @@
4645
"scripts": {
4746
"static-analysis": "psalm --shepherd --stats"
4847
},
49-
"replace": {
50-
"zendframework/zendoauth": "^2.0.3"
48+
"conflict": {
49+
"zendframework/zendoauth": "*"
5150
}
5251
}

composer.lock

Lines changed: 12 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)