Forward-compatible fixes for PHPUnit 10

phpunit.xml

@@ -14,16 +14,6 @@
 	beStrictAboutTodoAnnotatedTests="true"
 	verbose="false"
 	convertDeprecationsToExceptions="true">
-	<coverage processUncoveredFiles="true">
-		<include>
-			<directory suffix=".php">src</directory>
-		</include>
-		<report>
-			<clover outputFile="tests/tmp/clover.xml"/>
-			<text outputFile="php://stdout" showUncoveredFiles="true" showOnlySummary="true"/>
-		</report>
-	</coverage>
-
 	<testsuites>
 		<testsuite name="PHPStan">
 			<directory suffix="Test.php">tests/PHPStan</directory>

src/Fixable/Patcher.php

@@ -12,6 +12,7 @@
 use PHPStan\File\FileReader;
 use ReflectionClass;
 use SebastianBergmann\Diff\Differ;
+use SebastianBergmann\Diff\Output\UnifiedDiffOutputBuilder;
 use function array_map;
 use function count;
 use function implode;
@@ -29,7 +30,7 @@ final class Patcher
 
 	public function __construct()
 	{
-		$this->differ = new Differ();
+		$this->differ = new Differ(new UnifiedDiffOutputBuilder());
 	}
 
 	/**

tests/PHPStan/Analyser/AnalyserIntegrationTest.php

@@ -81,7 +81,7 @@ public function testExtendingKnownClassWithCheck(): void
 		$errors = $this->runAnalyse(__DIR__ . '/data/extending-known-class-with-check.php');
 		$this->assertNoErrors($errors);
 
-		$reflectionProvider = $this->createReflectionProvider();
+		$reflectionProvider = self::createReflectionProvider();
 		$this->assertTrue($reflectionProvider->hasClass(Foo::class));
 	}
 
@@ -372,7 +372,7 @@ public function testBug4713(): void
 		$this->assertCount(1, $errors);
 		$this->assertSame('Method Bug4713\Service::createInstance() should return Bug4713\Service but returns object.', $errors[0]->getMessage());
 
-		$reflectionProvider = $this->createReflectionProvider();
+		$reflectionProvider = self::createReflectionProvider();
 		$class = $reflectionProvider->getClass(Service::class);
 		$parameter = $class->getNativeMethod('createInstance')->getOnlyVariant()->getParameters()[0];
 		$defaultValue = $parameter->getDefaultValue();
@@ -385,7 +385,7 @@ public function testBug4288(): void
 		$errors = $this->runAnalyse(__DIR__ . '/data/bug-4288.php');
 		$this->assertNoErrors($errors);
 
-		$reflectionProvider = $this->createReflectionProvider();
+		$reflectionProvider = self::createReflectionProvider();
 		$class = $reflectionProvider->getClass(MyClass::class);
 		$parameter = $class->getNativeMethod('paginate')->getOnlyVariant()->getParameters()[0];
 		$defaultValue = $parameter->getDefaultValue();

tests/PHPStan/Analyser/AnalyserTest.php

@@ -152,7 +152,7 @@ public function testIgnoreErrorMultiByPath(): void
 		$this->assertNoErrors($result);
 	}
 
-	public function dataIgnoreErrorByPathAndCount(): iterable
+	public static function dataIgnoreErrorByPathAndCount(): iterable
 	{
 		yield [
 			[
@@ -204,7 +204,7 @@ public function testIgnoreErrorByPathAndCount(array $ignoreErrors): void
 		$this->assertNoErrors($result);
 	}
 
-	public function dataTrueAndFalse(): array
+	public static function dataTrueAndFalse(): array
 	{
 		return [
 			[true],
@@ -422,7 +422,7 @@ public function testIgnoreErrorNotFoundInPathExplicitReportUnmatched(): void
 		$this->assertSame('Ignored error pattern #Fail\.# in path ' . __DIR__ . '/data/not-existent-path.php was not matched in reported errors.', $result[0]);
 	}
 
-	public function dataIgnoreErrorInTraitUsingClassFilePath(): array
+	public static function dataIgnoreErrorInTraitUsingClassFilePath(): array
 	{
 		return [
 			[
@@ -672,7 +672,7 @@ private function runAnalyser(
 			new IgnoreErrorExtensionProvider(new NetteContainer(new Container([]))),
 			self::getContainer()->getByType(RuleErrorTransformer::class),
 			$this->createScopeFactory(
-				$this->createReflectionProvider(),
+				self::createReflectionProvider(),
 				self::getContainer()->getService('typeSpecifier'),
 			),
 			new LocalIgnoresProcessor(),
@@ -700,7 +700,7 @@ private function createAnalyser(): Analyser
 		]);
 		$collectorRegistry = new CollectorRegistry([]);
 
-		$reflectionProvider = $this->createReflectionProvider();
+		$reflectionProvider = self::createReflectionProvider();
 		$fileHelper = $this->getFileHelper();
 
 		$typeSpecifier = self::getContainer()->getService('typeSpecifier');

tests/PHPStan/Analyser/AnonymousClassNameRuleTest.php

@@ -10,7 +10,7 @@ class AnonymousClassNameRuleTest extends RuleTestCase
 
 	protected function getRule(): Rule
 	{
-		$reflectionProvider = $this->createReflectionProvider();
+		$reflectionProvider = self::createReflectionProvider();
 		return new AnonymousClassNameRule($reflectionProvider);
 	}
 

tests/PHPStan/Analyser/ArgumentsNormalizerTest.php

@@ -22,7 +22,7 @@
 class ArgumentsNormalizerTest extends PHPStanTestCase
 {
 
-	public function dataReorderValid(): iterable
+	public static function dataReorderValid(): iterable
 	{
 		yield [
 			[
@@ -298,7 +298,7 @@ public function testReorderValid(
 		}
 	}
 
-	public function dataReorderInvalid(): iterable
+	public static function dataReorderInvalid(): iterable
 	{
 		yield [
 			[

tests/PHPStan/Analyser/AssertStubTest.php

@@ -7,9 +7,9 @@
 class AssertStubTest extends TypeInferenceTestCase
 {
 
-	public function dataFileAsserts(): iterable
+	public static function dataFileAsserts(): iterable
 	{
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/assert-stub.php');
+		yield from self::gatherAssertTypes(__DIR__ . '/data/assert-stub.php');
 	}
 
 	/**

tests/PHPStan/Analyser/Bug10922Test.php

@@ -7,9 +7,9 @@
 class Bug10922Test extends TypeInferenceTestCase
 {
 
-	public function dataFileAsserts(): iterable
+	public static function dataFileAsserts(): iterable
 	{
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-10922.php');
+		yield from self::gatherAssertTypes(__DIR__ . '/data/bug-10922.php');
 	}
 
 	/**

tests/PHPStan/Analyser/Bug10980Test.php

@@ -7,7 +7,7 @@
 class Bug10980Test extends TypeInferenceTestCase
 {
 
-	public function dataFileAsserts(): iterable
+	public static function dataFileAsserts(): iterable
 	{
 		yield from self::gatherAssertTypes(__DIR__ . '/data/bug-10980.php');
 	}

tests/PHPStan/Analyser/Bug11009Test.php

@@ -7,9 +7,9 @@
 class Bug11009Test extends TypeInferenceTestCase
 {
 
-	public function dataFileAsserts(): iterable
+	public static function dataFileAsserts(): iterable
 	{
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-11009.php');
+		yield from self::gatherAssertTypes(__DIR__ . '/data/bug-11009.php');
 	}
 
 	/**

tests/PHPStan/Analyser/Bug9307CallMethodsRuleTest.php

@@ -20,7 +20,7 @@ class Bug9307CallMethodsRuleTest extends RuleTestCase
 
 	protected function getRule(): Rule
 	{
-		$reflectionProvider = $this->createReflectionProvider();
+		$reflectionProvider = self::createReflectionProvider();
 		$ruleLevelHelper = new RuleLevelHelper($reflectionProvider, true, false, true, true, false, false, true);
 		return new CallMethodsRule(
 			new MethodCallCheck($reflectionProvider, $ruleLevelHelper, true, true),

tests/PHPStan/Analyser/Bug9307Test.php

@@ -7,9 +7,9 @@
 class Bug9307Test extends TypeInferenceTestCase
 {
 
-	public function dataFileAsserts(): iterable
+	public static function dataFileAsserts(): iterable
 	{
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-9307.php');
+		yield from self::gatherAssertTypes(__DIR__ . '/data/bug-9307.php');
 	}
 
 	/**

tests/PHPStan/Analyser/ClassConstantStubFileTest.php

@@ -7,9 +7,9 @@
 class ClassConstantStubFileTest extends TypeInferenceTestCase
 {
 
-	public function dataFileAsserts(): iterable
+	public static function dataFileAsserts(): iterable
 	{
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/class-constant-stub-files.php');
+		yield from self::gatherAssertTypes(__DIR__ . '/data/class-constant-stub-files.php');
 	}
 
 	/**

tests/PHPStan/Analyser/ConditionalReturnTypeFromMethodStubTest.php

@@ -7,9 +7,9 @@
 class ConditionalReturnTypeFromMethodStubTest extends TypeInferenceTestCase
 {
 
-	public function dataFileAsserts(): iterable
+	public static function dataFileAsserts(): iterable
 	{
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/conditional-return-type-stub.php');
+		yield from self::gatherAssertTypes(__DIR__ . '/data/conditional-return-type-stub.php');
 	}
 
 	/**

tests/PHPStan/Analyser/DoNotPolluteScopeWithBlockTest.php

@@ -7,9 +7,9 @@
 class DoNotPolluteScopeWithBlockTest extends TypeInferenceTestCase
 {
 
-	public function dataFileAsserts(): iterable
+	public static function dataFileAsserts(): iterable
 	{
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/do-not-pollute-scope-with-block.php');
+		yield from self::gatherAssertTypes(__DIR__ . '/data/do-not-pollute-scope-with-block.php');
 	}
 
 	/**

tests/PHPStan/Analyser/DoNotRememberPossiblyImpureFunctionValuesTest.php

@@ -7,9 +7,9 @@
 class DoNotRememberPossiblyImpureFunctionValuesTest extends TypeInferenceTestCase
 {
 
-	public function dataAsserts(): iterable
+	public static function dataAsserts(): iterable
 	{
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/do-not-remember-possibly-impure-function-values.php');
+		yield from self::gatherAssertTypes(__DIR__ . '/data/do-not-remember-possibly-impure-function-values.php');
 	}
 
 	/**

tests/PHPStan/Analyser/DynamicMethodThrowTypeExtensionTest.php

@@ -8,14 +8,14 @@
 class DynamicMethodThrowTypeExtensionTest extends TypeInferenceTestCase
 {
 
-	public function dataFileAsserts(): iterable
+	public static function dataFileAsserts(): iterable
 	{
 		if (PHP_VERSION_ID < 80000) {
 			return [];
 		}
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/dynamic-method-throw-type-extension.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/dynamic-method-throw-type-extension-named-args-fixture.php');
+		yield from self::gatherAssertTypes(__DIR__ . '/data/dynamic-method-throw-type-extension.php');
+		yield from self::gatherAssertTypes(__DIR__ . '/data/dynamic-method-throw-type-extension-named-args-fixture.php');
 	}
 
 	/**

tests/PHPStan/Analyser/DynamicReturnTypeExtensionTypeInferenceTest.php

@@ -8,17 +8,17 @@
 class DynamicReturnTypeExtensionTypeInferenceTest extends TypeInferenceTestCase
 {
 
-	public function dataAsserts(): iterable
+	public static function dataAsserts(): iterable
 	{
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/dynamic-method-return-types.php');
+		yield from self::gatherAssertTypes(__DIR__ . '/data/dynamic-method-return-types.php');
 
 		if (PHP_VERSION_ID >= 80000) {
-			yield from $this->gatherAssertTypes(__DIR__ . '/data/dynamic-method-return-types-named-args.php');
+			yield from self::gatherAssertTypes(__DIR__ . '/data/dynamic-method-return-types-named-args.php');
 		}
 
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/dynamic-method-return-compound-types.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-7344.php');
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-7391b.php');
+		yield from self::gatherAssertTypes(__DIR__ . '/data/dynamic-method-return-compound-types.php');
+		yield from self::gatherAssertTypes(__DIR__ . '/data/bug-7344.php');
+		yield from self::gatherAssertTypes(__DIR__ . '/data/bug-7391b.php');
 	}
 
 	/**

tests/PHPStan/Analyser/ErrorTest.php

@@ -15,7 +15,7 @@ public function testError(): void
 		$this->assertSame(10, $error->getLine());
 	}
 
-	public function dataValidIdentifier(): iterable
+	public static function dataValidIdentifier(): iterable
 	{
 		yield ['a'];
 		yield ['aa'];
@@ -37,7 +37,7 @@ public function testValidIdentifier(string $identifier): void
 		$this->assertTrue(Error::validateIdentifier($identifier));
 	}
 
-	public function dataInvalidIdentifier(): iterable
+	public static function dataInvalidIdentifier(): iterable
 	{
 		yield [''];
 		yield [' '];

tests/PHPStan/Analyser/ExpressionTypeResolverExtensionTest.php

@@ -7,7 +7,7 @@
 class ExpressionTypeResolverExtensionTest extends TypeInferenceTestCase
 {
 
-	public function dataFileAsserts(): iterable
+	public static function dataFileAsserts(): iterable
 	{
 		yield from self::gatherAssertTypes(__DIR__ . '/data/expression-type-resolver-extension.php');
 	}

tests/PHPStan/Analyser/Ignore/IgnoreLexerTest.php

@@ -10,7 +10,7 @@
 class IgnoreLexerTest extends PHPStanTestCase
 {
 
-	public function dataTokenize(): iterable
+	public static function dataTokenize(): iterable
 	{
 		yield [
 			'',

tests/PHPStan/Analyser/ImmediatelyCalledFunctionWithoutImplicitThrowTest.php

@@ -8,9 +8,9 @@
 class ImmediatelyCalledFunctionWithoutImplicitThrowTest extends TypeInferenceTestCase
 {
 
-	public function dataFileAsserts(): iterable
+	public static function dataFileAsserts(): iterable
 	{
-		yield from $this->gatherAssertTypes(__DIR__ . '/data/immediately-called-function-without-implicit-throw.php');
+		yield from self::gatherAssertTypes(__DIR__ . '/data/immediately-called-function-without-implicit-throw.php');
 	}
 
 	/**