Splitting request attribute population into a private method

Author: Ocramius

src/Controller/MiddlewareController.php

@@ -10,6 +10,7 @@
 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;
@@ -80,13 +81,10 @@ public function onDispatch(MvcEvent $e)
         }
 
         $routeMatch  = $e->getRouteMatch();
-        $psr7Request = Psr7ServerRequest::fromZend($request)->withAttribute(RouteMatch::class, $routeMatch);
-
-        if ($routeMatch) {
-            foreach ($routeMatch->getParams() as $key => $value) {
-                $psr7Request = $psr7Request->withAttribute($key, $value);
-            }
-        }
+        $psr7Request = $this->populateRequestParametersFromRoute(
+            Psr7ServerRequest::fromZend($request)->withAttribute(RouteMatch::class, $routeMatch),
+            $routeMatch
+        );
 
         $result = $this->pipe->process($psr7Request, new CallableDelegateDecorator(
             function () {
@@ -99,4 +97,23 @@ function () {
 
         return $result;
     }
+
+    /**
+     * @param ServerRequestInterface $request
+     * @param RouteMatch|null $routeMatch
+     *
+     * @return ServerRequestInterface
+     */
+    private function populateRequestParametersFromRoute(ServerRequestInterface $request, RouteMatch $routeMatch = null)
+    {
+        if (! $routeMatch) {
+            return $request;
+        }
+
+        foreach ($routeMatch->getParams() as $key => $value) {
+            $request = $request->withAttribute($key, $value);
+        }
+
+        return $request;
+    }
 }