bug #46480 [FrameworkBundle][TwigBundle] Fix registering html-sanitizer services (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit df08c26b66cf · 2022-05-29T17:43:38.000+02:00
This PR was merged into the 6.1 branch. Discussion ---------- [FrameworkBundle][TwigBundle] Fix registering html-sanitizer services | Q | A | ------------- | --- | Branch? | 6.1 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | symfony/demo#1339 (comment) | License | MIT | Doc PR | - Commits ------- 9876f2f [FrameworkBundle][TwigBundle] Fix registering html-sanitizer services
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/html_sanitizer.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/html_sanitizer.php
@@ -22,7 +22,7 @@
 
         ->set('html_sanitizer.sanitizer.default', HtmlSanitizer::class)
             ->args([service('html_sanitizer.config.default')])
-            ->tag('html_sanitizer', ['name' => 'default'])
+            ->tag('html_sanitizer', ['sanitizer' => 'default'])
 
         ->alias('html_sanitizer', 'html_sanitizer.sanitizer.default')
         ->alias(HtmlSanitizerInterface::class, 'html_sanitizer')
diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExtensionPass.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExtensionPass.php
@@ -69,6 +69,10 @@ public function process(ContainerBuilder $container)
             $container->getDefinition('twig.extension.routing')->addTag('twig.extension');
         }
 
+        if ($container->has('html_sanitizer')) {
+            $container->getDefinition('twig.extension.htmlsanitizer')->addTag('twig.extension');
+        }
+
         if ($container->has('fragment.handler')) {
             $container->getDefinition('twig.extension.httpkernel')->addTag('twig.extension');
             $container->getDefinition('twig.runtime.httpkernel')->addTag('twig.runtime');
diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php
@@ -19,7 +19,6 @@
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\Form\AbstractRendererEngine;
 use Symfony\Component\Form\Form;
-use Symfony\Component\HtmlSanitizer\HtmlSanitizerInterface;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 use Symfony\Component\Mailer\Mailer;
 use Symfony\Component\Translation\Translator;
@@ -55,10 +54,6 @@ public function load(array $configs, ContainerBuilder $container)
             $loader->load('console.php');
         }
 
-        if (!$container::willBeAvailable('symfony/html-sanitizer', HtmlSanitizerInterface::class, ['symfony/twig-bundle'])) {
-            $container->removeDefinition('twig.extension.htmlsanitizer');
-        }
-
         if ($container::willBeAvailable('symfony/mailer', Mailer::class, ['symfony/twig-bundle'])) {
             $loader->load('mailer.php');
         }
