[12.x] fix: use contextual bindings in class dependency resolution (#55090)

* fix: use contextual bindings in class dependency resolution

* formatting

---------

Co-authored-by: Taylor Otwell <[email protected]>

Author: calebdw

src/Illuminate/Container/Container.php

@@ -1187,17 +1187,12 @@ protected function resolveClass(ReflectionParameter $parameter)
     {
         $className = Util::getParameterClassName($parameter);
 
-        // First, we check if the dependency has been explicitly bound in the container
-        // and if so, we will resolve it directly from there to respect any explicit
-        // bindings the developer has defined rather than using any default value.
-        if ($this->bound($className)) {
-            return $this->make($className);
-        }
-
-        // If no binding exists, we will check if a default value has been defined for
-        // the parameter. If it has, we should return it to avoid overriding any of
-        // the developer specified default values for the constructor parameters.
-        if ($parameter->isDefaultValueAvailable()) {
+        // First we will check if a default value has been defined for the parameter.
+        // If it has, and no explicit binding exists, we should return it to avoid
+        // overriding any of the developer specified defaults for the parameters.
+        if ($parameter->isDefaultValueAvailable() &&
+            ! $this->bound($className) &&
+            $this->findInContextualBindings($className) === null) {
             return $parameter->getDefaultValue();
         }
 

tests/Container/ContainerTest.php

@@ -319,6 +319,17 @@ public function testResolutionOfClassWithDefaultParameters()
         $this->assertInstanceOf(ContainerConcreteStub::class, $instance->default);
     }
 
+    public function testResolutionOfClassWithDefaultParametersAndContextualBindings()
+    {
+        $container = new Container;
+
+        $container->when(ContainerClassWithDefaultValueStub::class)
+            ->needs(ContainerConcreteStub::class)
+            ->give(fn () => new ContainerConcreteStub);
+        $instance = $container->make(ContainerClassWithDefaultValueStub::class);
+        $this->assertInstanceOf(ContainerConcreteStub::class, $instance->default);
+    }
+
     public function testBound()
     {
         $container = new Container;