Merging develop to master in preparation for 3.0.0 release

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);

.gitattributes

@@ -7,5 +7,6 @@
 /docs/ export-ignore
 /mkdocs.yml export-ignore
 /phpcs.xml export-ignore
+/phpstan.neon export-ignore
 /phpunit.xml.dist export-ignore
 /test/ export-ignore

.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 symfony/console symfony/debug symfony/finder"
-    - php: 7
-      env:
-        - DEPS=latest
     - php: 7.1
       env:
         - DEPS=lowest
@@ -52,6 +30,7 @@ matrix:
     - php: 7.2
       env:
         - DEPS=locked
+        - PHPSTAN_CHECK=true
     - php: 7.2
       env:
         - DEPS=latest
@@ -60,19 +39,18 @@ 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
-  - if [[ $TEST_COVERAGE == 'true' ]]; then cp phpunit.xml.dist-coverage phpunit.xml.dist ; fi
   - stty cols 120 && composer show
   - cat phpunit.xml.dist
 
 script:
   - if [[ $TEST_COVERAGE == 'true' ]]; then composer test-coverage ; else composer test ; fi
   - if [[ $CS_CHECK == 'true' ]]; then composer cs-check ; fi
   - if [[ $CS_CHECK == 'true' ]]; then composer license-check ; fi
+  - if [[ $PHPSTAN_CHECK == 'true' ]]; then composer phpstan ; fi
 
 after_script:
   - if [[ $TEST_COVERAGE == 'true' ]]; then vendor/bin/php-coveralls -v ; fi

CHANGELOG.md

@@ -1,4 +1,4 @@
-Copyright (c) 2015-2017, Zend Technologies USA, Inc.
+Copyright (c) 2015-2018, Zend Technologies USA, Inc.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

LICENSE.md

@@ -73,10 +73,10 @@ can recommend the following implementations:
 
 - [zend-servicemanager](https://github.com/zendframework/zend-servicemanager):
   `composer require zendframework/zend-servicemanager`
-- [pimple-container-interop](https://github.com/xtreamwayz/pimple-container-interop):
-  `composer require xtreamwayz/pimple-container-interop`
-- [Aura.Di](https://github.com/auraphp/Aura.Di):
-  `composer require aura/di`
+- [Pimple](https://github.com/silexphp/Pimple) (see [docs](docs/book/features/container/pimple.md) for more details):
+  `composer require zendframework/zend-pimple-config`
+- [Aura.Di](https://github.com/auraphp/Aura.Di) (see [docs](docs/book/features/container/aura-di.md) for more details):
+  `composer require zendframework/zend-auradi-config`
 
 Additionally, you may optionally want to install a template renderer
 implementation, and/or an error handling integration. These are covered in the

README.md

@@ -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'))) {

bin/expressive-tooling

@@ -1,13 +1,15 @@
 {
     "name": "zendframework/zend-expressive",
-    "description": "PSR-7 Middleware Microframework based on Stratigility",
+    "description": "PSR-15 Middleware Microframework",
     "license": "BSD-3-Clause",
     "keywords": [
         "http",
         "middleware",
         "psr",
         "psr-7",
         "psr-11",
+        "psr-15",
+        "expressive",
         "zf",
         "zendframework",
         "zend-expressive"
@@ -21,58 +23,63 @@
         "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",
         "psr/container": "^1.0",
         "psr/http-message": "^1.0.1",
-        "zendframework/zend-diactoros": "^1.3.10",
-        "zendframework/zend-expressive-router": "^2.4.1",
-        "zendframework/zend-expressive-template": "^1.0.4",
-        "zendframework/zend-stratigility": "^2.2.0"
+        "psr/http-server-middleware": "^1.0",
+        "zendframework/zend-expressive-router": "^3.0",
+        "zendframework/zend-expressive-template": "^2.0",
+        "zendframework/zend-httphandlerrunner": "^1.0.1",
+        "zendframework/zend-stratigility": "^3.0"
     },
     "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",
+        "phpstan/phpstan": "^0.9.2",
+        "phpstan/phpstan-strict-rules": "^0.9",
+        "phpunit/phpunit": "^7.0.1",
         "zendframework/zend-coding-standard": "~1.0.0",
-        "zendframework/zend-expressive-aurarouter": "^2.2",
-        "zendframework/zend-expressive-fastroute": "^2.2",
-        "zendframework/zend-expressive-zendrouter": "^2.2",
-        "zendframework/zend-servicemanager": "^3.3 || ^2.7.8"
+        "zendframework/zend-diactoros": "^1.7.1",
+        "zendframework/zend-expressive-aurarouter": "^3.0",
+        "zendframework/zend-expressive-fastroute": "^3.0",
+        "zendframework/zend-expressive-zendrouter": "^3.0",
+        "zendframework/zend-servicemanager": "^2.7.8 || ^3.3"
     },
     "conflict": {
-        "container-interop/container-interop": "<1.2.0"
+        "container-interop/container-interop": "<1.2.0",
+        "zendframework/zend-diactoros": "<1.7.1"
     },
     "suggest": {
         "filp/whoops": "^2.1 to use the Whoops error handler",
+        "psr/http-message-implementation": "Please install a psr/http-message-implementation to consume Expressive; e.g., zendframework/zend-diactoros",
+        "zendframework/zend-auradi-config": "^1.0 to use Aura.Di dependency injection container",
         "zendframework/zend-expressive-helpers": "^3.0 for its UrlHelper, ServerUrlHelper, and BodyParseMiddleware",
-        "aura/di": "^3.2 to make use of Aura.Di dependency injection container",
-        "xtreamwayz/pimple-container-interop": "^1.0 to use Pimple for dependency injection",
-        "zendframework/zend-expressive-tooling": "For migration and development tools; require it with the --dev flag",
+        "zendframework/zend-expressive-tooling": "^1.0 for migration and development tools; require it with the --dev flag",
+        "zendframework/zend-pimple-config": "^1.0 to use Pimple for dependency injection container",
         "zendframework/zend-servicemanager": "^3.3 to use zend-servicemanager for dependency injection"
     },
     "autoload": {
+        "files": [
+            "src/constants.php"
+        ],
         "psr-4": {
             "Zend\\Expressive\\": "src/"
         }
     },
     "autoload-dev": {
         "psr-4": {
             "ZendTest\\Expressive\\": "test/"
-        },
-        "files": [
-            "test/class_exists.php"
-        ]
+        }
     },
     "config": {
         "sort-packages": true
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.2.x-dev",
-            "dev-develop": "3.0.x-dev"
+            "dev-master": "3.0.x-dev",
+            "dev-develop": "3.1.x-dev"
         },
         "zf": {
             "config-provider": "Zend\\Expressive\\ConfigProvider"
@@ -89,6 +96,7 @@
         ],
         "cs-check": "phpcs",
         "cs-fix": "phpcbf",
+        "phpstan": "phpstan analyze -l max -c phpstan.neon ./src",
         "test": "phpunit --colors=always",
         "test-coverage": "phpunit --colors=always --coverage-clover clover.xml",
         "license-check": "docheader check src/ test/"