Merge branch 'feature/529-psr-15' into release-3.0.0

Close #529

Author: weierophinney

.docheader

@@ -1,5 +1,7 @@
 /**
  * @see       https://github.com/zendframework/zend-expressive 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/blob/master/LICENSE.md New BSD License
  */
+
+declare(strict_types=1);

.travis.yml

@@ -13,28 +13,6 @@ env:
 
 matrix:
   include:
-    - php: 5.6
-      env:
-        - DEPS=lowest
-        - LEGACY_DEPS="phpunit/phpunit malukenho/docheader"
-    - php: 5.6
-      env:
-        - DEPS=locked
-        - LEGACY_DEPS="phpunit/phpunit malukenho/docheader"
-    - php: 5.6
-      env:
-        - DEPS=latest
-        - LEGACY_DEPS="phpunit/phpunit malukenho/docheader"
-    - 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
@@ -60,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,6 +2,33 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
+## 3.0.0alpha1 - TBD
+
+### Added
+
+- [#529](https://github.com/zendframework/zend-expressive/pull/529) adds support
+  for PSR-15.
+
+### Changed
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- [#529](https://github.com/zendframework/zend-expressive/pull/529) removes
+  support for PHP versions prior to PHP 7.1.
+
+- [#529](https://github.com/zendframework/zend-expressive/pull/529) removes
+  support for http-interop/http-middleware.
+
+### Fixed
+
+- Nothing.
+
 ## 2.1.0 - 2017-12-11
 
 ### Added

bin/expressive-tooling

@@ -4,10 +4,12 @@
  * Script for migrating configuration-driven pipelines/routes to programmatic usage.
  *
  * @see       https://github.com/zendframework/zend-expressive for the canonical source repository
- * @copyright Copyright (c) 2016 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2016-2017 Zend Technologies USA Inc. (https://www.zend.com)
  * @license   https://github.com/zendframework/zend-expressive/blob/master/LICENSE.md New BSD License
  */
 
+declare(strict_types=1);
+
 namespace Zend\Expressive;
 
 if (false === ($paths = getenv('PATH'))) {

composer.json

@@ -8,6 +8,7 @@
         "psr",
         "psr-7",
         "psr-11",
+        "expressive",
         "zf",
         "zendframework",
         "zend-expressive"
@@ -21,26 +22,26 @@
         "forum": "https://discourse.zendframework.com/c/questions/expressive"
     },
     "require": {
-        "php": "^5.6 || ^7.0",
+        "php": "^7.1",
         "fig/http-message-util": "^1.1.2",
-        "http-interop/http-middleware": "^0.4.1",
+        "http-interop/http-server-middleware": "^1.0.1",
         "psr/container": "^1.0",
         "psr/http-message": "^1.0.1",
         "zendframework/zend-diactoros": "^1.3.10",
-        "zendframework/zend-expressive-router": "^2.1",
+        "zendframework/zend-expressive-router": "^3.0.0-dev",
         "zendframework/zend-expressive-template": "^1.0.4",
-        "zendframework/zend-stratigility": "^2.0.1"
+        "zendframework/zend-stratigility": "^3.0.0-dev"
     },
     "require-dev": {
-        "filp/whoops": "^2.1.6 || ^1.1.10",
-        "malukenho/docheader": "^0.1.5",
+        "filp/whoops": "^1.1.10 || ^2.1.13",
+        "malukenho/docheader": "^0.1.6",
         "mockery/mockery": "^1.0",
-        "phpunit/phpunit": "^5.7.23 || ^6.4.3",
+        "phpunit/phpunit": "^6.5.3",
         "zendframework/zend-coding-standard": "~1.0.0",
-        "zendframework/zend-expressive-aurarouter": "^2.0",
-        "zendframework/zend-expressive-fastroute": "^2.0",
-        "zendframework/zend-expressive-zendrouter": "^2.0.1",
-        "zendframework/zend-servicemanager": "^3.3 || ^2.7.8"
+        "zendframework/zend-expressive-aurarouter": "^3.0.0-dev",
+        "zendframework/zend-expressive-fastroute": "^3.0.0-dev",
+        "zendframework/zend-expressive-zendrouter": "^3.0.0-dev",
+        "zendframework/zend-servicemanager": "^2.7.8 || ^3.3"
     },
     "conflict": {
         "container-interop/container-interop": "<1.2.0"