feat(router): add ability to skip middleware per route

innocenzi · innocenzi · commit e0e4e0c2343b · 2025-08-09T16:25:26.000+02:00
diff --git a/packages/router/src/Connect.php b/packages/router/src/Connect.php
@@ -13,11 +13,13 @@
     public Method $method;
 
     /**
-     * @param class-string<HttpMiddleware>[] $middleware
+     * @param class-string<HttpMiddleware>[] $middleware Middleware specific to this route.
+     * @param class-string<HttpMiddleware>[] $without Middleware to remove from this route.
      */
     public function __construct(
         public string $uri,
         public array $middleware = [],
+        public array $without = [],
     ) {
         $this->method = Method::CONNECT;
     }
diff --git a/packages/router/src/Delete.php b/packages/router/src/Delete.php
@@ -13,11 +13,13 @@
     public Method $method;
 
     /**
-     * @param class-string<HttpMiddleware>[] $middleware
+     * @param class-string<HttpMiddleware>[] $middleware Middleware specific to this route.
+     * @param class-string<HttpMiddleware>[] $without Middleware to remove from this route.
      */
     public function __construct(
         public string $uri,
         public array $middleware = [],
+        public array $without = [],
     ) {
         $this->method = Method::DELETE;
     }
diff --git a/packages/router/src/GenericRouter.php b/packages/router/src/GenericRouter.php
@@ -77,6 +77,15 @@ private function getCallable(): HttpMiddlewareCallable
 
         foreach ($middlewareStack->unwrap() as $middlewareClass) {
             $callable = new HttpMiddlewareCallable(function (Request $request) use ($middlewareClass, $callable) {
+                // We skip this middleware if it's ignored by the route
+                if ($this->container->has(MatchedRoute::class)) {
+                    $matchedRoute = $this->container->get(MatchedRoute::class);
+
+                    if (in_array($middlewareClass->getName(), $matchedRoute->route->without, strict: true)) {
+                        return $callable($request);
+                    }
+                }
+
                 /** @var HttpMiddleware $middleware */
                 $middleware = $this->container->get($middlewareClass->getName());
 
diff --git a/packages/router/src/Get.php b/packages/router/src/Get.php
@@ -13,11 +13,13 @@
     public Method $method;
 
     /**
-     * @param class-string<HttpMiddleware>[] $middleware
+     * @param class-string<HttpMiddleware>[] $middleware Middleware specific to this route.
+     * @param class-string<HttpMiddleware>[] $without Middleware to remove from this route.
      */
     public function __construct(
         public string $uri,
         public array $middleware = [],
+        public array $without = [],
     ) {
         $this->method = Method::GET;
     }
diff --git a/packages/router/src/Head.php b/packages/router/src/Head.php
@@ -13,11 +13,13 @@
     public Method $method;
 
     /**
-     * @param class-string<HttpMiddleware>[] $middleware
+     * @param class-string<HttpMiddleware>[] $middleware Middleware specific to this route.
+     * @param class-string<HttpMiddleware>[] $without Middleware to remove from this route.
      */
     public function __construct(
         public string $uri,
         public array $middleware = [],
+        public array $without = [],
     ) {
         $this->method = Method::HEAD;
     }
diff --git a/packages/router/src/Options.php b/packages/router/src/Options.php
@@ -13,11 +13,13 @@
     public Method $method;
 
     /**
-     * @param class-string<HttpMiddleware>[] $middleware
+     * @param class-string<HttpMiddleware>[] $middleware Middleware specific to this route.
+     * @param class-string<HttpMiddleware>[] $without Middleware to remove from this route.
      */
     public function __construct(
         public string $uri,
         public array $middleware = [],
+        public array $without = [],
     ) {
         $this->method = Method::OPTIONS;
     }
diff --git a/packages/router/src/Patch.php b/packages/router/src/Patch.php
@@ -13,11 +13,13 @@
     public Method $method;
 
     /**
-     * @param class-string<HttpMiddleware>[] $middleware
+     * @param class-string<HttpMiddleware>[] $middleware Middleware specific to this route.
+     * @param class-string<HttpMiddleware>[] $without Middleware to remove from this route.
      */
     public function __construct(
         public string $uri,
         public array $middleware = [],
+        public array $without = [],
     ) {
         $this->method = Method::PATCH;
     }
diff --git a/packages/router/src/Post.php b/packages/router/src/Post.php
@@ -13,11 +13,13 @@
     public Method $method;
 
     /**
-     * @param class-string<HttpMiddleware>[] $middleware
+     * @param class-string<HttpMiddleware>[] $middleware Middleware specific to this route.
+     * @param class-string<HttpMiddleware>[] $without Middleware to remove from this route.
      */
     public function __construct(
         public string $uri,
         public array $middleware = [],
+        public array $without = [],
     ) {
         $this->method = Method::POST;
     }
diff --git a/packages/router/src/Put.php b/packages/router/src/Put.php
@@ -13,11 +13,13 @@
     public Method $method;
 
     /**
-     * @param class-string<HttpMiddleware>[] $middleware
+     * @param class-string<HttpMiddleware>[] $middleware Middleware specific to this route.
+     * @param class-string<HttpMiddleware>[] $without Middleware to remove from this route.
      */
     public function __construct(
         public string $uri,
         public array $middleware = [],
+        public array $without = [],
     ) {
         $this->method = Method::PUT;
     }
diff --git a/packages/router/src/Route.php b/packages/router/src/Route.php
@@ -20,4 +20,9 @@ interface Route
     public array $middleware {
         get;
     }
+
+    /** @var class-string<HttpMiddleware>[]  */
+    public array $without {
+        get;
+    }
 }
diff --git a/packages/router/src/Routing/Construction/DiscoveredRoute.php b/packages/router/src/Routing/Construction/DiscoveredRoute.php
@@ -24,6 +24,7 @@ public static function fromRoute(Route $route, MethodReflector $methodReflector)
             self::getRouteParams($route->uri),
             $route->middleware,
             $methodReflector,
+            $route->without,
         );
     }
 
@@ -36,6 +37,7 @@ private function __construct(
         /** @var class-string<\Tempest\Router\HttpMiddleware>[] */
         public array $middleware,
         public MethodReflector $handler,
+        public array $without = [],
     ) {
         $this->isDynamic = $parameters !== [];
     }
diff --git a/packages/router/src/Trace.php b/packages/router/src/Trace.php
@@ -13,11 +13,13 @@
     public Method $method;
 
     /**
-     * @param class-string<HttpMiddleware>[] $middleware
+     * @param class-string<HttpMiddleware>[] $middleware Middleware specific to this route.
+     * @param class-string<HttpMiddleware>[] $without Middleware to remove from this route.
      */
     public function __construct(
         public string $uri,
         public array $middleware = [],
+        public array $without = [],
     ) {
         $this->method = Method::TRACE;
     }
diff --git a/packages/router/tests/FakeRouteBuilder.php b/packages/router/tests/FakeRouteBuilder.php
@@ -21,6 +21,7 @@ public function __construct(
         public string $uri = '/',
         /** @var class-string<HttpMiddleware>[] */
         public array $middleware = [],
+        public array $without = [],
     ) {
         $this->handler = new MethodReflector(new ReflectionMethod($this, 'handler'));
     }
diff --git a/src/Tempest/Framework/Testing/Http/TestResponseHelper.php b/src/Tempest/Framework/Testing/Http/TestResponseHelper.php
@@ -50,6 +50,17 @@ public function assertHasHeader(string $name): self
         return $this;
     }
 
+    public function assertDoesNotHaveHeader(string $name): self
+    {
+        Assert::assertArrayNotHasKey(
+            $name,
+            $this->response->headers,
+            sprintf('Failed to assert that response does not contain header [%s].', $name),
+        );
+
+        return $this;
+    }
+
     public function assertHeaderContains(string $name, mixed $value): self
     {
         $this->assertHasHeader($name);
diff --git a/tests/Fixtures/Controllers/TestController.php b/tests/Fixtures/Controllers/TestController.php
@@ -91,6 +91,12 @@ public function withMiddleware(): Response
         return new Ok();
     }
 
+    #[Get(uri: '/without-middleware', without: [TestMiddleware::class])]
+    public function withoutMiddleware(): Response
+    {
+        return new Ok();
+    }
+
     #[Get('/view-model-with-response-data')]
     public function viewWithResponseData(): Response
     {
diff --git a/tests/Integration/Http/GenericResponseSenderTest.php b/tests/Integration/Http/GenericResponseSenderTest.php
@@ -82,6 +82,7 @@ public function test_file_response(): void
         $response = new File(path: $path);
         $responseSender = $this->container->get(GenericResponseSender::class);
         $responseSender->send($response);
+
         $content = ob_get_clean();
 
         $this->assertSame(file_get_contents($path), $content);
@@ -94,6 +95,7 @@ public function test_download_response(): void
         $response = new Download(path: $path);
         $responseSender = $this->container->get(GenericResponseSender::class);
         $responseSender->send($response);
+
         $content = ob_get_clean();
 
         $this->assertSame(file_get_contents($path), $content);
@@ -109,6 +111,7 @@ public function test_sending_of_array_to_json(): void
 
         $responseSender = $this->container->get(GenericResponseSender::class);
         $responseSender->send($response);
+
         $output = ob_get_clean();
 
         $this->assertSame('{"key":"value"}', $output);
@@ -129,6 +132,7 @@ public function jsonSerialize(): mixed
 
         $responseSender = $this->container->get(GenericResponseSender::class);
         $responseSender->send($response);
+
         $output = ob_get_clean();
 
         $this->assertSame('{"key":"value"}', $output);
@@ -145,6 +149,7 @@ public function test_view_body(): void
 
         $responseSender = $this->container->get(GenericResponseSender::class);
         $responseSender->send($response);
+
         $output = ob_get_clean();
 
         $this->assertStringContainsString('Hello Brent!', $output);
@@ -156,6 +161,7 @@ public function test_stream(): void
         $response = new EventStream(fn () => yield 'hello');
         $responseSender = $this->container->get(GenericResponseSender::class);
         $responseSender->send($response);
+
         $output = ob_get_clean();
         ob_start();
 
@@ -172,6 +178,7 @@ public function test_stream_with_custom_event(): void
         });
         $responseSender = $this->container->get(GenericResponseSender::class);
         $responseSender->send($response);
+
         $output = ob_get_clean();
         ob_start();
 
@@ -190,6 +197,7 @@ public function test_stream_with_custom_id(): void
         });
         $responseSender = $this->container->get(GenericResponseSender::class);
         $responseSender->send($response);
+
         $output = ob_get_clean();
         ob_start();
 
@@ -208,6 +216,7 @@ public function test_stream_with_custom_retry(): void
         });
         $responseSender = $this->container->get(GenericResponseSender::class);
         $responseSender->send($response);
+
         $output = ob_get_clean();
         ob_start();
 
@@ -223,13 +232,17 @@ public function test_stream_with_custom_implementation(): void
         $response = new EventStream(function () {
             yield new class implements ServerSentEvent {
                 public ?int $id = 1;
+
                 public null|Duration|int $retryAfter = null;
+
                 public ?string $event = 'custom';
+
                 public JsonSerializable|Stringable|string|iterable $data = ['foo', 'bar'];
             };
         });
         $responseSender = $this->container->get(GenericResponseSender::class);
         $responseSender->send($response);
+
         $output = ob_get_clean();
         ob_start();
 
diff --git a/tests/Integration/Route/RouterTest.php b/tests/Integration/Route/RouterTest.php
@@ -21,6 +21,7 @@
 use Tests\Tempest\Fixtures\Controllers\EnumForController;
 use Tests\Tempest\Fixtures\Controllers\TestController;
 use Tests\Tempest\Fixtures\Controllers\TestGlobalMiddleware;
+use Tests\Tempest\Fixtures\Controllers\TestMiddleware;
 use Tests\Tempest\Fixtures\Controllers\UriGeneratorController;
 use Tests\Tempest\Fixtures\Migrations\CreateAuthorTable;
 use Tests\Tempest\Fixtures\Migrations\CreateBookTable;
@@ -161,6 +162,17 @@ public function test_middleware(): void
         $this->assertEquals(['yes'], $response->getHeader('global-middleware')->values);
     }
 
+    public function test_skip_middleware(): void
+    {
+        $this
+            ->container->get(RouteConfig::class)
+            ->middleware->add(TestMiddleware::class);
+
+        $this->http
+            ->get('/without-middleware')
+            ->assertDoesNotHaveHeader('middleware');
+    }
+
     public function test_trailing_slash(): void
     {
         $this->http

Original file line number	Diff line number	Diff line change
`@@ -20,4 +20,9 @@ interface Route`
`20`	`20`	`public array $middleware {`
`21`	`21`	`get;`
`22`	`22`	`}`
	`23`	`+`
	`24`	`+ /** @var class-string<HttpMiddleware>[] */`
	`25`	`+ public array $without {`
	`26`	`+ get;`
	`27`	`+ }`
`23`	`28`	`}`