Merge branch 'feature/http-middleware-0.4.1' into feature/dev-http-mi…

…ddleware-0.4.1 Conflicts: CHANGELOG.md composer.lock src/Dispatch.php src/Middleware/ErrorHandler.php src/Middleware/NotFoundHandler.php src/MiddlewarePipe.php src/Next.php src/Route.php test/DispatchTest.php test/Middleware/CallableInteropMiddlewareWrapperTest.php test/Middleware/CallableMiddlewareWrapperTest.php test/Middleware/ErrorHandlerTest.php test/Middleware/NotFoundHandlerTest.php test/MiddlewarePipeTest.php test/NextTest.php
zendframework · Jan 23, 2017 · c718caa · c718caa
2 parents c59a22a + 57b645e
commit c718caa
Show file tree

Hide file tree

Showing 18 changed files with 170 additions and 186 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -144,24 +144,6 @@ details.
 
 - Nothing.
 
-## 1.4.0 - TBD
-
-### Added
-
-- Nothing.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- Nothing.
-
 ## 1.3.3 - TBD
 
 ### Added

diff --git a/composer.json b/composer.json
@@ -24,7 +24,7 @@
     "php": "^5.6 || ^7.0",
     "psr/http-message": "^1.0",
     "zendframework/zend-escaper": "^2.3",
-    "http-interop/http-middleware": "^0.2.0"
+    "http-interop/http-middleware": "^0.4.1"
   },
   "require-dev": {
     "zendframework/zend-diactoros": "^1.0",