Skip to content

[8.x] Allow method typed variadics dependencies #40255

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 5, 2022
Merged

[8.x] Allow method typed variadics dependencies #40255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
622b772
[8.x] Allow method typed variadics dependencies
LeoColomb Jan 4, 2022
e59f86d
check array
taylorotwell Jan 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion src/Illuminate/Container/BoundMethod.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,15 @@ protected static function addDependencyForCallParameter($container, $parameter,

unset($parameters[$className]);
} else {
$dependencies[] = $container->make($className);
if ($parameter->isVariadic()) {
$variadicDependencies = $container->make($className);

$dependencies = array_merge($dependencies, is_array($variadicDependencies)
? $variadicDependencies
: [$variadicDependencies]);
} else {
$dependencies[] = $container->make($className);
}
}
} elseif ($parameter->isDefaultValueAvailable()) {
$dependencies[] = $parameter->getDefaultValue();
Expand Down
23 changes: 23 additions & 0 deletions tests/Container/ContainerCallTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,29 @@ public function testCallWithDependencies()
$this->assertSame('taylor', $result[1]);
}

public function testCallWithVariadicDependency()
{
$stub1 = new ContainerCallConcreteStub;
$stub2 = new ContainerCallConcreteStub;

$container = new Container;
$container->bind(ContainerCallConcreteStub::class, function () use ($stub1, $stub2) {
return [
$stub1,
$stub2,
];
});

$result = $container->call(function (stdClass $foo, ContainerCallConcreteStub ...$bar) {
return func_get_args();
});

$this->assertInstanceOf(stdClass::class, $result[0]);
$this->assertInstanceOf(ContainerCallConcreteStub::class, $result[1]);
$this->assertSame($stub1, $result[1]);
$this->assertSame($stub2, $result[2]);
}

public function testCallWithCallableObject()
{
$container = new Container;
Expand Down