Ensure RoutingMiddleware does not wipe off existing params keys.

Closes #10989
cakephp · Aug 3, 2017 · 11a742e · 11a742e
1 parent 51f9ab8
commit 11a742e
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 1 deletion.
diff --git a/src/Routing/Middleware/RoutingMiddleware.php b/src/Routing/Middleware/RoutingMiddleware.php
@@ -88,7 +88,7 @@ public function __invoke(ServerRequestInterface $request, ResponseInterface $res
                 if (is_array($parsedBody) && isset($parsedBody['_method'])) {
                     $request = $request->withMethod($parsedBody['_method']);
                 }
-                $params = Router::parseRequest($request);
+                $params = Router::parseRequest($request) + $params;
                 if (isset($params['_middleware'])) {
                     $middleware = $params['_middleware'];
                     unset($params['_middleware']);

diff --git a/tests/TestCase/Routing/Middleware/RoutingMiddlewareTest.php b/tests/TestCase/Routing/Middleware/RoutingMiddlewareTest.php
@@ -105,6 +105,31 @@ public function testRouterSetParams()
         $middleware($request, $response, $next);
     }
 
+    /**
+     * Test routing middleware does wipe off existing params keys.
+     *
+     * @return void
+     */
+    public function testPreservingExistingParams()
+    {
+        $request = ServerRequestFactory::fromGlobals(['REQUEST_URI' => '/articles']);
+        $request = $request->withAttribute('params', ['_csrfToken' => 'i-am-groot']);
+        $response = new Response();
+        $next = function ($req, $res) {
+            $expected = [
+                'controller' => 'Articles',
+                'action' => 'index',
+                'plugin' => null,
+                'pass' => [],
+                '_matchedRoute' => '/articles',
+                '_csrfToken' => 'i-am-groot'
+            ];
+            $this->assertEquals($expected, $req->getAttribute('params'));
+        };
+        $middleware = new RoutingMiddleware();
+        $middleware($request, $response, $next);
+    }
+
     /**
      * Test middleware invoking hook method
      *