zhamao-robot/zhamao-framework
1
0
Fork 0
mirror of https://github.com/zhamao-robot/zhamao-framework.git synced 2026-07-02 14:25:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

update to 3.2.3, fix ergodic annotation order

Browse Source
This commit is contained in:
crazywhalecc
2023-06-12 18:15:00 +08:00
committed by Jerry Ma
parent c55515709b
commit 455e09c66d
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/ZM/Annotation/AnnotationParser.php
View File

@@ -139,7 +139,8 @@ class AnnotationParser
} }
} }
*/ */
// 保留ergodic注解
$append_ergodics = [];
// 保存对class的注解 // 保存对class的注解
$reflection_tree[$v]['class_annotations'] = $class_annotations; $reflection_tree[$v]['class_annotations'] = $class_annotations;
// 保存类成员的方法的对应反射对象们 // 保存类成员的方法的对应反射对象们
@@ -154,7 +155,7 @@ class AnnotationParser
$vs->class = $v; $vs->class = $v;
// 预处理0：排除所有非继承于 AnnotationBase 的注解 // 预处理0：排除所有非继承于 AnnotationBase 的注解
if (!$vs instanceof AnnotationBase) { if (!$vs instanceof AnnotationBase && !str_contains($vs::class, 'JetBrains\\Phpstorm\\ArrayShape')) {
logger()->notice($vs::class . ' is not extended from ' . AnnotationBase::class); logger()->notice($vs::class . ' is not extended from ' . AnnotationBase::class);
continue; continue;
} }
@@ -165,7 +166,8 @@ class AnnotationParser
// 用 clone 的目的是生成个独立的对象，避免和 class 以及方法之间互相冲突 // 用 clone 的目的是生成个独立的对象，避免和 class 以及方法之间互相冲突
$copy = clone $vs; $copy = clone $vs;
$copy->method = $method->getName(); $copy->method = $method->getName();
$reflection_tree[$v]['methods_annotations'][$method->getName()][] = $copy; $append_ergodics[$method->getName()][] = $copy;
// $reflection_tree[$v]['methods_annotations'][$method->getName()][] = $copy;
$annotation_list[get_class($vs)][] = $copy; $annotation_list[get_class($vs)][] = $copy;
} }
// 标记为 Ergodic 的类注解，不作为类的注解解析，而是全部当作每个方法有注解，所以直接跳过 // 标记为 Ergodic 的类注解，不作为类的注解解析，而是全部当作每个方法有注解，所以直接跳过
@@ -187,12 +189,18 @@ class AnnotationParser
$vs->group = array_merge($vs->group, $this->class_bind_group_list[get_class($vs)]); $vs->group = array_merge($vs->group, $this->class_bind_group_list[get_class($vs)]);
} }
} }
// 预处理：将Class的ergodic注解拼接到每个方法的注解列表前面，且按照顺序（修复 #365）
foreach ($reflection_tree[$v]['methods_annotations'] as $method_name => $annos) {
if (isset($append_ergodics[$method_name])) {
$reflection_tree[$v]['methods_annotations'][$method_name] = array_merge($append_ergodics[$method_name], $annos);
}
}
// 预处理3：处理每个函数上面的特殊注解，就是需要操作一些东西的 // 预处理3：处理每个函数上面的特殊注解，就是需要操作一些东西的
foreach (($reflection_tree[$v]['methods_annotations'] ?? []) as $method_name => $methods_annotations) { foreach (($reflection_tree[$v]['methods_annotations'] ?? []) as $method_name => $methods_annotations) {
foreach ($methods_annotations as $method_anno) { foreach ($methods_annotations as $method_anno) {
// 预处理3.0：排除所有非继承于 AnnotationBase 的注解 // 预处理3.0：排除所有非继承于 AnnotationBase 的注解
if (!$method_anno instanceof AnnotationBase) { if (!$method_anno instanceof AnnotationBase && !str_contains($method_anno::class, 'JetBrains\\Phpstorm\\ArrayShape')) {
logger()->notice('Binding annotation ' . $method_anno::class . ' to ' . $v . '::' . $method_name . ' is not extended from ' . AnnotationBase::class); logger()->notice('Binding annotation ' . $method_anno::class . ' to ' . $v . '::' . $method_name . ' is not extended from ' . AnnotationBase::class);
continue; continue;
} }

2
src/ZM/Framework.php
View File

@@ -50,7 +50,7 @@ class Framework
public const VERSION_ID = 722; public const VERSION_ID = 722;
/** @var string 版本名称 */ /** @var string 版本名称 */
public const VERSION = '3.2.2'; public const VERSION = '3.2.3';
/** /**
* @var RuntimePreferences 运行时偏好（环境信息&参数） * @var RuntimePreferences 运行时偏好（环境信息&参数）