Merging develop to master in preparation for 2.1.0 release

Author: weierophinney

.gitattributes

@@ -1,11 +1,11 @@
-/doc export-ignore
-/test export-ignore
 /.coveralls.yml export-ignore
 /.docheader export-ignore
 /.gitattributes export-ignore
 /.gitignore export-ignore
 /.travis.yml export-ignore
 /composer.lock export-ignore
+/docs/ export-ignore
 /mkdocs.yml export-ignore
 /phpcs.xml export-ignore
 /phpunit.xml.dist export-ignore
+/test/ export-ignore

.gitignore

@@ -1,7 +1,7 @@
-doc/html/
-vendor/
-phpunit.xml
-zf-mkdoc-theme/
-clover.xml
-coveralls-upload.json
-zf-mkdoc-theme.tgz
+/clover.xml
+/coveralls-upload.json
+/docs/html/
+/phpunit.xml
+/vendor/
+/zf-mkdoc-theme.tgz
+/zf-mkdoc-theme/

.travis.yml

@@ -10,27 +10,28 @@ env:
   global:
     - COMPOSER_ARGS="--no-interaction"
     - COVERAGE_DEPS="satooshi/php-coveralls"
-    - LEGACY_DEPS="phpunit/phpunit"
 
 matrix:
   include:
     - php: 5.6
       env:
         - DEPS=lowest
+        - LEGACY_DEPS="phpunit/phpunit malukenho/docheader"
     - php: 5.6
       env:
         - DEPS=locked
-        - CS_CHECK=true
-        - TEST_COVERAGE=true
+        - 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
@@ -40,6 +41,8 @@ matrix:
     - php: 7.1
       env:
         - DEPS=locked
+        - CS_CHECK=true
+        - TEST_COVERAGE=true
     - php: 7.1
       env:
         - DEPS=latest
@@ -52,16 +55,13 @@ matrix:
     - php: 7.2
       env:
         - DEPS=latest
-  allow_failures:
-    - php: 7.2
 
 before_install:
-  - if [[ $TEST_COVERAGE != 'true' && "$(php --version | grep xdebug -ci)" -ge 1 ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
-  - travis_retry composer self-update
+  - if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
 
 install:
   - travis_retry composer install $COMPOSER_ARGS --ignore-platform-reqs
-  - if [[ $TRAVIS_PHP_VERSION =~ ^5.6 ]]; then travis_retry composer update $COMPOSER_ARGS --with-dependencies $LEGACY_DEPS ; fi
+  - if [[ $LEGACY_DEPS != '' ]]; 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 [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS $COVERAGE_DEPS ; fi

CHANGELOG.md

@@ -2,6 +2,53 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
+## 2.1.0 - 2017-12-11
+
+### Added
+
+- [#480](https://github.com/zendframework/zend-expressive/pull/480) updates the
+  `ImplicitHeadMiddleware` to add a request attribute indicating the request was
+  originally generated for a `HEAD` request before delegating the request; you
+  can now pull the attribute `Zend\Expressive\Middleware\ImplicitHeadMiddleware::FORWARDED_HTTP_METHOD_ATTRIBUTE`
+  in your own middleware in order to vary behavior in these scenarios.
+
+### Changed
+
+- [#505](https://github.com/zendframework/zend-expressive/pull/505) modifies
+  `Zend\Expressive\Application` to remove implementation of `__call()` in favor
+  of the following new methods:
+
+  - `get($path, $middleware, $name = null)`
+  - `post($path, $middleware, $name = null)`
+  - `put($path, $middleware, $name = null)`
+  - `patch($path, $middleware, $name = null)`
+  - `delete($path, $middleware, $name = null)`
+
+  This change is an internal implementation detail only, and will not affect
+  existing implementations or extensions.
+
+- [#511](https://github.com/zendframework/zend-expressive/pull/511) modifies
+  the `NotFoundDelegate` to accept an optional `$layout` argument to its
+  constructor; the value defaults to `layout::default` if not provided. That
+  value will be passed for the `layout` template variable when the delegate
+  renders a template, allowing zend-view users (and potentially other template
+  systems) to customize the layout template used for reporting errors.
+
+  You may provide the template via the configuration
+  `zend-expressive.error_handler.layout`.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- Nothing.
+
 ## 2.0.6 - 2017-12-11
 
 ### Added

LICENSE.md

@@ -1,12 +1,27 @@
-Copyright (c) 2015-2016, Zend Technologies USA, Inc.
+Copyright (c) 2015-2017, Zend Technologies USA, Inc.
 All rights reserved.
 
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
-- Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+- Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
 
-- Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+- Redistributions in binary form must reproduce the above copyright notice, this
+  list of conditions and the following disclaimer in the documentation and/or
+  other materials provided with the distribution.
 
-- Neither the name of Zend Technologies USA, Inc. nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+- Neither the name of Zend Technologies USA, Inc. nor the names of its
+  contributors may be used to endorse or promote products derived from this
+  software without specific prior written permission.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

README.md

@@ -84,7 +84,7 @@ documentation.
 
 ## Documentation
 
-Documentation is [in the doc tree](doc/book/), and can be compiled using [mkdocs](http://www.mkdocs.org):
+Documentation is [in the doc tree](docs/book/), and can be compiled using [mkdocs](http://www.mkdocs.org):
 
 ```bash
 $ mkdocs build

composer.json

@@ -1,29 +1,25 @@
 {
     "name": "zendframework/zend-expressive",
     "description": "PSR-7 Middleware Microframework based on Stratigility",
-    "homepage": "https://docs.zendframework.com/zend-expressive/",
-    "type": "library",
     "license": "BSD-3-Clause",
     "keywords": [
         "http",
         "middleware",
         "psr",
         "psr-7",
-        "psr-11"
+        "psr-11",
+        "zf",
+        "zendframework",
+        "zend-expressive"
     ],
     "support": {
         "docs": "https://docs.zendframework.com/zend-expressive/",
         "issues": "https://github.com/zendframework/zend-expressive/issues",
         "source": "https://github.com/zendframework/zend-expressive",
+        "rss": "https://github.com/zendframework/zend-expressive/releases.atom",
         "slack": "https://zendframework-slack.herokuapp.com",
         "forum": "https://discourse.zendframework.com/c/questions/expressive"
     },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.0-dev",
-            "dev-develop": "2.1-dev"
-        }
-    },
     "require": {
         "php": "^5.6 || ^7.0",
         "fig/http-message-util": "^1.1.2",
@@ -39,7 +35,7 @@
         "filp/whoops": "^2.1.6 || ^1.1.10",
         "malukenho/docheader": "^0.1.5",
         "mockery/mockery": "^1.0",
-        "phpunit/phpunit": "^5.7.22 || ^6.4.1",
+        "phpunit/phpunit": "^5.7.23 || ^6.4.3",
         "zendframework/zend-coding-standard": "~1.0.0",
         "zendframework/zend-expressive-aurarouter": "^2.0",
         "zendframework/zend-expressive-fastroute": "^2.0",
@@ -49,6 +45,14 @@
     "conflict": {
         "container-interop/container-interop": "<1.2.0"
     },
+    "suggest": {
+        "filp/whoops": "^2.1 to use the Whoops error handler",
+        "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-servicemanager": "^3.3 to use zend-servicemanager for dependency injection"
+    },
     "autoload": {
         "psr-4": {
             "Zend\\Expressive\\": "src/"
@@ -62,13 +66,15 @@
             "test/class_exists.php"
         ]
     },
-    "suggest": {
-        "filp/whoops": "^2.1 to use the Whoops error handler",
-        "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-servicemanager": "^3.3 to use zend-servicemanager for dependency injection"
+    "config": {
+        "sort-packages": true
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "2.1.x-dev",
+            "dev-develop": "2.2.x-dev",
+            "dev-release-3.0.0": "3.0.x-dev"
+        }
     },
     "bin": [
         "bin/expressive-tooling"
@@ -79,11 +85,11 @@
             "@cs-check",
             "@test"
         ],
-        "upload-coverage": "coveralls -v",
         "cs-check": "phpcs",
         "cs-fix": "phpcbf",
         "test": "phpunit --colors=always",
-        "test-coverage": "phpunit --coverage-clover clover.xml",
-        "license-check": "vendor/bin/docheader check src/ test/"
+        "test-coverage": "phpunit --colors=always --coverage-clover clover.xml",
+        "upload-coverage": "coveralls -v",
+        "license-check": "docheader check src/ test/"
     }
 }