package and depencies
This commit is contained in:
@@ -137,7 +137,7 @@ class BoundMethod
|
||||
*/
|
||||
protected static function getCallReflector($callback)
|
||||
{
|
||||
if (is_string($callback) && strpos($callback, '::') !== false) {
|
||||
if (is_string($callback) && str_contains($callback, '::')) {
|
||||
$callback = explode('::', $callback);
|
||||
} elseif (is_object($callback) && ! $callback instanceof Closure) {
|
||||
$callback = [$callback, '__invoke'];
|
||||
@@ -171,16 +171,14 @@ class BoundMethod
|
||||
$dependencies[] = $parameters[$className];
|
||||
|
||||
unset($parameters[$className]);
|
||||
} else {
|
||||
if ($parameter->isVariadic()) {
|
||||
$variadicDependencies = $container->make($className);
|
||||
} elseif ($parameter->isVariadic()) {
|
||||
$variadicDependencies = $container->make($className);
|
||||
|
||||
$dependencies = array_merge($dependencies, is_array($variadicDependencies)
|
||||
? $variadicDependencies
|
||||
: [$variadicDependencies]);
|
||||
} else {
|
||||
$dependencies[] = $container->make($className);
|
||||
}
|
||||
$dependencies = array_merge($dependencies, is_array($variadicDependencies)
|
||||
? $variadicDependencies
|
||||
: [$variadicDependencies]);
|
||||
} else {
|
||||
$dependencies[] = $container->make($className);
|
||||
}
|
||||
} elseif ($parameter->isDefaultValueAvailable()) {
|
||||
$dependencies[] = $parameter->getDefaultValue();
|
||||
@@ -199,6 +197,6 @@ class BoundMethod
|
||||
*/
|
||||
protected static function isCallableWithAtSign($callback)
|
||||
{
|
||||
return is_string($callback) && strpos($callback, '@') !== false;
|
||||
return is_string($callback) && str_contains($callback, '@');
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user