Copy route match params into PSR-7 request attributes

Author: asgrim

Diff for: src/MiddlewareListener.php

@@ -59,7 +59,11 @@ public function onDispatch(MvcEvent $event)
 
         $caughtException = null;
         try {
-            $return = $middleware(Psr7Request::fromZend($request), Psr7Response::fromZend($response));
+            $psr7Request = Psr7Request::fromZend($request);
+            foreach ($routeMatch->getParams() as $key => $value) {
+                $psr7Request = $psr7Request->withAttribute($key, $value);
+            }
+            $return = $middleware($psr7Request, Psr7Response::fromZend($response));
         } catch (\Throwable $ex) {
             $caughtException = $ex;
         } catch (\Exception $ex) {  // @TODO clean up once PHP 7 requirement is enforced

Diff for: test/MiddlewareListenerTest.php

@@ -29,7 +29,6 @@ class MiddlewareListenerTest extends TestCase
      */
     private $routeMatch;
 
-
     /**
      * Create an MvcEvent, populated with everything it needs.
      *
@@ -42,6 +41,7 @@ public function createMvcEvent($middlewareMatched, $middleware = null)
         $response   = new Response();
         $this->routeMatch = $this->prophesize(RouteMatch::class);
         $this->routeMatch->getParam('middleware', false)->willReturn($middlewareMatched);
+        $this->routeMatch->getParams()->willReturn([]);
 
         $eventManager = new EventManager();
 
@@ -153,6 +153,7 @@ public function testCanLoadFromAbstractFactory()
         $response   = new Response();
         $routeMatch = $this->prophesize(RouteMatch::class);
         $routeMatch->getParam('middleware', false)->willReturn('test');
+        $routeMatch->getParams()->willReturn([]);
 
         $eventManager = new EventManager();