wip

Author: brendt

packages/router/src/HandleRouteExceptionMiddleware.php

@@ -3,6 +3,7 @@
 namespace Tempest\Router;
 
 use Tempest\Core\Priority;
+use Tempest\Http\HttpException;
 use Tempest\Http\Request;
 use Tempest\Http\Response;
 use Tempest\Http\Responses\Invalid;
@@ -21,6 +22,8 @@ public function __invoke(Request $request, HttpMiddlewareCallable $next): Respon
             return new NotFound();
         } catch (ValidationException $validationException) {
             return new Invalid($validationException->subject, $validationException->failingRules);
+//        } catch(HttpException $httpException) {
+            // TODO?
         }
     }
 }

packages/router/src/MatchRouteMiddleware.php

@@ -16,7 +16,7 @@
 use function Tempest\map;
 
 #[Priority(Priority::FRAMEWORK - 10)]
-final class MatchRouteMiddleware  implements HttpMiddleware
+final readonly class MatchRouteMiddleware  implements HttpMiddleware
 {
     public function __construct(
         private RouteMatcher $routeMatcher,
@@ -25,22 +25,28 @@ public function __construct(
 
     public function __invoke(Request $request, HttpMiddlewareCallable $next): Response
     {
-        $psrRequest = map($request)->with(RequestToPsrRequestMapper::class)->do();
-
-        $matchedRoute = $this->routeMatcher->match($psrRequest);
+        $matchedRoute = $this->routeMatcher->match($request);
 
         if ($matchedRoute === null) {
             return new NotFound();
         }
 
+        // We register the matched route in the container, some internal framework components will need it
         $this->container->singleton(MatchedRoute::class, fn () => $matchedRoute);
 
-        $request = $this->resolveRequest($psrRequest, $matchedRoute);
+        // Convert the request to a specific request implementation, if needed
+        $request = $this->resolveRequest($request, $matchedRoute);
+
+        // We register this newly created request object in the container
+        // This makes it so that RequestInitializer is bypassed entirely when the controller action needs the request class
+        // Making it so that we don't need to set any $_SERVER variables and stuff like that
+        $this->container->singleton(Request::class, fn () => $request);
+        $this->container->singleton($request::class, fn () => $request);
 
         return $next($request);
     }
 
-    private function resolveRequest(PsrRequest $psrRequest, MatchedRoute $matchedRoute): Request
+    private function resolveRequest(Request $request, MatchedRoute $matchedRoute): Request
     {
         // Let's find out if our input request data matches what the route's action needs
         $requestClass = GenericRequest::class;
@@ -56,20 +62,10 @@ private function resolveRequest(PsrRequest $psrRequest, MatchedRoute $matchedRou
             }
         }
 
-        // We map the original request we got into this method to the right request class
-        /** @var \Tempest\Http\GenericRequest $request */
-        $request = map($psrRequest)->with(PsrRequestToGenericRequestMapper::class)->do();
-
         if ($requestClass !== Request::class && $requestClass !== GenericRequest::class) {
             $request = map($request)->with(RequestToObjectMapper::class)->to($requestClass);
         }
 
-        // Next, we register this newly created request object in the container
-        // This makes it so that RequestInitializer is bypassed entirely when the controller action needs the request class
-        // Making it so that we don't need to set any $_SERVER variables and stuff like that
-        $this->container->singleton(Request::class, fn () => $request);
-        $this->container->singleton($request::class, fn () => $request);
-
         return $request;
     }
 }

packages/router/src/Routing/Matching/GenericRouteMatcher.php

@@ -4,9 +4,8 @@
 
 namespace Tempest\Router\Routing\Matching;
 
-use Psr\Http\Message\ServerRequestInterface as PsrRequest;
+use Tempest\Http\Request;
 use Tempest\Router\Exceptions\InvalidEnumParameterException;
-use Tempest\Router\Exceptions\NotFoundException;
 use Tempest\Router\MatchedRoute;
 use Tempest\Router\RouteConfig;
 use Tempest\Router\Routing\Construction\DiscoveredRoute;
@@ -17,7 +16,7 @@ public function __construct(
         private RouteConfig $routeConfig,
     ) {}
 
-    public function match(PsrRequest $request): ?MatchedRoute
+    public function match(Request $request): ?MatchedRoute
     {
         // Try to match routes without any parameters
         if (($staticRoute = $this->matchStaticRoute($request)) !== null) {
@@ -28,9 +27,9 @@ public function match(PsrRequest $request): ?MatchedRoute
         return $this->matchDynamicRoute($request);
     }
 
-    private function matchStaticRoute(PsrRequest $request): ?MatchedRoute
+    private function matchStaticRoute(Request $request): ?MatchedRoute
     {
-        $staticRoute = $this->routeConfig->staticRoutes[$request->getMethod()][$request->getUri()->getPath()] ?? null;
+        $staticRoute = $this->routeConfig->staticRoutes[$request->method->value][$request->path] ?? null;
 
         if ($staticRoute === null) {
             return null;
@@ -39,19 +38,19 @@ private function matchStaticRoute(PsrRequest $request): ?MatchedRoute
         return new MatchedRoute($staticRoute, []);
     }
 
-    private function matchDynamicRoute(PsrRequest $request): ?MatchedRoute
+    private function matchDynamicRoute(Request $request): ?MatchedRoute
     {
         // If there are no routes for the given request method, we immediately stop
-        $routesForMethod = $this->routeConfig->dynamicRoutes[$request->getMethod()] ?? null;
+        $routesForMethod = $this->routeConfig->dynamicRoutes[$request->method->value] ?? null;
         if ($routesForMethod === null) {
             return null;
         }
 
         // Get matching regex for route
-        $matchingRegexForMethod = $this->routeConfig->matchingRegexes[$request->getMethod()];
+        $matchingRegexForMethod = $this->routeConfig->matchingRegexes[$request->method->value];
 
         // Then we'll use this regex to see whether we have a match or not
-        $matchResult = $matchingRegexForMethod->match($request->getUri()->getPath());
+        $matchResult = $matchingRegexForMethod->match($request->path);
 
         if ($matchResult === null) {
             return null;

packages/router/src/Routing/Matching/RouteMatcher.php

@@ -4,10 +4,10 @@
 
 namespace Tempest\Router\Routing\Matching;
 
-use Psr\Http\Message\ServerRequestInterface as PsrRequest;
+use Tempest\Http\Request;
 use Tempest\Router\MatchedRoute;
 
 interface RouteMatcher
 {
-    public function match(PsrRequest $request): ?MatchedRoute;
+    public function match(Request $request): ?MatchedRoute;
 }