Update phpstan-phpunit to 2.0.8

build/phpstan.neon

@@ -75,7 +75,6 @@ parameters:
 		- '#^Dynamic call to static method PHPUnit\\Framework\\\S+\(\)\.$#'
 		- '#should be contravariant with parameter \$node \(PhpParser\\Node\) of method PHPStan\\Rules\\Rule<PhpParser\\Node>::processNode\(\)$#'
 		- '#Variable property access on PhpParser\\Node#'
-		- '#Test::data[a-zA-Z0-9_]+\(\) return type has no value type specified in iterable type#'
 		-
 			identifier: shipmonk.deadMethod
 			message: '#^Unused .*?Factory::create#' # likely used in DIC

composer.json

@@ -60,7 +60,7 @@
 		"php-parallel-lint/php-parallel-lint": "^1.2.0",
 		"phpstan/phpstan-deprecation-rules": "^2.0.2",
 		"phpstan/phpstan-nette": "^2.0",
-		"phpstan/phpstan-phpunit": "^2.0.7",
+		"phpstan/phpstan-phpunit": "^2.0.8",
 		"phpstan/phpstan-strict-rules": "^2.0",
 		"phpunit/phpunit": "^11.5.23",
 		"shipmonk/composer-dependency-analyser": "^1.5",

src/Type/ClosureTypeFactory.php

@@ -46,7 +46,7 @@ public function __construct(
 	}
 
 	/**
-	 * @param Closure(): mixed $closure
+	 * @param Closure(mixed): mixed $closure
 	 */
 	public function fromClosureObject(Closure $closure): ClosureType
 	{

tests/PHPStan/Command/CommandHelperTest.php

@@ -285,7 +285,7 @@ public static function dataParameters(): array
 	}
 
 	/**
-	 * @param array<string, string> $expectedParameters
+	 * @param array<string, mixed> $expectedParameters
 	 * @throws InceptionNotSuccessfulException
 	 */
 	#[DataProvider('dataParameters')]

tests/PHPStan/Command/ErrorFormatter/TeamcityErrorFormatterTest.php

@@ -19,7 +19,6 @@ public static function dataFormatterOutputProvider(): iterable
 			0,
 			0,
 			'',
-			'',
 		];
 
 		yield [

tests/PHPStan/Reflection/BetterReflection/SourceLocator/OptimizedSingleFileSourceLocatorTest.php

@@ -235,7 +235,7 @@ public function testConstUnknown(string $constantName): void
 	}
 
 	/**
-	 * @param class-string[] $expectedIdentifiers
+	 * @param array<string> $expectedIdentifiers
 	 */
 	#[DataProvider('dataForIdenifiersByType')]
 	public function testLocateIdentifiersByType(

tests/PHPStan/Reflection/ClassReflectionPropertyHooksTest.php

@@ -2,6 +2,7 @@
 
 namespace PHPStan\Reflection;
 
+use PHPStan\ShouldNotHappenException;
 use PHPStan\Testing\PHPStanTestCase;
 use PHPStan\Type\Generic\GenericObjectType;
 use PHPStan\Type\IntegerType;
@@ -226,6 +227,9 @@ public static function dataPropertyHooks(): iterable
 		];
 
 		$specificFooGenerics = (new GenericObjectType('PropertyHooksTypes\\FooGenerics', [new IntegerType()]))->getClassReflection();
+		if ($specificFooGenerics === null) {
+			throw new ShouldNotHappenException();
+		}
 
 		yield [
 			$specificFooGenerics,
@@ -291,6 +295,9 @@ public static function dataPropertyHooks(): iterable
 		];
 
 		$specificFooGenericsConstructor = (new GenericObjectType('PropertyHooksTypes\\FooGenericsConstructor', [new IntegerType()]))->getClassReflection();
+		if ($specificFooGenericsConstructor === null) {
+			throw new ShouldNotHappenException();
+		}
 
 		yield [
 			$specificFooGenericsConstructor,

tests/PHPStan/Type/ClosureTypeFactoryTest.php

@@ -63,7 +63,7 @@ public static function dataFromClosureObjectParameter(): array
 	}
 
 	/**
-	 * @param Closure(): mixed $closure
+	 * @param Closure(mixed): mixed $closure
 	 */
 	#[DataProvider('dataFromClosureObjectParameter')]
 	public function testFromClosureObjectParameter(Closure $closure, int $index, string $type): void
@@ -75,7 +75,7 @@ public function testFromClosureObjectParameter(Closure $closure, int $index, str
 	}
 
 	/**
-	 * @param Closure(): mixed $closure
+	 * @param Closure(mixed): mixed $closure
 	 */
 	private function getClosureType(Closure $closure): ClosureType
 	{

tests/PHPStan/Type/StringTypeTest.php

@@ -96,13 +96,15 @@ public static function dataIsSuperTypeOf(): array
 	}
 
 	#[DataProvider('dataIsSuperTypeOf')]
-	public function testIsSuperTypeOf(StringType $type, Type $otherType, TrinaryLogic $expectedResult): void
+	public function testIsSuperTypeOf(Type $stringType, Type $otherType, TrinaryLogic $expectedResult): void
 	{
-		$actualResult = $type->isSuperTypeOf($otherType);
+		$this->assertInstanceOf(StringType::class, $stringType);
+
+		$actualResult = $stringType->isSuperTypeOf($otherType);
 		$this->assertSame(
 			$expectedResult->describe(),
 			$actualResult->describe(),
-			sprintf('%s -> isSuperTypeOf(%s)', $type->describe(VerbosityLevel::precise()), $otherType->describe(VerbosityLevel::precise())),
+			sprintf('%s -> isSuperTypeOf(%s)', $stringType->describe(VerbosityLevel::precise()), $otherType->describe(VerbosityLevel::precise())),
 		);
 	}
 
@@ -174,13 +176,15 @@ public static function dataAccepts(): iterable
 	}
 
 	#[DataProvider('dataAccepts')]
-	public function testAccepts(StringType $type, Type $otherType, TrinaryLogic $expectedResult): void
+	public function testAccepts(Type $stringType, Type $otherType, TrinaryLogic $expectedResult): void
 	{
-		$actualResult = $type->accepts($otherType, true)->result;
+		$this->assertInstanceOf(StringType::class, $stringType);
+
+		$actualResult = $stringType->accepts($otherType, true)->result;
 		$this->assertSame(
 			$expectedResult->describe(),
 			$actualResult->describe(),
-			sprintf('%s -> accepts(%s)', $type->describe(VerbosityLevel::precise()), $otherType->describe(VerbosityLevel::precise())),
+			sprintf('%s -> accepts(%s)', $stringType->describe(VerbosityLevel::precise()), $otherType->describe(VerbosityLevel::precise())),
 		);
 	}
 

tests/PHPStan/Type/UnionTypeTest.php

@@ -77,13 +77,15 @@ public static function dataIsCallable(): array
 	}
 
 	#[DataProvider('dataIsCallable')]
-	public function testIsCallable(UnionType $type, TrinaryLogic $expectedResult): void
+	public function testIsCallable(Type $unionType, TrinaryLogic $expectedResult): void
 	{
-		$actualResult = $type->isCallable();
+		$this->assertInstanceOf(UnionType::class, $unionType);
+
+		$actualResult = $unionType->isCallable();
 		$this->assertSame(
 			$expectedResult->describe(),
 			$actualResult->describe(),
-			sprintf('%s -> isCallable()', $type->describe(VerbosityLevel::precise())),
+			sprintf('%s -> isCallable()', $unionType->describe(VerbosityLevel::precise())),
 		);
 	}
 
@@ -699,13 +701,15 @@ public static function dataIsScalar(): array
 	}
 
 	#[DataProvider('dataIsScalar')]
-	public function testIsScalar(UnionType $type, TrinaryLogic $expectedResult): void
+	public function testIsScalar(Type $unionType, TrinaryLogic $expectedResult): void
 	{
-		$actualResult = $type->isScalar();
+		$this->assertInstanceOf(UnionType::class, $unionType);
+
+		$actualResult = $unionType->isScalar();
 		$this->assertSame(
 			$expectedResult->describe(),
 			$actualResult->describe(),
-			sprintf('%s -> isScalar()', $type->describe(VerbosityLevel::precise())),
+			sprintf('%s -> isScalar()', $unionType->describe(VerbosityLevel::precise())),
 		);
 	}