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

fabpot · fabpot · commit 3d4ad0b08434 · 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
@@ -75,5 +75,9 @@ public function process(ContainerBuilder $container)
         if (class_exists('Symfony\Component\Yaml\Parser')) {
             $container->getDefinition('twig.extension.yaml')->addTag('twig.extension');
         }
+
+        if (class_exists('Symfony\Component\Stopwatch\Stopwatch')) {
+            $container->getDefinition('twig.extension.debug.stopwatch')->addTag('twig.extension');
+        }
     }
 }
diff --git a/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml b/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml
@@ -98,7 +98,6 @@
         <service id="twig.extension.yaml" class="Symfony\Bridge\Twig\Extension\YamlExtension" public="false" />
 
         <service id="twig.extension.debug.stopwatch" class="Symfony\Bridge\Twig\Extension\StopwatchExtension" public="false">
-            <tag name="twig.extension" />
             <argument type="service" id="debug.stopwatch" on-invalid="ignore" />
             <argument>%kernel.debug%</argument>
         </service>

Original file line number	Diff line number	Diff line change
`@@ -75,5 +75,9 @@ public function process(ContainerBuilder $container)`
`75`	`75`	`if (class_exists('Symfony\Component\Yaml\Parser')) {`
`76`	`76`	`$container->getDefinition('twig.extension.yaml')->addTag('twig.extension');`
`77`	`77`	`}`
	`78`	`+`
	`79`	`+ if (class_exists('Symfony\Component\Stopwatch\Stopwatch')) {`
	`80`	`+ $container->getDefinition('twig.extension.debug.stopwatch')->addTag('twig.extension');`
	`81`	`+ }`
`78`	`82`	`}`
`79`	`83`	`}`