support yield

Author: staabm

src/Rules/PHPUnit/DataProviderDataRule.php

@@ -6,6 +6,7 @@
 use PHPStan\Analyser\Scope;
 use PHPStan\Reflection\Php\PhpMethodFromParserNodeReflection;
 use PHPStan\Rules\Rule;
+use PHPStan\ShouldNotHappenException;
 use PHPUnit\Framework\TestCase;
 use function count;
 
@@ -30,12 +31,29 @@ public function __construct(
 
 	public function getNodeType(): string
 	{
-		return Node\Stmt\Return_::class;
+		return Node::class;
 	}
 
 	public function processNode(Node $node, Scope $scope): array
 	{
-		if (!$node->expr instanceof Node\Expr\Array_) {
+		if ($node instanceof Node\Stmt\Return_) {
+			if (!$node->expr instanceof Node\Expr\Array_) {
+				return [];
+			}
+
+			$arrayExprs = [];
+			foreach ($node->expr->items as $item) {
+				if (!$item->value instanceof Node\Expr\Array_) {
+					return [];
+				}
+				$arrayExprs[] = $item->value;
+			}
+		} elseif ($node instanceof Node\Expr\Yield_) {
+			if (!$node->value instanceof Node\Expr\Array_) {
+				return [];
+			}
+			$arrayExprs = [$node->value];
+		} else {
 			return [];
 		}
 
@@ -77,12 +95,12 @@ public function processNode(Node $node, Scope $scope): array
 			return [];
 		}
 
-		foreach ($node->expr->items as $item) {
-			if (!$item->value instanceof Node\Expr\Array_) {
-				continue;
+		foreach ($arrayExprs as $arrayExpr) {
+			if (!$arrayExpr instanceof Node\Expr\Array_) {
+				throw new ShouldNotHappenException();
 			}
 
-			$args = $this->arrayItemsToArgs($item->value);
+			$args = $this->arrayItemsToArgs($arrayExpr);
 			if ($args === null) {
 				continue;
 			}
@@ -92,7 +110,7 @@ public function processNode(Node $node, Scope $scope): array
 				$var,
 				$testsWithProvider[0]->getName(),
 				$args,
-				['startLine' => $item->getStartLine()],
+				['startLine' => $arrayExpr->getStartLine()],
 			));
 		}
 

tests/Rules/PHPUnit/DataProviderDataRuleTest.php

@@ -56,6 +56,14 @@ public function testRule(): void
 				'Parameter #2 $input of method DataProviderDataTest\BarTest::testWithAnnotation() expects string, false given.',
 				54,
 			],
+			[
+				'Parameter #2 $input of method DataProviderDataTest\YieldingTest::testYield() expects string, int given.',
+				79,
+			],
+			[
+				'Parameter #2 $input of method DataProviderDataTest\YieldingTest::testYield() expects string, false given.',
+				85,
+			],
 		]);
 	}
 

tests/Rules/PHPUnit/data/data-provider-data.php

@@ -59,3 +59,33 @@ public function aProvider(): array
 	}
 }
 
+class YieldingTest extends TestCase
+{
+
+	/** @dataProvider yieldProvider */
+	public function testYield(string $expectedResult, string $input): void
+	{
+	}
+
+	public function yieldProvider(): iterable
+	{
+		yield
+			[
+				'Hello World',
+				" Hello World \n",
+			];
+
+		yield
+			[
+				'Hello World',
+				123,
+			];
+
+		yield
+			[
+				'Hello World',
+				false,
+			];
+	}
+}
+