Merge branch 'hotfix/dependencies' into develop

Forward port #11
zendframework · Feb 4, 2016 · 066c159 · 066c159
2 parents c4e9a01 + f471ad3
commit 066c159
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -36,7 +36,8 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#11](https://github.com/zendframework/zend-server/pull/11) updates the
+  dependencies to use zend-stdlib `^2.5 || ^3.0`.
 
 ## 2.6.0 - 2015-12-17
 

diff --git a/composer.json b/composer.json
@@ -7,31 +7,29 @@
         "server"
     ],
     "homepage": "https://github.com/zendframework/zend-server",
-    "autoload": {
-        "psr-4": {
-            "Zend\\Server\\": "src/"
+    "extra": {
+        "branch-alias": {
+            "dev-master": "2.6-dev",
+            "dev-develop": "2.7-dev"
         }
     },
     "require": {
         "php": "^5.5 || ^7.0",
-        "zendframework/zend-stdlib": "~2.5",
-        "zendframework/zend-code": "~2.5"
+        "zendframework/zend-stdlib": "^2.5 || ^3.0",
+        "zendframework/zend-code": "^2.5"
     },
-    "minimum-stability": "dev",
-    "prefer-stable": true,
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.6-dev",
-            "dev-develop": "2.7-dev"
+    "require-dev": {
+        "fabpot/php-cs-fixer": "^1.7.0",
+        "phpunit/PHPUnit": "^4.0"
+    },
+    "autoload": {
+        "psr-4": {
+            "Zend\\Server\\": "src/"
         }
     },
     "autoload-dev": {
         "psr-4": {
             "ZendTest\\Server\\": "test/"
         }
-    },
-    "require-dev": {
-        "fabpot/php-cs-fixer": "^1.7.0",
-        "phpunit/PHPUnit": "^4.0"
     }
 }