Merge branch '4.1.x'

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

Author: MauricioFauth

CHANGELOG.md

@@ -8,6 +8,11 @@
 * Drop support for PHP 7.2, PHP 7.3, PHP 7.4, PHP 8.0 and PHP 8.1
 * Fix Twig deprecations (#16, #17, #18)
 
+## [4.1.4] - 2025-09-14
+
+* Fix some Twig deprecations (#23)
+* Improve Twig's environment version check
+
 ## [4.1.3] - 2024-09-08
 
 * Add support for Twig 3.13 (#15)
@@ -56,6 +61,7 @@
 * First release of this library.
 
 [Unreleased]: https://github.com/phpmyadmin/twig-i18n-extension/compare/4.1.x...HEAD
+[4.1.4]: https://github.com/phpmyadmin/twig-i18n-extension/compare/4.1.3...4.1.4
 [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

src/TokenParser/TransTokenParser.php

@@ -25,6 +25,8 @@
 use Twig\Token;
 use Twig\TokenParser\AbstractTokenParser;
 
+use function method_exists;
+
 class TransTokenParser extends AbstractTokenParser
 {
     /**
@@ -60,18 +62,24 @@ protected function preParse(Token $token): array
         /* If we aren't closing the block, do we have a domain? */
         if ($stream->test(Token::NAME_TYPE)) {
             $stream->expect(Token::NAME_TYPE, 'from');
-            $domain = $this->parser->getExpressionParser()->parseExpression();
+            $domain = method_exists($this->parser, 'parseExpression')
+                ? $this->parser->parseExpression()
+                : $this->parser->getExpressionParser()->parseExpression();
         }
 
         if (! $stream->test(Token::BLOCK_END_TYPE)) {
-            $body = $this->parser->getExpressionParser()->parseExpression();
+            $body = method_exists($this->parser, 'parseExpression')
+                ? $this->parser->parseExpression()
+                : $this->parser->getExpressionParser()->parseExpression();
         } else {
             $stream->expect(Token::BLOCK_END_TYPE);
             $body = $this->parser->subparse([$this, 'decideForFork']);
             $next = $stream->next()->getValue();
 
             if ($next === 'plural') {
-                $count = $this->parser->getExpressionParser()->parseExpression();
+                $count = method_exists($this->parser, 'parseExpression')
+                    ? $this->parser->parseExpression()
+                    : $this->parser->getExpressionParser()->parseExpression();
                 $stream->expect(Token::BLOCK_END_TYPE);
                 $plural = $this->parser->subparse([$this, 'decideForFork']);
                 $next = $stream->next()->getValue();