Turn yield from into multiple yield in PHPUnit Dataprovider

Author: staabm

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

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

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

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

rules/CodeQuality/Rector/Class_/YieldDataProviderRector.php

@@ -6,6 +6,7 @@
 
 use PhpParser\Node;
 use PhpParser\Node\Expr\Array_;
+use PhpParser\Node\Expr\YieldFrom;
 use PhpParser\Node\Name\FullyQualified;
 use PhpParser\Node\Stmt\Class_;
 use PhpParser\Node\Stmt\ClassMethod;
@@ -126,7 +127,11 @@ private function collectReturnArrayNodesFromClassMethod(ClassMethod $classMethod
         }
 
         foreach ($classMethod->stmts as $statement) {
-            if ($statement instanceof Return_) {
+            if ($statement instanceof Node\Stmt\Expression) {
+                $statement = $statement->expr;
+            }
+
+            if ($statement instanceof Return_ || $statement instanceof YieldFrom) {
                 $returnedExpr = $statement->expr;
                 if (! $returnedExpr instanceof Array_) {
                     return null;
@@ -150,7 +155,14 @@ private function transformArrayToYieldsOnMethodNode(ClassMethod $classMethod, Ar
 
         $commentReturn = [];
         foreach ((array) $classMethod->stmts as $key => $classMethodStmt) {
-            if (! $classMethodStmt instanceof Return_) {
+            if ($classMethodStmt instanceof Node\Stmt\Expression) {
+                $classMethodStmt = $classMethodStmt->expr;
+            }
+
+            if (
+                ! $classMethodStmt instanceof Return_
+                && ! $classMethodStmt instanceof YieldFrom
+            ) {
                 continue;
             }