use types

Author: staabm

src/Rules/PHPUnit/DataProviderDataRule.php

@@ -4,9 +4,10 @@
 
 use PhpParser\Node;
 use PHPStan\Analyser\Scope;
+use PHPStan\Node\Expr\TypeExpr;
 use PHPStan\Reflection\Php\PhpMethodFromParserNodeReflection;
 use PHPStan\Rules\Rule;
-use PHPStan\ShouldNotHappenException;
+use PHPStan\Type\Constant\ConstantArrayType;
 use PHPUnit\Framework\TestCase;
 use function array_slice;
 use function count;
@@ -40,22 +41,28 @@ public function getNodeType(): string
 	public function processNode(Node $node, Scope $scope): array
 	{
 		if ($node instanceof Node\Stmt\Return_ || $node instanceof Node\Expr\YieldFrom) {
-			if (!$node->expr instanceof Node\Expr\Array_) {
+			$exprType = $scope->getType($node->expr);
+			if (!$exprType->isConstantArray()->yes()) {
 				return [];
 			}
 
-			$arrayExprs = [];
-			foreach ($node->expr->items as $item) {
-				if (!$item->value instanceof Node\Expr\Array_) {
-					return [];
+			$constArrays = $exprType->getConstantArrays();
+			$constantArrays = [];
+			foreach ($constArrays as $constArray) {
+				foreach ($constArray->getValueTypes() as $valueType) {
+					if (!$valueType->isConstantArray()->yes()) {
+						return [];
+					}
+					$constantArrays[] = $valueType;
 				}
-				$arrayExprs[] = $item->value;
 			}
 		} elseif ($node instanceof Node\Expr\Yield_) {
-			if (!$node->value instanceof Node\Expr\Array_) {
+			$exprType = $scope->getType($node->value);
+			if (!$exprType->isConstantArray()->yes()) {
 				return [];
 			}
-			$arrayExprs = [$node->value];
+
+			$constantArrays = $exprType->getConstantArrays();
 		} else {
 			return [];
 		}
@@ -105,8 +112,8 @@ public function processNode(Node $node, Scope $scope): array
 		}
 
 		foreach ($testsWithProvider as $testMethod) {
-			foreach ($arrayExprs as $arrayExpr) {
-				$args = $this->arrayItemsToArgs($arrayExpr);
+			foreach ($constantArrays as $constantArray) {
+				$args = $this->arrayItemsToArgs($constantArray);
 				if ($args === null) {
 					continue;
 				}
@@ -120,7 +127,7 @@ public function processNode(Node $node, Scope $scope): array
 					$var,
 					$testMethod->getName(),
 					$args,
-					['startLine' => $arrayExpr->getStartLine()],
+					['startLine' => $node->getStartLine()],
 				));
 			}
 		}
@@ -131,15 +138,13 @@ public function processNode(Node $node, Scope $scope): array
 	/**
 	 * @return array<Node\Arg>
 	 */
-	private function arrayItemsToArgs(Node\Expr\Array_ $array): ?array
+	private function arrayItemsToArgs(ConstantArrayType $array): ?array
 	{
 		$args = [];
 
-		foreach ($array->items as $item) {
+		foreach ($array->getValueTypes() as $valueType) {
 			// XXX named args
-			$value = $item->value;
-
-			$arg = new Node\Arg($value);
+			$arg = new Node\Arg(new TypeExpr($valueType));
 			$args[] = $arg;
 		}
 

src/Rules/PHPUnit/TestMethodsHelper.php

@@ -3,10 +3,8 @@
 namespace PHPStan\Rules\PHPUnit;
 
 use PHPStan\Analyser\Scope;
-use PHPStan\Parser\Parser;
 use PHPStan\PhpDoc\ResolvedPhpDocBlock;
 use PHPStan\Reflection\ClassReflection;
-use PHPStan\Reflection\ReflectionProvider;
 use PHPStan\Type\FileTypeMapper;
 use ReflectionMethod;
 use function str_starts_with;

src/Rules/PHPUnit/TestMethodsHelperFactory.php

@@ -2,14 +2,11 @@
 
 namespace PHPStan\Rules\PHPUnit;
 
-use PHPStan\Parser\Parser;
-use PHPStan\Reflection\ReflectionProvider;
 use PHPStan\Type\FileTypeMapper;
 
 class TestMethodsHelperFactory
 {
 
-
 	private FileTypeMapper $fileTypeMapper;
 
 	private PHPUnitVersionDetector $PHPUnitVersionDetector;

tests/Rules/PHPUnit/DataProviderDataRuleTest.php

@@ -52,51 +52,55 @@ public function testRule(): void
 		$this->analyse([__DIR__ . '/data/data-provider-data.php'], [
 			[
 				'Parameter #2 $input of method DataProviderDataTest\FooTest::testWithAttribute() expects string, int given.',
-				24,
+				19,
 			],
 			[
 				'Parameter #2 $input of method DataProviderDataTest\FooTest::testWithAttribute() expects string, false given.',
-				28,
+				19,
 			],
 			[
 				'Parameter #2 $input of method DataProviderDataTest\BarTest::testWithAnnotation() expects string, int given.',
-				51,
+				46,
 			],
 			[
 				'Parameter #2 $input of method DataProviderDataTest\BarTest::testWithAnnotation() expects string, false given.',
-				55,
+				46,
 			],
 			[
 				'Parameter #2 $input of method DataProviderDataTest\YieldTest::myTestMethod() expects string, int given.',
-				81,
+				80,
 			],
 			[
 				'Parameter #2 $input of method DataProviderDataTest\YieldTest::myTestMethod() expects string, false given.',
-				87,
+				86,
 			],
 			[
 				'Parameter #2 $input of method DataProviderDataTest\YieldFromTest::myTestMethod() expects string, int given.',
-				112,
+				107,
 			],
 			[
 				'Parameter #2 $input of method DataProviderDataTest\YieldFromTest::myTestMethod() expects string, false given.',
-				116,
+				107,
 			],
 			[
 				'Method DataProviderDataTest\DifferentArgumentCount::testFoo() invoked with 3 parameters, 2 required.',
-				141,
+				136,
 			],
 			[
 				'Method DataProviderDataTest\DifferentArgumentCount::testFoo() invoked with 1 parameter, 2 required.',
-				146,
+				136,
 			],
 			[
 				'Method DataProviderDataTest\DifferentArgumentCountWithReusedDataprovider::testFoo() invoked with 3 parameters, 2 required.',
-				177,
+				172,
 			],
 			[
 				'Method DataProviderDataTest\DifferentArgumentCountWithReusedDataprovider::testFoo() invoked with 1 parameter, 2 required.',
-				182,
+				172,
+			],
+			[
+				'Parameter #2 $input of method DataProviderDataTest\UnionTypeReturnTest::testWithAnnotation() expects string, int given.',
+				216,
 			],
 		]);
 	}

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

@@ -186,3 +186,33 @@ public function yieldProvider(): iterable
 	}
 }
 
+
+class UnionTypeReturnTest extends TestCase
+{
+
+	/** @dataProvider aProvider */
+	public function testWithAnnotation(string $expectedResult, string $input): void
+	{
+	}
+
+	public function aProvider(): array
+	{
+		$arr = [
+			[
+				'Hello World',
+				" Hello World \n"
+			]
+		];
+
+		if (rand(0,1)) {
+			$arr = [
+				[
+					'Hello World',
+					123
+				]
+			];
+		}
+
+		return $arr;
+	}
+}