Move Operators to ExpressionParsers, deprecate ExpressionParser

Author: fabpot

TokenParser/CacheTokenParser.php

@@ -24,8 +24,7 @@ class CacheTokenParser extends AbstractTokenParser
     public function parse(Token $token): Node
     {
         $stream = $this->parser->getStream();
-        $expressionParser = $this->parser->getExpressionParser();
-        $key = $expressionParser->parseExpression();
+        $key = $this->parser->parseExpression();
 
         $ttl = null;
         $tags = null;
@@ -41,7 +40,7 @@ public function parse(Token $token): Node
             if ($stream->test(Token::PUNCTUATION_TYPE, ')')) {
                 throw new SyntaxError(\sprintf('The "%s" modifier takes exactly one argument (0 given).', $k), $line, $stream->getSourceContext());
             }
-            $arg = $expressionParser->parseExpression();
+            $arg = $this->parser->parseExpression();
             if ($stream->test(Token::PUNCTUATION_TYPE, ',')) {
                 throw new SyntaxError(\sprintf('The "%s" modifier takes exactly one argument (2 given).', $k), $line, $stream->getSourceContext());
             }

composer.json

@@ -17,7 +17,7 @@
     "require": {
         "php": ">=8.1.0",
         "symfony/cache": "^5.4|^6.4|^7.0",
-        "twig/twig": "^3.19|^4.0"
+        "twig/twig": "^3.20|^4.0"
     },
     "require-dev": {
         "symfony/phpunit-bridge": "^6.4|^7.0"