Faster SilentVoidResolver (#4923)

rectorphp · Sep 6, 2023 · 15e9249 · 15e9249
1 parent c171814
commit 15e9249
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/rules/TypeDeclaration/TypeInferer/SilentVoidResolver.php b/rules/TypeDeclaration/TypeInferer/SilentVoidResolver.php
@@ -4,6 +4,7 @@
 
 namespace Rector\TypeDeclaration\TypeInferer;
 
+use PhpParser\Node;
 use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\ArrowFunction;
 use PhpParser\Node\Expr\Closure;
@@ -21,6 +22,7 @@
 use Rector\Core\PhpParser\Node\BetterNodeFinder;
 use Rector\Core\Reflection\ReflectionResolver;
 
+
 final class SilentVoidResolver
 {
     public function __construct(
@@ -44,15 +46,14 @@ public function hasExclusiveVoid(ClassMethod | Closure | Function_ $functionLike
             return false;
         }
 
-        /** @var Return_[] $returns */
-        $returns = $this->betterNodeFinder->findInstancesOfInFunctionLikeScoped($functionLike, Return_::class);
-        foreach ($returns as $return) {
-            if ($return->expr instanceof Expr) {
-                return false;
+        $return = $this->betterNodeFinder->findFirstInFunctionLikeScoped($functionLike, function(Node $node) {
+            if ($node instanceof Return_ && $node->expr instanceof Expr) {
+                return true;
             }
-        }
+            return false;
+        });
 
-        return true;
+        return $return === null;
     }
 
     public function hasSilentVoid(FunctionLike $functionLike): bool