zhamao-robot/zhamao-framework
1
0
Fork 0
mirror of https://github.com/zhamao-robot/zhamao-framework.git synced 2026-07-21 15:45:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix param for annotation handler

Browse Source
This commit is contained in:
crazywhalecc
2022-08-13 22:04:05 +08:00
committed by Jerry Ma
parent dc742763a8
commit d56f9d6e6e
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ZM/Annotation/AnnotationHandler.php
View File

@@ -126,7 +126,7 @@ class AnnotationHandler
* @throws InterruptException
* @throws Throwable
*/
public function handle(AnnotationBase $v, ?callable $rule_callback = null): bool
public function handle(AnnotationBase $v, ?callable $rule_callback = null, ...$args): bool
{
// 由于3.0有额外的插件模式支持，所以注解就不再提供独立的闭包函数调用支持了
// 提取要调用的目标类和方法名称
@@ -139,7 +139,7 @@ class AnnotationHandler
}
$callback = [$target_class, $target_method];
try {
$this->return_val = middleware()->process($callback);
$this->return_val = middleware()->process($callback, ...$args);
} catch (InterruptException $e) {
// 这里直接抛出这个异常的目的就是给上层handleAll()捕获
throw $e;

4
src/ZM/Middleware/MiddlewareHandler.php
View File

@@ -137,7 +137,7 @@ class MiddlewareHandler
* @throws InvalidArgumentException
* @throws Throwable
*/
public function process(callable $callback)
public function process(callable $callback, ...$args)
{
$stack_id = $this->getStackId($callback);
unset($this->stack[$stack_id]);
@@ -147,7 +147,7 @@ class MiddlewareHandler
// 遍历执行before并压栈，并在遇到返回false后停止
try {
$mid_list = ($this->reg_map[$stack_id] ?? []);
$final_result = ($this->getPipeClosure($callback, $stack_id))($mid_list);
$final_result = ($this->getPipeClosure($callback, $stack_id))($mid_list, ...$args);
} finally {
array_pop($this->callable_stack);
}