RuleTestCase - do not assert diffs, but whole files

Author: ondrejmirtes

src/Testing/RuleTestCase.php

@@ -36,8 +36,6 @@
 use PHPStan\Rules\Properties\ReadWritePropertiesExtensionProvider;
 use PHPStan\Rules\Rule;
 use PHPStan\Type\FileTypeMapper;
-use SebastianBergmann\Diff\Differ;
-use SebastianBergmann\Diff\Output\DiffOnlyOutputBuilder;
 use function array_map;
 use function array_merge;
 use function count;
@@ -197,7 +195,7 @@ static function (Error $error) use ($strictlyTypedSprintf): string {
 		$this->assertSame($expectedErrorsString, $actualErrorsString);
 	}
 
-	public function fix(string $file, string $expectedDiff): void
+	public function fix(string $file, string $expectedFile): void
 	{
 		[$errors] = $this->gatherAnalyserErrorsWithDelayedErrors([$file]);
 		$diffs = [];
@@ -209,11 +207,11 @@ public function fix(string $file, string $expectedDiff): void
 		}
 
 		$patcher = self::getContainer()->getByType(Patcher::class);
-		$originalFileContents = FileReader::read($file);
 		$newFileContents = $patcher->applyDiffs($file, $diffs); // @phpstan-ignore missingType.checkedException, missingType.checkedException
 
-		$differ = new Differ(new DiffOnlyOutputBuilder(''));
-		$this->assertSame($expectedDiff, $differ->diff($originalFileContents, $newFileContents));
+		$fixedFileContents = FileReader::read($expectedFile);
+
+		$this->assertSame($fixedFileContents, $newFileContents);
 	}
 
 	/**

tests/PHPStan/Build/NamedArgumentsRuleTest.php

@@ -41,20 +41,18 @@ public function testRule(): void
 
 	public function testNoFix(): void
 	{
-		$this->fix(__DIR__ . '/data/named-arguments-no-errors.php', '');
+		$this->fix(
+			__DIR__ . '/data/named-arguments-no-errors.php',
+			__DIR__ . '/data/named-arguments-no-errors.php',
+		);
 	}
 
 	public function testFix(): void
 	{
-		$this->fix(__DIR__ . '/data/named-arguments.php', <<<DIFF
--		new Exception('foo', 0, new Exception('previous'));
--		new Exception('foo', code: 0, previous: new Exception('previous'));
-+		new Exception('foo', previous: new Exception('previous'));
-+		new Exception(previous: new Exception('previous'));
--		new Exception('', 0, new Exception('previous'));
-+		new Exception(previous: new Exception('previous'));
-
-DIFF);
+		$this->fix(
+			__DIR__ . '/data/named-arguments.php',
+			__DIR__ . '/data/named-arguments.php.fixed',
+		);
 	}
 
 }

tests/PHPStan/Build/data/named-arguments.php.fixed

@@ -0,0 +1,23 @@
+<?php // lint >= 8.0
+
+namespace NamedArgumentRule;
+
+use Exception;
+
+class Foo
+{
+
+	public function doFoo(): void
+	{
+		new Exception('foo', 0);
+		new Exception('foo', 0, null);
+		new Exception('foo', previous: new Exception('previous'));
+		new Exception('foo', previous: new Exception('previous'));
+		new Exception(previous: new Exception('previous'));
+		new Exception('foo', code: 1, previous: new Exception('previous'));
+		new Exception('foo', 1, new Exception('previous'));
+		new Exception('foo', 1);
+		new Exception(previous: new Exception('previous'));
+	}
+
+}