eee
This commit is contained in:
+5
-11
@@ -206,10 +206,7 @@ class RouterCollector implements \ArrayAccess, \IteratorAggregate
|
||||
public function register(string $path, string $method, Handler $handler): void
|
||||
{
|
||||
$this->methods[$method . '_' . $path] = $handler;
|
||||
$middlewares = $this->registerMiddleware($handler->getClass(), $handler->getMethod());
|
||||
if (count($middlewares) > 0) {
|
||||
$handler->setMiddlewares($middlewares);
|
||||
}
|
||||
$handler->setMiddlewares($this->registerMiddleware($handler->getClass(), $handler->getMethod()));
|
||||
}
|
||||
|
||||
|
||||
@@ -229,7 +226,7 @@ class RouterCollector implements \ArrayAccess, \IteratorAggregate
|
||||
$middlewares = array_column($this->groupTack, 'middleware');
|
||||
$response = $this->appendMiddleware($response, $middlewares);
|
||||
|
||||
$reflect = \Kiri::getDi()->getReflectionClass($class);
|
||||
$reflect = \Kiri::getDi()->getReflectionClass($class);
|
||||
$attributes = $reflect->getMethod($method)->getAttributes(Annotate\Middleware::class);
|
||||
|
||||
foreach ($attributes as $attribute) {
|
||||
@@ -239,18 +236,15 @@ class RouterCollector implements \ArrayAccess, \IteratorAggregate
|
||||
$data = $instance->middleware;
|
||||
if (is_string($data)) {
|
||||
$data = [$data];
|
||||
}
|
||||
}
|
||||
|
||||
foreach ($data as $middleware) {
|
||||
foreach ($data as $middleware) {
|
||||
if (!in_array($middleware, $response)) {
|
||||
$response[] = $middleware;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
var_dump($class.'::'.$method. '(' . json_encode($response, JSON_UNESCAPED_UNICODE) . ')');
|
||||
|
||||
return $response;
|
||||
return $response;
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user