[TwigBundle] removed ExpressionLanguage Twig extension when the ExpressionLanguage component is not available

fabpot · fabpot · commit 79efb4c8414e · 2016-09-30T11:15:51.000-07:00
diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExtensionPass.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExtensionPass.php
@@ -79,5 +79,9 @@ public function process(ContainerBuilder $container)
         if (class_exists('Symfony\Component\Stopwatch\Stopwatch')) {
             $container->getDefinition('twig.extension.debug.stopwatch')->addTag('twig.extension');
         }
+
+        if (class_exists('Symfony\Component\ExpressionLanguage\ExpressionLanguage')) {
+            $container->getDefinition('twig.extension.expression')->addTag('twig.extension');
+        }
     }
 }
diff --git a/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml b/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml
@@ -102,9 +102,7 @@
             <argument>%kernel.debug%</argument>
         </service>
 
-        <service id="twig.extension.expression" class="Symfony\Bridge\Twig\Extension\ExpressionExtension" public="false">
-            <tag name="twig.extension" />
-        </service>
+        <service id="twig.extension.expression" class="Symfony\Bridge\Twig\Extension\ExpressionExtension" public="false" />
 
         <service id="twig.extension.httpkernel" class="Symfony\Bridge\Twig\Extension\HttpKernelExtension" public="false">
             <argument type="service" id="fragment.handler" />

Original file line number	Diff line number	Diff line change
`@@ -79,5 +79,9 @@ public function process(ContainerBuilder $container)`
`79`	`79`	`if (class_exists('Symfony\Component\Stopwatch\Stopwatch')) {`
`80`	`80`	`$container->getDefinition('twig.extension.debug.stopwatch')->addTag('twig.extension');`
`81`	`81`	`}`
	`82`	`+`
	`83`	`+ if (class_exists('Symfony\Component\ExpressionLanguage\ExpressionLanguage')) {`
	`84`	`+ $container->getDefinition('twig.extension.expression')->addTag('twig.extension');`
	`85`	`+ }`
`82`	`86`	`}`
`83`	`87`	`}`