Merging develop to master in preparation for 1.4.0 release

Author: weierophinney

.travis.yml

@@ -23,6 +23,14 @@ matrix:
       env:
         - DEPS=locked
         - TEST_COVERAGE=true
+    - php: 5.6
+      env:
+        - DEPS=locked
+        - HELPER_DEPS="zendframework/zend-expressive-helpers:^2.2 zendframework/zend-expressive-router:^1.3.2"
+    - php: 5.6
+      env:
+        - DEPS=locked
+        - HELPER_DEPS="zendframework/zend-expressive-helpers:^3.0.1"
     - php: 5.6
       env:
         - DEPS=latest
@@ -33,6 +41,14 @@ matrix:
       env:
         - DEPS=locked
         - CS_CHECK=true
+    - php: 7
+      env:
+        - DEPS=locked
+        - HELPER_DEPS="zendframework/zend-expressive-helpers:^2.2 zendframework/zend-expressive-router:^1.3.2"
+    - php: 7
+      env:
+        - DEPS=locked
+        - HELPER_DEPS="zendframework/zend-expressive-helpers:^3.0.1"
     - php: 7
       env:
         - DEPS=latest
@@ -42,6 +58,14 @@ matrix:
     - php: 7.1
       env:
         - DEPS=locked
+    - php: 7.1
+      env:
+        - DEPS=locked
+        - HELPER_DEPS="zendframework/zend-expressive-helpers:^2.2 zendframework/zend-expressive-router:^1.3.2"
+    - php: 7.1
+      env:
+        - DEPS=locked
+        - HELPER_DEPS="zendframework/zend-expressive-helpers:^3.0.1"
     - php: 7.1
       env:
         - DEPS=latest
@@ -51,6 +75,14 @@ matrix:
     - php: hhvm
       env:
         - DEPS=locked
+    - php: hhvm
+      env:
+        - DEPS=locked
+        - HELPER_DEPS="zendframework/zend-expressive-helpers:^2.2 zendframework/zend-expressive-router:^1.3.2"
+    - php: hhvm
+      env:
+        - DEPS=locked
+        - HELPER_DEPS="zendframework/zend-expressive-helpers:^3.0.1"
     - php: hhvm
       env:
         - DEPS=latest
@@ -66,6 +98,7 @@ install:
   - if [[ $TRAVIS_PHP_VERSION =~ ^5.6 ]]; then travis_retry composer update $COMPOSER_ARGS --with-dependencies $LEGACY_DEPS ; fi
   - if [[ $DEPS == 'latest' ]]; then travis_retry composer update $COMPOSER_ARGS ; fi
   - if [[ $DEPS == 'lowest' ]]; then travis_retry composer update --prefer-lowest --prefer-stable $COMPOSER_ARGS ; fi
+  - if [[ $HELPER_DEPS != '' ]]; then travis_retry composer require $COMPOSER_ARGS --update-with-dependencies $HELPER_DEPS ; fi
   - if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS $COVERAGE_DEPS ; fi
   - composer show
 

CHANGELOG.md

@@ -2,6 +2,25 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
+## 1.4.0 - TBD
+
+### Added
+
+- [#36](https://github.com/zendframework/zend-expressive-zendviewrenderer/pull/36)
+  adds support for zend-expressive-helpers 4.0.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- Nothing.
+
 ## 1.3.1 - TBD
 
 ### Added

composer.json

@@ -21,7 +21,7 @@
         "php": "^5.6 || ^7.0",
         "container-interop/container-interop": "^1.2",
         "psr/http-message": "^1.0.1",
-        "zendframework/zend-expressive-helpers": "^1.4 || ^2.2 || ^3.0.1",
+        "zendframework/zend-expressive-helpers": "^1.4 || ^2.2 || ^3.0.1 || ^4.0",
         "zendframework/zend-expressive-router": "^1.3.2 || ^2.1",
         "zendframework/zend-expressive-template": "^1.0.4",
         "zendframework/zend-servicemanager": "^2.7.8 || ^3.3",