Fix twig deprecation: twig_escape_filter

symfony · Dec 14, 2023 · d5fb5b2 · d5fb5b2
1 parent 8fe391d
commit d5fb5b2
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/src/LiveComponent/src/Util/LiveAttributesCollection.php b/src/LiveComponent/src/Util/LiveAttributesCollection.php
@@ -12,6 +12,7 @@
 namespace Symfony\UX\LiveComponent\Util;
 
 use Twig\Environment;
+use Twig\Extension\EscaperExtension;
 
 /**
  * An array of attributes that can eventually be returned as an escaped array.
@@ -99,6 +100,11 @@ public function setBrowserEventsToDispatch(array $browserEventsToDispatch): void
 
     private function escapeAttribute(string $value): string
     {
-        return twig_escape_filter($this->twig, $value, 'html_attr');
+        if (class_exists(EscaperExtension::class)) {
+            return EscaperExtension::escape($this->twig, $value, 'html_attr');
+        }
+
+        // since twig/twig 3.9.0: Using the internal "twig_escape_filter" function is deprecated.
+        return (string) twig_escape_filter($this->twig, $value, 'html_attr');
     }
 }
diff --git a/src/StimulusBundle/src/Dto/StimulusAttributes.php b/src/StimulusBundle/src/Dto/StimulusAttributes.php
@@ -14,6 +14,7 @@
 namespace Symfony\UX\StimulusBundle\Dto;
 
 use Twig\Environment;
+use Twig\Extension\EscaperExtension;
 
 /**
  * Helper to build Stimulus-related HTML attributes.
@@ -214,6 +215,11 @@ private function getFormattedValue(mixed $value): string
 
     private function escapeAsHtmlAttr(mixed $value): string
     {
+        if (class_exists(EscaperExtension::class)) {
+            return EscaperExtension::escape($this->env, $value, 'html_attr');
+        }
+
+        // since twig/twig 3.9.0: Using the internal "twig_escape_filter" function is deprecated.
         return (string) twig_escape_filter($this->env, $value, 'html_attr');
     }