more robust deferred logic + deprecated fixes

rhukster · rhukster · commit 114aebae7cdc · 2025-11-21T12:25:58.000Z
Signed-off-by: Andy Miller &lt;rhuk@mac.com&gt;
diff --git a/composer.lock b/composer.lock
diff --git a/system/src/Grav/Common/Twig/Node/TwigNodeSwitch.php b/system/src/Grav/Common/Twig/Node/TwigNodeSwitch.php
@@ -31,7 +31,7 @@ public function __construct(Node $value, Node $cases, ?Node $default = null, $li
         $nodes = ['value' => $value, 'cases' => $cases, 'default' => $default];
         $nodes = array_filter($nodes);
 
-        parent::__construct($nodes, [], $lineno, $tag);
+        parent::__construct($nodes, [], $lineno);
     }
 
     /**
diff --git a/system/src/Grav/Common/Twig/TokenParser/TwigTokenParserCache.php b/system/src/Grav/Common/Twig/TokenParser/TwigTokenParserCache.php
@@ -44,9 +44,9 @@ public function parse(Token $token)
         $lifetime = null;
         while (!$stream->test(Token::BLOCK_END_TYPE)) {
             if ($stream->test(Token::STRING_TYPE)) {
-                $key = $this->parser->getExpressionParser()->parseExpression();
+                $key = $this->parser->parseExpression();
             } elseif ($stream->test(Token::NUMBER_TYPE)) {
-                $lifetime = $this->parser->getExpressionParser()->parseExpression();
+                $lifetime = $this->parser->parseExpression();
             } else {
                 throw new \Twig\Error\SyntaxError("Unexpected token type in cache tag.", $token->getLine(), $stream->getSourceContext());
             }
diff --git a/system/src/Grav/Common/Twig/TokenParser/TwigTokenParserLink.php b/system/src/Grav/Common/Twig/TokenParser/TwigTokenParserLink.php
@@ -73,23 +73,23 @@ protected function parseArguments(Token $token): array
 
         $file = null;
         if (!$stream->test(Token::NAME_TYPE) && !$stream->test(Token::BLOCK_END_TYPE)) {
-            $file = $this->parser->getExpressionParser()->parseExpression();
+            $file = $this->parser->parseExpression();
         }
 
         $group = null;
         if ($stream->nextIf(Token::NAME_TYPE, 'at')) {
-            $group = $this->parser->getExpressionParser()->parseExpression();
+            $group = $this->parser->parseExpression();
         }
 
         $priority = null;
         if ($stream->nextIf(Token::NAME_TYPE, 'priority')) {
             $stream->expect(Token::PUNCTUATION_TYPE, ':');
-            $priority = $this->parser->getExpressionParser()->parseExpression();
+            $priority = $this->parser->parseExpression();
         }
 
         $attributes = null;
         if ($stream->nextIf(Token::NAME_TYPE, 'with')) {
-            $attributes = $this->parser->getExpressionParser()->parseExpression();
+            $attributes = $this->parser->parseExpression();
         }
 
         $stream->expect(Token::BLOCK_END_TYPE);
diff --git a/system/src/Grav/Common/Twig/TokenParser/TwigTokenParserRender.php b/system/src/Grav/Common/Twig/TokenParser/TwigTokenParserRender.php
@@ -44,17 +44,17 @@ protected function parseArguments(Token $token): array
     {
         $stream = $this->parser->getStream();
 
-        $object = $this->parser->getExpressionParser()->parseExpression();
+        $object = $this->parser->parseExpression();
 
         $layout = null;
         if ($stream->nextIf(Token::NAME_TYPE, 'layout')) {
             $stream->expect(Token::PUNCTUATION_TYPE, ':');
-            $layout = $this->parser->getExpressionParser()->parseExpression();
+            $layout = $this->parser->parseExpression();
         }
 
         $context = null;
         if ($stream->nextIf(Token::NAME_TYPE, 'with')) {
-            $context = $this->parser->getExpressionParser()->parseExpression();
+            $context = $this->parser->parseExpression();
         }
 
         $stream->expect(Token::BLOCK_END_TYPE);
diff --git a/system/src/Grav/Common/Twig/TokenParser/TwigTokenParserScript.php b/system/src/Grav/Common/Twig/TokenParser/TwigTokenParserScript.php
@@ -87,23 +87,23 @@ protected function parseArguments(Token $token): array
 
         $file = null;
         if (!$stream->test(Token::NAME_TYPE) && !$stream->test(Token::OPERATOR_TYPE, 'in') && !$stream->test(Token::BLOCK_END_TYPE)) {
-            $file = $this->parser->getExpressionParser()->parseExpression();
+            $file = $this->parser->parseExpression();
         }
 
         $group = null;
         if ($stream->nextIf(Token::NAME_TYPE, 'at') || $stream->nextIf(Token::OPERATOR_TYPE, 'in')) {
-            $group = $this->parser->getExpressionParser()->parseExpression();
+            $group = $this->parser->parseExpression();
         }
 
         $priority = null;
         if ($stream->nextIf(Token::NAME_TYPE, 'priority')) {
             $stream->expect(Token::PUNCTUATION_TYPE, ':');
-            $priority = $this->parser->getExpressionParser()->parseExpression();
+            $priority = $this->parser->parseExpression();
         }
 
         $attributes = null;
         if ($stream->nextIf(Token::NAME_TYPE, 'with')) {
-            $attributes = $this->parser->getExpressionParser()->parseExpression();
+            $attributes = $this->parser->parseExpression();
         }
 
         $stream->expect(Token::BLOCK_END_TYPE);
diff --git a/system/src/Grav/Common/Twig/TokenParser/TwigTokenParserStyle.php b/system/src/Grav/Common/Twig/TokenParser/TwigTokenParserStyle.php
@@ -74,23 +74,23 @@ protected function parseArguments(Token $token): array
 
         $file = null;
         if (!$stream->test(Token::NAME_TYPE) && !$stream->test(Token::OPERATOR_TYPE, 'in') && !$stream->test(Token::BLOCK_END_TYPE)) {
-            $file = $this->parser->getExpressionParser()->parseExpression();
+            $file = $this->parser->parseExpression();
         }
 
         $group = null;
         if ($stream->nextIf(Token::NAME_TYPE, 'at') || $stream->nextIf(Token::OPERATOR_TYPE, 'in')) {
-            $group = $this->parser->getExpressionParser()->parseExpression();
+            $group = $this->parser->parseExpression();
         }
 
         $priority = null;
         if ($stream->nextIf(Token::NAME_TYPE, 'priority')) {
             $stream->expect(Token::PUNCTUATION_TYPE, ':');
-            $priority = $this->parser->getExpressionParser()->parseExpression();
+            $priority = $this->parser->parseExpression();
         }
 
         $attributes = null;
         if ($stream->nextIf(Token::NAME_TYPE, 'with')) {
-            $attributes = $this->parser->getExpressionParser()->parseExpression();
+            $attributes = $this->parser->parseExpression();
         }
 
         $stream->expect(Token::BLOCK_END_TYPE);
diff --git a/system/src/Grav/Common/Twig/TokenParser/TwigTokenParserSwitch.php b/system/src/Grav/Common/Twig/TokenParser/TwigTokenParserSwitch.php
@@ -13,6 +13,7 @@
 use Grav\Common\Twig\Node\TwigNodeSwitch;
 use Twig\Error\SyntaxError;
 use Twig\Node\Node;
+use Twig\Node\Nodes;
 use Twig\Token;
 use Twig\TokenParser\AbstractTokenParser;
 
@@ -40,21 +41,22 @@ public function parse(Token $token)
         $lineno = $token->getLine();
         $stream = $this->parser->getStream();
 
-        $name = $this->parser->getExpressionParser()->parseExpression();
+        $name = $this->parser->parseExpression();
         $stream->expect(Token::BLOCK_END_TYPE);
 
         // There can be some whitespace between the {% switch %} and first {% case %} tag.
-        while ($stream->getCurrent()->getType() === Token::TEXT_TYPE && trim((string) $stream->getCurrent()->getValue()) === '') {
+        while ($stream->getCurrent()->test(Token::TEXT_TYPE) && trim((string) $stream->getCurrent()->getValue()) === '') {
             $stream->next();
         }
 
         $stream->expect(Token::BLOCK_START_TYPE);
 
-        $expressionParser = $this->parser->getExpressionParser();
-
         $default = null;
         $cases = [];
         $end = false;
+        
+        // 'or' operator precedence is 10. We want to stop parsing if we encounter it.
+        $orPrecedence = 10;
 
         while (!$end) {
             $next = $stream->next();
@@ -64,7 +66,7 @@ public function parse(Token $token)
                     $values = [];
 
                     while (true) {
-                        $values[] = $expressionParser->parsePrimaryExpression();
+                        $values[] = $this->parser->parseExpression($orPrecedence + 1);
                         // Multiple allowed values?
                         if ($stream->test(Token::OPERATOR_TYPE, 'or')) {
                             $stream->next();
@@ -75,10 +77,10 @@ public function parse(Token $token)
 
                     $stream->expect(Token::BLOCK_END_TYPE);
                     $body = $this->parser->subparse($this->decideIfFork(...));
-                    $cases[] = new Node([
-                        'values' => new Node($values),
+                    $cases[] = new class([
+                        'values' => new Nodes($values),
                         'body' => $body
-                    ]);
+                    ]) extends Node {};
                     break;
 
                 case 'default':
@@ -97,7 +99,7 @@ public function parse(Token $token)
 
         $stream->expect(Token::BLOCK_END_TYPE);
 
-        return new TwigNodeSwitch($name, new Node($cases), $default, $lineno, $this->getTag());
+        return new TwigNodeSwitch($name, new Nodes($cases), $default, $lineno, $this->getTag());
     }
 
     /**
diff --git a/system/src/Grav/Common/Twig/TokenParser/TwigTokenParserThrow.php b/system/src/Grav/Common/Twig/TokenParser/TwigTokenParserThrow.php
@@ -37,7 +37,7 @@ public function parse(Token $token)
         $stream = $this->parser->getStream();
 
         $code = $stream->expect(Token::NUMBER_TYPE)->getValue();
-        $message = $this->parser->getExpressionParser()->parseExpression();
+        $message = $this->parser->parseExpression();
         $stream->expect(Token::BLOCK_END_TYPE);
 
         return new TwigNodeThrow((int)$code, $message, $lineno, $this->getTag());
diff --git a/system/src/Grav/Common/Twig/TwigEnvironment.php b/system/src/Grav/Common/Twig/TwigEnvironment.php
@@ -11,8 +11,11 @@
 
 use Twig\Environment;
 use Twig\Error\LoaderError;
+use Twig\Extension\EscaperExtension;
+use Twig\Extension\ExtensionInterface;
 use Twig\Loader\ExistsLoaderInterface;
 use Twig\Loader\LoaderInterface;
+use Twig\Runtime\EscaperRuntime;
 use Twig\Template;
 use Twig\TemplateWrapper;
 
@@ -22,6 +25,39 @@
  */
 class TwigEnvironment extends Environment
 {
+    /**
+     * @inheritDoc
+     */
+    public function getExtension(string $name): ExtensionInterface
+    {
+        $extension = parent::getExtension($name);
+
+        if ($name === EscaperExtension::class && class_exists(EscaperRuntime::class)) {
+            return new class($extension, $this) extends EscaperExtension {
+                private $original;
+                private $env;
+
+                public function __construct($original, $env)
+                {
+                    $this->original = $original;
+                    $this->env = $env;
+                }
+
+                public function setEscaper($strategy, $callable)
+                {
+                    $this->env->getRuntime(EscaperRuntime::class)->setEscaper($strategy, $callable);
+                }
+
+                public function getDefaultStrategy($filename)
+                {
+                    return $this->original->getDefaultStrategy($filename);
+                }
+            };
+        }
+
+        return $extension;
+    }
+
     /**
      * @inheritDoc
      *
diff --git a/system/src/Twig/DeferredExtension/DeferredTokenParser.php b/system/src/Twig/DeferredExtension/DeferredTokenParser.php
@@ -13,66 +13,70 @@
 
 namespace Twig\DeferredExtension;
 
+use Twig\Error\SyntaxError;
 use Twig\Node\BlockNode;
+use Twig\Node\BlockReferenceNode;
+use Twig\Node\EmptyNode;
 use Twig\Node\Node;
-use Twig\Parser;
+use Twig\Node\Nodes;
+use Twig\Node\PrintNode;
 use Twig\Token;
 use Twig\TokenParser\AbstractTokenParser;
-use Twig\TokenParser\BlockTokenParser;
 
 final class DeferredTokenParser extends AbstractTokenParser
 {
-    private $blockTokenParser;
-
-    public function setParser(Parser $parser) : void
-    {
-        parent::setParser($parser);
-
-        $this->blockTokenParser = new BlockTokenParser();
-        $this->blockTokenParser->setParser($parser);
-    }
-
     public function parse(Token $token) : Node
     {
+        $lineno = $token->getLine();
         $stream = $this->parser->getStream();
-        $nameToken = $stream->next();
-        $deferredToken = $stream->nextIf(Token::NAME_TYPE, 'deferred');
-        $stream->injectTokens([$nameToken]);
+        $name = $stream->expect(Token::NAME_TYPE)->getValue();
+        
+        $deferred = $stream->nextIf(Token::NAME_TYPE, 'deferred');
 
-        $node = $this->blockTokenParser->parse($token);
+        if ($this->parser->hasBlock($name)) {
+            throw new SyntaxError(\sprintf("The block '%s' has already been defined line %d.", $name, $this->parser->getBlock($name)->getTemplateLine()), $stream->getCurrent()->getLine(), $stream->getSourceContext());
+        }
 
-        if ($deferredToken) {
-            $this->replaceBlockNode($nameToken->getValue());
+        if ($deferred) {
+            $block = new DeferredBlockNode($name, new EmptyNode(), $lineno);
+        } else {
+            $block = new BlockNode($name, new EmptyNode(), $lineno);
         }
 
-        return $node;
-    }
+        $this->parser->setBlock($name, $block);
+        $this->parser->pushLocalScope();
+        $this->parser->pushBlockStack($name);
+
+        if ($stream->nextIf(Token::BLOCK_END_TYPE)) {
+            $body = $this->parser->subparse([$this, 'decideBlockEnd'], true);
+            if ($token = $stream->nextIf(Token::NAME_TYPE)) {
+                $value = $token->getValue();
+
+                if ($value != $name) {
+                    throw new SyntaxError(\sprintf('Expected endblock for block "%s" (but "%s" given).', $name, $value), $stream->getCurrent()->getLine(), $stream->getSourceContext());
+                }
+            }
+        } else {
+            $body = new Nodes([
+                new PrintNode($this->parser->parseExpression(), $lineno),
+            ]);
+        }
+        $stream->expect(Token::BLOCK_END_TYPE);
 
-    public function getTag() : string
-    {
-        return 'block';
+        $block->setNode('body', $body);
+        $this->parser->popBlockStack();
+        $this->parser->popLocalScope();
+
+        return new BlockReferenceNode($name, $lineno, $this->getTag());
     }
 
-    private function replaceBlockNode(string $name) : void
+    public function decideBlockEnd(Token $token): bool
     {
-        $blockContainer = $this->parser->getBlock($name);
-        $block = $blockContainer->getNode('0');
-        $blockContainer->setNode('0', $this->createDeferredBlockNode($block));
+        return $token->test('endblock');
     }
 
-    private function createDeferredBlockNode(BlockNode $block) : DeferredBlockNode
+    public function getTag() : string
     {
-        $name = $block->getAttribute('name');
-        $deferredBlock = new DeferredBlockNode($name, new Node([]), $block->getTemplateLine());
-
-        foreach ($block as $nodeName => $node) {
-            $deferredBlock->setNode($nodeName, $node);
-        }
-
-        if ($sourceContext = $block->getSourceContext()) {
-            $deferredBlock->setSourceContext($sourceContext);
-        }
-
-        return $deferredBlock;
+        return 'block';
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public function __construct(Node $value, Node $cases, ?Node $default = null, $li`
`31`	`31`	`$nodes = ['value' => $value, 'cases' => $cases, 'default' => $default];`
`32`	`32`	`$nodes = array_filter($nodes);`
`33`	`33`
`34`		`- parent::__construct($nodes, [], $lineno, $tag);`
	`34`	`+ parent::__construct($nodes, [], $lineno);`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -73,23 +73,23 @@ protected function parseArguments(Token $token): array`
`73`	`73`
`74`	`74`	`$file = null;`
`75`	`75`	`if (!$stream->test(Token::NAME_TYPE) && !$stream->test(Token::BLOCK_END_TYPE)) {`
`76`		`- $file = $this->parser->getExpressionParser()->parseExpression();`
	`76`	`+ $file = $this->parser->parseExpression();`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`$group = null;`
`80`	`80`	`if ($stream->nextIf(Token::NAME_TYPE, 'at')) {`
`81`		`- $group = $this->parser->getExpressionParser()->parseExpression();`
	`81`	`+ $group = $this->parser->parseExpression();`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`$priority = null;`
`85`	`85`	`if ($stream->nextIf(Token::NAME_TYPE, 'priority')) {`
`86`	`86`	`$stream->expect(Token::PUNCTUATION_TYPE, ':');`
`87`		`- $priority = $this->parser->getExpressionParser()->parseExpression();`
	`87`	`+ $priority = $this->parser->parseExpression();`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`$attributes = null;`
`91`	`91`	`if ($stream->nextIf(Token::NAME_TYPE, 'with')) {`
`92`		`- $attributes = $this->parser->getExpressionParser()->parseExpression();`
	`92`	`+ $attributes = $this->parser->parseExpression();`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`$stream->expect(Token::BLOCK_END_TYPE);`
Original file line number	Diff line number	Diff line change
`@@ -44,17 +44,17 @@ protected function parseArguments(Token $token): array`
`44`	`44`	`{`
`45`	`45`	`$stream = $this->parser->getStream();`
`46`	`46`
`47`		`- $object = $this->parser->getExpressionParser()->parseExpression();`
	`47`	`+ $object = $this->parser->parseExpression();`
`48`	`48`
`49`	`49`	`$layout = null;`
`50`	`50`	`if ($stream->nextIf(Token::NAME_TYPE, 'layout')) {`
`51`	`51`	`$stream->expect(Token::PUNCTUATION_TYPE, ':');`
`52`		`- $layout = $this->parser->getExpressionParser()->parseExpression();`
	`52`	`+ $layout = $this->parser->parseExpression();`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`$context = null;`
`56`	`56`	`if ($stream->nextIf(Token::NAME_TYPE, 'with')) {`
`57`		`- $context = $this->parser->getExpressionParser()->parseExpression();`
	`57`	`+ $context = $this->parser->parseExpression();`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`$stream->expect(Token::BLOCK_END_TYPE);`
Original file line number	Diff line number	Diff line change
`@@ -87,23 +87,23 @@ protected function parseArguments(Token $token): array`
`87`	`87`
`88`	`88`	`$file = null;`
`89`	`89`	`if (!$stream->test(Token::NAME_TYPE) && !$stream->test(Token::OPERATOR_TYPE, 'in') && !$stream->test(Token::BLOCK_END_TYPE)) {`
`90`		`- $file = $this->parser->getExpressionParser()->parseExpression();`
	`90`	`+ $file = $this->parser->parseExpression();`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`$group = null;`
`94`	`94`	`if ($stream->nextIf(Token::NAME_TYPE, 'at') \|\| $stream->nextIf(Token::OPERATOR_TYPE, 'in')) {`
`95`		`- $group = $this->parser->getExpressionParser()->parseExpression();`
	`95`	`+ $group = $this->parser->parseExpression();`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`$priority = null;`
`99`	`99`	`if ($stream->nextIf(Token::NAME_TYPE, 'priority')) {`
`100`	`100`	`$stream->expect(Token::PUNCTUATION_TYPE, ':');`
`101`		`- $priority = $this->parser->getExpressionParser()->parseExpression();`
	`101`	`+ $priority = $this->parser->parseExpression();`
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`$attributes = null;`
`105`	`105`	`if ($stream->nextIf(Token::NAME_TYPE, 'with')) {`
`106`		`- $attributes = $this->parser->getExpressionParser()->parseExpression();`
	`106`	`+ $attributes = $this->parser->parseExpression();`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`$stream->expect(Token::BLOCK_END_TYPE);`
Original file line number	Diff line number	Diff line change
`@@ -74,23 +74,23 @@ protected function parseArguments(Token $token): array`
`74`	`74`
`75`	`75`	`$file = null;`
`76`	`76`	`if (!$stream->test(Token::NAME_TYPE) && !$stream->test(Token::OPERATOR_TYPE, 'in') && !$stream->test(Token::BLOCK_END_TYPE)) {`
`77`		`- $file = $this->parser->getExpressionParser()->parseExpression();`
	`77`	`+ $file = $this->parser->parseExpression();`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`$group = null;`
`81`	`81`	`if ($stream->nextIf(Token::NAME_TYPE, 'at') \|\| $stream->nextIf(Token::OPERATOR_TYPE, 'in')) {`
`82`		`- $group = $this->parser->getExpressionParser()->parseExpression();`
	`82`	`+ $group = $this->parser->parseExpression();`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`$priority = null;`
`86`	`86`	`if ($stream->nextIf(Token::NAME_TYPE, 'priority')) {`
`87`	`87`	`$stream->expect(Token::PUNCTUATION_TYPE, ':');`
`88`		`- $priority = $this->parser->getExpressionParser()->parseExpression();`
	`88`	`+ $priority = $this->parser->parseExpression();`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`$attributes = null;`
`92`	`92`	`if ($stream->nextIf(Token::NAME_TYPE, 'with')) {`
`93`		`- $attributes = $this->parser->getExpressionParser()->parseExpression();`
	`93`	`+ $attributes = $this->parser->parseExpression();`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`$stream->expect(Token::BLOCK_END_TYPE);`