Merging develop to master in preparation for 2.0.0 release

.docheader

@@ -3,3 +3,5 @@
  * @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-template/blob/master/LICENSE.md New BSD License
  */
+
+declare(strict_types=1);

.travis.yml

@@ -13,26 +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=latest
-    - php: 7
-      env:
-        - DEPS=lowest
-    - php: 7
-      env:
-        - DEPS=locked
-        - LEGACY_DEPS="phpunit/phpunit"
-    - php: 7
-      env:
-        - DEPS=latest
     - php: 7.1
       env:
         - DEPS=lowest
@@ -58,8 +38,7 @@ 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 [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS $COVERAGE_DEPS ; fi

CHANGELOG.md

@@ -2,12 +2,23 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
-## 1.0.5 - TBD
+## 2.0.0 - 2018-03-15
 
 ### Added
 
 - Nothing.
 
+### Changed
+
+- [#17](https://github.com/zendframework/zend-expressive-template/pull/17)
+  updates the component to add return type hints and scalar type hints,
+  including nullable types and `void` return types. Notably, this affects the
+  `TemplateRendererInterface`, which updates its method signatures to read:
+  - `public function render(string $name, $params = []) : string`
+  - `public function addPath(string $path, string $namespace = null) : void`
+  - `public function getPaths() : array`
+  - `public function addDefaultParam(string $templateName, string $param, $value) : void`
+
 ### Deprecated
 
 - Nothing.

composer.json

@@ -17,17 +17,17 @@
         "forum": "https://discourse.zendframework.com/c/questions/expressive"
     },
     "require": {
-        "php": "^5.6 || ^7.0"
+        "php": "^7.1"
     },
     "require-dev": {
-        "malukenho/docheader": "^0.1.5",
-        "phpunit/phpunit": "^5.7.23 || ^6.4.3",
+        "malukenho/docheader": "^0.1.6",
+        "phpunit/phpunit": "^7.0.2",
         "zendframework/zend-coding-standard": "~1.0.0"
     },
     "suggest": {
-        "zendframework/zend-expressive-platesrenderer": "^1.2.1 to use the Plates template renderer",
-        "zendframework/zend-expressive-twigrenderer": "^1.3 to use the Twig template renderer",
-        "zendframework/zend-expressive-zendviewrenderer": "^1.3 to use the zend-view PhpRenderer template renderer"
+        "zendframework/zend-expressive-platesrenderer": "^2.0 to use the Plates template renderer",
+        "zendframework/zend-expressive-twigrenderer": "^2.0 to use the Twig template renderer",
+        "zendframework/zend-expressive-zendviewrenderer": "^2.0 to use the zend-view PhpRenderer template renderer"
     },
     "autoload": {
         "psr-4": {
@@ -44,9 +44,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.0.x-dev",
-            "dev-develop": "1.1.x-dev",
-            "dev-release-2.0.0": "2.0.x-dev"
+            "dev-master": "2.0.x-dev",
+            "dev-develop": "2.1.x-dev"
         }
     },
     "scripts": {