This commit is contained in:
2021-07-21 14:43:51 +08:00
parent 8d83dedd2b
commit cb70c7f885
+5 -6
View File
@@ -342,26 +342,25 @@ class Loader extends BaseObject
$annotation = Snowflake::getAnnotation(); $annotation = Snowflake::getAnnotation();
foreach ($classes as $className) { foreach ($classes as $className) {
$annotations = static::$_classes[$className] ?? null; if (!isset(static::$_methods[$className])) {
if ($annotations === null) {
continue; continue;
} }
foreach (static::$_methods[$className] as $name => $attribute) { foreach (static::$_methods[$className] as $name => $attribute) {
$this->methods($annotations, $attribute, $annotation, $className, $name); $this->methods($attribute, $annotation, $className, $name);
} }
} }
} }
/** /**
* @param $annotations
* @param $attribute * @param $attribute
* @param $annotation * @param $annotation
* @param $className * @param $className
* @param $name * @param $name
*/ */
private function methods($annotations, $attribute, $annotation, $className, $name) private function methods($attribute, $annotation, $className, $name)
{ {
$handler = static::$_classes[$className]['handler'];
foreach ($attribute as $value) { foreach ($attribute as $value) {
if ($value instanceof Relation) { if ($value instanceof Relation) {
$annotation->addRelate($className, $value->name, $name); $annotation->addRelate($className, $value->name, $name);
@@ -370,7 +369,7 @@ class Loader extends BaseObject
} else if ($value instanceof Set) { } else if ($value instanceof Set) {
$annotation->addSets($className, $value->name, $name); $annotation->addSets($className, $value->name, $name);
} else { } else {
$value->execute($annotations['handler'], $name); $value->execute($handler, $name);
} }
} }
} }