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

[DI] Do not inline values of lazy arguments

Browse Source
This commit is contained in:
Robin Chalas 2017-01-16 19:42:28 +01:00
parent f8b02ed038
commit 04da7c30d9
No known key found for this signature in database
GPG Key ID: 89672113756EE03B
2 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php
View File

@ -69,7 +69,7 @@ class InlineServiceDefinitionsPass implements RepeatablePassInterface
if (is_array($argument)) {
$arguments[$k] = $this->inlineArguments($container, $argument);
} elseif ($argument instanceof ArgumentInterface) {
$argument->setValues($this->inlineArguments($container, $argument->getValues()));
$this->inlineArguments($container, $argument->getValues());
} elseif ($argument instanceof Reference) {
if (!$container->hasDefinition($id = (string) $argument)) {
continue;

29
src/Symfony/Component/DependencyInjection/Tests/Compiler/InlineServiceDefinitionsPassTest.php
View File

@ -17,6 +17,8 @@ use Symfony\Component\DependencyInjection\Compiler\RepeatedPass;
use Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass;
use Symfony\Component\DependencyInjection\Reference;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Argument\ClosureProxyArgument;
use Symfony\Component\DependencyInjection\Argument\IteratorArgument;
class InlineServiceDefinitionsPassTest extends \PHPUnit_Framework_TestCase
{
@ -222,6 +224,33 @@ class InlineServiceDefinitionsPassTest extends \PHPUnit_Framework_TestCase
$this->assertSame($ref, $calls[0][1][0]);
}
public function testProcessDoesNotSetLazyArgumentValuesAfterInlining()
{
$container = new ContainerBuilder();
$container
->register('inline')
->setShared(false)
;
$container
->register('closure-proxy')
->setArguments(array(new ClosureProxyArgument('inline', 'method')))
;
$container
->register('iterator')
->setArguments(array(new IteratorArgument(array(new Reference('inline')))))
;
$this->process($container);
$values = $container->getDefinition('closure-proxy')->getArgument(0)->getValues();
$this->assertInstanceOf(Reference::class, $values[0]);
$this->assertSame('inline', (string) $values[0]);
$values = $container->getDefinition('iterator')->getArgument(0)->getValues();
$this->assertInstanceOf(Reference::class, $values[0]);
$this->assertSame('inline', (string) $values[0]);
}
protected function process(ContainerBuilder $container)
{
$repeatedPass = new RepeatedPass(array(new AnalyzeServiceReferencesPass(), new InlineServiceDefinitionsPass()));