Corrected rebase conflicts - moved middleware pipe dispatch into the controller wrapper

Author: Ocramius

src/Controller/MiddlewareController.php

@@ -9,14 +9,19 @@
 
 namespace Zend\Mvc\Controller;
 
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
 use Zend\EventManager\EventManager;
 use Zend\Http\Request;
 use Zend\Http\Response;
+use Zend\Mvc\Exception\ReachedFinalHandlerException;
 use Zend\Mvc\Exception\RuntimeException;
 use Zend\Mvc\MvcEvent;
 use Zend\Psr7Bridge\Psr7Response;
 use Zend\Psr7Bridge\Psr7ServerRequest;
 use Zend\Router\RouteMatch;
+use Zend\Stratigility\Delegate\CallableDelegateDecorator;
+use Zend\Stratigility\MiddlewarePipe;
 
 /**
  * Note: I'm a terrible person
@@ -27,17 +32,28 @@
 final class MiddlewareController extends AbstractController
 {
     /**
-     * @var callable
+     * @var MiddlewarePipe
      */
-    private $middleware;
+    private $pipe;
 
-    public function __construct(callable $middleware, EventManager $eventManager, MvcEvent $event)
-    {
-        $this->eventIdentifier = __CLASS__;
-        $this->middleware      = $middleware;
+    /**
+     * @var ResponseInterface
+     */
+    private $responsePrototype;
+
+    public function __construct(
+        MiddlewarePipe $pipe,
+        ResponseInterface $responsePrototype,
+        EventManager $eventManager,
+        MvcEvent $event
+    ) {
+        $this->eventIdentifier   = __CLASS__;
+        $this->pipe              = $pipe;
+        $this->responsePrototype = $responsePrototype;
 
         $this->setEventManager($eventManager);
         $this->setEvent($event);
+
     }
 
     /**
@@ -74,7 +90,12 @@ public function onDispatch(MvcEvent $e)
             }
         }
 
-        $result = \call_user_func($this->middleware, $psr7Request, Psr7Response::fromZend($response));
+        $result = $this->pipe->process($psr7Request, new CallableDelegateDecorator(
+            function (ServerRequestInterface $request, ResponseInterface $response) {
+                throw ReachedFinalHandlerException::create();
+            },
+            $this->responsePrototype
+        ));
 
         $e->setResult($result);
 

src/MiddlewareListener.php

@@ -83,20 +83,11 @@ public function onDispatch(MvcEvent $event)
         $caughtException = null;
         try {
             $return = (new MiddlewareController(
-                $middleware,
+                $pipe,
+                $psr7ResponsePrototype,
                 $application->getServiceManager()->get('EventManager'),
                 $event
             ))->dispatch($request, $response);
-            $psr7Request = Psr7Request::fromZend($request)->withAttribute(RouteMatch::class, $routeMatch);
-            foreach ($routeMatch->getParams() as $key => $value) {
-                $psr7Request = $psr7Request->withAttribute($key, $value);
-            }
-            $return = $pipe->process($psr7Request, new CallableDelegateDecorator(
-                function (PsrServerRequestInterface $request, PsrResponseInterface $response) {
-                    throw ReachedFinalHandlerException::create();
-                },
-                $psr7ResponsePrototype
-            ));
         } catch (\Throwable $ex) {
             $caughtException = $ex;
         } catch (\Exception $ex) {  // @TODO clean up once PHP 7 requirement is enforced

test/MiddlewareListenerTest.php

@@ -89,7 +89,6 @@ public function testSuccessfullyDispatchesMiddleware()
         $application = $event->getApplication();
 
         $application->getEventManager()->attach(MvcEvent::EVENT_DISPATCH_ERROR, function ($e) {
-            die(var_dump($e->getParam('exception')->getMessage()));
             $this->fail(sprintf('dispatch.error triggered when it should not be: %s', var_export($e->getError(), 1)));
         });
 
@@ -163,6 +162,7 @@ public function testSuccessfullyDispatchesPipeOfCallableAndHttpInteropStyleMiddl
         $eventManager = new EventManager();
 
         $serviceManager = $this->prophesize(ContainerInterface::class);
+        $serviceManager->get('EventManager')->willReturn($eventManager);
         $serviceManager->has('firstMiddleware')->willReturn(true);
         $serviceManager->get('firstMiddleware')->willReturn(function ($request, $response, $next) {
             $this->assertInstanceOf(ServerRequestInterface::class, $request);
@@ -303,6 +303,8 @@ public function testMiddlewareWithNothingPipedReachesFinalHandlerException()
         });
         $application->getResponse()->willReturn($response);
 
+        $serviceManager->get('EventManager')->willReturn($eventManager);
+
         $event = new MvcEvent();
         $event->setRequest(new Request());
         $event->setResponse($response);