merged branch fabpot/recursion-fix (PR #6800)
This PR was merged into the master branch.
Commits
-------
94cb13d
[FrameworkBundle] fixed circular reference for service templating (closes #6730, closes #6762)
Discussion
----------
[FrameworkBundle] fixed circular reference for service templating (closes #6730, closes #6762)
| Q | A
| ------------- | ---
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | #6730, #6762
| License | MIT
| Doc PR | n/a
---------------------------------------------------------------------------
by tristanbes at 2013-01-18T14:55:39Z
@fabpot Do you have an idea when you'll merge it please ?
This commit is contained in:
commit
d4a0804aab
@ -430,7 +430,9 @@ class FrameworkExtension extends Extension
|
|||||||
if (1 === count($engines)) {
|
if (1 === count($engines)) {
|
||||||
$container->setAlias('templating', (string) reset($engines));
|
$container->setAlias('templating', (string) reset($engines));
|
||||||
} else {
|
} else {
|
||||||
$container->getDefinition('templating.engine.delegating')->replaceArgument(1, $engines);
|
foreach ($engines as $engine) {
|
||||||
|
$container->getDefinition('templating.engine.delegating')->addMethodCall('addEngine', array($engine));
|
||||||
|
}
|
||||||
$container->setAlias('templating', 'templating.engine.delegating');
|
$container->setAlias('templating', 'templating.engine.delegating');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -19,7 +19,7 @@
|
|||||||
<services>
|
<services>
|
||||||
<service id="templating.engine.delegating" class="%templating.engine.delegating.class%" public="false">
|
<service id="templating.engine.delegating" class="%templating.engine.delegating.class%" public="false">
|
||||||
<argument type="service" id="service_container" />
|
<argument type="service" id="service_container" />
|
||||||
<argument /> <!-- engines -->
|
<argument type="collection" /> <!-- engines -->
|
||||||
</service>
|
</service>
|
||||||
|
|
||||||
<service id="templating.name_parser" class="%templating.name_parser.class%">
|
<service id="templating.name_parser" class="%templating.name_parser.class%">
|
||||||
|
Reference in New Issue
Block a user