[TwigBundle] always load the exception listener if the templating.engines is not present

fabpot · fabpot · commit 30ba9df07c4c · 2015-01-04T11:30:48.000+01:00
diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExceptionListenerPass.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExceptionListenerPass.php
@@ -28,9 +28,11 @@ public function process(ContainerBuilder $container)
         }
 
         // register the exception controller only if Twig is enabled
-        $engines = $container->getParameter('templating.engines');
-        if (!in_array('twig', $engines)) {
-            $container->removeDefinition('twig.exception_listener');
+        if ($container->hasParameter('templating.engines')) {
+            $engines = $container->getParameter('templating.engines');
+            if (!in_array('twig', $engines)) {
+                $container->removeDefinition('twig.exception_listener');
+            }
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -28,9 +28,11 @@ public function process(ContainerBuilder $container)`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`// register the exception controller only if Twig is enabled`
`31`		`- $engines = $container->getParameter('templating.engines');`
`32`		`- if (!in_array('twig', $engines)) {`
`33`		`- $container->removeDefinition('twig.exception_listener');`
	`31`	`+ if ($container->hasParameter('templating.engines')) {`
	`32`	`+ $engines = $container->getParameter('templating.engines');`
	`33`	`+ if (!in_array('twig', $engines)) {`
	`34`	`+ $container->removeDefinition('twig.exception_listener');`
	`35`	`+ }`
`34`	`36`	`}`
`35`	`37`	`}`
`36`	`38`	`}`