refactor(router): convert route attributes to plain objects (#822)

.php-cs-fixer.dist.php

@@ -9,6 +9,7 @@
     ])
     ->name('*.php')
     ->notName('*.cache.php')
+    ->notPath('Tempest/Router/src/Route.php') // phpcs doesn't yet support property hooks in interfaces
     ->ignoreDotFiles(true)
     ->ignoreVCS(true);
 

src/Tempest/Router/src/Connect.php

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

src/Tempest/Router/src/Delete.php

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

src/Tempest/Router/src/GenericRouter.php

@@ -119,7 +119,7 @@ public function toUri(array|string $action, ...$params): string
             /** @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]);

src/Tempest/Router/src/Get.php

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

src/Tempest/Router/src/Head.php

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

src/Tempest/Router/src/Options.php

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

src/Tempest/Router/src/Patch.php

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

src/Tempest/Router/src/Post.php

@@ -8,19 +8,17 @@
 use Tempest\Http\Method;
 
 #[Attribute(Attribute::IS_REPEATABLE | Attribute::TARGET_METHOD)]
-final class Post implements Route
+final readonly class Post implements Route
 {
-    use IsRoute;
+    public Method $method;
 
     /**
      * @param class-string<HttpMiddleware>[] $middleware
      */
     public function __construct(
-        string $uri,
-        array $middleware = [],
+        public string $uri,
+        public array $middleware = [],
     ) {
-        $this->uri = $uri;
         $this->method = Method::POST;
-        $this->middleware = $middleware;
     }
 }

src/Tempest/Router/src/Put.php

@@ -8,19 +8,17 @@
 use Tempest\Http\Method;
 
 #[Attribute(Attribute::IS_REPEATABLE | Attribute::TARGET_METHOD)]
-final class Put implements Route
+final readonly class Put implements Route
 {
-    use IsRoute;
+    public Method $method;
 
     /**
      * @param class-string<HttpMiddleware>[] $middleware
      */
     public function __construct(
-        string $uri,
-        array $middleware = [],
+        public string $uri,
+        public array $middleware = [],
     ) {
-        $this->uri = $uri;
         $this->method = Method::PUT;
-        $this->middleware = $middleware;
     }
 }

src/Tempest/Router/src/Route.php

@@ -8,10 +8,10 @@
 
 interface Route
 {
-    public function method(): Method;
+    public Method $method { get; }
 
-    public function uri(): string;
+    public string $uri { get; }
 
-    /** @return class-string<HttpMiddleware>[] */
-    public function middleware(): array;
+    /** @var HttpMiddleware[]  */
+    public array $middleware { get; }
 }

src/Tempest/Router/src/Routing/Construction/DiscoveredRoute.php

@@ -19,10 +19,10 @@ final class DiscoveredRoute implements Route
     public static function fromRoute(Route $route, MethodReflector $methodReflector): self
     {
         return new self(
-            $route->uri(),
-            $route->method(),
-            self::getRouteParams($route->uri()),
-            $route->middleware(),
+            $route->uri,
+            $route->method,
+            self::getRouteParams($route->uri),
+            $route->middleware,
             $methodReflector,
         );
     }
@@ -63,19 +63,4 @@ public function split(): array
             array_filter($parts, static fn (string $part) => $part !== ''),
         );
     }
-
-    public function method(): Method
-    {
-        return $this->method;
-    }
-
-    public function uri(): string
-    {
-        return $this->uri;
-    }
-
-    public function middleware(): array
-    {
-        return $this->middleware;
-    }
 }

src/Tempest/Router/src/Routing/Construction/DuplicateRouteException.php

@@ -11,6 +11,6 @@ final class DuplicateRouteException extends InvalidArgumentException
 {
     public function __construct(Route $route)
     {
-        parent::__construct("Route '{$route->uri()}' already exists.");
+        parent::__construct("Route '{$route->uri}' already exists.");
     }
 }

src/Tempest/Router/src/Routing/Construction/RouteConfigurator.php

@@ -5,7 +5,6 @@
 namespace Tempest\Router\Routing\Construction;
 
 use Tempest\Container\Singleton;
-use Tempest\Router\Route;
 use Tempest\Router\RouteConfig;
 
 /**

src/Tempest/Router/src/Trace.php

@@ -8,19 +8,17 @@
 use Tempest\Http\Method;
 
 #[Attribute(Attribute::IS_REPEATABLE | Attribute::TARGET_METHOD)]
-final class Trace implements Route
+final readonly class Trace implements Route
 {
-    use IsRoute;
+    public Method $method;
 
     /**
      * @param class-string<HttpMiddleware>[] $middleware
      */
     public function __construct(
-        string $uri,
-        array $middleware = [],
+        public string $uri,
+        public array $middleware = [],
     ) {
-        $this->uri = $uri;
         $this->method = Method::TRACE;
-        $this->middleware = $middleware;
     }
 }

src/Tempest/Router/tests/FakeRouteBuilder.php

@@ -18,6 +18,7 @@
     public function __construct(
         public Method $method = Method::GET,
         public string $uri = '/',
+        public array $middleware = [],
     ) {
         $this->handler = new MethodReflector(new ReflectionMethod($this, 'handler'));
     }
@@ -42,21 +43,6 @@ public function asDiscoveredRoute(): DiscoveredRoute
         return DiscoveredRoute::fromRoute($this, $this->handler);
     }
 
-    public function method(): Method
-    {
-        return $this->method;
-    }
-
-    public function uri(): string
-    {
-        return $this->uri;
-    }
-
-    public function middleware(): array
-    {
-        return [];
-    }
-
     public function handler(): void
     {
     }