diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[DI] Fix bad exception on uninitialized references to non-shared services

Browse Source
This commit is contained in:
Nicolas Grekas 2018-05-24 13:25:06 +02:00
parent ffd612c9a6
commit 8bba68f811
3 changed files with 3 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Symfony/Component/DependencyInjection/Compiler/CheckExceptionOnInvalidReferenceBehaviorPass.php
View File

@ -11,7 +11,6 @@
namespace Symfony\Component\DependencyInjection\Compiler;
use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\DependencyInjection\Reference;
@ -31,9 +30,6 @@ class CheckExceptionOnInvalidReferenceBehaviorPass extends AbstractRecursivePass
if (ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE === $value->getInvalidBehavior() && !$this->container->has($id = (string) $value)) {
throw new ServiceNotFoundException($id, $this->currentId);
}
if (ContainerInterface::IGNORE_ON_UNINITIALIZED_REFERENCE === $value->getInvalidBehavior() && $this->container->has($id = (string) $value) && !$this->container->findDefinition($id)->isShared()) {
throw new InvalidArgumentException(sprintf('Invalid ignore-on-uninitialized reference found in service "%s": target service "%s" is not shared.', $this->currentId, $id));
}
return $value;
}

3
src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
View File

@ -1896,6 +1896,9 @@ EOF;
if ($this->container->hasDefinition($id) && ($definition = $this->container->getDefinition($id)) && !$definition->isSynthetic()) {
if (null !== $reference && ContainerInterface::IGNORE_ON_UNINITIALIZED_REFERENCE === $reference->getInvalidBehavior()) {
$code = 'null';
if (!$definition->isShared()) {
return $code;
}
} elseif ($this->isTrivialInstance($definition)) {
$code = substr($this->addNewInstance($definition, '', '', $id), 8, -2);
if ($definition->isShared()) {

21
src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckExceptionOnInvalidReferenceBehaviorPassTest.php
View File

@ -68,27 +68,6 @@ class CheckExceptionOnInvalidReferenceBehaviorPassTest extends TestCase
$this->process($container);
}
/**
* @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
* @expectedExceptionMessage Invalid ignore-on-uninitialized reference found in service
*/
public function testProcessThrowsExceptionOnNonSharedUninitializedReference()
{
$container = new ContainerBuilder();
$container
->register('a', 'stdClass')
->addArgument(new Reference('b', $container::IGNORE_ON_UNINITIALIZED_REFERENCE))
;
$container
->register('b', 'stdClass')
->setShared(false)
;
$this->process($container);
}
public function testProcessDefinitionWithBindings()
{
$container = new ContainerBuilder();