Merge branch 'hotfix/dependencies' into develop

Forward port #42

Author: weierophinney

.travis.yml

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

CHANGELOG.md

@@ -36,7 +36,9 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#42](https://github.com/zendframework/zend-http/pull/42) updates dependencies
+  to ensure it can work with PHP 5.5+ and 7.0+, as well as zend-stdlib
+  2.5+/3.0+.
 
 ## 2.5.3 - 2015-09-14
 

composer.json

@@ -7,34 +7,32 @@
         "http"
     ],
     "homepage": "https://github.com/zendframework/zend-http",
-    "autoload": {
-        "psr-4": {
-            "Zend\\Http\\": "src/"
-        }
-    },
-    "require": {
-        "php": ">=5.5",
-        "zendframework/zend-loader": "~2.5",
-        "zendframework/zend-stdlib": "~2.5",
-        "zendframework/zend-uri": "~2.5",
-        "zendframework/zend-validator": "~2.5"
-    },
-    "minimum-stability": "dev",
-    "prefer-stable": true,
     "extra": {
         "branch-alias": {
             "dev-master": "2.5-dev",
             "dev-develop": "2.6-dev"
         }
     },
+    "require": {
+        "php": "^5.5 || ^7.0",
+        "zendframework/zend-loader": "^2.5",
+        "zendframework/zend-stdlib": "^2.5 || ^3.0",
+        "zendframework/zend-uri": "^2.5",
+        "zendframework/zend-validator": "^2.5"
+    },
+    "require-dev": {
+        "fabpot/php-cs-fixer": "1.7.*",
+        "phpunit/PHPUnit": "^4.0",
+        "zendframework/zend-config": "^2.5"
+    },
+    "autoload": {
+        "psr-4": {
+            "Zend\\Http\\": "src/"
+        }
+    },
     "autoload-dev": {
         "psr-4": {
             "ZendTest\\Http\\": "test/"
         }
-    },
-    "require-dev": {
-        "fabpot/php-cs-fixer": "1.7.*",
-        "phpunit/PHPUnit": "~4.0",
-        "zendframework/zend-config": "~2.5"
     }
 }