merged branch fabpot/recursion-fix (PR #6800)

fabpot · fabpot · commit d4a0804aab2c · 2013-01-18T16:01:26.000+01:00
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 ?
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -430,7 +430,9 @@ function($v, Reference $ref) use ($container) {
         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');
         }
     }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/templating.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/templating.xml
@@ -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%">

Original file line number	Diff line number	Diff line change
`@@ -430,7 +430,9 @@ function($v, Reference $ref) use ($container) {`
`430`	`430`	`if (1 === count($engines)) {`
`431`	`431`	`$container->setAlias('templating', (string) reset($engines));`
`432`	`432`	`} else {`
`433`		`- $container->getDefinition('templating.engine.delegating')->replaceArgument(1, $engines);`
	`433`	`+ foreach ($engines as $engine) {`
	`434`	`+ $container->getDefinition('templating.engine.delegating')->addMethodCall('addEngine', array($engine));`
	`435`	`+ }`
`434`	`436`	`$container->setAlias('templating', 'templating.engine.delegating');`
`435`	`437`	`}`
`436`	`438`	`}`