geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-10-06 03:47:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle single-node child template bodies in cleanup

Browse Source
This commit is contained in:
Fabien Potencier
2026-06-08 13:13:35 +02:00
parent a69d3dc71e
commit c0504b90c5
2 changed files with 36 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Parser.php
+8 -2
View File
@@ -121,7 +121,7 @@ class Parser
}
if ($this->parent) {
$this->cleanupBodyForChildTemplates($body);
$body = $this->cleanupBodyForChildTemplates($body);
}
$node = new ModuleNode(
@@ -552,8 +552,12 @@ class Parser
return $test;
}
private function cleanupBodyForChildTemplates(Node $body): void
private function cleanupBodyForChildTemplates(Node $body): Node
{
if ($body instanceof BlockReferenceNode || ($body instanceof TextNode && $body->isBlank())) {
return new EmptyNode();
}
foreach ($body as $k => $node) {
if ($node instanceof BlockReferenceNode) {
// as it has a parent, the block reference won't be used
@@ -563,6 +567,8 @@ class Parser
$body->removeNode($k);
}
}
return $body;
}
private function checkPrecedenceDeprecations(ExpressionParserInterface $expressionParser, AbstractExpression $expr)