Merge pull request #587 from grossmannmartin/mg-nodevisitor

goetas · web-flow · commit 90d26b3bf435 · 2024-06-08T10:59:56.000+02:00
Removed usage of deprecated AbstractNodeVisitor
diff --git a/Translation/Extractor/File/TwigFileExtractor.php b/Translation/Extractor/File/TwigFileExtractor.php
@@ -31,9 +31,9 @@
 use Twig\Node\Expression\FilterExpression;
 use Twig\Node\Node;
 use Twig\NodeTraverser;
-use Twig\NodeVisitor\AbstractNodeVisitor;
+use Twig\NodeVisitor\NodeVisitorInterface;
 
-class TwigFileExtractor extends AbstractNodeVisitor implements FileVisitorInterface
+class TwigFileExtractor implements FileVisitorInterface, NodeVisitorInterface
 {
     /**
      * @var FileSourceFactory
@@ -66,10 +66,7 @@ public function __construct(Environment $env, FileSourceFactory $fileSourceFacto
         $this->traverser = new NodeTraverser($env, [$this]);
     }
 
-    /**
-     * @return Node
-     */
-    protected function doEnterNode(Node $node, Environment $env)
+    public function enterNode(Node $node, Environment $env): Node
     {
         $this->stack[] = $node;
 
@@ -145,10 +142,7 @@ protected function doEnterNode(Node $node, Environment $env)
         return $node;
     }
 
-    /**
-     * @return int
-     */
-    public function getPriority()
+    public function getPriority(): int
     {
         return 0;
     }
@@ -178,10 +172,7 @@ private function traverseEmbeddedTemplates(Node $node)
         }
     }
 
-    /**
-     * @return Node
-     */
-    protected function doLeaveNode(Node $node, Environment $env)
+    public function leaveNode(Node $node, Environment $env): Node
     {
         array_pop($this->stack);
 
diff --git a/Twig/DefaultApplyingNodeVisitor.php b/Twig/DefaultApplyingNodeVisitor.php
@@ -29,7 +29,7 @@
 use Twig\Node\Expression\ConstantExpression;
 use Twig\Node\Expression\FilterExpression;
 use Twig\Node\Node;
-use Twig\NodeVisitor\AbstractNodeVisitor;
+use Twig\NodeVisitor\NodeVisitorInterface;
 
 /**
  * Applies the value of the "desc" filter if the "trans" filter has no
@@ -39,7 +39,7 @@
  *
  * @author Johannes M. Schmitt <schmittjoh@gmail.com>
  */
-class DefaultApplyingNodeVisitor extends AbstractNodeVisitor
+class DefaultApplyingNodeVisitor implements NodeVisitorInterface
 {
     /**
      * @var bool
@@ -51,10 +51,7 @@ public function setEnabled($bool)
         $this->enabled = (bool) $bool;
     }
 
-    /**
-     * @return Node
-     */
-    public function doEnterNode(Node $node, Environment $env)
+    public function enterNode(Node $node, Environment $env): Node
     {
         if (!$this->enabled) {
             return $node;
@@ -133,18 +130,12 @@ public function doEnterNode(Node $node, Environment $env)
         return $node;
     }
 
-    /**
-     * @return Node
-     */
-    public function doLeaveNode(Node $node, Environment $env)
+    public function leaveNode(Node $node, Environment $env): Node
     {
         return $node;
     }
 
-    /**
-     * @return int
-     */
-    public function getPriority()
+    public function getPriority(): int
     {
         return -2;
     }
diff --git a/Twig/NormalizingNodeVisitor.php b/Twig/NormalizingNodeVisitor.php
@@ -24,7 +24,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
@@ -34,20 +34,14 @@
  *
  * @author Johannes M. Schmitt <schmittjoh@gmail.com>
  */
-class NormalizingNodeVisitor extends AbstractNodeVisitor
+class NormalizingNodeVisitor implements NodeVisitorInterface
 {
-    /**
-     * @return Node
-     */
-    protected function doEnterNode(Node $node, Environment $env)
+    public function enterNode(Node $node, Environment $env): Node
     {
         return $node;
     }
 
-    /**
-     * @return ConstantExpression|Node
-     */
-    protected function doLeaveNode(Node $node, Environment $env)
+    public function leaveNode(Node $node, Environment $env): Node
     {
         if (
             $node instanceof ConcatBinary
@@ -60,10 +54,7 @@ protected function doLeaveNode(Node $node, Environment $env)
         return $node;
     }
 
-    /**
-     * @return int
-     */
-    public function getPriority()
+    public function getPriority(): int
     {
         return -3;
     }
diff --git a/Twig/RemovingNodeVisitor.php b/Twig/RemovingNodeVisitor.php
@@ -23,14 +23,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 <schmittjoh@gmail.com>
  */
-class RemovingNodeVisitor extends AbstractNodeVisitor
+class RemovingNodeVisitor implements NodeVisitorInterface
 {
     /**
      * @var bool
@@ -42,10 +42,7 @@ public function setEnabled($bool)
         $this->enabled = (bool) $bool;
     }
 
-    /**
-     * @return Node
-     */
-    protected function doEnterNode(Node $node, Environment $env)
+    public function enterNode(Node $node, Environment $env): Node
     {
         if ($this->enabled && $node instanceof FilterExpression) {
             $name = $node->getNode('filter')->getAttribute('value');
@@ -58,18 +55,12 @@ protected function doEnterNode(Node $node, Environment $env)
         return $node;
     }
 
-    /**
-     * @return Node
-     */
-    protected function doLeaveNode(Node $node, Environment $env)
+    public function leaveNode(Node $node, Environment $env): Node
     {
         return $node;
     }
 
-    /**
-     * @return int
-     */
-    public function getPriority()
+    public function getPriority(): int
     {
         return -1;
     }
diff --git a/composer.json b/composer.json
@@ -30,7 +30,7 @@
         "symfony/translation": "^4.3 || ^5.4 || ^6.0",
         "symfony/translation-contracts": "^1.1 || ^2.0 || ^3.0",
         "symfony/validator": "^4.3 || ^5.4 || ^6.0",
-        "twig/twig": "^1.42.4 || ^2.12.5 || ^3.0",
+        "twig/twig": "^2.13.1 || ^3.0",
         "psr/log": "^1.0 || ^2.0"
     },
     "require-dev": {

Original file line number	Diff line number	Diff line change
`@@ -31,9 +31,9 @@`
`31`	`31`	`use Twig\Node\Expression\FilterExpression;`
`32`	`32`	`use Twig\Node\Node;`
`33`	`33`	`use Twig\NodeTraverser;`
`34`		`-use Twig\NodeVisitor\AbstractNodeVisitor;`
	`34`	`+use Twig\NodeVisitor\NodeVisitorInterface;`
`35`	`35`
`36`		`-class TwigFileExtractor extends AbstractNodeVisitor implements FileVisitorInterface`
	`36`	`+class TwigFileExtractor implements FileVisitorInterface, NodeVisitorInterface`
`37`	`37`	`{`
`38`	`38`	`/**`
`39`	`39`	`* @var FileSourceFactory`
`@@ -66,10 +66,7 @@ public function __construct(Environment $env, FileSourceFactory $fileSourceFacto`
`66`	`66`	`$this->traverser = new NodeTraverser($env, [$this]);`
`67`	`67`	`}`
`68`	`68`
`69`		`- /**`
`70`		`- * @return Node`
`71`		`- */`
`72`		`- protected function doEnterNode(Node $node, Environment $env)`
	`69`	`+ public function enterNode(Node $node, Environment $env): Node`
`73`	`70`	`{`
`74`	`71`	`$this->stack[] = $node;`
`75`	`72`
`@@ -145,10 +142,7 @@ protected function doEnterNode(Node $node, Environment $env)`
`145`	`142`	`return $node;`
`146`	`143`	`}`
`147`	`144`
`148`		`- /**`
`149`		`- * @return int`
`150`		`- */`
`151`		`- public function getPriority()`
	`145`	`+ public function getPriority(): int`
`152`	`146`	`{`
`153`	`147`	`return 0;`
`154`	`148`	`}`
`@@ -178,10 +172,7 @@ private function traverseEmbeddedTemplates(Node $node)`
`178`	`172`	`}`
`179`	`173`	`}`
`180`	`174`
`181`		`- /**`
`182`		`- * @return Node`
`183`		`- */`
`184`		`- protected function doLeaveNode(Node $node, Environment $env)`
	`175`	`+ public function leaveNode(Node $node, Environment $env): Node`
`185`	`176`	`{`
`186`	`177`	`array_pop($this->stack);`
`187`	`178`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@`
`29`	`29`	`use Twig\Node\Expression\ConstantExpression;`
`30`	`30`	`use Twig\Node\Expression\FilterExpression;`
`31`	`31`	`use Twig\Node\Node;`
`32`		`-use Twig\NodeVisitor\AbstractNodeVisitor;`
	`32`	`+use Twig\NodeVisitor\NodeVisitorInterface;`
`33`	`33`
`34`	`34`	`/**`
`35`	`35`	`* Applies the value of the "desc" filter if the "trans" filter has no`
`@@ -39,7 +39,7 @@`
`39`	`39`	`*`
`40`	`40`	`* @author Johannes M. Schmitt <[email protected]>`
`41`	`41`	`*/`
`42`		`-class DefaultApplyingNodeVisitor extends AbstractNodeVisitor`
	`42`	`+class DefaultApplyingNodeVisitor implements NodeVisitorInterface`
`43`	`43`	`{`
`44`	`44`	`/**`
`45`	`45`	`* @var bool`
`@@ -51,10 +51,7 @@ public function setEnabled($bool)`
`51`	`51`	`$this->enabled = (bool) $bool;`
`52`	`52`	`}`
`53`	`53`
`54`		`- /**`
`55`		`- * @return Node`
`56`		`- */`
`57`		`- public function doEnterNode(Node $node, Environment $env)`
	`54`	`+ public function enterNode(Node $node, Environment $env): Node`
`58`	`55`	`{`
`59`	`56`	`if (!$this->enabled) {`
`60`	`57`	`return $node;`
`@@ -133,18 +130,12 @@ public function doEnterNode(Node $node, Environment $env)`
`133`	`130`	`return $node;`
`134`	`131`	`}`
`135`	`132`
`136`		`- /**`
`137`		`- * @return Node`
`138`		`- */`
`139`		`- public function doLeaveNode(Node $node, Environment $env)`
	`133`	`+ public function leaveNode(Node $node, Environment $env): Node`
`140`	`134`	`{`
`141`	`135`	`return $node;`
`142`	`136`	`}`
`143`	`137`
`144`		`- /**`
`145`		`- * @return int`
`146`		`- */`
`147`		`- public function getPriority()`
	`138`	`+ public function getPriority(): int`
`148`	`139`	`{`
`149`	`140`	`return -2;`
`150`	`141`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`use Twig\Node\Expression\Binary\ConcatBinary;`
`25`	`25`	`use Twig\Node\Expression\ConstantExpression;`
`26`	`26`	`use Twig\Node\Node;`
`27`		`-use Twig\NodeVisitor\AbstractNodeVisitor;`
	`27`	`+use Twig\NodeVisitor\NodeVisitorInterface;`
`28`	`28`
`29`	`29`	`/**`
`30`	`30`	`* Performs equivalence transformations on the AST to ensure that`
`@@ -34,20 +34,14 @@`
`34`	`34`	`*`
`35`	`35`	`* @author Johannes M. Schmitt <[email protected]>`
`36`	`36`	`*/`
`37`		`-class NormalizingNodeVisitor extends AbstractNodeVisitor`
	`37`	`+class NormalizingNodeVisitor implements NodeVisitorInterface`
`38`	`38`	`{`
`39`		`- /**`
`40`		`- * @return Node`
`41`		`- */`
`42`		`- protected function doEnterNode(Node $node, Environment $env)`
	`39`	`+ public function enterNode(Node $node, Environment $env): Node`
`43`	`40`	`{`
`44`	`41`	`return $node;`
`45`	`42`	`}`
`46`	`43`
`47`		`- /**`
`48`		`- * @return ConstantExpression\|Node`
`49`		`- */`
`50`		`- protected function doLeaveNode(Node $node, Environment $env)`
	`44`	`+ public function leaveNode(Node $node, Environment $env): Node`
`51`	`45`	`{`
`52`	`46`	`if (`
`53`	`47`	`$node instanceof ConcatBinary`
`@@ -60,10 +54,7 @@ protected function doLeaveNode(Node $node, Environment $env)`
`60`	`54`	`return $node;`
`61`	`55`	`}`
`62`	`56`
`63`		`- /**`
`64`		`- * @return int`
`65`		`- */`
`66`		`- public function getPriority()`
	`57`	`+ public function getPriority(): int`
`67`	`58`	`{`
`68`	`59`	`return -3;`
`69`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,14 +23,14 @@`
`23`	`23`	`use Twig\Environment;`
`24`	`24`	`use Twig\Node\Expression\FilterExpression;`
`25`	`25`	`use Twig\Node\Node;`
`26`		`-use Twig\NodeVisitor\AbstractNodeVisitor;`
	`26`	`+use Twig\NodeVisitor\NodeVisitorInterface;`
`27`	`27`
`28`	`28`	`/**`
`29`	`29`	`* Removes translation metadata filters from the AST.`
`30`	`30`	`*`
`31`	`31`	`* @author Johannes M. Schmitt <[email protected]>`
`32`	`32`	`*/`
`33`		`-class RemovingNodeVisitor extends AbstractNodeVisitor`
	`33`	`+class RemovingNodeVisitor implements NodeVisitorInterface`
`34`	`34`	`{`
`35`	`35`	`/**`
`36`	`36`	`* @var bool`
`@@ -42,10 +42,7 @@ public function setEnabled($bool)`
`42`	`42`	`$this->enabled = (bool) $bool;`
`43`	`43`	`}`
`44`	`44`
`45`		`- /**`
`46`		`- * @return Node`
`47`		`- */`
`48`		`- protected function doEnterNode(Node $node, Environment $env)`
	`45`	`+ public function enterNode(Node $node, Environment $env): Node`
`49`	`46`	`{`
`50`	`47`	`if ($this->enabled && $node instanceof FilterExpression) {`
`51`	`48`	`$name = $node->getNode('filter')->getAttribute('value');`
`@@ -58,18 +55,12 @@ protected function doEnterNode(Node $node, Environment $env)`
`58`	`55`	`return $node;`
`59`	`56`	`}`
`60`	`57`
`61`		`- /**`
`62`		`- * @return Node`
`63`		`- */`
`64`		`- protected function doLeaveNode(Node $node, Environment $env)`
	`58`	`+ public function leaveNode(Node $node, Environment $env): Node`
`65`	`59`	`{`
`66`	`60`	`return $node;`
`67`	`61`	`}`
`68`	`62`
`69`		`- /**`
`70`		`- * @return int`
`71`		`- */`
`72`		`- public function getPriority()`
	`63`	`+ public function getPriority(): int`
`73`	`64`	`{`
`74`	`65`	`return -1;`
`75`	`66`	`}`