Merge branch 'hotfix/204'

Close #204
zendframework · Sep 7, 2016 · a60da17 · a60da17
2 parents 21feb7b + d9094fa
commit a60da17
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -29,7 +29,8 @@ matrix:
         - EXECUTE_COVERAGE=true
         - DEPLOY_DOCS="$(if [[ $TRAVIS_BRANCH == 'master' && $TRAVIS_PULL_REQUEST == 'false' ]]; then echo -n 'true' ; else echo -n 'false' ; fi)"
         - PATH="$HOME/.local/bin:$PATH"
-    - php: 7
+    - php: 7.0
+    - php: 7.1
     - 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.
 
-## 1.3.6 - TBD
+## 1.3.6 - 2016-09-07
 
 ### Added
 
@@ -12,6 +12,8 @@ All notable changes to this project will be documented in this file, in reverse
   for Apache `REDIRECT_HTTP_*` header detection in the `ServerRequestFactory`.
 - [#166](https://github.com/zendframework/zend-diactoros/pull/166) adds support
   for UTF-8 characters in URI paths.
+- [#204](https://github.com/zendframework/zend-diactoros/pull/204) adds testing
+  against PHP 7.1 release-candidate builds.
 
 ### Deprecated