[TwigComponent] Register safe classes in the configurator

Author: smnandre

src/LiveComponent/src/Attribute/LiveProp.php

@@ -111,7 +111,7 @@ public function __construct(
          *
          * @var string|null
          */
-        private string|null $modifier = null,
+        private ?string $modifier = null,
     ) {
         self::validateHydrationStrategy($this);
     }
@@ -290,7 +290,7 @@ public function withUrl(bool $url): self
         return $clone;
     }
 
-    public function modifier(): string|null
+    public function modifier(): ?string
     {
         return $this->modifier;
     }

src/TwigComponent/src/BlockStack.php

@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /*
  * This file is part of the Symfony package.
  *

src/TwigComponent/src/Command/TwigComponentDebugCommand.php

@@ -50,7 +50,8 @@ protected function configure(): void
             ->setDefinition([
                 new InputArgument('name', InputArgument::OPTIONAL, 'A component name or part of the component name'),
             ])
-            ->setHelp(<<<'EOF'
+            ->setHelp(
+                <<<'EOF'
 The <info>%command.name%</info> display all the Twig components in your application.
 
 To list all components:

src/TwigComponent/src/ComponentAttributes.php

@@ -195,7 +195,7 @@ public function getIterator(): \Traversable
 
     public function has(string $attribute): bool
     {
-        return array_key_exists($attribute, $this->attributes);
+        return \array_key_exists($attribute, $this->attributes);
     }
 
     public function count(): int

src/TwigComponent/src/ComponentRenderer.php

@@ -18,7 +18,6 @@
 use Symfony\UX\TwigComponent\Event\PreCreateForRenderEvent;
 use Symfony\UX\TwigComponent\Event\PreRenderEvent;
 use Twig\Environment;
-use Twig\Extension\EscaperExtension;
 
 /**
  * @author Kevin Bond <[email protected]>
@@ -27,8 +26,6 @@
  */
 final class ComponentRenderer implements ComponentRendererInterface
 {
-    private bool $safeClassesRegistered = false;
-
     public function __construct(
         private Environment $twig,
         private EventDispatcherInterface $dispatcher,
@@ -108,12 +105,6 @@ public function finishEmbeddedComponentRender(): void
 
     private function preRender(MountedComponent $mounted, array $context = []): PreRenderEvent
     {
-        if (!$this->safeClassesRegistered) {
-            $this->twig->getExtension(EscaperExtension::class)->addSafeClass(ComponentAttributes::class, ['html']);
-
-            $this->safeClassesRegistered = true;
-        }
-
         $component = $mounted->getComponent();
         $metadata = $this->factory->metadataFor($mounted->getName());
         // expose public properties and properties marked with ExposeInTemplate attribute

src/TwigComponent/src/Test/InteractsWithTwigComponents.php

@@ -39,7 +39,8 @@ protected function renderTwigComponent(string $name, array $data = [], ?string $
         $blocks = array_filter(array_merge($blocks, ['content' => $content]));
 
         if (!$blocks) {
-            return new RenderedComponent(self::getContainer()->get('twig')
+            return new RenderedComponent(
+                self::getContainer()->get('twig')
                 ->createTemplate('{{ component(name, data) }}')
                 ->render([
                     'name' => $name,
@@ -56,7 +57,8 @@ protected function renderTwigComponent(string $name, array $data = [], ?string $
 
         $template .= '{% endcomponent %}';
 
-        return new RenderedComponent(self::getContainer()->get('twig')
+        return new RenderedComponent(
+            self::getContainer()->get('twig')
             ->createTemplate($template)
             ->render([
                 'data' => $data,

src/TwigComponent/src/Twig/TemplateNameParser.php

@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /*
  * This file is part of the Symfony package.
  *

src/TwigComponent/src/Twig/TwigEnvironmentConfigurator.php

@@ -12,22 +12,27 @@
 namespace Symfony\UX\TwigComponent\Twig;
 
 use Symfony\Bundle\TwigBundle\DependencyInjection\Configurator\EnvironmentConfigurator;
+use Symfony\UX\TwigComponent\ComponentAttributes;
 use Twig\Environment;
+use Twig\Extension\EscaperExtension;
 
+/**
+ * @final
+ */
 class TwigEnvironmentConfigurator
 {
-    private EnvironmentConfigurator $decorated;
-
     public function __construct(
-        EnvironmentConfigurator $decorated,
+        private readonly EnvironmentConfigurator $decorated,
     ) {
-        $this->decorated = $decorated;
     }
 
     public function configure(Environment $environment): void
     {
         $this->decorated->configure($environment);
-
         $environment->setLexer(new ComponentLexer($environment));
+
+        if ($environment->hasExtension(EscaperExtension::class)) {
+            $environment->getExtension(EscaperExtension::class)->addSafeClass(ComponentAttributes::class, ['html']);
+        }
     }
 }

src/TwigComponent/tests/Unit/ComponentAttributesTest.php

@@ -224,7 +224,7 @@ public function testCannotRenderNonStringAttribute(): void
 
         $attributes->render('attr1');
     }
-    
+
     public function testCanCheckIfAttributeExists(): void
     {
         $attributes = new ComponentAttributes(['foo' => 'bar']);

ux.symfony.com/src/LiveMemory/Component/ScoreRow.php

@@ -11,7 +11,6 @@
 
 namespace App\LiveMemory\Component;
 
-use Symfony\UX\LiveComponent\Attribute\AsLiveComponent;
 use Symfony\UX\TwigComponent\Attribute\AsTwigComponent;
 use Symfony\UX\TwigComponent\Attribute\ExposeInTemplate;