fix

samsonasik · samsonasik · commit fed18928a201 · 2024-11-20T00:16:36.000+07:00
diff --git a/rules/DowngradePhp73/Rector/ConstFetch/DowngradePhp73JsonConstRector.php b/rules/DowngradePhp73/Rector/ConstFetch/DowngradePhp73JsonConstRector.php
@@ -4,6 +4,7 @@
 
 namespace Rector\DowngradePhp73\Rector\ConstFetch;
 
+use PhpParser\NodeVisitor;
 use PhpParser\Node;
 use PhpParser\Node\Arg;
 use PhpParser\Node\Expr;
@@ -23,7 +24,6 @@
 use PhpParser\Node\Stmt\Throw_;
 use PhpParser\Node\Stmt\TryCatch;
 use PhpParser\Node\VariadicPlaceholder;
-use PhpParser\NodeTraverser;
 use Rector\DowngradePhp72\NodeManipulator\JsonConstCleaner;
 use Rector\Enum\JsonConstant;
 use Rector\NodeAnalyzer\DefineFuncCallAnalyzer;
@@ -120,7 +120,7 @@ public function refactor(Node $node): int|null|Expr|If_|array
                 $node->stmts,
                 function (Node $subNode): ?int {
                     if ($subNode instanceof Class_ || $subNode instanceof Function_ || $subNode instanceof Closure) {
-                        return NodeTraverser::DONT_TRAVERSE_CURRENT_AND_CHILDREN;
+                        return NodeVisitor::DONT_TRAVERSE_CURRENT_AND_CHILDREN;
                     }
 
                     if (! $subNode instanceof Expression) {
diff --git a/rules/DowngradePhp74/Rector/ArrowFunction/ArrowFunctionToAnonymousFunctionRector.php b/rules/DowngradePhp74/Rector/ArrowFunction/ArrowFunctionToAnonymousFunctionRector.php
@@ -4,6 +4,7 @@
 
 namespace Rector\DowngradePhp74\Rector\ArrowFunction;
 
+use PhpParser\Node\Expr\Throw_;
 use PhpParser\Node;
 use PhpParser\Node\ClosureUse;
 use PhpParser\Node\Expr;
diff --git a/rules/DowngradePhp80/Rector/Expression/DowngradeMatchToSwitchRector.php b/rules/DowngradePhp80/Rector/Expression/DowngradeMatchToSwitchRector.php
@@ -4,6 +4,7 @@
 
 namespace Rector\DowngradePhp80\Rector\Expression;
 
+use PhpParser\NodeVisitor;
 use PhpParser\Node;
 use PhpParser\Node\Arg;
 use PhpParser\Node\ArrayItem;
@@ -25,7 +26,6 @@
 use PhpParser\Node\Stmt\Expression;
 use PhpParser\Node\Stmt\Return_;
 use PhpParser\Node\Stmt\Switch_;
-use PhpParser\NodeTraverser;
 use PHPStan\Analyser\Scope;
 use Rector\NodeTypeResolver\Node\AttributeKey;
 use Rector\Php72\NodeFactory\AnonymousFunctionFactory;
@@ -120,7 +120,7 @@ function (Node $subNode) use ($node, &$match, &$hasChanged, $scope) {
                     $subNode->value = new FuncCall($this->anonymousFunctionFactory->create([], [$switch], null));
 
                     $hasChanged = true;
-                    return NodeTraverser::DONT_TRAVERSE_CURRENT_AND_CHILDREN;
+                    return NodeVisitor::DONT_TRAVERSE_CURRENT_AND_CHILDREN;
                 }
 
                 if ($subNode instanceof Arg && $subNode->value instanceof ArrowFunction && $subNode->value->expr instanceof Match_) {
@@ -129,7 +129,7 @@ function (Node $subNode) use ($node, &$match, &$hasChanged, $scope) {
                         $hasChanged = true;
                     }
 
-                    return NodeTraverser::DONT_TRAVERSE_CURRENT_AND_CHILDREN;
+                    return NodeVisitor::DONT_TRAVERSE_CURRENT_AND_CHILDREN;
                 }
 
                 if ($subNode instanceof Assign && $subNode->expr instanceof ArrowFunction && $subNode->expr->expr instanceof Match_) {
@@ -138,7 +138,7 @@ function (Node $subNode) use ($node, &$match, &$hasChanged, $scope) {
                         $hasChanged = true;
                     }
 
-                    return NodeTraverser::DONT_TRAVERSE_CURRENT_AND_CHILDREN;
+                    return NodeVisitor::DONT_TRAVERSE_CURRENT_AND_CHILDREN;
                 }
 
                 if ($subNode instanceof Expression && $subNode->expr instanceof ArrowFunction && $subNode->expr->expr instanceof Match_) {
@@ -147,7 +147,7 @@ function (Node $subNode) use ($node, &$match, &$hasChanged, $scope) {
                         $hasChanged = true;
                     }
 
-                    return NodeTraverser::DONT_TRAVERSE_CURRENT_AND_CHILDREN;
+                    return NodeVisitor::DONT_TRAVERSE_CURRENT_AND_CHILDREN;
                 }
 
                 if ($subNode instanceof Return_ && $subNode->expr instanceof ArrowFunction && $subNode->expr->expr instanceof Match_) {
@@ -156,7 +156,7 @@ function (Node $subNode) use ($node, &$match, &$hasChanged, $scope) {
                         $hasChanged = true;
                     }
 
-                    return NodeTraverser::DONT_TRAVERSE_CURRENT_AND_CHILDREN;
+                    return NodeVisitor::DONT_TRAVERSE_CURRENT_AND_CHILDREN;
                 }
 
                 if ($subNode instanceof FuncCall && $subNode->name instanceof ArrowFunction && $subNode->name->expr instanceof Match_) {
@@ -165,12 +165,12 @@ function (Node $subNode) use ($node, &$match, &$hasChanged, $scope) {
                         $hasChanged = true;
                     }
 
-                    return NodeTraverser::DONT_TRAVERSE_CURRENT_AND_CHILDREN;
+                    return NodeVisitor::DONT_TRAVERSE_CURRENT_AND_CHILDREN;
                 }
 
                 if ($subNode instanceof Match_) {
                     $match = $subNode;
-                    return NodeTraverser::STOP_TRAVERSAL;
+                    return NodeVisitor::STOP_TRAVERSAL;
                 }
             }
         );

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`
`5`	`5`	`namespace Rector\DowngradePhp80\Rector\Expression;`
`6`	`6`
	`7`	`+use PhpParser\NodeVisitor;`
`7`	`8`	`use PhpParser\Node;`
`8`	`9`	`use PhpParser\Node\Arg;`
`9`	`10`	`use PhpParser\Node\ArrayItem;`
`@@ -25,7 +26,6 @@`
`25`	`26`	`use PhpParser\Node\Stmt\Expression;`
`26`	`27`	`use PhpParser\Node\Stmt\Return_;`
`27`	`28`	`use PhpParser\Node\Stmt\Switch_;`
`28`		`-use PhpParser\NodeTraverser;`
`29`	`29`	`use PHPStan\Analyser\Scope;`
`30`	`30`	`use Rector\NodeTypeResolver\Node\AttributeKey;`
`31`	`31`	`use Rector\Php72\NodeFactory\AnonymousFunctionFactory;`
`@@ -120,7 +120,7 @@ function (Node $subNode) use ($node, &$match, &$hasChanged, $scope) {`
`120`	`120`	`$subNode->value = new FuncCall($this->anonymousFunctionFactory->create([], [$switch], null));`
`121`	`121`
`122`	`122`	`$hasChanged = true;`
`123`		`- return NodeTraverser::DONT_TRAVERSE_CURRENT_AND_CHILDREN;`
	`123`	`+ return NodeVisitor::DONT_TRAVERSE_CURRENT_AND_CHILDREN;`
`124`	`124`	`}`
`125`	`125`
`126`	`126`	`if ($subNode instanceof Arg && $subNode->value instanceof ArrowFunction && $subNode->value->expr instanceof Match_) {`
`@@ -129,7 +129,7 @@ function (Node $subNode) use ($node, &$match, &$hasChanged, $scope) {`
`129`	`129`	`$hasChanged = true;`
`130`	`130`	`}`
`131`	`131`
`132`		`- return NodeTraverser::DONT_TRAVERSE_CURRENT_AND_CHILDREN;`
	`132`	`+ return NodeVisitor::DONT_TRAVERSE_CURRENT_AND_CHILDREN;`
`133`	`133`	`}`
`134`	`134`
`135`	`135`	`if ($subNode instanceof Assign && $subNode->expr instanceof ArrowFunction && $subNode->expr->expr instanceof Match_) {`
`@@ -138,7 +138,7 @@ function (Node $subNode) use ($node, &$match, &$hasChanged, $scope) {`
`138`	`138`	`$hasChanged = true;`
`139`	`139`	`}`
`140`	`140`
`141`		`- return NodeTraverser::DONT_TRAVERSE_CURRENT_AND_CHILDREN;`
	`141`	`+ return NodeVisitor::DONT_TRAVERSE_CURRENT_AND_CHILDREN;`
`142`	`142`	`}`
`143`	`143`
`144`	`144`	`if ($subNode instanceof Expression && $subNode->expr instanceof ArrowFunction && $subNode->expr->expr instanceof Match_) {`
`@@ -147,7 +147,7 @@ function (Node $subNode) use ($node, &$match, &$hasChanged, $scope) {`
`147`	`147`	`$hasChanged = true;`
`148`	`148`	`}`
`149`	`149`
`150`		`- return NodeTraverser::DONT_TRAVERSE_CURRENT_AND_CHILDREN;`
	`150`	`+ return NodeVisitor::DONT_TRAVERSE_CURRENT_AND_CHILDREN;`
`151`	`151`	`}`
`152`	`152`
`153`	`153`	`if ($subNode instanceof Return_ && $subNode->expr instanceof ArrowFunction && $subNode->expr->expr instanceof Match_) {`
`@@ -156,7 +156,7 @@ function (Node $subNode) use ($node, &$match, &$hasChanged, $scope) {`
`156`	`156`	`$hasChanged = true;`
`157`	`157`	`}`
`158`	`158`
`159`		`- return NodeTraverser::DONT_TRAVERSE_CURRENT_AND_CHILDREN;`
	`159`	`+ return NodeVisitor::DONT_TRAVERSE_CURRENT_AND_CHILDREN;`
`160`	`160`	`}`
`161`	`161`
`162`	`162`	`if ($subNode instanceof FuncCall && $subNode->name instanceof ArrowFunction && $subNode->name->expr instanceof Match_) {`
`@@ -165,12 +165,12 @@ function (Node $subNode) use ($node, &$match, &$hasChanged, $scope) {`
`165`	`165`	`$hasChanged = true;`
`166`	`166`	`}`
`167`	`167`
`168`		`- return NodeTraverser::DONT_TRAVERSE_CURRENT_AND_CHILDREN;`
	`168`	`+ return NodeVisitor::DONT_TRAVERSE_CURRENT_AND_CHILDREN;`
`169`	`169`	`}`
`170`	`170`
`171`	`171`	`if ($subNode instanceof Match_) {`
`172`	`172`	`$match = $subNode;`
`173`		`- return NodeTraverser::STOP_TRAVERSAL;`
	`173`	`+ return NodeVisitor::STOP_TRAVERSAL;`
`174`	`174`	`}`
`175`	`175`	`}`
`176`	`176`	`);`