Merge 84aa889 into e9ca722

thephpleague · Jul 23, 2019 · be1be76 · be1be76
2 parents e9ca722 + 84aa889
commit be1be76
Show file tree

Hide file tree

Showing 2 changed files with 73 additions and 4 deletions.
diff --git a/src/Dispatcher.php b/src/Dispatcher.php
@@ -42,12 +42,27 @@ public function dispatchRequest(ServerRequestInterface $request): ResponseInterf
             case FastRoute::FOUND:
                 $route = $this->ensureHandlerIsRoute($match[1], $httpMethod, $uri)->setVars($match[2]);
                 $this->setFoundMiddleware($route);
+                $request = $this->requestWithRouteVars($request, $route);
                 break;
         }
 
         return $this->handle($request);
     }
 
+    /**
+     * @param ServerRequestInterface $request
+     * @param Route $route
+     * @return ServerRequestInterface
+     */
+    private function requestWithRouteVars(ServerRequestInterface $request, Route $route): ServerRequestInterface
+    {
+        $queryParams = $request->getQueryParams() ?: [];
+        $routerParams = $route->getVars() ?: [];
+        $params = array_merge($queryParams, $routerParams);
+
+        return $request->withQueryParams($params);
+    }
+
     /**
      * Ensure handler is a Route, honoring the contract of dispatchRequest.
      *

diff --git a/tests/DispatchIntegrationTest.php b/tests/DispatchIntegrationTest.php
@@ -37,6 +37,12 @@ public function testDispatchesFoundRoute(): void
             ->willReturn('GET')
         ;
 
+        $request
+            ->expects($this->once())
+            ->method('withQueryParams')
+            ->willReturn($request)
+        ;
+
         $request
             ->expects($this->exactly(2))
             ->method('getUri')
@@ -93,6 +99,12 @@ public function testDispatchesExceptionRoute(): void
             ->willReturn('GET')
         ;
 
+        $request
+            ->expects($this->once())
+            ->method('withQueryParams')
+            ->willReturn($request)
+        ;
+
         $request
             ->expects($this->exactly(2))
             ->method('getUri')
@@ -132,6 +144,12 @@ public function testDispatchesExceptionWithJsonStrategyRoute(): void
             ->willReturn($uri)
         ;
 
+        $request
+            ->expects($this->once())
+            ->method('withQueryParams')
+            ->willReturn($request)
+        ;
+
         $body
             ->expects($this->once())
             ->method('write')
@@ -212,6 +230,12 @@ public function testDispatchesHttpExceptionWithJsonStrategyRoute(): void
             ->willReturn($uri)
         ;
 
+        $request
+            ->expects($this->once())
+            ->method('withQueryParams')
+            ->willReturn($request)
+        ;
+
         $body
             ->expects($this->once())
             ->method('isWritable')
@@ -718,6 +742,12 @@ public function testRouteStrategyOverridesGlobalStrategy(): void
             ->willReturn($this->createMock(StreamInterface::class))
         ;
 
+        $request
+            ->expects($this->once())
+            ->method('withQueryParams')
+            ->willReturn($request)
+        ;
+
         $uri
             ->expects($this->exactly(2))
             ->method('getPath')
@@ -765,6 +795,12 @@ public function testRouteStrategyOverridesGroupStrategy(): void
             ->willReturn($uri)
         ;
 
+        $request
+            ->expects($this->once())
+            ->method('withQueryParams')
+            ->willReturn($request)
+        ;
+
         $response
             ->expects($this->once())
             ->method('getBody')
@@ -911,30 +947,42 @@ public function process(
 
         $request
             ->expects($this->at(3))
+            ->method('getQueryParams')
+            ->willReturn([])
+        ;
+
+        $request
+            ->expects($this->at(4))
+            ->method('withQueryParams')
+            ->willReturn($request)
+        ;
+
+        $request
+            ->expects($this->at(5))
             ->method('withRequestTarget')
             ->with($this->equalTo('middleware1'))
         ;
 
         $request
-            ->expects($this->at(4))
+            ->expects($this->at(6))
             ->method('withRequestTarget')
             ->with($this->equalTo('middleware4'))
         ;
 
         $request
-            ->expects($this->at(5))
+            ->expects($this->at(7))
             ->method('withRequestTarget')
             ->with($this->equalTo('middleware2'))
         ;
 
         $request
-            ->expects($this->at(6))
+            ->expects($this->at(8))
             ->method('withRequestTarget')
             ->with($this->equalTo('middleware3'))
         ;
 
         $request
-            ->expects($this->at(7))
+            ->expects($this->at(9))
             ->method('withRequestTarget')
             ->with($this->equalTo('middleware4'))
         ;
@@ -988,6 +1036,12 @@ public function testDispatchDoesNotThrowWhenUsingAddRoute(): void
             ->willReturn($uri)
         ;
 
+        $request
+            ->expects($this->once())
+            ->method('withQueryParams')
+            ->willReturn($request)
+        ;
+
         $router = new Router;
 
         $router->addRoute(['GET', 'POST'], '/example/{something}', function (