Skip to content

Commit 1fddbb6

Browse files
committed
refac: replace AbstractNodeVisitor with NodeVisitorInterface
1 parent 9b7e961 commit 1fddbb6

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

Twig/Visitor/DefaultApplyingNodeVisitor.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
use Twig\Node\Expression\ConstantExpression;
2020
use Twig\Node\Expression\FilterExpression;
2121
use Twig\Node\Node;
22-
use Twig\NodeVisitor\AbstractNodeVisitor;
22+
use Twig\NodeVisitor\NodeVisitorInterface;
2323

2424
/**
2525
* Applies the value of the "desc" filter if the "trans" filter has no
@@ -29,7 +29,7 @@
2929
*
3030
* @author Johannes M. Schmitt <[email protected]>
3131
*/
32-
final class DefaultApplyingNodeVisitor extends AbstractNodeVisitor
32+
final class DefaultApplyingNodeVisitor implements NodeVisitorInterface
3333
{
3434
/**
3535
* @var bool
@@ -41,7 +41,7 @@ public function setEnabled(bool $bool): void
4141
$this->enabled = $bool;
4242
}
4343

44-
public function doEnterNode(Node $node, Environment $env): Node
44+
public function enterNode(Node $node, Environment $env): Node
4545
{
4646
if (!$this->enabled) {
4747
return $node;
@@ -114,7 +114,7 @@ public function doEnterNode(Node $node, Environment $env): Node
114114
return $node;
115115
}
116116

117-
public function doLeaveNode(Node $node, Environment $env): Node
117+
public function leaveNode(Node $node, Environment $env): Node
118118
{
119119
return $node;
120120
}

Twig/Visitor/NormalizingNodeVisitor.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
use Twig\Node\Expression\Binary\ConcatBinary;
1616
use Twig\Node\Expression\ConstantExpression;
1717
use Twig\Node\Node;
18-
use Twig\NodeVisitor\AbstractNodeVisitor;
18+
use Twig\NodeVisitor\NodeVisitorInterface;
1919

2020
/**
2121
* Performs equivalence transformations on the AST to ensure that
@@ -25,17 +25,17 @@
2525
*
2626
* @author Johannes M. Schmitt <[email protected]>
2727
*/
28-
final class NormalizingNodeVisitor extends AbstractNodeVisitor
28+
final class NormalizingNodeVisitor implements NodeVisitorInterface
2929
{
30-
protected function doEnterNode(Node $node, Environment $env): Node
30+
public function enterNode(Node $node, Environment $env): Node
3131
{
3232
return $node;
3333
}
3434

3535
/**
3636
* @return ConstantExpression|Node
3737
*/
38-
protected function doLeaveNode(Node $node, Environment $env): Node
38+
public function leaveNode(Node $node, Environment $env): Node
3939
{
4040
if ($node instanceof ConcatBinary
4141
&& ($left = $node->getNode('left')) instanceof ConstantExpression

Twig/Visitor/RemovingNodeVisitor.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@
1414
use Twig\Environment;
1515
use Twig\Node\Expression\FilterExpression;
1616
use Twig\Node\Node;
17-
use Twig\NodeVisitor\AbstractNodeVisitor;
17+
use Twig\NodeVisitor\NodeVisitorInterface;
1818

1919
/**
2020
* Removes translation metadata filters from the AST.
2121
*
2222
* @author Johannes M. Schmitt <[email protected]>
2323
*/
24-
final class RemovingNodeVisitor extends AbstractNodeVisitor
24+
final class RemovingNodeVisitor implements NodeVisitorInterface
2525
{
2626
/**
2727
* @var bool
@@ -33,7 +33,7 @@ public function setEnabled(bool $bool): void
3333
$this->enabled = $bool;
3434
}
3535

36-
protected function doEnterNode(Node $node, Environment $env): Node
36+
public function enterNode(Node $node, Environment $env): Node
3737
{
3838
if ($this->enabled && $node instanceof FilterExpression) {
3939
$name = $node->getNode('filter')->getAttribute('value');
@@ -46,7 +46,7 @@ protected function doEnterNode(Node $node, Environment $env): Node
4646
return $node;
4747
}
4848

49-
protected function doLeaveNode(Node $node, Environment $env): Node
49+
public function leaveNode(Node $node, Environment $env): Node
5050
{
5151
return $node;
5252
}

0 commit comments

Comments
 (0)