Merge branch 'feature/517-revert' into develop

Close #534

Author: weierophinney

.travis.yml

@@ -10,21 +10,23 @@ 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
+        - LEGACY_DEPS="phpunit/phpunit malukenho/docheader"
         - CS_CHECK=true
         - TEST_COVERAGE=true
     - php: 5.6
       env:
         - DEPS=latest
+        - LEGACY_DEPS="phpunit/phpunit malukenho/docheader"
     - php: 7
       env:
         - DEPS=lowest
@@ -61,7 +63,7 @@ before_install:
 
 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

@@ -6,11 +6,7 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Added
 
-- [#517](https://github.com/zendframework/zend-expressive/pull/517) adds
-  support for http-interop/http-middleware 0.5.0 via a polyfill provided by the
-  package webimpress/http-middleware-compatibility. Essentially, this means you
-  can drop this package into an application targeting either the 0.4.1 or 0.5.0
-  versions of http-middleware, and it will "just work".
+- Nothing.
 
 ### Changed
 

composer.json

@@ -24,20 +24,16 @@
             "dev-develop": "2.1-dev"
         }
     },
-    "config": {
-        "sort-packages": true
-    },
     "require": {
         "php": "^5.6 || ^7.0",
         "fig/http-message-util": "^1.1.2",
         "http-interop/http-middleware": "^0.4.1",
         "psr/container": "^1.0",
         "psr/http-message": "^1.0.1",
-        "webimpress/http-middleware-compatibility": "^0.1.1",
         "zendframework/zend-diactoros": "^1.3.10",
-        "zendframework/zend-expressive-router": "^2.2",
+        "zendframework/zend-expressive-router": "^2.1",
         "zendframework/zend-expressive-template": "^1.0.4",
-        "zendframework/zend-stratigility": "^2.1"
+        "zendframework/zend-stratigility": "^2.0.1"
     },
     "require-dev": {
         "filp/whoops": "^2.1.6 || ^1.1.10",