refactor: clean up

Author: innocenzi

packages/http/src/IsRequest.php

@@ -141,7 +141,7 @@ public function accepts(ContentType ...$contentTypes): bool
         $header = $this->headers->get(name: 'accept') ?? '';
 
         /** @var array{mediaType:string,subType:string} */
-        $mediaTypes = [];
+        $acceptedMediaTypes = [];
 
         foreach (str($header)->explode(separator: ',') as $acceptedType) {
             $acceptedType = str($acceptedType)->trim();
@@ -150,20 +150,20 @@ public function accepts(ContentType ...$contentTypes): bool
                 continue;
             }
 
-            $mediaTypes[] = [
+            $acceptedMediaTypes[] = [
                 'mediaType' => $acceptedType->before('/')->toString(),
                 'subType' => $acceptedType->afterFirst('/')->beforeLast(';q')->toString(),
             ];
         }
 
-        if (count($mediaTypes) === 0) {
+        if (count($acceptedMediaTypes) === 0) {
             return true;
         }
 
         foreach ($contentTypes as $contentType) {
-            [$mediaType, $subType] = explode('/', $contentType->value);
+            [$mediaType, $subType] = explode('/', string: $contentType->value);
 
-            foreach ($mediaTypes as $acceptedType) {
+            foreach ($acceptedMediaTypes as $acceptedType) {
                 if (
                     ($acceptedType['mediaType'] === '*' || $acceptedType['mediaType'] === $mediaType)
                     && ($acceptedType['subType'] === '*' || $acceptedType['subType'] === $subType)

packages/router/src/Exceptions/ConvertsToResponse.php

@@ -14,5 +14,5 @@ interface ConvertsToResponse
     /**
      * Gets a response to be sent to the client.
      */
-    public function toResponse(): Response;
+    public function convertToResponse(): Response;
 }

packages/router/src/Exceptions/JsonExceptionRenderer.php

@@ -37,7 +37,7 @@ public function canRender(Throwable $throwable, Request $request): bool
     public function render(Throwable $throwable): Response
     {
         return match (true) {
-            $throwable instanceof ConvertsToResponse => $throwable->toResponse(),
+            $throwable instanceof ConvertsToResponse => $throwable->convertToResponse(),
             $throwable instanceof HttpRequestFailed => $this->renderErrorResponse($throwable->status, $throwable),
             $throwable instanceof ValidationFailed => $this->renderValidationErrorResponse($throwable),
             $throwable instanceof AccessWasDenied => $this->renderErrorResponse(Status::FORBIDDEN),

packages/router/src/HandleRouteExceptionMiddleware.php

@@ -30,15 +30,12 @@ public function __invoke(Request $request, HttpMiddlewareCallable $next): Respon
 
     /**
      * Some exceptions are not necessary to be thrown as-is, so we catch them here and convert them to equivalent responses.
-     * - `ConvertsToResponse` is straightforward, this exception is made to return its own response.
      * - `RouteBindingFailed` would require to be handled manually in renderers, it's better DX to simply return a 404.
      */
     private function forward(Request $request, HttpMiddlewareCallable $next): Response
     {
         try {
             return $next($request);
-        } catch (ConvertsToResponse $convertsToResponse) {
-            return $convertsToResponse->toResponse();
         } catch (RouteBindingFailed) {
             return new NotFound();
         }

packages/validation/src/Exceptions/ValidationFailed.php

@@ -5,9 +5,12 @@
 namespace Tempest\Validation\Exceptions;
 
 use Exception;
+use Tempest\Http\Response;
+use Tempest\Http\Responses\Invalid;
+use Tempest\Router\Exceptions\ConvertsToResponse;
 use Tempest\Validation\FailingRule;
 
-final class ValidationFailed extends Exception
+final class ValidationFailed extends Exception implements ConvertsToResponse
 {
     /**
      * @template TKey of array-key
@@ -27,4 +30,9 @@ public function __construct(
             default => sprintf('Validation failed for %s.', is_object($subject) ? $subject::class : $subject),
         });
     }
+
+    public function convertToResponse(): Response
+    {
+        return new Invalid($this->subject, $this->failingRules, $this->targetClass);
+    }
 }

tests/Integration/Http/Fixtures/ExceptionThatConvertsToRedirectResponse.php

@@ -12,7 +12,7 @@
  */
 final class ExceptionThatConvertsToRedirectResponse extends Exception implements ConvertsToResponse
 {
-    public function toResponse(): Response
+    public function convertToResponse(): Response
     {
         return new Redirect('https://tempestphp.com');
     }

tests/Integration/Route/Fixtures/ExceptionThatConvertsToRedirectResponse.php

@@ -12,7 +12,7 @@
  */
 final class ExceptionThatConvertsToRedirectResponse extends Exception implements ConvertsToResponse
 {
-    public function toResponse(): Response
+    public function convertToResponse(): Response
     {
         return new Redirect('https://tempestphp.com');
     }