变更
This commit is contained in:
@@ -130,7 +130,6 @@ class RouterCollector implements \ArrayAccess, \IteratorAggregate
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
$hashMap->put('handler', $handler);
|
$hashMap->put('handler', $handler);
|
||||||
|
|
||||||
$this->registerMiddleware($handler->getClass(), $handler->getMethod());
|
$this->registerMiddleware($handler->getClass(), $handler->getMethod());
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -144,7 +143,8 @@ class RouterCollector implements \ArrayAccess, \IteratorAggregate
|
|||||||
*/
|
*/
|
||||||
public function registerMiddleware(string $class, string $method): void
|
public function registerMiddleware(string $class, string $method): void
|
||||||
{
|
{
|
||||||
$middlewares = array_column($this->groupTack, 'middleware');
|
$middlewares = Kiri::service()->get('request')->middlewares;
|
||||||
|
$middlewares = [...$middlewares, ...array_column($this->groupTack, 'middleware')];
|
||||||
if (count($middlewares) > 0) {
|
if (count($middlewares) > 0) {
|
||||||
$manager = Kiri::getDi()->get(Middleware::class);
|
$manager = Kiri::getDi()->get(Middleware::class);
|
||||||
foreach ($middlewares as $middleware) {
|
foreach ($middlewares as $middleware) {
|
||||||
|
|||||||
+1
-1
@@ -91,7 +91,7 @@ class Server implements OnRequestInterface
|
|||||||
$request_uri = $request->getMethod() == 'OPTIONS' ? '/*' : $request->server['request_uri'];
|
$request_uri = $request->getMethod() == 'OPTIONS' ? '/*' : $request->server['request_uri'];
|
||||||
$dispatcher = $this->router->query($request_uri, $request->getMethod());
|
$dispatcher = $this->router->query($request_uri, $request->getMethod());
|
||||||
|
|
||||||
$middleware = $this->request->middlewares;
|
$middleware = [];
|
||||||
if (!($dispatcher instanceof Kiri\Router\Base\NotFoundController)) {
|
if (!($dispatcher instanceof Kiri\Router\Base\NotFoundController)) {
|
||||||
$middlewareManager = \Kiri::getDi()->get(MiddlewareManager::class);
|
$middlewareManager = \Kiri::getDi()->get(MiddlewareManager::class);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user