Drop support for Twig < 3.13.0

phpmyadmin · Dec 28, 2024 · ea585ce · ea585ce
1 parent e3998e6
commit ea585ce
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ## [Unreleased]
 
-* Drop support for Twig < 3.9.0
+* Drop support for Twig < 3.13.0
 * Drop support for PHP 7.2, PHP 7.3, PHP 7.4 and PHP 8.0
 
 ## [4.1.3] - 2024-09-08

diff --git a/composer.json b/composer.json
@@ -21,7 +21,7 @@
     },
     "require": {
         "php": "^8.1",
-        "twig/twig": "^3.9"
+        "twig/twig": "^3.13"
     },
     "require-dev": {
         "phpmyadmin/coding-standard": "^4.0",

diff --git a/src/Node/TransNode.php b/src/Node/TransNode.php
@@ -16,7 +16,6 @@
 
 use Twig\Attribute\YieldReady;
 use Twig\Compiler;
-use Twig\Environment;
 use Twig\Node\CheckToStringNode;
 use Twig\Node\Expression\AbstractExpression;
 use Twig\Node\Expression\ConstantExpression;
@@ -61,6 +60,7 @@ class TransNode extends Node
      */
     public static bool $hasContextFunctions = false;
 
+    /** @phpstan-ignore constructor.unusedParameter */
     public function __construct(
         Node $body,
         Node|null $plural,
@@ -92,14 +92,7 @@ public function __construct(
             $nodes['context'] = $context;
         }
 
-        /** @phpstan-ignore-next-line */
-        if (Environment::MAJOR_VERSION >= 3 && Environment::MINOR_VERSION >= 12) {
-            parent::__construct($nodes, [], $lineno);
-
-            return;
-        }
-
-        parent::__construct($nodes, [], $lineno, $tag);
+        parent::__construct($nodes, [], $lineno);
     }
 
     /**