[TwigBundle] added conditions for routing & httpkernel extensions

jfsimon · jfsimon · commit 82aa135e428b · 2013-03-14T13:50:58.000+01:00
diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExtensionPass.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExtensionPass.php
@@ -30,5 +30,13 @@ public function process(ContainerBuilder $container)
         if ($container->has('translator')) {
             $container->getDefinition('twig.extension.trans')->addTag('twig.extension');
         }
+
+        if ($container->has('router')) {
+            $container->getDefinition('twig.extension.routing')->addTag('twig.extension');
+        }
+
+        if ($container->has('fragment.handler')) {
+            $container->getDefinition('twig.extension.httpkernel')->addTag('twig.extension');
+        }
     }
 }
diff --git a/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml b/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml
@@ -79,7 +79,6 @@
         </service>
 
         <service id="twig.extension.routing" class="%twig.extension.routing.class%" public="false">
-            <tag name="twig.extension" />
             <argument type="service" id="router" />
         </service>
 
@@ -88,7 +87,6 @@
         </service>
 
         <service id="twig.extension.httpkernel" class="%twig.extension.httpkernel.class%" public="false">
-            <tag name="twig.extension" />
             <argument type="service" id="fragment.handler" />
         </service>
 

Original file line number	Diff line number	Diff line change
`@@ -30,5 +30,13 @@ public function process(ContainerBuilder $container)`
`30`	`30`	`if ($container->has('translator')) {`
`31`	`31`	`$container->getDefinition('twig.extension.trans')->addTag('twig.extension');`
`32`	`32`	`}`
	`33`	`+`
	`34`	`+ if ($container->has('router')) {`
	`35`	`+ $container->getDefinition('twig.extension.routing')->addTag('twig.extension');`
	`36`	`+ }`
	`37`	`+`
	`38`	`+ if ($container->has('fragment.handler')) {`
	`39`	`+ $container->getDefinition('twig.extension.httpkernel')->addTag('twig.extension');`
	`40`	`+ }`
`33`	`41`	`}`
`34`	`42`	`}`