skip multiple yield from

Author: staabm

rules-tests/CodeQuality/Rector/Class_/YieldDataProviderRector/Fixture/skip_yield_from_multiple.php.inc

@@ -0,0 +1,28 @@
+<?php
+
+namespace Rector\PHPUnit\Tests\CodeQuality\Rector\Class_\YieldDataProviderRector\Fixture;
+
+use PHPUnit\Framework\TestCase;
+
+final class SkipMultipleYieldFrom extends TestCase
+{
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataProvider')]
+    public function test(string $val1, string $val2): void
+    {
+    }
+
+    public static function dataProvider(): iterable
+    {
+        yield from [
+            ['value1', 'value2'],
+            ['value3', 'value4'],
+        ];
+        yield from [
+            ['value5', 'value6'],
+            ['value7', 'value8'],
+        ];
+    }
+
+}
+
+?>

rules/CodeQuality/Rector/Class_/YieldDataProviderRector.php

@@ -22,6 +22,7 @@
 use Rector\Comments\NodeDocBlock\DocBlockUpdater;
 use Rector\DeadCode\NodeAnalyzer\IsClassMethodUsedAnalyzer;
 use Rector\NodeTypeResolver\Node\AttributeKey;
+use Rector\PhpParser\Node\BetterNodeFinder;
 use Rector\PhpParser\NodeTransformer;
 use Rector\PHPStan\ScopeFetcher;
 use Rector\PHPUnit\NodeAnalyzer\TestsNodeAnalyzer;
@@ -45,7 +46,8 @@ public function __construct(
         private readonly PhpDocInfoFactory $phpDocInfoFactory,
         private readonly IsClassMethodUsedAnalyzer $isClassMethodUsedAnalyzer,
         private readonly PhpDocTypeChanger $phpDocTypeChanger,
-        private readonly DocBlockUpdater $docBlockUpdater
+        private readonly DocBlockUpdater $docBlockUpdater,
+        private readonly BetterNodeFinder $betterNodeFinder,
     ) {
     }
 
@@ -130,24 +132,30 @@ private function collectReturnArrayNodesFromClassMethod(ClassMethod $classMethod
             return null;
         }
 
-        $yieldFromOrReturn = null;
+        $yieldedFromExpr = null;
         foreach ($classMethod->stmts as $statement) {
             if ($statement instanceof Expression) {
                 $statement = $statement->expr;
             }
 
-            if ($statement instanceof Return_ || $statement instanceof YieldFrom) {
+            if ($statement instanceof Return_) {
                 $returnedExpr = $statement->expr;
 
                 if (! $returnedExpr instanceof Array_) {
                     return null;
                 }
 
-                if ($yieldFromOrReturn instanceof Array_) {
+                return $returnedExpr;
+            } elseif ($statement instanceof YieldFrom) {
+                if (! $statement->expr instanceof Array_) {
                     return null;
                 }
 
-                $yieldFromOrReturn = $returnedExpr;
+                if ($yieldedFromExpr !== null) {
+                    return null;
+                }
+
+                $yieldedFromExpr = $statement->expr;
             } elseif (
                 ! $statement instanceof Assign
                 && ! $statement instanceof AssignRef
@@ -157,7 +165,7 @@ private function collectReturnArrayNodesFromClassMethod(ClassMethod $classMethod
             }
         }
 
-        return $yieldFromOrReturn;
+        return $yieldedFromExpr;
     }
 
     private function transformArrayToYieldsOnMethodNode(ClassMethod $classMethod, Array_ $array): void