Merge branch 'hotfix/forwards-compat'

Close #18
zendframework · Feb 23, 2016 · 53ddb0e · 53ddb0e
2 parents 7c247bb + 2f93243
commit 53ddb0e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -28,7 +28,6 @@ matrix:
     - php: 7
     - php: hhvm 
   allow_failures:
-    - php: 7
     - php: hhvm
 
 notifications:

diff --git a/CHANGELOG.md b/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.5.4 - TBD
+## 2.5.4 - 2016-02-23
 
 ### 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-captcha/pull/18) updates
+  dependencies to known-stable, forwards-compatible versions.
 
 ## 2.5.3 - 2016-02-22
 

diff --git a/composer.json b/composer.json
@@ -13,14 +13,14 @@
         }
     },
     "require": {
-        "php": ">=5.5",
-        "zendframework/zend-math": "~2.5",
-        "zendframework/zend-stdlib": "~2.5"
+        "php": "^5.5 || ^7.0",
+        "zendframework/zend-math": "^2.6",
+        "zendframework/zend-stdlib": "^2.7 || ^3.0"
     },
     "require-dev": {
-        "zendframework/zend-session": "~2.5",
-        "zendframework/zend-text": "~2.5",
-        "zendframework/zend-validator": "~2.5",
+        "zendframework/zend-session": "^2.6",
+        "zendframework/zend-text": "^2.6",
+        "zendframework/zend-validator": "^2.6",
         "zendframework/zendservice-recaptcha": "*",
         "fabpot/php-cs-fixer": "1.7.*",
         "phpunit/PHPUnit": "~4.0"