From d6aecb7196bf610e63ebb64f937c33878d5d03b1 Mon Sep 17 00:00:00 2001
From: Alexandre Daubois <alex.daubois@gmail.com>
Date: Fri, 14 Feb 2025 10:47:54 +0100
Subject: [PATCH] [TwigBridge] Fix compatibility with Twig 3.21

---
 TokenParser/DumpTokenParser.php               | 18 +++++++++++++++++-
 TokenParser/FormThemeTokenParser.php          | 10 +++++++---
 TokenParser/StopwatchTokenParser.php          |  4 +++-
 TokenParser/TransDefaultDomainTokenParser.php |  4 +++-
 TokenParser/TransTokenParser.php              | 12 ++++++++----
 5 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/TokenParser/DumpTokenParser.php b/TokenParser/DumpTokenParser.php
index e671f9ba..9c12dc23 100644
--- a/TokenParser/DumpTokenParser.php
+++ b/TokenParser/DumpTokenParser.php
@@ -14,6 +14,7 @@
 use Symfony\Bridge\Twig\Node\DumpNode;
 use Twig\Node\Expression\Variable\LocalVariable;
 use Twig\Node\Node;
+use Twig\Node\Nodes;
 use Twig\Token;
 use Twig\TokenParser\AbstractTokenParser;
 
@@ -34,13 +35,28 @@ public function parse(Token $token): Node
     {
         $values = null;
         if (!$this->parser->getStream()->test(Token::BLOCK_END_TYPE)) {
-            $values = $this->parser->getExpressionParser()->parseMultitargetExpression();
+            $values = method_exists($this->parser, 'parseExpression') ?
+                $this->parseMultitargetExpression() :
+                $this->parser->getExpressionParser()->parseMultitargetExpression();
         }
         $this->parser->getStream()->expect(Token::BLOCK_END_TYPE);
 
         return new DumpNode(class_exists(LocalVariable::class) ? new LocalVariable(null, $token->getLine()) : $this->parser->getVarName(), $values, $token->getLine(), $this->getTag());
     }
 
+    private function parseMultitargetExpression(): Node
+    {
+        $targets = [];
+        while (true) {
+            $targets[] = $this->parser->parseExpression();
+            if (!$this->parser->getStream()->nextIf(Token::PUNCTUATION_TYPE, ',')) {
+                break;
+            }
+        }
+
+        return new Nodes($targets);
+    }
+
     public function getTag(): string
     {
         return 'dump';
diff --git a/TokenParser/FormThemeTokenParser.php b/TokenParser/FormThemeTokenParser.php
index b95a2a05..c5fc2311 100644
--- a/TokenParser/FormThemeTokenParser.php
+++ b/TokenParser/FormThemeTokenParser.php
@@ -29,12 +29,16 @@ public function parse(Token $token): Node
         $lineno = $token->getLine();
         $stream = $this->parser->getStream();
 
-        $form = $this->parser->getExpressionParser()->parseExpression();
+        $parseExpression = method_exists($this->parser, 'parseExpression')
+            ? $this->parser->parseExpression(...)
+            : $this->parser->getExpressionParser()->parseExpression(...);
+
+        $form = $parseExpression();
         $only = false;
 
         if ($this->parser->getStream()->test(Token::NAME_TYPE, 'with')) {
             $this->parser->getStream()->next();
-            $resources = $this->parser->getExpressionParser()->parseExpression();
+            $resources = $parseExpression();
 
             if ($this->parser->getStream()->nextIf(Token::NAME_TYPE, 'only')) {
                 $only = true;
@@ -42,7 +46,7 @@ public function parse(Token $token): Node
         } else {
             $resources = new ArrayExpression([], $stream->getCurrent()->getLine());
             do {
-                $resources->addElement($this->parser->getExpressionParser()->parseExpression());
+                $resources->addElement($parseExpression());
             } while (!$stream->test(Token::BLOCK_END_TYPE));
         }
 
diff --git a/TokenParser/StopwatchTokenParser.php b/TokenParser/StopwatchTokenParser.php
index 324f9d45..c478d9e6 100644
--- a/TokenParser/StopwatchTokenParser.php
+++ b/TokenParser/StopwatchTokenParser.php
@@ -38,7 +38,9 @@ public function parse(Token $token): Node
         $stream = $this->parser->getStream();
 
         // {% stopwatch 'bar' %}
-        $name = $this->parser->getExpressionParser()->parseExpression();
+        $name = method_exists($this->parser, 'parseExpression') ?
+            $this->parser->parseExpression() :
+            $this->parser->getExpressionParser()->parseExpression();
 
         $stream->expect(Token::BLOCK_END_TYPE);
 
diff --git a/TokenParser/TransDefaultDomainTokenParser.php b/TokenParser/TransDefaultDomainTokenParser.php
index c6d850d0..a64a2332 100644
--- a/TokenParser/TransDefaultDomainTokenParser.php
+++ b/TokenParser/TransDefaultDomainTokenParser.php
@@ -25,7 +25,9 @@ final class TransDefaultDomainTokenParser extends AbstractTokenParser
 {
     public function parse(Token $token): Node
     {
-        $expr = $this->parser->getExpressionParser()->parseExpression();
+        $expr = method_exists($this->parser, 'parseExpression') ?
+            $this->parser->parseExpression() :
+            $this->parser->getExpressionParser()->parseExpression();
 
         $this->parser->getStream()->expect(Token::BLOCK_END_TYPE);
 
diff --git a/TokenParser/TransTokenParser.php b/TokenParser/TransTokenParser.php
index e60263a4..2d17c9da 100644
--- a/TokenParser/TransTokenParser.php
+++ b/TokenParser/TransTokenParser.php
@@ -36,29 +36,33 @@ public function parse(Token $token): Node
         $vars = new ArrayExpression([], $lineno);
         $domain = null;
         $locale = null;
+        $parseExpression = method_exists($this->parser, 'parseExpression')
+            ? $this->parser->parseExpression(...)
+            : $this->parser->getExpressionParser()->parseExpression(...);
+
         if (!$stream->test(Token::BLOCK_END_TYPE)) {
             if ($stream->test('count')) {
                 // {% trans count 5 %}
                 $stream->next();
-                $count = $this->parser->getExpressionParser()->parseExpression();
+                $count = $parseExpression();
             }
 
             if ($stream->test('with')) {
                 // {% trans with vars %}
                 $stream->next();
-                $vars = $this->parser->getExpressionParser()->parseExpression();
+                $vars = $parseExpression();
             }
 
             if ($stream->test('from')) {
                 // {% trans from "messages" %}
                 $stream->next();
-                $domain = $this->parser->getExpressionParser()->parseExpression();
+                $domain = $parseExpression();
             }
 
             if ($stream->test('into')) {
                 // {% trans into "fr" %}
                 $stream->next();
-                $locale = $this->parser->getExpressionParser()->parseExpression();
+                $locale = $parseExpression();
             } elseif (!$stream->test(Token::BLOCK_END_TYPE)) {
                 throw new SyntaxError('Unexpected token. Twig was looking for the "with", "from", or "into" keyword.', $stream->getCurrent()->getLine(), $stream->getSourceContext());
             }