变更
This commit is contained in:
+18
-3
@@ -166,8 +166,25 @@ class RouterCollector implements \ArrayAccess, \IteratorAggregate
|
|||||||
public function registerMiddleware(string $class, string $method): void
|
public function registerMiddleware(string $class, string $method): void
|
||||||
{
|
{
|
||||||
$middlewares = Kiri::service()->get('request')->middlewares;
|
$middlewares = Kiri::service()->get('request')->middlewares;
|
||||||
$middlewares = [...$middlewares, ...array_column($this->groupTack, 'middleware')];
|
|
||||||
if (count($middlewares) > 0) {
|
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);
|
$manager = Kiri::getDi()->get(Middleware::class);
|
||||||
foreach ($middlewares as $middleware) {
|
foreach ($middlewares as $middleware) {
|
||||||
if (is_string($middleware)) {
|
if (is_string($middleware)) {
|
||||||
@@ -178,8 +195,6 @@ class RouterCollector implements \ArrayAccess, \IteratorAggregate
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param string $path
|
* @param string $path
|
||||||
|
|||||||
Reference in New Issue
Block a user