support iterables

Author: staabm

src/Rules/PHPUnit/DataProviderDataRule.php

@@ -40,24 +40,31 @@ public function getNodeType(): string
 
 	public function processNode(Node $node, Scope $scope): array
 	{
+		if ($scope->getFunction() === null) {
+			return [];
+		}
+		if ($scope->isInAnonymousFunction()) {
+			return [];
+		}
+
 		if ($node instanceof Node\Stmt\Return_ || $node instanceof Node\Expr\YieldFrom) {
 			if ($node->expr === null) {
 				return [];
 			}
 
-			$exprType = $scope->getType($node->expr);
-			if (!$exprType->isConstantArray()->yes()) {
-				return [];
-			}
-
-			$constArrays = $exprType->getConstantArrays();
 			$constantArrays = [];
-			foreach ($constArrays as $constArray) {
-				foreach ($constArray->getValueTypes() as $valueType) {
-					foreach ($valueType->getConstantArrays() as $constValueArray) {
-						$constantArrays[] = $constValueArray;
+			$exprType = $scope->getType($node->expr);
+			$exprConstArrays = $exprType->getConstantArrays();
+			if ($exprConstArrays !== []) {
+				foreach ($exprConstArrays as $constArray) {
+					foreach ($constArray->getValueTypes() as $valueType) {
+						foreach ($valueType->getConstantArrays() as $constValueArray) {
+							$constantArrays[] = $constValueArray;
+						}
 					}
 				}
+			} else {
+				$constantArrays = $exprType->getIterableValueType()->getConstantArrays();
 			}
 		} elseif ($node instanceof Node\Expr\Yield_) {
 			if ($node->value === null) {
@@ -74,11 +81,7 @@ public function processNode(Node $node, Scope $scope): array
 			return [];
 		}
 
-		if ($scope->getFunction() === null) {
-			return [];
-		}
-
-		if ($scope->isInAnonymousFunction()) {
+		if ($constantArrays === []) {
 			return [];
 		}
 

tests/Rules/PHPUnit/DataProviderDataRuleTest.php

@@ -138,6 +138,14 @@ public function testRule(): void
 				'Parameter #1 $s of method DataProviderDataTest\TestInvalidVariadic2::testFoo() expects string, int given.',
 				355,
 			],
+			[
+				'Unknown parameter $foo in call to method DataProviderDataTest\TestIterable::testBar().',
+				371,
+			],
+			[
+				'Missing parameter $si (int) in call to method DataProviderDataTest\TestIterable::testBar().',
+				371,
+			],
 		]);
 	}
 

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

@@ -358,3 +358,23 @@ public function aProvider(): iterable
 		];
 	}
 }
+
+class TestIterable extends TestCase
+{
+	/** @dataProvider aProvider */
+	public function testBar(int $si): void
+	{
+	}
+
+	public function aProvider(): iterable
+	{
+		return $this->data();
+	}
+
+	/**
+	 * @return iterable<array{foo: string}>
+	 */
+	public function data(): iterable
+	{
+	}
+}