diff --git a/composer.json b/composer.json index 312e48c5e7..f2e3855031 100644 --- a/composer.json +++ b/composer.json @@ -10,7 +10,7 @@ "yzalis/identicon": "*", "zordius/lightncandy": "0.*", "composer/semver": "^1.4", - "zendframework/zend-servicemanager": "^3.1", + "zendframework/zend-servicemanager": "2.6.0", "tecnickcom/tcpdf": "^6.2", "php-mime-mail-parser/php-mime-mail-parser": "^2.5" }, diff --git a/composer.lock b/composer.lock index aed8a55653..ba8ac818f5 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "1255274fea690daf512f990763ea3afa", - "content-hash": "606642f3170381129dbe0612c8ed4fb7", + "hash": "db035a3a8588328c27b938c919c9ad36", + "content-hash": "44324609c64eb3f36213a310b3b1dc2b", "packages": [ { "name": "composer/semver", @@ -1324,40 +1324,37 @@ }, { "name": "zendframework/zend-servicemanager", - "version": "3.1.1", + "version": "2.6.0", "source": { "type": "git", "url": "https://github.com/zendframework/zend-servicemanager.git", - "reference": "f701b0d322741b0c8d8ca1288f249a49438029cd" + "reference": "1dc33f23bd0a7f4d8ba743b915fae523d356027a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-servicemanager/zipball/f701b0d322741b0c8d8ca1288f249a49438029cd", - "reference": "f701b0d322741b0c8d8ca1288f249a49438029cd", + "url": "https://api.github.com/repos/zendframework/zend-servicemanager/zipball/1dc33f23bd0a7f4d8ba743b915fae523d356027a", + "reference": "1dc33f23bd0a7f4d8ba743b915fae523d356027a", "shasum": "" }, "require": { "container-interop/container-interop": "~1.0", - "php": "^5.5 || ^7.0" - }, - "provide": { - "container-interop/container-interop-implementation": "^1.1" + "php": ">=5.5" }, "require-dev": { - "ocramius/proxy-manager": "^1.0 || ^2.0", - "phpbench/phpbench": "^0.10.0", - "phpunit/phpunit": "^4.6 || ^5.2.10", - "squizlabs/php_codesniffer": "^2.5.1" + "fabpot/php-cs-fixer": "1.7.*", + "phpunit/phpunit": "~4.0", + "zendframework/zend-di": "~2.5", + "zendframework/zend-mvc": "~2.5" }, "suggest": { - "ocramius/proxy-manager": "ProxyManager 1.* to handle lazy initialization of services", - "zendframework/zend-stdlib": "zend-stdlib ^2.5 if you wish to use the MergeReplaceKey or MergeRemoveKey features in Config instances" + "ocramius/proxy-manager": "ProxyManager 0.5.* to handle lazy initialization of services", + "zendframework/zend-di": "Zend\\Di component" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.1-dev", - "dev-develop": "3.2-dev" + "dev-master": "2.6-dev", + "dev-develop": "2.7-dev" } }, "autoload": { @@ -1371,11 +1368,10 @@ ], "homepage": "https://github.com/zendframework/zend-servicemanager", "keywords": [ - "service-manager", "servicemanager", - "zf" + "zf2" ], - "time": "2016-07-15 14:59:51" + "time": "2015-07-23 21:49:08" }, { "name": "zendframework/zend-stdlib",