10000 generate conflict-free variable names · symfony/symfony@51e5e72 · GitHub
[go: up one dir, main page]

Skip to content

Commit 51e5e72

Browse files
committed
generate conflict-free variable names
1 parent 273fa3f commit 51e5e72

File tree

1 file changed

+13
-9
lines changed

1 file changed

+13
-9
lines changed

src/Symfony/Bridge/Twig/NodeVisitor/TranslationDefaultDomainNodeVisitor.php

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@
2121
use Twig\Node\Expression\ConstantExpression;
2222
use Twig\Node\Expression\FilterExpression;
2323
use Twig\Node\Expression\NameExpression;
24-
use Twig\Node\Expression\Variable\LocalVariable;
24+
use Twig\Node\Expression\Variable\AssignContextVariable;
25+
use Twig\Node\Expression\Variable\ContextVariable;
2526
use Twig\Node\ModuleNode;
2627
use Twig\Node\Node;
2728
use Twig\Node\Nodes;
@@ -34,7 +35,7 @@
3435
final class TranslationDefaultDomainNodeVisitor implements NodeVisitorInterface
3536
{
3637
private Scope $scope;
37-
private int $nestingLevel = 0;
38+
private int $nameCounter = 0;
3839

3940
public function __construct()
4041
{
@@ -48,22 +49,27 @@ public function enterNode(Node $node, Environment $env): Node
4849
}
4950

5051
if ($node instanceof TransDefaultDomainNode) {
51-
++$this->nestingLevel;
52-
5352
if ($node->getNode('expr') instanceof ConstantExpression) {
5453
$this->scope->set('domain', $node->getNode('expr'));
5554

5655
return $node;
5756
}
5857

58+
$var = '__internal_trans_default_domain';
59+
60+
if (null !== $templateName = $node->getTemplateName()) {
61+
$var .= hash('xxh128', $templateName);
62+
} else {
63+
$var .= ++$this->nameCounter;
64+
}
65+
5966
if (class_exists(Nodes::class)) {
60-
$name = new LocalVariable(null, $node->getTemplateLine());
61-
$this->scope->set('domain', $name);
67+
$name = new AssignContextVariable($var, $node->getTemplateLine());
68+
$this->scope->set('domain', new ContextVariable($var, $node->getTemplateLine()));
6269

6370
return new SetNode(false, new Nodes([$name]), new Nodes([$node->getNode('expr')]), $node->getTemplateLine());
6471
}
6572

66-
$var = '__internal_trans_default_domain_'.$this->nestingLevel;
6773
$name = new AssignNameExpression($var, $node->getTemplateLine());
6874
$this->scope->set('domain', new NameExpression($var, $node->getTemplateLine()));
6975

@@ -105,8 +111,6 @@ public function enterNode(Node $node, Environment $env): Node
105111
public function leaveNode(Node $node, Environment $env): ?Node
106112
{
107113
if ($node instanceof TransDefaultDomainNode) {
108-
--$this->nestingLevel;
109-
110114
return null;
111115
}
112116

0 commit comments

Comments
 (0)
0