[DI] Improve exception message on missing $ of named argument

This commit is contained in:
Jan Schädlich 2019-04-28 18:34:33 +02:00 committed by Fabien Potencier
parent e9aaaafbbb
commit d0e44996f9
2 changed files with 19 additions and 0 deletions

View File

@ -53,6 +53,10 @@ class ResolveNamedArgumentsPass extends AbstractRecursivePass
$parameters = $r->getParameters();
}
if (isset($key[0]) && '$' !== $key[0] && !class_exists($key)) {
throw new InvalidArgumentException(sprintf('Invalid service "%s": did you forget to add the "$" prefix to argument "%s"?', $this->currentId, $key));
}
if (isset($key[0]) && '$' === $key[0]) {
foreach ($parameters as $j => $p) {
if ($key === '$'.$p->name) {

View File

@ -149,6 +149,21 @@ class ResolveNamedArgumentsPassTest extends TestCase
$this->assertEquals([new Reference('foo'), '123'], $definition->getArguments());
}
/**
* @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
* @expectedExceptionMessage Invalid service "Symfony\Component\DependencyInjection\Tests\Fixtures\NamedArgumentsDummy": did you forget to add the "$" prefix to argument "apiKey"?
*/
public function testTypedArgumentWithMissingDollar()
{
$container = new ContainerBuilder();
$definition = $container->register(NamedArgumentsDummy::class, NamedArgumentsDummy::class);
$definition->setArgument('apiKey', '123');
$pass = new ResolveNamedArgumentsPass();
$pass->process($container);
}
public function testResolvesMultipleArgumentsOfTheSameType()
{
$container = new ContainerBuilder();