PHPUnit 9.x/10.x does not at all support named arguments from data-providers

Author: staabm

src/Rules/PHPUnit/DataProviderDataRule.php

@@ -23,13 +23,17 @@ class DataProviderDataRule implements Rule
 
 	private DataProviderHelper $dataProviderHelper;
 
+	private PHPUnitVersion $PHPUnitVersion;
+
 	public function __construct(
 		TestMethodsHelper $testMethodsHelper,
-		DataProviderHelper $dataProviderHelper
+		DataProviderHelper $dataProviderHelper,
+		PHPUnitVersion $PHPUnitVersion
 	)
 	{
 		$this->testMethodsHelper = $testMethodsHelper;
 		$this->dataProviderHelper = $dataProviderHelper;
+		$this->PHPUnitVersion = $PHPUnitVersion;
 	}
 
 	public function getNodeType(): string
@@ -153,11 +157,10 @@ private function arrayItemsToArgs(Type $array, int $numberOfParameters): ?array
 				return null;
 			}
 
-			if (count($key) === 0) {
+			if (count($key) === 0 || !$this->PHPUnitVersion->supportsNamedArgumentsInDataProvider()->yes()) {
 				$arg = new Node\Arg(new TypeExpr($valueType));
 				$args[] = $arg;
 				continue;
-
 			}
 
 			$arg = new Node\Arg(

src/Rules/PHPUnit/PHPUnitVersion.php

@@ -38,4 +38,12 @@ public function requiresStaticDataProviders(): TrinaryLogic
 		return TrinaryLogic::createFromBoolean($this->majorVersion >= 10);
 	}
 
+	public function supportsNamedArgumentsInDataProvider(): TrinaryLogic
+	{
+		if ($this->majorVersion === null) {
+			return TrinaryLogic::createMaybe();
+		}
+		return TrinaryLogic::createFromBoolean($this->majorVersion >= 11);
+	}
+
 }

tests/Rules/PHPUnit/DataProviderDataRuleTest.php

@@ -8,6 +8,7 @@
 use PHPStan\Rules\Rule;
 use PHPStan\Testing\RuleTestCase;
 use PHPStan\Type\FileTypeMapper;
+use const PHP_VERSION_ID;
 
 /**
  * @extends RuleTestCase<CompositeRule>
@@ -19,21 +20,22 @@ class DataProviderDataRuleTest extends RuleTestCase
 	protected function getRule(): Rule
 	{
 		$reflectionProvider = $this->createReflectionProvider();
+		$phpunitVersion = new PHPUnitVersion($this->phpunitVersion);
 
 		/** @var list<Rule<Node>> $rules */
 		$rules = [
 			new DataProviderDataRule(
 				new TestMethodsHelper(
 					self::getContainer()->getByType(FileTypeMapper::class),
-					new PHPUnitVersion($this->phpunitVersion)
+					$phpunitVersion
 				),
 				new DataProviderHelper(
 					$reflectionProvider,
 					self::getContainer()->getByType(FileTypeMapper::class),
 					self::getContainer()->getService('defaultAnalysisParser'),
-					new PHPUnitVersion($this->phpunitVersion)
+					$phpunitVersion
 				),
-
+				$phpunitVersion,
 			),
 			self::getContainer()->getByType(CallMethodsRule::class) /** @phpstan-ignore phpstanApi.classConstant */
 		];
@@ -176,30 +178,26 @@ public function testRule(): void
 	public function testRulePhp8(): void
 	{
 		if (PHP_VERSION_ID < 80000) {
-			self::markTestSkipped();
+			self::markTestSkipped('PHPUnit11 requires PHP 8.0.');
 		}
 
 		$this->phpunitVersion = 10;
 
 		$this->analyse([__DIR__ . '/data/data-provider-data-named.php'], [
 			[
-				'Parameter $input of method DataProviderDataTestPhp8\NamedArgsInProvider::testFoo() expects string, int given.',
+				'Parameter #1 $expectedResult of method DataProviderDataTestPhp8\NamedArgsInProvider::testFoo() expects string, int given.',
 				44
 			],
 			[
-				'Parameter $input of method DataProviderDataTestPhp8\NamedArgsInProvider::testFoo() expects string, false given.',
+				'Parameter #1 $expectedResult of method DataProviderDataTestPhp8\NamedArgsInProvider::testFoo() expects string, false given.',
 				44
 			],
 			[
-				'Unknown parameter $wrong in call to method DataProviderDataTestPhp8\TestWrongOffsetNameArrayShapeIterable::testBar().',
-				58
-			],
-			[
-				'Missing parameter $si (int) in call to method DataProviderDataTestPhp8\TestWrongOffsetNameArrayShapeIterable::testBar().',
+				'Parameter #1 $si of method DataProviderDataTestPhp8\TestWrongOffsetNameArrayShapeIterable::testBar() expects int, string given.',
 				58
 			],
 			[
-				'Parameter $si of method DataProviderDataTestPhp8\TestWrongTypeInArrayShapeIterable::testBar() expects int, string given.',
+				'Parameter #1 $si of method DataProviderDataTestPhp8\TestWrongTypeInArrayShapeIterable::testBar() expects int, string given.',
 				79
 			],
 		]);
@@ -274,7 +272,36 @@ public function testTrimmingArgs(): void
 		]);
 	}
 
-	/**
+	public function testNamedArgumentsInDataProviders(): void
+	{
+		$this->phpunitVersion = 10;
+
+		$this->analyse([__DIR__ . '/data/data-provider-named-args.php'], [
+			[
+				'Parameter #1 $int of method DataProviderNamedArgs\FooTest::testFoo() expects int, string given.',
+				26
+			],
+			[
+				'Parameter #2 $string of method DataProviderNamedArgs\FooTest::testFoo() expects string, int given.',
+				26
+			],
+		]);
+	}
+
+	public function testNamedArgumentsInDataProvidersPhpUnit11OrNewer(): void
+	{
+		if (PHP_VERSION_ID < 80000) {
+			self::markTestSkipped('PHPUnit11 requires PHP 8.0.');
+		}
+
+		$this->phpunitVersion = 11;
+
+		$this->analyse([__DIR__ . '/data/data-provider-named-args.php'], [
+		]);
+	}
+
+
+		/**
 	 * @return string[]
 	 */
 	public static function getAdditionalConfigFiles(): array

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

@@ -0,0 +1,32 @@
+<?php
+
+namespace DataProviderNamedArgs;
+
+class FooTest extends \PHPUnit\Framework\TestCase
+{
+
+	/**
+	 * @dataProvider dataProvider
+	 */
+	public function testFoo(
+		int    $int,
+		string $string
+	): void
+	{
+		$this->assertTrue(true);
+	}
+
+	public static function dataProvider(): iterable
+	{
+		yield 'even' => [
+			'int' => 50,
+			'string' => 'abc',
+		];
+
+		yield 'odd' => [
+			'string' => 'def',
+			'int' => 51,
+		];
+	}
+}
+