refactor(http): refactor http route attribute (#793)

Co-authored-by: Brent Roose <[email protected]>

Author: blackshadev

src/Tempest/Router/src/Connect.php

@@ -8,21 +8,19 @@
 use Tempest\Http\Method;
 
 #[Attribute(Attribute::IS_REPEATABLE | Attribute::TARGET_METHOD)]
-final class Connect extends Route
+final class Connect implements Route
 {
+    use IsRoute;
+
+    /**
+     * @param class-string<HttpMiddleware>[] $middleware
+     */
     public function __construct(
         string $uri,
-
-        /**
-         * @template MiddlewareClass of \Tempest\Router\HttpMiddleware
-         * @var class-string<MiddlewareClass>[] $middleware
-         */
         array $middleware = [],
     ) {
-        parent::__construct(
-            uri: $uri,
-            method: Method::CONNECT,
-            middleware: $middleware,
-        );
+        $this->uri = $uri;
+        $this->method = Method::CONNECT;
+        $this->middleware = $middleware;
     }
 }

src/Tempest/Router/src/Delete.php

@@ -8,21 +8,19 @@
 use Tempest\Http\Method;
 
 #[Attribute(Attribute::IS_REPEATABLE | Attribute::TARGET_METHOD)]
-final class Delete extends Route
+final class Delete implements Route
 {
+    use IsRoute;
+
+    /**
+     * @param class-string<HttpMiddleware>[] $middleware
+     */
     public function __construct(
         string $uri,
-
-        /**
-         * @template MiddlewareClass of \Tempest\Router\HttpMiddleware
-         * @var class-string<MiddlewareClass>[] $middleware
-         */
         array $middleware = [],
     ) {
-        parent::__construct(
-            uri: $uri,
-            method: Method::DELETE,
-            middleware: $middleware,
-        );
+        $this->uri = $uri;
+        $this->method = Method::DELETE;
+        $this->middleware = $middleware;
     }
 }

src/Tempest/Router/src/Exceptions/ControllerActionHasNoReturn.php

@@ -5,11 +5,11 @@
 namespace Tempest\Router\Exceptions;
 
 use Exception;
-use Tempest\Router\Route;
+use Tempest\Router\Routing\Construction\DiscoveredRoute;
 
 final class ControllerActionHasNoReturn extends Exception
 {
-    public function __construct(Route $route)
+    public function __construct(DiscoveredRoute $route)
     {
         parent::__construct(sprintf(
             "The controller action %s::%s doesn't return a valid response",

src/Tempest/Router/src/GenericRouter.php

@@ -17,6 +17,7 @@
 use Tempest\Router\Responses\Invalid;
 use Tempest\Router\Responses\NotFound;
 use Tempest\Router\Responses\Ok;
+use Tempest\Router\Routing\Construction\DiscoveredRoute;
 use Tempest\Router\Routing\Matching\RouteMatcher;
 use Tempest\Validation\Exceptions\ValidationException;
 use Tempest\View\View;
@@ -115,9 +116,10 @@ public function toUri(array|string $action, ...$params): string
                 $controllerMethod = $reflection->getMethod('__invoke');
             }
 
+            /** @var Route|null $routeAttribute */
             $routeAttribute = $controllerMethod->getAttribute(Route::class);
 
-            $uri = $routeAttribute->uri;
+            $uri = $routeAttribute->uri();
         } catch (ReflectionException) {
             if (is_array($action)) {
                 throw new InvalidRouteException($action[0], $action[1]);
@@ -141,7 +143,7 @@ public function toUri(array|string $action, ...$params): string
             }
 
             $uri = $uri->replaceRegex(
-                '#\{' . $key . Route::ROUTE_PARAM_CUSTOM_REGEX . '\}#',
+                '#\{' . $key . DiscoveredRoute::ROUTE_PARAM_CUSTOM_REGEX . '\}#',
                 (string) $value,
             );
         }

src/Tempest/Router/src/Get.php

@@ -8,21 +8,19 @@
 use Tempest\Http\Method;
 
 #[Attribute(Attribute::IS_REPEATABLE | Attribute::TARGET_METHOD)]
-final class Get extends Route
+final class Get implements Route
 {
+    use IsRoute;
+
+    /**
+     * @param class-string<HttpMiddleware>[] $middleware
+     */
     public function __construct(
         string $uri,
-
-        /**
-         * @template MiddlewareClass of \Tempest\Router\HttpMiddleware
-         * @var class-string<MiddlewareClass>[] $middleware
-         */
         array $middleware = [],
     ) {
-        parent::__construct(
-            uri: $uri,
-            method: Method::GET,
-            middleware: $middleware,
-        );
+        $this->uri = $uri;
+        $this->method = Method::GET;
+        $this->middleware = $middleware;
     }
 }

src/Tempest/Router/src/Head.php

@@ -8,21 +8,19 @@
 use Tempest\Http\Method;
 
 #[Attribute(Attribute::IS_REPEATABLE | Attribute::TARGET_METHOD)]
-final class Head extends Route
+final class Head implements Route
 {
+    use IsRoute;
+
+    /**
+     * @param class-string<HttpMiddleware>[] $middleware
+     */
     public function __construct(
         string $uri,
-
-        /**
-         * @template MiddlewareClass of \Tempest\Router\HttpMiddleware
-         * @var class-string<MiddlewareClass>[] $middleware
-         */
         array $middleware = [],
     ) {
-        parent::__construct(
-            uri: $uri,
-            method: Method::HEAD,
-            middleware: $middleware,
-        );
+        $this->uri = $uri;
+        $this->method = Method::HEAD;
+        $this->middleware = $middleware;
     }
 }

src/Tempest/Router/src/IsRoute.php

@@ -0,0 +1,36 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tempest\Router;
+
+use Tempest\Http\Method;
+use Tempest\Reflection\MethodReflector;
+
+trait IsRoute
+{
+    private Method $method;
+
+    private string $uri;
+
+    /** @var class-string<HttpMiddleware>[] */
+    private array $middleware;
+
+    private MethodReflector $handler;
+
+    public function method(): Method
+    {
+        return $this->method;
+    }
+
+    public function uri(): string
+    {
+        return $this->uri;
+    }
+
+    /** @return class-string<HttpMiddleware>[] */
+    public function middleware(): array
+    {
+        return $this->middleware;
+    }
+}

src/Tempest/Router/src/MatchedRoute.php

@@ -4,10 +4,12 @@
 
 namespace Tempest\Router;
 
+use Tempest\Router\Routing\Construction\DiscoveredRoute;
+
 final readonly class MatchedRoute
 {
     public function __construct(
-        public Route $route,
+        public DiscoveredRoute $route,
         public array $params,
     ) {
     }

src/Tempest/Router/src/Options.php

@@ -8,21 +8,19 @@
 use Tempest\Http\Method;
 
 #[Attribute(Attribute::IS_REPEATABLE | Attribute::TARGET_METHOD)]
-final class Options extends Route
+final class Options implements Route
 {
+    use IsRoute;
+
+    /**
+     * @param class-string<HttpMiddleware>[] $middleware
+     */
     public function __construct(
         string $uri,
-
-        /**
-         * @template MiddlewareClass of \Tempest\Router\HttpMiddleware
-         * @var class-string<MiddlewareClass>[] $middleware
-         */
         array $middleware = [],
     ) {
-        parent::__construct(
-            uri: $uri,
-            method: Method::OPTIONS,
-            middleware: $middleware,
-        );
+        $this->uri = $uri;
+        $this->method = Method::OPTIONS;
+        $this->middleware = $middleware;
     }
 }

src/Tempest/Router/src/Patch.php

@@ -8,21 +8,19 @@
 use Tempest\Http\Method;
 
 #[Attribute(Attribute::IS_REPEATABLE | Attribute::TARGET_METHOD)]
-final class Patch extends Route
+final class Patch implements Route
 {
+    use IsRoute;
+
+    /**
+     * @param class-string<HttpMiddleware>[] $middleware
+     */
     public function __construct(
         string $uri,
-
-        /**
-         * @template MiddlewareClass of \Tempest\Router\HttpMiddleware
-         * @var class-string<MiddlewareClass>[] $middleware
-         */
         array $middleware = [],
     ) {
-        parent::__construct(
-            uri: $uri,
-            method: Method::PATCH,
-            middleware: $middleware,
-        );
+        $this->uri = $uri;
+        $this->method = Method::PATCH;
+        $this->middleware = $middleware;
     }
 }