Skip to content

Make embeds deterministic #4797

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
itsalmostchristmas wants to merge 4 commits into
base: 3.x
Choose a base branch
from
+8 −2
Open

Make embeds deterministic #4797

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5d4bd1b
make embeds deterministic
itsalmostchristmas May 6, 2026
90749dc
use per-root indices for embedded templates
itsalmostchristmas May 6, 2026
300b68e
move nextEmbedIndex out of stack
itsalmostchristmas May 7, 2026
698ea13
reset nextEmbedIndex at start of parse()
itsalmostchristmas May 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion src/Parser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ class Parser
private $importedSymbols;
private $traits;
private $embeddedTemplates = [];
private int $nextEmbedIndex = 1;
private $varNameSalt = 0;
private $ignoreUnknownTwigCallables = false;
private ExpressionParsers $parsers;
Expand Down Expand Up @@ -83,6 +84,12 @@ public function parse(TokenStream $stream, $test = null, bool $dropNeedle = fals
{
$vars = get_object_vars($this);
unset($vars['stack'], $vars['env'], $vars['handlers'], $vars['visitors'], $vars['expressionParser'], $vars['reservedMacroNames'], $vars['varNameSalt']);

// restore on root modules only
if (0 < \count($this->stack)) {
unset($vars['nextEmbedIndex']);
Comment thread
itsalmostchristmas marked this conversation as resolved.
Outdated
}

$this->stack[] = $vars;

// node visitors
Expand Down Expand Up @@ -319,7 +326,7 @@ public function hasTraits(): bool
*/
public function embedTemplate(ModuleNode $template)
{
$template->setIndex(mt_rand());
$template->setIndex($this->nextEmbedIndex++);

$this->embeddedTemplates[] = $template;
}
Expand Down