report too many/too few with when provider re-used

Author: staabm

src/Rules/PHPUnit/DataProviderDataRule.php

@@ -8,7 +8,10 @@
 use PHPStan\Rules\Rule;
 use PHPStan\ShouldNotHappenException;
 use PHPUnit\Framework\TestCase;
+use function array_slice;
 use function count;
+use function max;
+use function min;
 
 /**
  * @implements Rule<Node>
@@ -95,23 +98,35 @@ public function processNode(Node $node, Scope $scope): array
 			return [];
 		}
 
-		foreach ($arrayExprs as $arrayExpr) {
-			if (!$arrayExpr instanceof Node\Expr\Array_) {
-				throw new ShouldNotHappenException();
-			}
+		$maxNumberOfParameters = 0;
+		$trimArgs = count($testsWithProvider) > 1;
+		foreach ($testsWithProvider as $testMethod) {
+			$maxNumberOfParameters = max($maxNumberOfParameters, $testMethod->getNumberOfParameters());
+		}
 
-			$args = $this->arrayItemsToArgs($arrayExpr);
-			if ($args === null) {
-				continue;
-			}
+		foreach ($testsWithProvider as $testMethod) {
+			foreach ($arrayExprs as $arrayExpr) {
+				if (!$arrayExpr instanceof Node\Expr\Array_) {
+					throw new ShouldNotHappenException();
+				}
 
-			$var = new Node\Expr\New_(new Node\Name($classReflection->getName()));
-			$scope->invokeNodeCallback(new Node\Expr\MethodCall(
-				$var,
-				$testsWithProvider[0]->getName(),
-				$args,
-				['startLine' => $arrayExpr->getStartLine()],
-			));
+				$args = $this->arrayItemsToArgs($arrayExpr);
+				if ($args === null) {
+					continue;
+				}
+
+				if ($trimArgs && $maxNumberOfParameters !== $testMethod->getNumberOfParameters()) {
+					$args = array_slice($args, 0, min($testMethod->getNumberOfParameters(), $maxNumberOfParameters));
+				}
+
+				$var = new Node\Expr\New_(new Node\Name($classReflection->getName()));
+				$scope->invokeNodeCallback(new Node\Expr\MethodCall(
+					$var,
+					$testMethod->getName(),
+					$args,
+					['startLine' => $arrayExpr->getStartLine()],
+				));
+			}
 		}
 
 		return [];

tests/Rules/PHPUnit/DataProviderDataRuleTest.php

@@ -92,6 +92,14 @@ public function testRule(): void
 				'Method DataProviderDataTest\DifferentArgumentCount::testFoo() invoked with 1 parameter, 2 required.',
 				146,
 			],
+			[
+				'Method DataProviderDataTest\DifferentArgumentCountWithReusedDataprovider::testFoo() invoked with 3 parameters, 2 required.',
+				177,
+			],
+			[
+				'Method DataProviderDataTest\DifferentArgumentCountWithReusedDataprovider::testFoo() invoked with 1 parameter, 2 required.',
+				182,
+			],
 		]);
 	}
 

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

@@ -150,3 +150,39 @@ public function yieldProvider(): iterable
 	}
 }
 
+class DifferentArgumentCountWithReusedDataprovider extends TestCase
+{
+
+	/**
+	 * @dataProvider yieldProvider
+	 */
+	public function testFoo(string $expectedResult, string $input): void
+	{
+	}
+
+	/**
+	 * @dataProvider yieldProvider
+	 */
+	public function testBar(string $expectedResult): void
+	{
+	}
+
+	public function yieldProvider(): iterable
+	{
+		yield from [
+			[
+				'Hello World',
+				" Hello World \n",
+			],
+			[
+				'Hello World',
+				'abc',
+				123,
+			],
+			[
+				'Hello World',
+			]
+		];
+	}
+}
+