Remove Twig deprecations

Author: ZZromanZZ

Diff for: Twig/Visitor/DefaultApplyingNodeVisitor.php

@@ -20,9 +20,7 @@
 use Twig\Node\Expression\FilterExpression;
 use Twig\Node\Expression\Ternary\ConditionalTernary;
 use Twig\Node\Node;
-use Twig\Node\Nodes;
-use Twig\NodeVisitor\AbstractNodeVisitor;
-use Twig\TwigFilter;
+use Twig\NodeVisitor\NodeVisitorInterface;
 
 /**
  * Applies the value of the "desc" filter if the "trans" filter has no
@@ -32,7 +30,7 @@
  *
  * @author Johannes M. Schmitt <[email protected]>
  */
-final class DefaultApplyingNodeVisitor extends AbstractNodeVisitor
+final class DefaultApplyingNodeVisitor implements NodeVisitorInterface
 {
     /**
      * @var bool
@@ -50,14 +48,14 @@ public function doEnterNode(Node $node, Environment $env): Node
             return $node;
         }
 
-        if (!($node instanceof FilterExpression && 'desc' === $node->getNode('filter')->getAttribute('value'))) {
+        if (!($node instanceof FilterExpression && 'desc' === $node->getAttribute('twig_callable')->getName())) {
             return $node;
         }
 
         $transNode = $node->getNode('node');
         while ($transNode instanceof FilterExpression
-                   && 'trans' !== $transNode->getNode('filter')->getAttribute('value')
-                   && 'transchoice' !== $transNode->getNode('filter')->getAttribute('value')) {
+                   && 'trans' !== $transNode->getAttribute('twig_callable')->getName()
+                   && 'transchoice' !== $transNode->getAttribute('twig_callable')->getName()) {
             $transNode = $transNode->getNode('node');
         }
 
@@ -72,7 +70,7 @@ public function doEnterNode(Node $node, Environment $env): Node
         // if the |transchoice filter is used, delegate the call to the TranslationExtension
         // so that we can catch a possible exception when the default translation has not yet
         // been extracted
-        if ('transchoice' === $transNode->getNode('filter')->getAttribute('value')) {
+        if ('transchoice' === $transNode->getAttribute('twig_callable')->getName()) {
             $transchoiceArguments = new ArrayExpression([], $transNode->getTemplateLine());
             $transchoiceArguments->addElement($wrappingNode->getNode('node'));
             $transchoiceArguments->addElement($defaultNode);
@@ -150,4 +148,15 @@ public function getPriority(): int
     {
         return -2;
     }
+
+    public function enterNode(Node $node, Environment $env): Node
+    {
+        return $this->doEnterNode($node, $env);
+    }
+
+    public function leaveNode(Node $node, Environment $env): ?Node
+    {
+        return $this->doLeaveNode($node, $env);
+    }
+
 }

Diff for: Twig/Visitor/RemovingNodeVisitor.php

@@ -14,14 +14,14 @@
 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
@@ -36,7 +36,7 @@ public function setEnabled(bool $bool): void
     protected function doEnterNode(Node $node, Environment $env): Node
     {
         if ($this->enabled && $node instanceof FilterExpression) {
-            $name = $node->getNode('filter')->getAttribute('value');
+            $name = $node->getAttribute('twig_callable')->getName();
 
             if ('desc' === $name || 'meaning' === $name) {
                 return $this->enterNode($node->getNode('node'), $env);
@@ -55,4 +55,15 @@ public function getPriority(): int
     {
         return -1;
     }
+
+    public function enterNode(Node $node, Environment $env): Node
+    {
+        return $this->doEnterNode($node, $env);
+    }
+
+    public function leaveNode(Node $node, Environment $env): ?Node
+    {
+        return $this->doLeaveNode($node, $env);
+    }
+
 }