Merge branch '4.1.x'

Signed-off-by: Maurício Meneghini Fauth <[email protected]>

.gitignore

@@ -2,6 +2,5 @@ phpunit.xml
 vendor/
 build/
 composer.lock
-.phpunit.result.cache
 phpcs.xml
 .phpcs-cache

CHANGELOG.md

@@ -5,6 +5,14 @@
 * Drop support for Twig < 3.9.0
 * Drop support for PHP 7.2, PHP 7.3, PHP 7.4 and PHP 8.0
 
+## [4.1.3] - 2024-09-08
+
+* Add support for Twig 3.13 (#15)
+
+## [4.1.2] - 2024-08-31
+
+* Add support for Twig 3.12 (#14)
+
 ## [4.1.1] - 2024-04-19
 
 * Add support for Twig 3.9 (#12)
@@ -44,7 +52,9 @@
 
 * First release of this library.
 
-[Unreleased]: https://github.com/phpmyadmin/twig-i18n-extension/compare/4.1.1...HEAD
+[Unreleased]: https://github.com/phpmyadmin/twig-i18n-extension/compare/4.1.x...HEAD
+[4.1.3]: https://github.com/phpmyadmin/twig-i18n-extension/compare/4.1.2...4.1.3
+[4.1.2]: https://github.com/phpmyadmin/twig-i18n-extension/compare/4.1.1...4.1.2
 [4.1.1]: https://github.com/phpmyadmin/twig-i18n-extension/compare/4.1.0...4.1.1
 [4.1.0]: https://github.com/phpmyadmin/twig-i18n-extension/compare/v4.0.1...4.1.0
 [4.0.1]: https://github.com/phpmyadmin/twig-i18n-extension/compare/v4.0.0...v4.0.1

phpunit.xml.dist

@@ -1,18 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/8.5/phpunit.xsd"
          bootstrap="vendor/autoload.php"
->
+         cacheResultFile="build/.phpunit.cache/test-results"
+         beStrictAboutOutputDuringTests="true"
+         beStrictAboutTodoAnnotatedTests="true"
+         convertDeprecationsToExceptions="true"
+         colors="true"
+         verbose="true">
     <testsuites>
-        <testsuite name="Twig Extensions Test Suite">
-            <directory>./test/</directory>
+        <testsuite name="default">
+            <directory>test</directory>
         </testsuite>
     </testsuites>
 
@@ -21,8 +19,8 @@
     </logging>
 
     <filter>
-        <whitelist>
-            <directory suffix=".php">./src/</directory>
+        <whitelist processUncoveredFilesFromWhitelist="true">
+            <directory suffix=".php">src</directory>
         </whitelist>
     </filter>
 </phpunit>

src/Node/TransNode.php

@@ -16,6 +16,7 @@
 
 use Twig\Attribute\YieldReady;
 use Twig\Compiler;
+use Twig\Environment;
 use Twig\Node\CheckToStringNode;
 use Twig\Node\Expression\AbstractExpression;
 use Twig\Node\Expression\ConstantExpression;
@@ -91,6 +92,13 @@ 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);
     }