Allow passing object instances regardless of the parameter name to me…

…thod injection (#24234)
laravel · May 24, 2018 · 49549b7 · 49549b7
1 parent de7455a
commit 49549b7
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/src/Illuminate/Container/BoundMethod.php b/src/Illuminate/Container/BoundMethod.php
@@ -152,6 +152,10 @@ protected static function addDependencyForCallParameter($container, $parameter,
             $dependencies[] = $parameters[$parameter->name];
 
             unset($parameters[$parameter->name]);
+        } elseif ($parameter->getClass() && array_key_exists($parameter->getClass()->name, $parameters)) {
+            $dependencies[] = $parameters[$parameter->getClass()->name];
+
+            unset($parameters[$parameter->getClass()->name]);
         } elseif ($parameter->getClass()) {
             $dependencies[] = $container->make($parameter->getClass()->name);
         } elseif ($parameter->isDefaultValueAvailable()) {

diff --git a/tests/Container/ContainerTest.php b/tests/Container/ContainerTest.php
@@ -490,6 +490,14 @@ public function testCallWithDependencies()
         $this->assertInstanceOf('stdClass', $result[0]);
         $this->assertEquals('taylor', $result[1]);
 
+        $stub = new ContainerConcreteStub;
+        $result = $container->call(function (stdClass $foo, ContainerConcreteStub $bar) {
+            return func_get_args();
+        }, [ContainerConcreteStub::class => $stub]);
+
+        $this->assertInstanceOf('stdClass', $result[0]);
+        $this->assertSame($stub, $result[1]);
+
         /*
          * Wrap a function...
          */