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

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:
Fabien Potencier 2013-01-18 16:01:26 +01:00
parent d12011724e 94cb13df42
commit d4a0804aab
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
View File

@ -430,7 +430,9 @@ class FrameworkExtension extends Extension
if (1 === count($engines)) {
$container->setAlias('templating', (string) reset($engines));
} 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');
}
}

2
src/Symfony/Bundle/FrameworkBundle/Resources/config/templating.xml
View File

@ -19,7 +19,7 @@
<services>
<service id="templating.engine.delegating" class="%templating.engine.delegating.class%" public="false">
<argument type="service" id="service_container" />
<argument /> <!-- engines -->
<argument type="collection" /> <!-- engines -->
</service>
<service id="templating.name_parser" class="%templating.name_parser.class%">