From 7b9475a1c961367d5385ea65223b6c7f37da9309 Mon Sep 17 00:00:00 2001 From: whwyy Date: Tue, 30 Dec 2025 21:11:44 +0800 Subject: [PATCH] eee --- src/Base/AbstractHandler.php | 6 +++++- src/RouterCollector.php | 8 ++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/Base/AbstractHandler.php b/src/Base/AbstractHandler.php index bc55c30..9c2e9ab 100644 --- a/src/Base/AbstractHandler.php +++ b/src/Base/AbstractHandler.php @@ -27,7 +27,11 @@ abstract class AbstractHandler */ public function __construct(public array $middlewares, public Handler $handler) { - var_dump(request()->middlewares); + foreach (request()->middlewares as $middleware) { + $middleware = \Kiri::getDi()->get($middleware); + + array_unshift($this->middlewares, $middleware); + } } diff --git a/src/RouterCollector.php b/src/RouterCollector.php index dacc9a2..911e77a 100644 --- a/src/RouterCollector.php +++ b/src/RouterCollector.php @@ -219,10 +219,10 @@ class RouterCollector implements \ArrayAccess, \IteratorAggregate public function registerMiddleware(string $class, string $method): array { $response = []; - $middlewares = \request()->middlewares; - if (count($middlewares) > 0) { - $response = $this->appendMiddleware($response, $middlewares); - } +// $middlewares = \request()->middlewares; +// if (count($middlewares) > 0) { +// $response = $this->appendMiddleware($response, $middlewares); +// } $middlewares = array_column($this->groupTack, 'middleware'); $response = $this->appendMiddleware($response, $middlewares);