From c44fb76b598dba16c3b15cbbc236f2b9b46f1c96 Mon Sep 17 00:00:00 2001
From: "as2252258@163.com" <as22522582>
Date: Sun, 2 May 2021 04:38:26 +0800
Subject: [PATCH] modify

---
 Annotation/Loader.php | 29 +++++------------------------
 1 file changed, 5 insertions(+), 24 deletions(-)

diff --git a/Annotation/Loader.php b/Annotation/Loader.php
index b708845d..097dae56 100644
--- a/Annotation/Loader.php
+++ b/Annotation/Loader.php
@@ -179,7 +179,7 @@ class Loader extends BaseObject
             }
             $this->appendFileToDirectory($path->getRealPath(), $replace->getName());
 
-            $_array = ['handler' => $replace->getName(), 'target' => [], 'methods' => [], 'property' => []];
+            $_array = ['handler' => $replace->newInstance(), 'target' => [], 'methods' => [], 'property' => []];
             foreach ($replace->getAttributes() as $attribute) {
                 if ($attribute->getName() == Attribute::class) {
                     continue;
@@ -309,21 +309,18 @@ class Loader extends BaseObject
             if ($annotations === null) {
                 continue;
             }
-            if (($reflect = $this->getRelect($annotations)) === null) {
-                continue;
-            }
-            $class = $reflect->newInstance();
+            $class = clone $annotations['handler'];
             foreach ($annotations['target'] ?? [] as $value) {
                 $value->execute([$class]);
             }
             foreach ($annotations['methods'] as $name => $attribute) {
                 foreach ($attribute as $value) {
                     if ($value instanceof Relation) {
-                        $annotation->addRelate($reflect->getName(), $value->name, $name);
+                        $annotation->addRelate($class::class, $value->name, $name);
                     } else if ($value instanceof Get) {
-                        $annotation->addGets($reflect->getName(), $value->name, $name);
+                        $annotation->addGets($class::class, $value->name, $name);
                     } else if ($value instanceof Set) {
-                        $annotation->addSets($reflect->getName(), $value->name, $name);
+                        $annotation->addSets($class::class, $value->name, $name);
                     } else {
                         $value->execute([$class, $name]);
                     }
@@ -333,20 +330,4 @@ class Loader extends BaseObject
     }
 
 
-    /**
-     * @param $annotations
-     * @return \ReflectionClass|null
-     * @throws \ReflectionException
-     * @throws \Snowflake\Exception\NotFindClassException
-     */
-    private function getRelect($annotations)
-    {
-        $reflect = Snowflake::getDi()->getReflect($annotations['handler']);
-        if ($reflect === null) {
-            return null;
-        }
-        return $reflect;
-    }
-
-
 }