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

Author: blackshadev

.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/IsRoute.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/Options.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/Patch.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;
     }
 }