[TypeDeclaration] Reduce double traverse on StrictReturnNewAnalyzer R…

…eturnTypeFromStrictNewArrayRector (#6321)
rectorphp · Sep 21, 2024 · c5940d2 · c5940d2
1 parent 92f64ff
commit c5940d2
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 16 deletions.
diff --git a/rules/TypeDeclaration/NodeAnalyzer/ReturnTypeAnalyzer/StrictReturnNewAnalyzer.php b/rules/TypeDeclaration/NodeAnalyzer/ReturnTypeAnalyzer/StrictReturnNewAnalyzer.php
@@ -8,8 +8,6 @@
 use PhpParser\Node\Expr\Closure;
 use PhpParser\Node\Expr\New_;
 use PhpParser\Node\Expr\Variable;
-use PhpParser\Node\Expr\Yield_;
-use PhpParser\Node\Expr\YieldFrom;
 use PhpParser\Node\Stmt;
 use PhpParser\Node\Stmt\ClassMethod;
 use PhpParser\Node\Stmt\Expression;
@@ -37,13 +35,6 @@ public function matchAlwaysReturnVariableNew(ClassMethod|Function_ $functionLike
             return null;
         }
 
-        if ($this->betterNodeFinder->hasInstancesOfInFunctionLikeScoped(
-            $functionLike,
-            [Yield_::class, YieldFrom::class]
-        )) {
-            return null;
-        }
-
         $returns = $this->betterNodeFinder->findReturnsScoped($functionLike);
         if (! $this->returnAnalyzer->hasOnlyReturnWithExpr($functionLike, $returns)) {
             return null;

diff --git a/rules/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictNewArrayRector.php b/rules/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictNewArrayRector.php
@@ -9,8 +9,6 @@
 use PhpParser\Node\Expr\Assign;
 use PhpParser\Node\Expr\Closure;
 use PhpParser\Node\Expr\Variable;
-use PhpParser\Node\Expr\Yield_;
-use PhpParser\Node\Expr\YieldFrom;
 use PhpParser\Node\Identifier;
 use PhpParser\Node\Stmt;
 use PhpParser\Node\Stmt\ClassMethod;
@@ -110,11 +108,6 @@ public function refactorWithScope(Node $node, Scope $scope): ?Node
             return null;
         }
 
-        // 2. skip yields
-        if ($this->betterNodeFinder->hasInstancesOfInFunctionLikeScoped($node, [Yield_::class, YieldFrom::class])) {
-            return null;
-        }
-
         $returns = $this->betterNodeFinder->findReturnsScoped($node);
         if (! $this->returnAnalyzer->hasOnlyReturnWithExpr($node, $returns)) {
             return null;