wip

Author: brendt

packages/router/src/GenericRouter.php

@@ -83,22 +83,6 @@ private function getCallable(): HttpMiddlewareCallable
                     )) {
                         return $callable($request);
                     }
-
-                    // Skip middleware that sets cookies or session values when the route is stateless
-                    if (
-                        $matchedRoute->route->handler->hasAttribute(Stateless::class)
-                        && in_array(
-                            needle: $middlewareClass->getName(),
-                            haystack: [
-                                VerifyCsrfMiddleware::class,
-                                SetCurrentUrlMiddleware::class,
-                                SetCookieMiddleware::class,
-                            ],
-                            strict: true,
-                        )
-                    ) {
-                        return $callable($request);
-                    }
                 }
 
                 /** @var HttpMiddleware $middleware */

packages/router/src/MatchRouteMiddleware.php

@@ -34,6 +34,17 @@ public function __invoke(Request $request, HttpMiddlewareCallable $next): Respon
             return new NotFound();
         }
 
+        // Apply route decorators
+        $decorators = [
+            ...$matchedRoute->route->handler->getDeclaringClass()->getAttributes(RouteDecorator::class),
+            ...$matchedRoute->route->handler->getAttributes(RouteDecorator::class),
+        ];
+
+        /** @var \Tempest\Router\RouteDecorator $decorator */
+        foreach ($decorators as $decorator) {
+            $matchedRoute->route = $decorator->decorate($matchedRoute->route);
+        }
+
         // We register the matched route in the container, some internal framework components will need it
         $this->container->singleton(MatchedRoute::class, fn () => $matchedRoute);
 

packages/router/src/MatchedRoute.php

@@ -6,7 +6,7 @@
 
 use Tempest\Router\Routing\Construction\DiscoveredRoute;
 
-final readonly class MatchedRoute
+final class MatchedRoute
 {
     public function __construct(
         public DiscoveredRoute $route,

packages/router/src/RouteDecorator.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace Tempest\Router;
+
+use Tempest\Router\Routing\Construction\DiscoveredRoute;
+
+interface RouteDecorator
+{
+    public function decorate(DiscoveredRoute $route): DiscoveredRoute;
+}

packages/router/src/Routing/Construction/DiscoveredRoute.php

@@ -8,7 +8,7 @@
 use Tempest\Reflection\MethodReflector;
 use Tempest\Router\Route;
 
-final readonly class DiscoveredRoute implements Route
+final class DiscoveredRoute implements Route
 {
     public const string DEFAULT_MATCHING_GROUP = '[^/]++';
 

packages/router/src/Stateless.php

@@ -3,11 +3,24 @@
 namespace Tempest\Router;
 
 use Attribute;
+use Tempest\Http\Session\VerifyCsrfMiddleware;
+use Tempest\Router\Routing\Construction\DiscoveredRoute;
 
 /**
  * Mark a route handler as stateless, causing all cookie- and session-related middleware to be skipped.
  */
 #[Attribute(Attribute::TARGET_METHOD)]
-final class Stateless
+final class Stateless implements RouteDecorator
 {
+    public function decorate(DiscoveredRoute $route): DiscoveredRoute
+    {
+        $route->without = [
+            ...$route->without,
+            VerifyCsrfMiddleware::class,
+            SetCurrentUrlMiddleware::class,
+            SetCookieMiddleware::class,
+        ];
+
+        return $route;
+    }
 }