Skip to content
This repository was archived by the owner on Jan 29, 2020. It is now read-only.

Commit be1656d

Browse files
committed
Remove zend-servicemanager-di dependency
- Per #125 - Also replaces fabpot/php-cs-fixer with friendsofphp/php-cs-fixer, per warnings during update (former is abandoned in favor of latter).
1 parent 10dcadc commit be1656d

File tree

2 files changed

+105
-156
lines changed

2 files changed

+105
-156
lines changed

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
"php": "^5.5 || ^7.0",
1717
"zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
1818
"zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
19-
"zendframework/zend-servicemanager-di": "^1.0.1",
2019
"zendframework/zend-hydrator": "^1.1 || ^2.1",
2120
"zendframework/zend-form": "^2.7",
2221
"zendframework/zend-stdlib": "^2.7.5 || ^3.0",
@@ -42,7 +41,7 @@
4241
"zendframework/zend-validator": "^2.6",
4342
"zendframework/zend-version": "^2.5",
4443
"zendframework/zend-view": "^2.6.3",
45-
"fabpot/php-cs-fixer": "1.7.*",
44+
"friendsofphp/php-cs-fixer": "1.7.*",
4645
"phpunit/PHPUnit": "^4.5",
4746
"sebastian/version": "^1.0.4"
4847
},
@@ -59,6 +58,7 @@
5958
"zendframework/zend-log": "Zend\\Log component",
6059
"zendframework/zend-modulemanager": "Zend\\ModuleManager component",
6160
"zendframework/zend-serializer": "Zend\\Serializer component",
61+
"zendframework/zend-servicemanager-di": "^1.0.1, if using zend-servicemanager v3 and requiring the zend-di integration",
6262
"zendframework/zend-session": "Zend\\Session component for FlashMessenger, PRG, and FPRG plugins",
6363
"zendframework/zend-text": "Zend\\Text component",
6464
"zendframework/zend-uri": "Zend\\Uri component",

composer.lock

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

0 commit comments

Comments
 (0)