Merge branch '3.x' into 4.x

* 3.x: Fix cache-extra impl
twigphp · Feb 14, 2025 · 69b191f · 69b191f
2 parents 892e0bd + 613d6b9
commit 69b191f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/extra/cache-extra/TokenParser/CacheTokenParser.php b/extra/cache-extra/TokenParser/CacheTokenParser.php
@@ -35,7 +35,7 @@ public function parse(Token $token): Node
             }
 
             $stream->next();
-            $stream->expect(Token::PUNCTUATION_TYPE, '(');
+            $stream->expect(Token::OPERATOR_TYPE, '(');
             $line = $stream->getCurrent()->getLine();
             if ($stream->test(Token::PUNCTUATION_TYPE, ')')) {
                 throw new SyntaxError(\sprintf('The "%s" modifier takes exactly one argument (0 given).', $k), $line, $stream->getSourceContext());

diff --git a/extra/cache-extra/composer.json b/extra/cache-extra/composer.json
@@ -17,7 +17,7 @@
     "require": {
         "php": ">=8.2",
         "symfony/cache": "^5.4|^6.4|^7.0",
-        "twig/twig": "^3.20|^4.0"
+        "twig/twig": "^3.21|^4.0"
     },
     "autoload": {
         "psr-4" : { "Twig\\Extra\\Cache\\" : "" },