wip

Author: brendt

packages/router/src/Exceptions/NoMatchedRoute.php

@@ -10,4 +10,4 @@ public function __construct()
     {
         parent::__construct('No matched route was registered in the container. Did you remove `\Tempest\Router\MatchRouteMiddleware` from the middleware stack by any chance?');
     }
-}
+}

packages/router/src/HandleRouteExceptionMiddleware.php

@@ -3,27 +3,32 @@
 namespace Tempest\Router;
 
 use Tempest\Core\Priority;
-use Tempest\Http\HttpException;
 use Tempest\Http\Request;
 use Tempest\Http\Response;
 use Tempest\Http\Responses\Invalid;
 use Tempest\Http\Responses\NotFound;
 use Tempest\Router\Exceptions\NotFoundException;
 use Tempest\Validation\Exceptions\ValidationException;
 
-#[Priority(Priority::FRAMEWORK - 9)]
-final class HandleRouteExceptionMiddleware implements HttpMiddleware
+#[Priority(Priority::FRAMEWORK - 10)]
+final readonly class HandleRouteExceptionMiddleware implements HttpMiddleware
 {
+    public function __construct(
+        private RouteConfig $routeConfig,
+    ) {}
+
     public function __invoke(Request $request, HttpMiddlewareCallable $next): Response
     {
+        if ($this->routeConfig->throwHttpExceptions === true) {
+            return $next($request);
+        }
+
         try {
             return $next($request);
         } catch (NotFoundException) {
             return new NotFound();
         } catch (ValidationException $validationException) {
             return new Invalid($validationException->subject, $validationException->failingRules);
-//        } catch(HttpException $httpException) {
-            // TODO?
         }
     }
-}
+}

packages/router/src/HandleRouteSpecificMiddleware.php

@@ -33,4 +33,4 @@ public function __invoke(Request $request, HttpMiddlewareCallable $next): Respon
 
         return $callable($request);
     }
-}
+}

packages/router/src/MatchRouteMiddleware.php

@@ -6,17 +6,16 @@
 use Tempest\Container\Container;
 use Tempest\Core\Priority;
 use Tempest\Http\GenericRequest;
-use Tempest\Http\Mappers\PsrRequestToGenericRequestMapper;
 use Tempest\Http\Mappers\RequestToObjectMapper;
-use Tempest\Http\Mappers\RequestToPsrRequestMapper;
 use Tempest\Http\Request;
 use Tempest\Http\Response;
 use Tempest\Http\Responses\NotFound;
 use Tempest\Router\Routing\Matching\RouteMatcher;
+
 use function Tempest\map;
 
-#[Priority(Priority::FRAMEWORK - 10)]
-final readonly class MatchRouteMiddleware  implements HttpMiddleware
+#[Priority(Priority::FRAMEWORK - 9)]
+final readonly class MatchRouteMiddleware implements HttpMiddleware
 {
     public function __construct(
         private RouteMatcher $routeMatcher,
@@ -68,4 +67,4 @@ private function resolveRequest(Request $request, MatchedRoute $matchedRoute): R
 
         return $request;
     }
-}
+}

packages/router/src/RouteConfig.php

@@ -23,8 +23,8 @@ public function __construct(
 
         /** @var Middleware<\Tempest\Router\HttpMiddleware> */
         public Middleware $middleware = new Middleware(
-            MatchRouteMiddleware::class,
             HandleRouteExceptionMiddleware::class,
+            MatchRouteMiddleware::class,
             SetCookieMiddleware::class,
             HandleRouteSpecificMiddleware::class,
         ),

tests/Integration/Route/NotFoundTest.php

@@ -10,4 +10,4 @@ public function test_unmatched_route_returns_not_found(): void
     {
         $this->http->get('unknown-route')->assertNotFound();
     }
-}
+}