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 2.8.9, fix ergodic order via #365

Browse Source
This commit is contained in:
crazywhalecc
2023-06-12 18:33:31 +08:00
committed by Jerry Ma
parent ea83ea2cce
commit f0cba01bd7
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -105,6 +105,8 @@ class AnnotationParser
} }
*/ */
// 保留ergodic注解
$append_ergodics = [];
// 生成主树 // 生成主树
$this->annotation_map[$v]['class_annotations'] = $class_annotations; $this->annotation_map[$v]['class_annotations'] = $class_annotations;
$this->annotation_map[$v]['methods'] = $methods; $this->annotation_map[$v]['methods'] = $methods;
@@ -120,7 +122,8 @@ class AnnotationParser
foreach (($this->annotation_map[$v]['methods'] ?? []) as $method) { foreach (($this->annotation_map[$v]['methods'] ?? []) as $method) {
$copy = clone $vs; $copy = clone $vs;
$copy->method = $method->getName(); $copy->method = $method->getName();
$this->annotation_map[$v]['methods_annotations'][$method->getName()][] = $copy; $append_ergodics[$method->getName()][] = $copy;
// $this->annotation_map[$v]['methods_annotations'][$method->getName()][] = $copy;
} }
} }
@@ -139,6 +142,13 @@ class AnnotationParser
$inserted = []; $inserted = [];
// 预处理：将Class的ergodic注解拼接到每个方法的注解列表前面，且按照顺序（修复 #365）
foreach ($this->annotation_map[$v]['methods_annotations'] as $method_name => $annos) {
if (isset($append_ergodics[$method_name])) {
$this->annotation_map[$v]['methods_annotations'][$method_name] = array_merge($append_ergodics[$method_name], $annos);
}
}
// 预处理3：处理每个函数上面的特殊注解，就是需要操作一些东西的 // 预处理3：处理每个函数上面的特殊注解，就是需要操作一些东西的
foreach (($this->annotation_map[$v]['methods_annotations'] ?? []) as $method_name => $methods_annotations) { foreach (($this->annotation_map[$v]['methods_annotations'] ?? []) as $method_name => $methods_annotations) {
foreach ($methods_annotations as $method_anno) { foreach ($methods_annotations as $method_anno) {

2
src/ZM/ConsoleApplication.php
View File

@@ -30,7 +30,7 @@ class ConsoleApplication extends Application
{ {
public const VERSION_ID = 480; public const VERSION_ID = 480;
public const VERSION = '2.8.8'; public const VERSION = '2.8.9';
private static $obj; private static $obj;