more fixes

Author: staabm

src/Rules/PHPUnit/DataProviderDataRule.php

@@ -85,32 +85,37 @@ public function processNode(Node $node, Scope $scope): array
 		}
 
 		$trimArgs = false;
+		$maxNumberOfParameters = $testsWithProvider[0]->getNumberOfParameters();
 		if (count($testsWithProvider) > 1) {
-			$maxNumberOfParameters = $testsWithProvider[0]->getNumberOfParameters();
 			foreach ($testsWithProvider as $testMethod) {
-				if ($testMethod->isVariadic()) {
+				if ($maxNumberOfParameters !== $testMethod->getNumberOfParameters()) {
 					$trimArgs = true;
-					break;
 				}
 
-				if ($maxNumberOfParameters !== $testMethod->getNumberOfParameters()) {
+				if ($testMethod->isVariadic()) {
 					$trimArgs = true;
-					break;
+					$maxNumberOfParameters = PHP_INT_MAX;
 				}
+
+				$maxNumberOfParameters = max($maxNumberOfParameters, $testMethod->getNumberOfParameters());
 			}
 		}
 
 		foreach ($testsWithProvider as $testMethod) {
 			$numberOfParameters = $testMethod->getNumberOfParameters();
 
 			foreach ($arraysTypes as [$startLine, $arraysType]) {
-				$args = $this->arrayItemsToArgs($arraysType, $numberOfParameters);
+				$args = $this->arrayItemsToArgs($arraysType, $maxNumberOfParameters);
 				if ($args === null) {
 					continue;
 				}
 
-				if (!$testMethod->isVariadic() && $trimArgs) {
-					$args = array_slice($args, 0, $numberOfParameters);
+				if (
+					$trimArgs
+					&& !$testMethod->isVariadic()
+					&& $numberOfParameters !== $maxNumberOfParameters
+				) {
+					$args = array_slice($args, 0, min($numberOfParameters, $maxNumberOfParameters));
 				}
 
 				$scope->invokeNodeCallback(new Node\Expr\MethodCall(