Merge branch 'versions/2.5.4'

weierophinney · weierophinney · commit 31edd30df3c0 · 2016-02-17T11:13:10.000-06:00
2.5.4 readiness
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-17
 
 ### Added
 
diff --git a/composer.json b/composer.json
@@ -13,7 +13,7 @@
         }
     },
     "require": {
-        "php": ">=5.5",
+        "php": "^5.5 || ^7.0",
         "zendframework/zend-stdlib": "~2.5"
     },
     "require-dev": {
