opensourcemirror
/
Laravel-Framework
mirror of https://github.com/laravel/framework.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Allow passing object instances regardless of the parameter name to method injection (#24234)

This commit is contained in:
Marcel Pociot 2018-05-24 15:16:56 +02:00 committed by Taylor Otwell
parent de7455a7e0
commit 49549b73dc
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Illuminate/Container/BoundMethod.php
View File

@ -152,6 +152,10 @@ class BoundMethod
$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()) {

8
tests/Container/ContainerTest.php
View File

@ -490,6 +490,14 @@ class ContainerTest extends TestCase
$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...
*/