Skip to content

[5.5] Preserve parameter order in BoundMethod::call() #22709

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

Closed
wants to merge 2 commits into from
Closed

[5.5] Preserve parameter order in BoundMethod::call() #22709

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
d4cf6cc
Fix issue with parameter order
tssge Jan 8, 2018
bb55612
Test BoundMethod::call() parameter order
tssge Jan 9, 2018
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
26 changes: 18 additions & 8 deletions src/Illuminate/Container/BoundMethod.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,12 +111,22 @@ protected static function normalizeMethod($callback)
protected static function getMethodDependencies($container, $callback, array $parameters = [])
{
$dependencies = [];
$arguments = [];

foreach (static::getCallReflector($callback)->getParameters() as $parameter) {
static::addDependencyForCallParameter($container, $parameter, $parameters, $dependencies);
}

return array_merge($dependencies, $parameters);
// Fill all the missing spots and consume rest of parameters
for ($i = 0; $i <= count($parameters) + count($dependencies); $i++) {
if (array_key_exists($i, $dependencies)) {
$arguments[] = $dependencies[$i];
} elseif ($param = array_shift($parameters)) {
$arguments[] = $param;
}
}

return $arguments;
}

/**
Expand All @@ -139,23 +149,23 @@ protected static function getCallReflector($callback)
/**
* Get the dependency for the given call parameter.
*
* @param \Illuminate\Container\Container $container
* @param \ReflectionParameter $parameter
* @param array $parameters
* @param array $dependencies
* @param \Illuminate\Container\Container $container
* @param \ReflectionParameter $parameter
* @param array $parameters
* @param array $dependencies
* @return mixed
*/
protected static function addDependencyForCallParameter($container, $parameter,
array &$parameters, &$dependencies)
{
if (array_key_exists($parameter->name, $parameters)) {
$dependencies[] = $parameters[$parameter->name];
$dependencies[$parameter->getPosition()] = $parameters[$parameter->name];

unset($parameters[$parameter->name]);
} elseif ($parameter->getClass()) {
$dependencies[] = $container->make($parameter->getClass()->name);
$dependencies[$parameter->getPosition()] = $container->make($parameter->getClass()->name);
} elseif ($parameter->isDefaultValueAvailable()) {
$dependencies[] = $parameter->getDefaultValue();
$dependencies[$parameter->getPosition()] = $parameter->getDefaultValue();
}
}

Expand Down
13 changes: 13 additions & 0 deletions tests/Container/ContainerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -530,6 +530,14 @@ public function testCallWithCallableArray()
$this->assertEquals(['foo', 'bar'], $result);
}

public function testCallParameterOrder()
{
$container = new Container;
$stub = new ContainerTestCallStub;
$result = $container->call([$stub, 'order'], ['foo']);
$this->assertEquals(['foo', 'default'], $result);
}

public function testCallWithStaticMethodNameString()
{
$container = new Container;
Expand Down Expand Up @@ -1093,6 +1101,11 @@ public function unresolvable($foo, $bar)
{
return func_get_args();
}

public function order($foo, $bar = 'default')
{
return func_get_args();
}
}

class ContainerTestContextInjectOne
Expand Down