wip

Author: brendt

packages/router/src/HandleRouteExceptionMiddleware.php

@@ -8,6 +8,7 @@
 use Tempest\Http\Response;
 use Tempest\Http\Responses\Invalid;
 use Tempest\Http\Responses\NotFound;
+use Tempest\Router\Exceptions\ConvertsToResponse;
 use Tempest\Router\Exceptions\RouteBindingFailed;
 use Tempest\Validation\Exceptions\ValidationFailed;
 
@@ -35,6 +36,8 @@ public function __invoke(Request $request, HttpMiddlewareCallable $next): Respon
 
         try {
             return $next($request);
+        } catch (ConvertsToResponse $exception) {
+            return $exception->toResponse();
         } catch (RouteBindingFailed) {
             return new NotFound();
         } catch (ValidationFailed $validationException) {

tests/Integration/Http/HttpExceptionHandlerTest.php

@@ -53,12 +53,9 @@ public function __construct(FrameworkKernel $kernel)
                     $this->container = $kernel->container;
                 }
 
-                public static function boot(string $root, array $discoveryLocations = [], ?Container $container = null): self
+                public static function boot(string $root, array $discoveryLocations = [], ?Container $container = null): FrameworkKernel
                 {
-                    // This is just to make static analysis pass, this is never called.
-                    // @mago-expect analysis/undefined-function-or-method
-                    // @phpstan-ignore-next-line
-                    return Kernel::boot($root, $discoveryLocations, $container);
+                    return FrameworkKernel::boot($root, $discoveryLocations, $container);
                 }
 
                 public function shutdown(int|string $status = ''): never

tests/Integration/Route/Fixtures/ConvertsToResponseException.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace Tests\Tempest\Integration\Route\Fixtures;
+
+use Exception;
+use Tempest\Http\Response;
+use Tempest\Http\Responses\Ok;
+use Tempest\Router\Exceptions\ConvertsToResponse;
+
+final class ConvertsToResponseException extends Exception implements ConvertsToResponse
+{
+    public function __construct(
+        private readonly string $name,
+    )
+    {
+        parent::__construct($name);
+    }
+
+    public function toResponse(): Response
+    {
+        return new Ok($this->name);
+    }
+}

tests/Integration/Route/Fixtures/ConvertsToResponseExceptionController.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace Tests\Tempest\Integration\Route\Fixtures;
+
+use Tempest\Router\Get;
+
+final class ConvertsToResponseExceptionController
+{
+    #[Get('/converts-to-response-exception')]
+    public function __invoke()
+    {
+        throw new ConvertsToResponseException('Test');
+    }
+}

tests/Integration/Route/NotFoundTest.php …e/HandleRouteExceptionMiddlewareTest.phptests/Integration/Route/NotFoundTest.php renamed to tests/Integration/Route/HandleRouteExceptionMiddlewareTest.php tests/Integration/Route/NotFoundTest.php renamed to tests/Integration/Route/HandleRouteExceptionMiddlewareTest.php

@@ -4,12 +4,13 @@
 
 use Tempest\Router\RouteConfig;
 use Tests\Tempest\Integration\FrameworkIntegrationTestCase;
+use Tests\Tempest\Integration\Route\Fixtures\ConvertsToResponseExceptionController;
 use Tests\Tempest\Integration\Route\Fixtures\CustomNotFoundMiddleware;
 
 /**
  * @property \Tempest\Framework\Testing\Http\HttpRouterTester $http
  */
-final class NotFoundTest extends FrameworkIntegrationTestCase
+final class HandleRouteExceptionMiddlewareTest extends FrameworkIntegrationTestCase
 {
     public function test_unmatched_route_returns_not_found(): void
     {
@@ -23,4 +24,14 @@ public function test_custom_not_found_middleware(): void
 
         $this->http->get('unknown-route')->assertHasHeader('x-not-found');
     }
+
+    public function test_exception_implementing_converts_to_response(): void
+    {
+        $this->registerRoute(ConvertsToResponseExceptionController::class);
+
+        $this->http
+            ->get('/converts-to-response-exception')
+            ->assertOk()
+            ->assertSee('Test');
+    }
 }