[TwigBridge][WebProfilerBundle] Require Twig 3.9

symfony · May 3, 2024 · 6bcd771 · 6bcd771
1 parent eccdbea
commit 6bcd771
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 14 deletions.
diff --git a/composer.json b/composer.json
@@ -39,7 +39,7 @@
         "ext-xml": "*",
         "doctrine/event-manager": "^2",
         "doctrine/persistence": "^3.1",
-        "twig/twig": "^3.0.4",
+        "twig/twig": "^3.9",
         "psr/cache": "^2.0|^3.0",
         "psr/clock": "^1.0",
         "psr/container": "^1.1|^2.0",

diff --git a/src/Symfony/Bridge/Twig/Node/TransNode.php b/src/Symfony/Bridge/Twig/Node/TransNode.php
@@ -55,10 +55,8 @@ public function compile(Compiler $compiler): void
             $vars = null;
         }
         [$msg, $defaults] = $this->compileString($this->getNode('body'), $defaults, (bool) $vars);
-        $display = class_exists(YieldReady::class) ? 'yield' : 'echo';
-
         $compiler
-            ->write($display.' $this->env->getExtension(\'Symfony\Bridge\Twig\Extension\TranslationExtension\')->trans(')
+            ->write('yield $this->env->getExtension(\'Symfony\Bridge\Twig\Extension\TranslationExtension\')->trans(')
             ->subcompile($msg)
         ;
 

diff --git a/src/Symfony/Bridge/Twig/Tests/Node/TransNodeTest.php b/src/Symfony/Bridge/Twig/Tests/Node/TransNodeTest.php
@@ -36,8 +36,7 @@ public function testCompileStrict()
 
         $this->assertEquals(
             sprintf(
-                '%s $this->env->getExtension(\'Symfony\Bridge\Twig\Extension\TranslationExtension\')->trans("trans %%var%%", array_merge(["%%var%%" => %s], %s), "messages");',
-                class_exists(YieldReady::class) ? 'yield' : 'echo',
+                'yield $this->env->getExtension(\'Symfony\Bridge\Twig\Extension\TranslationExtension\')->trans("trans %%var%%", array_merge(["%%var%%" => %s], %s), "messages");',
                 $this->getVariableGetterWithoutStrictCheck('var'),
                 $this->getVariableGetterWithStrictCheck('foo')
             ),

diff --git a/src/Symfony/Bridge/Twig/composer.json b/src/Symfony/Bridge/Twig/composer.json
@@ -18,7 +18,7 @@
     "require": {
         "php": ">=8.2",
         "symfony/translation-contracts": "^2.5|^3",
-        "twig/twig": "^3.0.4"
+        "twig/twig": "^3.9"
     },
     "require-dev": {
         "egulias/email-validator": "^2.1.10|^3|^4",

diff --git a/src/Symfony/Bundle/WebProfilerBundle/Twig/WebProfilerExtension.php b/src/Symfony/Bundle/WebProfilerBundle/Twig/WebProfilerExtension.php
@@ -115,11 +115,6 @@ private static function escape(Environment $env, string $s): string
         }
 
         // Twig 3.9
-        if (method_exists(EscaperExtension::class, 'escape')) {
-            return EscaperExtension::escape($env, $s);
-        }
-
-        // to be removed when support for Twig 3 is dropped
-        return twig_escape_filter($env, $s);
+        return EscaperExtension::escape($env, $s);
     }
 }
diff --git a/src/Symfony/Bundle/WebProfilerBundle/composer.json b/src/Symfony/Bundle/WebProfilerBundle/composer.json
@@ -22,7 +22,7 @@
         "symfony/http-kernel": "^6.4|^7.0",
         "symfony/routing": "^6.4|^7.0",
         "symfony/twig-bundle": "^6.4|^7.0",
-        "twig/twig": "^3.0.4"
+        "twig/twig": "^3.9"
     },
     "require-dev": {
         "symfony/browser-kit": "^6.4|^7.0",