From f3c3cfd9857540d743fdaebac60019e1fd30380d Mon Sep 17 00:00:00 2001 From: "as2252258@163.com" Date: Sat, 24 Apr 2021 19:31:58 +0800 Subject: [PATCH] modify --- Annotation/Loader.php | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/Annotation/Loader.php b/Annotation/Loader.php index efcb64c8..6c9f6cd1 100644 --- a/Annotation/Loader.php +++ b/Annotation/Loader.php @@ -409,7 +409,7 @@ class Loader extends BaseObject } foreach ($annotations['methods'] as $name => $attribute) { foreach ($attribute as $value) { - $this->_execute($class, $annotation, $annotations, $value, $name); + $this->_execute($class, $annotation, $annotations['handler'], $value, $name); } } } @@ -423,17 +423,14 @@ class Loader extends BaseObject * @param $value * @param $name */ - private function _execute($class, $annotation, $annotations, $value, $name) + private function _execute($class, $annotation, $handler, $value, $name) { - if ($annotations instanceof Get) { - var_dump($value->name, $name); - $annotation->addGets($annotations['handler'], $value->name, $name); - } else if ($annotations instanceof Get) { - var_dump($value->name, $name); - $annotation->addSets($annotations['handler'], $value->name, $name); - } else if ($annotations instanceof Get) { - var_dump($value->name, $name); - $annotation->addRelate($annotations['handler'], $value->name, $name); + if ($value instanceof Relation) { + $annotation->addGets($handler, $value->name, $name); + } else if ($value instanceof Get) { + $annotation->addSets($handler, $value->name, $name); + } else if ($value instanceof Set) { + $annotation->addRelate($handler, $value->name, $name); } else { $value->execute([$class, $name]); }