Skip to content

[5.7] [WIP] bug fix for app()->call() #26915

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 5 commits into from
Closed

[5.7] [WIP] bug fix for app()->call() #26915

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
febdb64
Some changes in the BoundMethod class to make a bug fix and add suppo…
imanghafoori1 Dec 19, 2018
f912f0e
Clean up the code
imanghafoori1 Dec 19, 2018
31c7bca
Code clean up
imanghafoori1 Dec 19, 2018
9e826ae
Clean up code and comments
imanghafoori1 Dec 19, 2018
82377fd
Junk removal
imanghafoori1 Dec 19, 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
107 changes: 69 additions & 38 deletions src/Illuminate/Container/BoundMethod.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,16 +49,13 @@ protected static function callClass($container, $target, array $parameters = [],
// We will assume an @ sign is used to delimit the class name from the method
// name. We will split on this @ sign and then build a callable array that
// we can pass right back into the "call" method for dependency binding.
$method = count($segments) === 2
? $segments[1] : $defaultMethod;
$method = count($segments) === 2 ? $segments[1] : $defaultMethod;

if (is_null($method)) {
throw new InvalidArgumentException('Method not provided.');
}

return static::call(
$container, [$container->make($segments[0]), $method], $parameters
);
return static::call($container, [$container->make($segments[0]), $method], $parameters);
}

/**
Expand Down Expand Up @@ -103,20 +100,27 @@ protected static function normalizeMethod($callback)
/**
* Get all dependencies for a given method.
*
* @param \Illuminate\Container\Container $container
* @param callable|string $callback
* @param array $parameters
* @param \Illuminate\Container\Container $container
* @param callable|string $callback
* @param array $inputData
* @return array
* @throws \ReflectionException
*/
protected static function getMethodDependencies($container, $callback, array $parameters = [])
protected static function getMethodDependencies($container, $callback, array $inputData = []) : array
{
$dependencies = [];
$signature = static::getCallReflector($callback)->getParameters();

// In case the method has no explicit input parameters defined
// we will call it, with whatever input data available to us.
if (count($signature) === 0) {
return $inputData;
}

foreach (static::getCallReflector($callback)->getParameters() as $parameter) {
static::addDependencyForCallParameter($container, $parameter, $parameters, $dependencies);
if (\Illuminate\Support\Arr::isAssoc($inputData)) {
$inputData = self::discardRedundantKeys($inputData, $signature);
}

return array_merge($dependencies, $parameters);
return static::addDependencyForCallParameter($container, $signature, $inputData);
}

/**
Expand All @@ -127,42 +131,45 @@ protected static function getMethodDependencies($container, $callback, array $pa
*
* @throws \ReflectionException
*/
protected static function getCallReflector($callback)
protected static function getCallReflector($callback): \Reflector
{
if (is_string($callback) && strpos($callback, '::') !== false) {
$callback = explode('::', $callback);
}

return is_array($callback)
? new ReflectionMethod($callback[0], $callback[1])
: new ReflectionFunction($callback);
return is_array($callback) ? new ReflectionMethod($callback[0], $callback[1]) : new ReflectionFunction($callback);
}

/**
* Get the dependency for the given call parameter.
* Add the dependencies to the input data.
*
* @param \Illuminate\Container\Container $container
* @param \ReflectionParameter $parameter
* @param array $parameters
* @param array $dependencies
* @return mixed
* @param \Illuminate\Container\Container $container
* @param array $signature
* @param array $inputData
* @return array
*/
protected static function addDependencyForCallParameter($container, $parameter,
array &$parameters, &$dependencies)
protected static function addDependencyForCallParameter($container, array $signature, array $inputData): array
{
if (array_key_exists($parameter->name, $parameters)) {
$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()) {
$dependencies[] = $parameter->getDefaultValue();
$resolvedInputData = [];
$i = 0;

foreach ($signature as $parameter) {
if (array_key_exists($parameter->name, $inputData)) {
$resolvedInputData[] = $inputData[$parameter->name];
} elseif ($parameter->getClass() && array_key_exists($parameter->getClass()->name, $inputData)) {
$resolvedInputData[] = $inputData[$parameter->getClass()->name];
} elseif ($parameter->getClass()) {
$resolvedInputData[] = $container->make($parameter->getClass()->name);
} elseif (isset($inputData[$i])) {
$data = $inputData[$i];
$i++;
$resolvedInputData[] = $data;
} elseif ($parameter->isDefaultValueAvailable()) {
$resolvedInputData[] = $parameter->getDefaultValue();
}
}

return $resolvedInputData;
}

/**
Expand All @@ -171,8 +178,32 @@ protected static function addDependencyForCallParameter($container, $parameter,
* @param mixed $callback
* @return bool
*/
protected static function isCallableWithAtSign($callback)
protected static function isCallableWithAtSign($callback): bool
{
return is_string($callback) && strpos($callback, '@') !== false;
}

/**
* @param array $inputData
* @param array $signature
* @return array
*/
protected static function discardRedundantKeys(array $inputData, array $signature): array
{
$wantedKeys = [];

foreach ($signature as $param) {
$wantedKeys[] = $param->getName();
}

// In case the key is the full class name
// we must keep the corresponding value
foreach ($inputData as $key => $value) {
if (class_exists($key)) {
$wantedKeys[] = $key;
}
}

return array_only($inputData, $wantedKeys);
}
}