Skip to content

Commit ef3dbab

Browse files
committed
minor #4481 Simplify code even more (fabpot)
This PR was merged into the 3.x branch. Discussion ---------- Simplify code even more More simplifications Commits ------- 2337c7f Simplify code even more
2 parents ae82e8b + 2337c7f commit ef3dbab

File tree

1 file changed

+7
-11
lines changed

1 file changed

+7
-11
lines changed

src/NodeVisitor/EscaperNodeVisitor.php

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public function leaveNode(Node $node, Environment $env): ?Node
7676
} elseif ($node instanceof PrintNode && false !== $type = $this->needEscaping()) {
7777
$expression = $node->getNode('expr');
7878
if ($expression instanceof ConditionalExpression) {
79-
$node->setNode('expr', $this->escapeConditional($expression, $env, $type));
79+
$this->escapeConditional($expression, $env, $type);
8080
} else {
8181
$node->setNode('expr', $this->escapeExpression($expression, $env, $type));
8282
}
@@ -93,27 +93,23 @@ public function leaveNode(Node $node, Environment $env): ?Node
9393
return $node;
9494
}
9595

96-
private function escapeConditional(ConditionalExpression $expression, Environment $env, string $type): ConditionalExpression
96+
private function escapeConditional(ConditionalExpression $expression, Environment $env, string $type): void
9797
{
9898
/** @var AbstractExpression $expr2 */
9999
$expr2 = $expression->getNode('expr2');
100100
if ($expr2 instanceof ConditionalExpression) {
101-
$expr2 = $this->escapeConditional($expr2, $env, $type);
101+
$this->escapeConditional($expr2, $env, $type);
102102
} else {
103-
$expr2 = $this->escapeExpression($expr2, $env, $type);
103+
$expression->setNode('expr2', $this->escapeExpression($expr2, $env, $type));
104104
}
105+
105106
/** @var AbstractExpression $expr3 */
106107
$expr3 = $expression->getNode('expr3');
107108
if ($expr3 instanceof ConditionalExpression) {
108-
$expr3 = $this->escapeConditional($expr3, $env, $type);
109+
$this->escapeConditional($expr3, $env, $type);
109110
} else {
110-
$expr3 = $this->escapeExpression($expr3, $env, $type);
111+
$expression->setNode('expr3', $this->escapeExpression($expr3, $env, $type));
111112
}
112-
113-
/** @var AbstractExpression $expr1 */
114-
$expr1 = $expression->getNode('expr1');
115-
116-
return new ConditionalExpression($expr1, $expr2, $expr3, $expression->getTemplateLine());
117113
}
118114

119115
private function escapeExpression(AbstractExpression $expression, Environment $env, string $type): AbstractExpression

0 commit comments

Comments
 (0)