bug #21312 [DI] Do not set values of lazy arguments after inlining them (chalasr)
This PR was merged into the 3.3-dev branch.
Discussion
----------
[DI] Do not set values of lazy arguments after inlining them
| Q | A
| ------------- | ---
| Branch? | master
| Bug fix? | not yet
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | #21299
| License | MIT
| Doc PR | n/a
Commits
-------
04da7c30d9
[DI] Do not inline values of lazy arguments
This commit is contained in:
commit
71f8f1546f
@ -69,7 +69,7 @@ class InlineServiceDefinitionsPass implements RepeatablePassInterface
|
|||||||
if (is_array($argument)) {
|
if (is_array($argument)) {
|
||||||
$arguments[$k] = $this->inlineArguments($container, $argument);
|
$arguments[$k] = $this->inlineArguments($container, $argument);
|
||||||
} elseif ($argument instanceof ArgumentInterface) {
|
} elseif ($argument instanceof ArgumentInterface) {
|
||||||
$argument->setValues($this->inlineArguments($container, $argument->getValues()));
|
$this->inlineArguments($container, $argument->getValues());
|
||||||
} elseif ($argument instanceof Reference) {
|
} elseif ($argument instanceof Reference) {
|
||||||
if (!$container->hasDefinition($id = (string) $argument)) {
|
if (!$container->hasDefinition($id = (string) $argument)) {
|
||||||
continue;
|
continue;
|
||||||
|
@ -17,6 +17,8 @@ use Symfony\Component\DependencyInjection\Compiler\RepeatedPass;
|
|||||||
use Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass;
|
use Symfony\Component\DependencyInjection\Compiler\InlineServiceDefinitionsPass;
|
||||||
use Symfony\Component\DependencyInjection\Reference;
|
use Symfony\Component\DependencyInjection\Reference;
|
||||||
use Symfony\Component\DependencyInjection\ContainerBuilder;
|
use Symfony\Component\DependencyInjection\ContainerBuilder;
|
||||||
|
use Symfony\Component\DependencyInjection\Argument\ClosureProxyArgument;
|
||||||
|
use Symfony\Component\DependencyInjection\Argument\IteratorArgument;
|
||||||
|
|
||||||
class InlineServiceDefinitionsPassTest extends \PHPUnit_Framework_TestCase
|
class InlineServiceDefinitionsPassTest extends \PHPUnit_Framework_TestCase
|
||||||
{
|
{
|
||||||
@ -222,6 +224,33 @@ class InlineServiceDefinitionsPassTest extends \PHPUnit_Framework_TestCase
|
|||||||
$this->assertSame($ref, $calls[0][1][0]);
|
$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)
|
protected function process(ContainerBuilder $container)
|
||||||
{
|
{
|
||||||
$repeatedPass = new RepeatedPass(array(new AnalyzeServiceReferencesPass(), new InlineServiceDefinitionsPass()));
|
$repeatedPass = new RepeatedPass(array(new AnalyzeServiceReferencesPass(), new InlineServiceDefinitionsPass()));
|
||||||
|
Reference in New Issue
Block a user