Merge branch 'hotfix/100'

Close #100
zendframework · Mar 9, 2017 · a8c6bd6 · a8c6bd6
2 parents 818b2ab + cc8b48b
commit a8c6bd6
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,24 @@ Versions prior to 1.0 were originally released as `phly/conduit`; please visit
 its [CHANGELOG](https://github.com/phly/conduit/blob/master/CHANGELOG.md) for
 details.
 
+## 2.1.0 - TBD
+
+### Added
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- Nothing.
+
 ## 2.0.2 - TBD
 
 ### Added

diff --git a/doc/book/middleware.md b/doc/book/middleware.md
@@ -7,9 +7,10 @@ take the incoming request, perform actions based on it, and either complete the
 response or pass delegation on to the next middleware in the queue.
 
 ```php
-use Zend\Stratigility\MiddlewarePipe;
 use Zend\Diactoros\Response;
 use Zend\Diactoros\Server;
+use Zend\Stratigility\MiddlewarePipe;
+use Zend\Stratigility\NoopFinalHandler;
 
 require __DIR__ . '/../vendor/autoload.php';
 
@@ -33,7 +34,7 @@ $app->pipe('/foo', function ($req, $res, $next) {
     return $res;
 });
 
-$server->listen();
+$server->listen(new NoopFinalHandler());
 ```
 
 In the above example, we have two examples of middleware. The first is a