zhamao-robot/zhamao-framework
1
0
Fork 0
mirror of https://github.com/zhamao-robot/zhamao-framework.git synced 2026-03-19 05:34:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix AnnotationHandler return callback not working for BotCommand

Browse Source
This commit is contained in:
crazywhalecc 2022-12-31 19:12:29 +08:00
parent dce126136b
commit 18df76f650
No known key found for this signature in database
GPG Key ID: 4B0FFA175E762022
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -94,15 +94,6 @@ class AnnotationHandler
foreach ((AnnotationMap::$_list[$this->annotation_class] ?? []) as $v) {
// 调用单个注解
$this->handle($v, $this->rule_callback, ...$params);
// 执行完毕后检查状态，如果状态是规则判断或中间件before不通过，则重置状态后继续执行别的注解函数
if ($this->status == self::STATUS_BEFORE_FAILED || $this->status == self::STATUS_RULE_FAILED) {
$this->status = self::STATUS_NORMAL;
continue;
}
// 如果执行完毕，且设置了返回值后续逻辑的回调函数，那么就调用返回值回调的逻辑
if (is_callable($this->return_callback) && $this->status === self::STATUS_NORMAL) {
($this->return_callback)($this->return_val);
}
}
} catch (InterruptException $e) {
// InterruptException 用于中断，这里必须 catch，并标记状态
@ -140,6 +131,15 @@ class AnnotationHandler
}
try {
$this->return_val = middleware()->process($callback, ...$args);
// 执行完毕后检查状态，如果状态是规则判断或中间件before不通过，则重置状态后继续执行别的注解函数
if ($this->status == self::STATUS_BEFORE_FAILED || $this->status == self::STATUS_RULE_FAILED) {
$this->status = self::STATUS_NORMAL;
return false;
}
// 如果执行完毕，且设置了返回值后续逻辑的回调函数，那么就调用返回值回调的逻辑
if (is_callable($this->return_callback) && $this->status === self::STATUS_NORMAL) {
($this->return_callback)($this->return_val);
}
} catch (InterruptException $e) {
// 这里直接抛出这个异常的目的就是给上层handleAll()捕获
throw $e;