Skip to content
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.

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

[DependencyInjection] Fix a wrong error when using a factory #30889

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Expand Up @@ -181,7 +181,15 @@ private function autowireCalls(\ReflectionClass $reflectionClass, array $methodC
if ($method instanceof \ReflectionFunctionAbstract) {
$reflectionMethod = $method;
} else {
$reflectionMethod = $this->getReflectionMethod(new Definition($reflectionClass->name), $method);
$definition = new Definition($reflectionClass->name);
try {
$reflectionMethod = $this->getReflectionMethod($definition, $method);
} catch (RuntimeException $e) {
if ($definition->getFactory()) {
continue;
}
throw $e;
}
}

$arguments = $this->autowireMethod($reflectionMethod, $arguments);
Expand Down
Expand Up @@ -115,7 +115,14 @@ protected function processValue($value, $isRoot = false)
if ($method instanceof \ReflectionFunctionAbstract) {
$reflectionMethod = $method;
} else {
$reflectionMethod = $this->getReflectionMethod($value, $method);
try {
$reflectionMethod = $this->getReflectionMethod($value, $method);
} catch (RuntimeException $e) {
if ($value->getFactory()) {
continue;
}
throw $e;
}
}

foreach ($reflectionMethod->getParameters() as $key => $parameter) {
Expand Down
Expand Up @@ -23,6 +23,7 @@
use Symfony\Component\DependencyInjection\Reference;
use Symfony\Component\DependencyInjection\Tests\Fixtures\includes\FooVariadic;
use Symfony\Component\DependencyInjection\TypedReference;
use Symfony\Component\HttpKernel\HttpKernelInterface;

require_once __DIR__.'/../Fixtures/includes/autowiring_classes.php';

Expand Down Expand Up @@ -605,6 +606,18 @@ public function testSetterInjection()
);
}

public function testWithNonExistingSetterAndAutowiring()
{
$container = new ContainerBuilder();

$definition = $container->register(HttpKernelInterface::class, HttpKernelInterface::class)->setAutowired(true);
$definition->addMethodCall('setLogger');
$this->expectException(RuntimeException::class);
(new ResolveClassPass())->process($container);
(new AutowireRequiredMethodsPass())->process($container);
(new AutowirePass())->process($container);
}

public function testExplicitMethodInjection()
{
$container = new ContainerBuilder();
Expand Down
Expand Up @@ -16,11 +16,14 @@
use Symfony\Component\DependencyInjection\Compiler\AutowireRequiredMethodsPass;
use Symfony\Component\DependencyInjection\Compiler\ResolveBindingsPass;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Definition;
use Symfony\Component\DependencyInjection\Exception\RuntimeException;
use Symfony\Component\DependencyInjection\Reference;
use Symfony\Component\DependencyInjection\Tests\Fixtures\CaseSensitiveClass;
use Symfony\Component\DependencyInjection\Tests\Fixtures\NamedArgumentsDummy;
use Symfony\Component\DependencyInjection\Tests\Fixtures\ParentNotExists;
use Symfony\Component\DependencyInjection\TypedReference;
use Symfony\Component\HttpKernel\HttpKernelInterface;

require_once __DIR__.'/../Fixtures/includes/autowiring_classes.php';

Expand Down Expand Up @@ -111,4 +114,45 @@ public function testScalarSetter()

$this->assertEquals([['setDefaultLocale', ['fr']]], $definition->getMethodCalls());
}

public function testWithNonExistingSetterAndBinding()
{
$container = new ContainerBuilder();

$bindings = [
'$c' => (new Definition('logger'))->setFactory('logger'),
];

$definition = $container->register(HttpKernelInterface::class, HttpKernelInterface::class);
$definition->addMethodCall('setLogger');
$definition->setBindings($bindings);
$this->expectException(RuntimeException::class);

$pass = new ResolveBindingsPass();
$pass->process($container);
}

public function testTupleBinding()
{
$container = new ContainerBuilder();

$bindings = [
'$c' => new BoundArgument(new Reference('bar')),
CaseSensitiveClass::class.'$c' => new BoundArgument(new Reference('foo')),
];

$definition = $container->register(NamedArgumentsDummy::class, NamedArgumentsDummy::class);
$definition->addMethodCall('setSensitiveClass');
$definition->addMethodCall('setAnotherC');
$definition->setBindings($bindings);

$pass = new ResolveBindingsPass();
$pass->process($container);

$expected = [
['setSensitiveClass', [new Reference('foo')]],
['setAnotherC', [new Reference('bar')]],
];
$this->assertEquals($expected, $definition->getMethodCalls());
}
}