wip

Author: brendt

packages/router/src/Exceptions/HttpErrorResponseProcessor.php

@@ -34,21 +34,14 @@ public function __construct(
     ) {}
 
     public function dispatch(Request|PsrRequest $request): Response
-    {
-        return $this->processResponse(
-            $this->processRequest($request),
-        );
-    }
-
-    private function processRequest(Request|PsrRequest $request): Response
     {
         if (! ($request instanceof Request)) {
             $request = map($request)->with(PsrRequestToGenericRequestMapper::class)->do();
         }
 
         $callable = $this->getCallable();
 
-        return $callable($request);
+        return $this->processResponse($callable($request));
     }
 
     private function getCallable(): HttpMiddlewareCallable

packages/router/src/GenericRouter.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;
@@ -20,7 +21,16 @@ public function __construct(
     public function __invoke(Request $request, HttpMiddlewareCallable $next): Response
     {
         if ($this->routeConfig->throwHttpExceptions === true) {
-            return $next($request);
+            $response = $next($request);
+
+            if ($response->status->isServerError() || $response->status->isClientError()) {
+                throw new HttpException(
+                    status: $response->status,
+                    cause: $response,
+                );
+            }
+
+            return $response;
         }
 
         try {