bug #23186 [TwigBundle] Move template.xml loading to a compiler pass (ogizanagi)

fabpot · fabpot · commit 511905d417d7 · 2017-06-15T07:32:56.000-07:00
This PR was merged into the 2.7 branch. Discussion ---------- [TwigBundle] Move template.xml loading to a compiler pass | Q | A | ------------- | --- | Branch? | 2.7  | Bug fix? | yes | New feature? | no  | BC breaks? | no | Deprecations? | no  | Tests pass? | yes | Fixed tickets | #23181  | License | MIT | Doc PR | N/A (failures unrelated) Commits ------- 6ac0de8 [TwigBundle] Remove template.xml services when templating is disabled
diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExtensionPass.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExtensionPass.php
@@ -96,6 +96,7 @@ public function process(ContainerBuilder $container)
             $twigLoader->clearTag('twig.loader');
         } else {
             $container->setAlias('twig.loader.filesystem', new Alias('twig.loader.native_filesystem', false));
+            $container->removeDefinition('templating.engine.twig');
         }
 
         if ($container->has('assets.packages')) {

Original file line number	Diff line number	Diff line change
`@@ -96,6 +96,7 @@ public function process(ContainerBuilder $container)`
`96`	`96`	`$twigLoader->clearTag('twig.loader');`
`97`	`97`	`} else {`
`98`	`98`	`$container->setAlias('twig.loader.filesystem', new Alias('twig.loader.native_filesystem', false));`
	`99`	`+ $container->removeDefinition('templating.engine.twig');`
`99`	`100`	`}`
`100`	`101`
`101`	`102`	`if ($container->has('assets.packages')) {`