This commit is contained in:
2023-04-21 17:40:40 +08:00
parent c12606d233
commit 52872eb6f7
+18 -3
View File
@@ -166,8 +166,25 @@ class RouterCollector implements \ArrayAccess, \IteratorAggregate
public function registerMiddleware(string $class, string $method): void
{
$middlewares = Kiri::service()->get('request')->middlewares;
$middlewares = [...$middlewares, ...array_column($this->groupTack, 'middleware')];
if (count($middlewares) > 0) {
$this->appendMiddleware($middlewares, $class, $method);
}
$middlewares = array_column($this->groupTack, 'middleware');
if (count($middlewares) > 0) {
$this->appendMiddleware($middlewares, $class, $method);
}
}
/**
* @param array $middlewares
* @param $class
* @param $method
* @return void
* @throws
*/
private function appendMiddleware(array $middlewares, $class, $method): void
{
$manager = Kiri::getDi()->get(Middleware::class);
foreach ($middlewares as $middleware) {
if (is_string($middleware)) {
@@ -178,8 +195,6 @@ class RouterCollector implements \ArrayAccess, \IteratorAggregate
}
}
}
}
/**
* @param string $path