修改 容器中存在提供的类时才进行注入，否则使用默认值

Author: ChinaMoli

src/Container.php

@@ -500,13 +500,10 @@ protected function getObjectParam(string $className, array &$vars, ReflectionPar
             $result = $value;
             array_shift($vars);
         } else {
-            try {
+            if ($param->isDefaultValueAvailable()) {
+                $result = $this->bound($className) ? $this->make($className) : $param->getDefaultValue();
+            } else {
                 $result = $this->make($className);
-            } catch (Throwable $th) {
-                if (!$param->isDefaultValueAvailable()) {
-                    throw $th;
-                }
-                $result = $param->getDefaultValue();
             }
         }
 

tests/ContainerTest.php

@@ -340,10 +340,13 @@ public function testInvokeClassNotExists()
     public function testInvokeWithDefaultValues()
     {
         $container = $this->resolveContainer();
-        $container->bind(Container::class, $container);
 
-        $class = $container->make(WithDefaultValues::class);
-        $this->assertSame($container, $class->container);
+        $class = $container->invokeClass(WithDefaultValues::class);
+        $this->assertSame(null, $class->container);
+
+        $container->bind(Container::class, $container);
+        $bound = $container->invokeClass(WithDefaultValues::class);
+        $this->assertSame($container, $bound->container);
 
         $this->assertSame(null, $container->invokeMethod(WithDefaultValues::class . '::classExistsButCannotBeInjected'));
     }