Merge branch 'hotfix/dev-requirements'

Close #18

Author: weierophinney

.travis.yml

@@ -23,7 +23,6 @@ matrix:
     - php: 7
     - php: hhvm 
   allow_failures:
-    - php: 7
     - php: hhvm
 
 notifications:

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
-## 2.6.1 - TBD
+## 2.6.1 - 2016-02-04
 
 ### Added
 
@@ -18,7 +18,8 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#18](https://github.com/zendframework/zend-json/pull/18) updates dependencies
+  to allow usage on PHP 7, as well as with zend-stdlib v3.
 
 ## 2.6.0 - 2015-11-18
 

composer.json

@@ -7,34 +7,32 @@
         "json"
     ],
     "homepage": "https://github.com/zendframework/zend-json",
-    "autoload": {
-        "psr-4": {
-            "Zend\\Json\\": "src/"
+    "extra": {
+        "branch-alias": {
+            "dev-master": "2.6-dev",
+            "dev-develop": "2.7-dev"
         }
     },
     "require": {
-        "php": ">=5.5"
+        "php": "^5.5 || ^7.0"
     },
     "require-dev": {
-        "zendframework/zend-http": "~2.5",
-        "zendframework/zend-server": "~2.5",
-        "zendframework/zend-stdlib": "~2.5",
-        "zendframework/zendxml": "~1.0",
+        "zendframework/zend-http": "^2.5.4",
+        "zendframework/zend-server": "^2.6.1",
+        "zendframework/zend-stdlib": "^2.5 || ^3.0",
+        "zendframework/zendxml": "^1.0.2",
         "fabpot/php-cs-fixer": "1.7.*",
         "phpunit/PHPUnit": "~4.0"
     },
     "suggest": {
-        "zendframework/zend-http": "Zend\\Http component",
-        "zendframework/zend-server": "Zend\\Server component",
-        "zendframework/zend-stdlib": "To use the cache for Zend\\Server",
+        "zendframework/zend-http": "Zend\\Http component, required to use Zend\\Json\\Server",
+        "zendframework/zend-server": "Zend\\Server component, required to use Zend\\Json\\Server",
+        "zendframework/zend-stdlib": "Zend\\Stdlib component, for use with caching Zend\\Json\\Server responses",
         "zendframework/zendxml": "To support Zend\\Json\\Json::fromXml() usage"
     },
-    "minimum-stability": "dev",
-    "prefer-stable": true,
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.6-dev",
-            "dev-develop": "2.7-dev"
+    "autoload": {
+        "psr-4": {
+            "Zend\\Json\\": "src/"
         }
     },
     "autoload-dev": {