Merging release-2.0.0 to develop

Conflicts:
	CHANGELOG.md

Author: weierophinney

.docheader

@@ -1,5 +1,7 @@
 /**
  * @see       https://github.com/zendframework/zend-expressive-zendviewrenderer for the canonical source repository
- * @copyright Copyright (c) %regexp:(20\d{2}-)?20\d{2}% Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) %regexp:(20\d{2}-)?20\d{2}% Zend Technologies USA Inc. (https://www.zend.com)
  * @license   https://github.com/zendframework/zend-expressive-zendviewrenderer/blob/master/LICENSE.md New BSD License
  */
+
+declare(strict_types=1);

.travis.yml

@@ -13,46 +13,6 @@ env:
 
 matrix:
   include:
-    - php: 5.6
-      env:
-        - DEPS=lowest
-    - php: 5.6
-      env:
-        - DEPS=locked
-        - LEGACY_DEPS="phpunit/phpunit"
-    - php: 5.6
-      env:
-        - DEPS=locked
-        - LEGACY_DEPS="phpunit/phpunit"
-        - HELPER_DEPS="zendframework/zend-expressive-helpers:^2.2 zendframework/zend-expressive-router:^1.3.2"
-    - php: 5.6
-      env:
-        - DEPS=locked
-        - LEGACY_DEPS="phpunit/phpunit"
-        - HELPER_DEPS="zendframework/zend-expressive-helpers:^3.0.1"
-    - php: 5.6
-      env:
-        - DEPS=latest
-    - php: 7
-      env:
-        - DEPS=lowest
-    - php: 7
-      env:
-        - DEPS=locked
-        - LEGACY_DEPS="phpunit/phpunit"
-    - php: 7
-      env:
-        - DEPS=locked
-        - LEGACY_DEPS="phpunit/phpunit"
-        - HELPER_DEPS="zendframework/zend-expressive-helpers:^2.2 zendframework/zend-expressive-router:^1.3.2"
-    - php: 7
-      env:
-        - DEPS=locked
-        - LEGACY_DEPS="phpunit/phpunit"
-        - HELPER_DEPS="zendframework/zend-expressive-helpers:^3.0.1"
-    - php: 7
-      env:
-        - DEPS=latest
     - php: 7.1
       env:
         - DEPS=lowest
@@ -61,14 +21,6 @@ matrix:
         - DEPS=locked
         - CS_CHECK=true
         - TEST_COVERAGE=true
-    - 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
@@ -78,14 +30,6 @@ matrix:
     - php: 7.2
       env:
         - DEPS=locked
-    - php: 7.2
-      env:
-        - DEPS=locked
-        - HELPER_DEPS="zendframework/zend-expressive-helpers:^2.2 zendframework/zend-expressive-router:^1.3.2"
-    - php: 7.2
-      env:
-        - DEPS=locked
-        - HELPER_DEPS="zendframework/zend-expressive-helpers:^3.0.1"
     - php: 7.2
       env:
         - DEPS=latest
@@ -94,11 +38,9 @@ before_install:
   - if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
 
 install:
-  - travis_retry composer install $COMPOSER_ARGS --ignore-platform-reqs
-  - if [[ $LEGACY_DEPS != '' ]]; then travis_retry composer update $COMPOSER_ARGS --with-dependencies $LEGACY_DEPS ; fi
+  - travis_retry composer install $COMPOSER_ARGS
   - 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
   - stty cols 120 && composer show
 

CHANGELOG.md

@@ -2,27 +2,61 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
-## 1.5.0 - TBD
+## 2.0.0 - 2018-03-15
 
 ### Added
 
-- Nothing.
+- [#46](https://github.com/zendframework/zend-expressive-zendviewrenderer/pull/46) and
+  [#52](https://github.com/zendframework/zend-expressive-zendviewrenderer/pull/52)
+  add support for the zend-expressive-template v2 series,
+  zend-expressive-router v3 series, and zend-expressive-helpers v5 series.
+
+- [#47](https://github.com/zendframework/zend-expressive-zendviewrenderer/pull/47)
+  adds a `ConfigProvider` class with default service wiring and configuration
+  for the component. It also updates `composer.json` to add
+  `extra.zf.config-provider` configuration to notify zend-component-installer
+  of the shipped `ConfigProvider` class, allowing the plugin to inject the
+  `ConfigProvider` in your application configuration during initial
+  installation.
 
 ### Changed
 
-- Nothing.
+- [#37](https://github.com/zendframework/zend-expressive-zendviewrenderer/pull/37)
+  adds support for PSR-11. All exception types that previously extended from
+  container-interop exceptions now extend from PSR-11 exception interfaces,
+  and factories typehint against the PSR-11 `ContainerInterface`.
+
+- [#46](https://github.com/zendframework/zend-expressive-zendviewrenderer/pull/46)
+  updates all classes to use scalar and return type hints, including nullable
+  and void types. If you were extending classes from this package, you may need
+  to update signatures of methods you override.
+
+- [#45](https://github.com/zendframework/zend-expressive-zendviewrenderer/pull/45)
+  updates the `ExceptionInterface` to extend from the `ExceptionInterface`
+  provided in zend-expressive-template.
 
 ### Deprecated
 
 - Nothing.
 
 ### Removed
 
-- Nothing.
+- [#46](https://github.com/zendframework/zend-expressive-zendviewrenderer/pull/46)
+  removes support for PHP versions prior to PHP 7.1.
+
+- [#46](https://github.com/zendframework/zend-expressive-zendviewrenderer/pull/46)
+  removes support for zend-expressive-template versions prior to v2.
+
+- [#46](https://github.com/zendframework/zend-expressive-zendviewrenderer/pull/46)
+  removes support for zend-expressive-router versions prior to v3.
+
+- [#46](https://github.com/zendframework/zend-expressive-zendviewrenderer/pull/46)
+  removes support for zend-expressive-helpers versions prior to v5.
 
 ### Fixed
 
-- Nothing.
+- [#53](https://github.com/zendframework/zend-expressive-zendviewrenderer/pull/53)
+  adds the missing default layout.
 
 ## 1.4.2 - 2018-03-15
 
@@ -297,7 +331,7 @@ First stable release.
 - [#11](https://github.com/zendframework/zend-expressive-zendviewrenderer/pull/11)
   adds a factory for providing the `HelperPluginManager`, and support in the
   `ZendViewRendererFactory` for injecting the `HelperPluginManager` service
-  (using its FQCN) instead of instantiating one directly. 
+  (using its FQCN) instead of instantiating one directly.
 - [#13](https://github.com/zendframework/zend-expressive-zendviewrenderer/pull/13)
   adds `zendframework/zend-expressive-helpers` as a dependency, in order to
   consume its `UrlHelper` and `ServerUrlHelper` implementations.

composer.json

@@ -20,20 +20,23 @@
         "forum": "https://discourse.zendframework.com/c/questions/expressive"
     },
     "require": {
-        "php": "^5.6 || ^7.0",
-        "container-interop/container-interop": "^1.2",
+        "php": "^7.1",
+        "psr/container": "^1.0",
         "psr/http-message": "^1.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-expressive-helpers": "^5.0",
+        "zendframework/zend-expressive-router": "^3.0",
+        "zendframework/zend-expressive-template": "^2.0",
         "zendframework/zend-servicemanager": "^2.7.8 || ^3.3",
         "zendframework/zend-view": "^2.8.1"
     },
     "require-dev": {
         "malukenho/docheader": "^0.1.5",
-        "phpunit/phpunit": "^5.7.23 || ^6.4.3",
+        "phpunit/phpunit": "^7.0.2",
         "zendframework/zend-coding-standard": "~1.0.0"
     },
+    "conflict": {
+        "container-interop/container-interop": "<1.2.0"
+    },
     "autoload": {
         "psr-4": {
             "Zend\\Expressive\\ZendView\\": "src/"
@@ -49,9 +52,11 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.4.x-dev",
-            "dev-develop": "1.5.x-dev",
-            "dev-release-2.0.0": "2.0.x-dev"
+            "dev-master": "2.0.x-dev",
+            "dev-develop": "2.1.x-dev"
+        },
+        "zf": {
+            "config-provider": "Zend\\Expressive\\ZendView\\ConfigProvider"
         }
     },
     "scripts": {