refac: replace AbstractNodeVisitor with NodeVisitorInterface

Author: gimler

Diff for: Twig/Visitor/DefaultApplyingNodeVisitor.php

@@ -21,7 +21,7 @@
 use Twig\Node\Expression\Ternary\ConditionalTernary;
 use Twig\Node\Node;
 use Twig\Node\Nodes;
-use Twig\NodeVisitor\AbstractNodeVisitor;
+use Twig\NodeVisitor\NodeVisitorInterface;
 use Twig\TwigFilter;
 
 /**
@@ -32,19 +32,16 @@
  *
  * @author Johannes M. Schmitt <[email protected]>
  */
-final class DefaultApplyingNodeVisitor extends AbstractNodeVisitor
+final class DefaultApplyingNodeVisitor implements NodeVisitorInterface
 {
-    /**
-     * @var bool
-     */
-    private $enabled = true;
+    private bool $enabled = true;
 
     public function setEnabled(bool $bool): void
     {
         $this->enabled = $bool;
     }
 
-    public function doEnterNode(Node $node, Environment $env): Node
+    public function enterNode(Node $node, Environment $env): Node
     {
         if (!$this->enabled) {
             return $node;
@@ -141,7 +138,7 @@ public function doEnterNode(Node $node, Environment $env): Node
         return $node;
     }
 
-    public function doLeaveNode(Node $node, Environment $env): Node
+    public function leaveNode(Node $node, Environment $env): Node
     {
         return $node;
     }

Diff for: Twig/Visitor/NormalizingNodeVisitor.php

@@ -15,7 +15,7 @@
 use Twig\Node\Expression\Binary\ConcatBinary;
 use Twig\Node\Expression\ConstantExpression;
 use Twig\Node\Node;
-use Twig\NodeVisitor\AbstractNodeVisitor;
+use Twig\NodeVisitor\NodeVisitorInterface;
 
 /**
  * Performs equivalence transformations on the AST to ensure that
@@ -25,17 +25,14 @@
  *
  * @author Johannes M. Schmitt <[email protected]>
  */
-final class NormalizingNodeVisitor extends AbstractNodeVisitor
+final class NormalizingNodeVisitor implements NodeVisitorInterface
 {
-    protected function doEnterNode(Node $node, Environment $env): Node
+    public function enterNode(Node $node, Environment $env): Node
     {
         return $node;
     }
 
-    /**
-     * @return ConstantExpression|Node
-     */
-    protected function doLeaveNode(Node $node, Environment $env): Node
+    public function leaveNode(Node $node, Environment $env): ConstantExpression|Node
     {
         if ($node instanceof ConcatBinary
             && ($left = $node->getNode('left')) instanceof ConstantExpression

Diff for: Twig/Visitor/RemovingNodeVisitor.php

@@ -14,26 +14,23 @@
 use Twig\Environment;
 use Twig\Node\Expression\FilterExpression;
 use Twig\Node\Node;
-use Twig\NodeVisitor\AbstractNodeVisitor;
+use Twig\NodeVisitor\NodeVisitorInterface;
 
 /**
  * Removes translation metadata filters from the AST.
  *
  * @author Johannes M. Schmitt <[email protected]>
  */
-final class RemovingNodeVisitor extends AbstractNodeVisitor
+final class RemovingNodeVisitor implements NodeVisitorInterface
 {
-    /**
-     * @var bool
-     */
-    private $enabled = true;
+    private bool $enabled = true;
 
     public function setEnabled(bool $bool): void
     {
         $this->enabled = $bool;
     }
 
-    protected function doEnterNode(Node $node, Environment $env): Node
+    public function enterNode(Node $node, Environment $env): Node
     {
         if ($this->enabled && $node instanceof FilterExpression) {
             $name = $node->getNode('filter')->getAttribute('value');
@@ -46,7 +43,7 @@ protected function doEnterNode(Node $node, Environment $env): Node
         return $node;
     }
 
-    protected function doLeaveNode(Node $node, Environment $env): Node
+    public function leaveNode(Node $node, Environment $env): Node
     {
         return $node;
     }