From 494a42f6b9844546c5ebd0c3134f6812cd16eb08 Mon Sep 17 00:00:00 2001 From: Sander De la Marche Date: Fri, 18 Aug 2023 09:16:34 +0200 Subject: [PATCH 1/2] Save the matched Route object as an atribute on the request --- src/Dispatcher.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Dispatcher.php b/src/Dispatcher.php index eb651c9..944ebf0 100644 --- a/src/Dispatcher.php +++ b/src/Dispatcher.php @@ -40,7 +40,9 @@ public function dispatchRequest(ServerRequestInterface $request): ResponseInterf case FastRoute::FOUND: $route = $this->ensureHandlerIsRoute($match[1], $method, $uri)->setVars($match[2]); - if ($this->isExtraConditionMatch($route, $request)) { + $request = $request->withAttribute('route', $route); + + if ($this->isExtraConditionMatch($route, $request)) { $this->setFoundMiddleware($route); $request = $this->requestWithRouteAttributes($request, $route); break; From 67b98d348aaf023dcd0825f1ac1f0249dd9aa451 Mon Sep 17 00:00:00 2001 From: Sander De la Marche Date: Fri, 18 Aug 2023 09:22:17 +0200 Subject: [PATCH 2/2] Fix space indenting --- src/Dispatcher.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Dispatcher.php b/src/Dispatcher.php index 944ebf0..ff10517 100644 --- a/src/Dispatcher.php +++ b/src/Dispatcher.php @@ -40,9 +40,9 @@ public function dispatchRequest(ServerRequestInterface $request): ResponseInterf case FastRoute::FOUND: $route = $this->ensureHandlerIsRoute($match[1], $method, $uri)->setVars($match[2]); - $request = $request->withAttribute('route', $route); + $request = $request->withAttribute('route', $route); - if ($this->isExtraConditionMatch($route, $request)) { + if ($this->isExtraConditionMatch($route, $request)) { $this->setFoundMiddleware($route); $request = $this->requestWithRouteAttributes($request, $route); break;