From 9bc853c959adc23b0ca19b101bd7378b91022561 Mon Sep 17 00:00:00 2001
From: "as2252258@163.com" <as22522582>
Date: Tue, 23 Feb 2021 00:53:30 +0800
Subject: [PATCH] modify

---
 System/Di/Container.php | 53 ++++++++++++++++++-----------------------
 1 file changed, 23 insertions(+), 30 deletions(-)

diff --git a/System/Di/Container.php b/System/Di/Container.php
index f626a467..b4708526 100644
--- a/System/Di/Container.php
+++ b/System/Di/Container.php
@@ -126,10 +126,6 @@ class Container extends BaseObject
      */
     private function resolve($class, $constrict, $config): object
     {
-        /**
-         * @var ReflectionClass $reflect
-         * @var array $dependencies
-         */
         list($reflect, $dependencies) = $this->resolveDependencies($class);
         foreach ($constrict as $index => $param) {
             $dependencies[$index] = $param;
@@ -163,17 +159,15 @@ class Container extends BaseObject
      */
     private function resolveDependencies($class): array
     {
-        $dependencies = [];
-        if (isset($this->_reflection[$class])) {
-            $reflection = $this->_reflection[$class];
-        } else {
-            $reflection = new ReflectionClass($class);
-            $this->_reflection[$class] = $reflection;
+        $reflection = $this->reflectionClass($class);
+        if (empty($reflection)) {
+            return [];
         }
         $constructs = $reflection->getConstructor();
         if (empty($constructs) || count($constructs->getParameters()) < 1) {
             return [$reflection, $this->_constructs[$class] = []];
         }
+        $dependencies = [];
         foreach ($constructs->getParameters() as $key => $param) {
             if ($param->isDefaultValueAvailable()) {
                 $dependencies[] = $param->getDefaultValue();
@@ -187,6 +181,25 @@ class Container extends BaseObject
     }
 
 
+    /**
+     * @param $class
+     * @return array
+     */
+    private function reflectionClass($class)
+    {
+        if (isset($this->_reflection[$class])) {
+            $reflection = $this->_reflection[$class];
+        } else {
+            $reflection = new ReflectionClass($class);
+            if (!$reflection->isInstantiable()) {
+                return null;
+            }
+            $this->_reflection[$class] = $reflection;
+        }
+        return $reflection;
+    }
+
+
     /**
      * @param $class
      * @return mixed
@@ -200,26 +213,6 @@ class Container extends BaseObject
         return $this->_reflection[$class];
     }
 
-
-    /**
-     * @param string $class
-     * @return array
-     * @throws ReflectionException
-     */
-    public function getAttributes(string $class): array
-    {
-        $reflection = $this->getReflect($class);
-        $methods = $reflection->getMethods(\ReflectionMethod::IS_PUBLIC);
-
-        $classAttribute = $reflection->getAttributes();
-
-        foreach ($methods as $method) {
-            $this->_attributes[$reflection->getName()][$method->getName()] = $method->getAttributes();
-        }
-        return $this->_attributes[$reflection->getName()];
-    }
-
-
     /**
      * @param $class
      */