Refactor BetterNodeFinder::findFirstInFunctionLikeScoped() to work wi…

…th SilentVoidResolver (#4931) * Refactor findFirstInFunctionLikeScoped * Fix
rectorphp · Sep 7, 2023 · fa28385 · staabm · Sep 7, 2023 · samsonasik
1 parent 54799fc
commit fa28385
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/rules/TypeDeclaration/TypeInferer/SilentVoidResolver.php b/rules/TypeDeclaration/TypeInferer/SilentVoidResolver.php
@@ -41,14 +41,11 @@ public function hasExclusiveVoid(ClassMethod | Closure | Function_ $functionLike
             return false;
         }
 
-        $returns = $this->betterNodeFinder->findInstancesOfInFunctionLikeScoped($functionLike, Return_::class);
-        foreach ($returns as $return) {
-            if ($return->expr instanceof Expr) {
-                return false;
-            }
-        }
-
-        return true;
+        $return = $this->betterNodeFinder->findFirstInFunctionLikeScoped(
+            $functionLike,
+            static fn (Node $node): bool => $node instanceof Return_ && $node->expr instanceof Expr
+        );
+        return ! $return instanceof Return_;
     }
 
     public function hasSilentVoid(FunctionLike $functionLike): bool

diff --git a/src/PhpParser/Node/BetterNodeFinder.php b/src/PhpParser/Node/BetterNodeFinder.php
@@ -246,7 +246,7 @@ public function findFirstInFunctionLikeScoped(
         $scopedNode = null;
         $this->simpleCallableNodeTraverser->traverseNodesWithCallable(
             $functionLike->stmts,
-            static function (Node $subNode) use (&$scopedNode, $foundNode): ?int {
+            function (Node $subNode) use (&$scopedNode, $foundNode, $filter): ?int {
                 if ($subNode instanceof Class_ || $subNode instanceof Function_ || $subNode instanceof Closure) {
                     if ($foundNode instanceof $subNode && $subNode === $foundNode) {
                         $scopedNode = $subNode;
@@ -256,7 +256,14 @@ static function (Node $subNode) use (&$scopedNode, $foundNode): ?int {
                     return NodeTraverser::DONT_TRAVERSE_CURRENT_AND_CHILDREN;
                 }
 
-                if ($foundNode instanceof $subNode && $subNode === $foundNode) {
+                if (! $foundNode instanceof $subNode) {
+                    return null;
+                }
+
+                // handle after Closure
+                // @see https://github.com/rectorphp/rector-src/pull/4931
+                $scopedFoundNode = $this->findFirst($subNode, $filter);
+                if ($scopedFoundNode === $subNode) {
                     $scopedNode = $subNode;
                     return NodeTraverser::STOP_TRAVERSAL;
                 }