[CodeQuality] Skip with if on YieldDataProviderRector with yield from and return (#557)

* YieldDataProviderRector: Added failling test

* fix

* Update skip_yield_from_with_return.php.inc

* added another test

* Update YieldDataProviderRector.php

* rector

* Update YieldDataProviderRector.php

* skip multiple yield from

* run rector

* run rector

Author: staabm

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

@@ -0,0 +1,56 @@
+<?php
+
+namespace Rector\PHPUnit\Tests\CodeQuality\Rector\Class_\YieldDataProviderRector\Fixture;
+
+use PHPUnit\Framework\TestCase;
+
+final class MultiStmtsReturnTest extends TestCase
+{
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataProvider')]
+    public function test(string $val1, string $val2): void
+    {
+    }
+
+    public static function dataProvider(): iterable
+    {
+        $a = 1;
+        $b = 2;
+        $c = 3;
+        $d = 4;
+
+        return [
+            [$a, $b],
+            [$c, $d]
+        ];
+    }
+
+}
+
+?>
+-----
+<?php
+
+namespace Rector\PHPUnit\Tests\CodeQuality\Rector\Class_\YieldDataProviderRector\Fixture;
+
+use PHPUnit\Framework\TestCase;
+
+final class MultiStmtsReturnTest extends TestCase
+{
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataProvider')]
+    public function test(string $val1, string $val2): void
+    {
+    }
+
+    public static function dataProvider(): \Iterator
+    {
+        $a = 1;
+        $b = 2;
+        $c = 3;
+        $d = 4;
+        yield [$a, $b];
+        yield [$c, $d];
+    }
+
+}
+
+?>

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-tests/CodeQuality/Rector/Class_/YieldDataProviderRector/Fixture/skip_yield_from_with_return.php.inc

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

rules/CodeQuality/Rector/Class_/YieldDataProviderRector.php

@@ -6,6 +6,9 @@
 
 use PhpParser\Node;
 use PhpParser\Node\Expr\Array_;
+use PhpParser\Node\Expr\Assign;
+use PhpParser\Node\Expr\AssignOp;
+use PhpParser\Node\Expr\AssignRef;
 use PhpParser\Node\Expr\YieldFrom;
 use PhpParser\Node\Name\FullyQualified;
 use PhpParser\Node\Stmt\Class_;
@@ -42,7 +45,7 @@ public function __construct(
         private readonly PhpDocInfoFactory $phpDocInfoFactory,
         private readonly IsClassMethodUsedAnalyzer $isClassMethodUsedAnalyzer,
         private readonly PhpDocTypeChanger $phpDocTypeChanger,
-        private readonly DocBlockUpdater $docBlockUpdater
+        private readonly DocBlockUpdater $docBlockUpdater,
     ) {
     }
 
@@ -127,23 +130,41 @@ private function collectReturnArrayNodesFromClassMethod(ClassMethod $classMethod
             return null;
         }
 
-        $totalStmts = count($classMethod->stmts);
+        $yieldedFromExpr = null;
         foreach ($classMethod->stmts as $statement) {
             if ($statement instanceof Expression) {
                 $statement = $statement->expr;
             }
 
-            if ($statement instanceof Return_ || ($statement instanceof YieldFrom && $totalStmts === 1)) {
+            if ($statement instanceof Return_) {
                 $returnedExpr = $statement->expr;
                 if (! $returnedExpr instanceof Array_) {
                     return null;
                 }
 
                 return $returnedExpr;
             }
+
+            if ($statement instanceof YieldFrom) {
+                if (! $statement->expr instanceof Array_) {
+                    return null;
+                }
+
+                if ($yieldedFromExpr instanceof Array_) {
+                    return null;
+                }
+
+                $yieldedFromExpr = $statement->expr;
+            } elseif (
+                ! $statement instanceof Assign
+                && ! $statement instanceof AssignRef
+                && ! $statement instanceof AssignOp
+            ) {
+                return null;
+            }
         }
 
-        return null;
+        return $yieldedFromExpr;
     }
 
     private function transformArrayToYieldsOnMethodNode(ClassMethod $classMethod, Array_ $array): void