This commit is contained in:
2020-12-16 10:52:08 +08:00
parent f5af725a9c
commit 991c3f9145
+24 -9
View File
@@ -63,15 +63,13 @@ class Middleware
*/ */
protected function annotation(Node $node): array protected function annotation(Node $node): array
{ {
$middleWares = $this->middleWares; $middleWares = $this->annotation_limit($node);
$middleWares = $this->annotation_interceptor($node, $middleWares);
foreach ($this->middleWares as $middleWare) {
$middleWares[] = $middleWare;
}
$this->middleWares = []; $this->middleWares = [];
if (!$node->hasInterceptor()) { return $middleWares;
return $this->annotation_limit($node, $middleWares);
}
foreach ($node->getInterceptor() as $item) {
$middleWares[] = $item;
}
return $this->annotation_limit($node, $middleWares);
} }
@@ -80,7 +78,24 @@ class Middleware
* @param $middleWares * @param $middleWares
* @return array * @return array
*/ */
protected function annotation_limit(Node $node, $middleWares): array protected function annotation_interceptor(Node $node, $middleWares = []): array
{
if (!$node->hasInterceptor()) {
return $middleWares;
}
foreach ($node->getInterceptor() as $item) {
$middleWares[] = $item;
}
return $middleWares;
}
/**
* @param Node $node
* @param $middleWares
* @return array
*/
protected function annotation_limit(Node $node, $middleWares = []): array
{ {
if (!$node->hasLimits()) { if (!$node->hasLimits()) {
return $middleWares; return $middleWares;