Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 9280a3e

Browse files
nicolas-grekasnicolas-grekas
committed
[DependencyInjection] Allow anonymous DefinitionDecorator resolving
1 parent bd66434 commit 9280a3e

File tree

2 files changed

+89
-15
lines changed

2 files changed

+89
-15
lines changed

‎src/Symfony/Component/DependencyInjection/Compiler/ResolveDefinitionTemplatesPass.php

Lines changed: 53 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,13 @@
2121
* merged Definition instance.
2222
*
2323
* @author Johannes M. Schmitt <[email protected]>
24+
* @author Nicolas Grekas <[email protected]>
2425
*/
2526
class ResolveDefinitionTemplatesPass implements CompilerPassInterface
2627
{
27-
private $container;
2828
private $compiler;
2929
private $formatter;
30+
private $currentId;
3031

3132
/**
3233
* Process the ContainerBuilder to replace DefinitionDecorator instances with their real Definition instances.
@@ -35,44 +36,84 @@ class ResolveDefinitionTemplatesPass implements CompilerPassInterface
3536
*/
3637
public function process(ContainerBuilder $container)
3738
{
38-
$this->container = $container;
3939
$this->compiler = $container->getCompiler();
4040
$this->formatter = $this->compiler->getLoggingFormatter();
4141

4242
foreach ($container->getDefinitions() as $id => $definition) {
43+
$this->currentId = $id;
44+
4345
// yes, we are specifically fetching the definition from the
4446
// container to ensure we are not operating on stale data
4547
$definition = $container->getDefinition($id);
46-
if (!$definition instanceof DefinitionDecorator || $definition->isAbstract()) {
47-
continue;
48+
if ($definition instanceof DefinitionDecorator) {
49+
$definition = $this->resolveDefinition($container, $definition);
50+
$container->setDefinition($id, $definition);
4851
}
4952

50-
$this->resolveDefinition($id, $definition);
53+
$definition->setArguments($this->resolveArguments($container, $definition->getArguments()));
54+
$definition->setMethodCalls($this->resolveArguments($container, $definition->getMethodCalls()));
55+
$definition->setProperties($this->resolveArguments($container, $definition->getProperties()));
56+
57+
$configurator = $this->resolveArguments($container, array($definition->getConfigurator()));
58+
$definition->setConfigurator($configurator[0]);
59+
60+
$factory = $this->resolveArguments($container, array($definition->getFactory()));
61+
$definition->setFactory($factory[0]);
5162
}
5263
}
5364

65+
/**
66+
* Resolves definition decorator arguments.
67+
*
68+
* @param ContainerBuilder $container The ContainerBuilder
69+
* @param array $arguments An array of arguments
70+
*
71+
* @return array
72+
*/
73+
private function resolveArguments(ContainerBuilder $container, array $arguments)
74+
{
75+
foreach ($arguments as $k => $argument) {
76+
if (is_array($argument)) {
77+
$arguments[$k] = $this->resolveArguments($container, $argument);
78+
} elseif ($argument instanceof Definition) {
79+
if ($argument instanceof DefinitionDecorator) {
80+
$arguments[$k] = $argument = $this->resolveDefinition($container, $argument);
81+
}
82+
$argument->setArguments($this->resolveArguments($container, $argument->getArguments()));
83+
$argument->setMethodCalls($this->resolveArguments($container, $argument->getMethodCalls()));
84+
$argument->setProperties($this->resolveArguments($container, $argument->getProperties()));
85+
}
86+
}
87+
88+
return $arguments;
89+
}
90+
5491
/**
5592
* Resolves the definition.
5693
*
57-
* @param string $id The definition identifier
94+
* @param ContainerBuilder $container The ContainerBuilder
5895
* @param DefinitionDecorator $definition
5996
*
6097
* @return Definition
6198
*
6299
* @throws \RuntimeException When the definition is invalid
63100
*/
64-
private function resolveDefinition($id, DefinitionDecorator $definition)
101+
private function resolveDefinition(ContainerBuilder $container, DefinitionDecorator $definition)
65102
{
66-
if (!$this->container->hasDefinition($parent = $definition->getParent())) {
67-
throw new RuntimeException(sprintf('The parent definition "%s" defined for definition "%s" does not exist.', $parent, $id));
103+
if (!$container->hasDefinition($parent = $definition->getParent())) {
104+
throw new RuntimeException(sprintf('The parent definition "%s" defined for definition "%s" does not exist.', $parent, $this->currentId));
68105
}
69106

70-
$parentDef = $this->container->getDefinition($parent);
107+
$parentDef = $container->getDefinition($parent);
71108
if ($parentDef instanceof DefinitionDecorator) {
72-
$parentDef = $this->resolveDefinition($parent, $parentDef);
109+
$id = $this->currentId;
110+
$this->currentId = $parent;
111+
$parentDef = $this->resolveDefinition($container, $parentDef);
112+
$container->setDefinition($parent, $parentDef);
113+
$this->currentId = $id;
73114
}
74115

75-
$this->compiler->addLogMessage($this->formatter->formatResolveInheritance($this, $id, $parent));
116+
$this->compiler->addLogMessage($this->formatter->formatResolveInheritance($this, $this->currentId, $parent));
76117
$def = new Definition();
77118

78119
// merge in parent definition
@@ -156,9 +197,6 @@ private function resolveDefinition($id, DefinitionDecorator $definition)
156197
$def->setScope($definition->getScope(false), false);
157198
$def->setTags($definition->getTags());
158199

159-
// set new definition on container
160-
$this->container->setDefinition($id, $def);
161-
162200
return $def;
163201
}
164202
}

‎src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveDefinitionTemplatesPassTest.php

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,42 @@ public function testSetLazyOnServiceIsParent()
176176
$this->assertTrue($container->getDefinition('child1')->isLazy());
177177
}
178178

179+
public function testDeepDefinitionsResolving()
180+
{
181+
$container = new ContainerBuilder();
182+
183+
$container->register('parent', 'parentClass');
184+
$container->register('sibling', 'siblingClass')
185+
->setConfigurator(new DefinitionDecorator('parent'), 'foo')
186+
->setFactory(array(new DefinitionDecorator('parent'), 'foo'))
187+
->addArgument(new DefinitionDecorator('parent'))
188+
->setProperty('prop', new DefinitionDecorator('parent'))
189+
->addMethodCall('meth', array(new DefinitionDecorator('parent')))
190+
;
191+
192+
$this->process($container);
193+
194+
$configurator = $container->getDefinition('sibling')->getConfigurator();
195+
$this->assertSame('Symfony\Component\DependencyInjection\Definition', get_class($configurator));
196+
$this->assertSame('parentClass', $configurator->getClass());
197+
198+
$factory = $container->getDefinition('sibling')->getFactory();
199+
$this->assertSame('Symfony\Component\DependencyInjection\Definition', get_class($factory[0]));
200+
$this->assertSame('parentClass', $factory[0]->getClass());
201+
202+
$argument = $container->getDefinition('sibling')->getArgument(0);
203+
$this->assertSame('Symfony\Component\DependencyInjection\Definition', get_class($argument));
204+
$this->assertSame('parentClass', $argument->getClass());
205+
206+
$properties = $container->getDefinition('sibling')->getProperties();
207+
$this->assertSame('Symfony\Component\DependencyInjection\Definition', get_class($properties['prop']));
208+
$this->assertSame('parentClass', $properties['prop']->getClass());
209+
210+
$methodCalls = $container->getDefinition('sibling')->getMethodCalls();
211+
$this->assertSame('Symfony\Component\DependencyInjection\Definition', get_class($methodCalls[0][1][0]));
212+
$this->assertSame('parentClass', $methodCalls[0][1][0]->getClass());
213+
}
214+
179215
protected function process(ContainerBuilder $container)
180216
{
181217
$pass = new ResolveDefinitionTemplatesPass();

0 commit comments

Comments
 (0)