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

Commit de3c203

Browse files
authored
Merge pull request #10 from PowerKiKi/drop-bridge
Drop `laminas/laminas-zendframework-bridge` and `zendframework/*` compatibility
2 parents 7da5c5f + 79c39d8 commit de3c203

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
@@ -20,8 +20,7 @@
2020
},
2121
"require": {
2222
"php": "^7.3 || ~8.0.0",
23-
"laminas/laminas-stdlib": "^3.2.1",
24-
"laminas/laminas-zendframework-bridge": "^1.0"
23+
"laminas/laminas-stdlib": "^3.2.1"
2524
},
2625
"require-dev": {
2726
"laminas/laminas-coding-standard": "~1.0.0",
@@ -53,7 +52,7 @@
5352
"test": "phpunit --colors=always",
5453
"test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
5554
},
56-
"replace": {
57-
"zendframework/zend-progressbar": "^2.7.0"
55+
"conflict": {
56+
"zendframework/zend-progressbar": "*"
5857
}
5958
}

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)