Merge branch 'hotfix/updated-deps'

Close #3

Author: weierophinney

.travis.yml

@@ -23,7 +23,7 @@ matrix:
     - php: 7
     - php: hhvm 
   allow_failures:
-    - php: 7
+    - php: hhvm
 
 notifications:
   irc: "irc.freenode.org#zftalk.dev"

CHANGELOG.md

@@ -0,0 +1,23 @@
+# Changelog
+
+All notable changes to this project will be documented in this file, in reverse chronological order by release.
+
+## 2.5.2 - 2016-02-17
+
+### Added
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- [#3](https://github.com/zendframework/zend-uri/pull/3) updates dependencies to
+  allow the component to work with both PHP 5 and PHP 7 versions, as well as
+  all 2.X versions of required Zend components.

composer.json

@@ -13,12 +13,10 @@
         }
     },
     "require": {
-        "php": ">=5.5",
-        "zendframework/zend-escaper": "~2.5",
-        "zendframework/zend-validator": "~2.5"
+        "php": "^5.5 || ^7.0",
+        "zendframework/zend-escaper": "^2.5",
+        "zendframework/zend-validator": "^2.5"
     },
-    "minimum-stability": "dev",
-    "prefer-stable": true,
     "extra": {
         "branch-alias": {
             "dev-master": "2.5-dev",
@@ -34,4 +32,4 @@
         "fabpot/php-cs-fixer": "1.7.*",
         "phpunit/PHPUnit": "~4.0"
     }
-}
+}