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

fabpot · fabpot · commit d0792e454e83 · 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
@@ -71,5 +71,9 @@ public function process(ContainerBuilder $container)
         if ($container->has('assets.packages')) {
             $container->getDefinition('twig.extension.assets')->addTag('twig.extension');
         }
+
+        if (class_exists('Symfony\Component\Yaml\Parser')) {
+            $container->getDefinition('twig.extension.yaml')->addTag('twig.extension');
+        }
     }
 }
diff --git a/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml b/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml
@@ -95,9 +95,7 @@
             <argument type="service" id="router" />
         </service>
 
-        <service id="twig.extension.yaml" class="Symfony\Bridge\Twig\Extension\YamlExtension" public="false">
-            <tag name="twig.extension" />
-        </service>
+        <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" />

Original file line number	Diff line number	Diff line change
`@@ -71,5 +71,9 @@ public function process(ContainerBuilder $container)`
`71`	`71`	`if ($container->has('assets.packages')) {`
`72`	`72`	`$container->getDefinition('twig.extension.assets')->addTag('twig.extension');`
`73`	`73`	`}`
	`74`	`+`
	`75`	`+ if (class_exists('Symfony\Component\Yaml\Parser')) {`
	`76`	`+ $container->getDefinition('twig.extension.yaml')->addTag('twig.extension');`
	`77`	`+ }`
`74`	`78`	`}`
`75`	`79`	`}`