Differ as a service

Author: ondrejmirtes

conf/services.neon

@@ -160,6 +160,9 @@ services:
 	-
 		class: PHPStan\Rules\Properties\UninitializedPropertyRule
 
+	-
+		class: SebastianBergmann\Diff\Differ
+
 	betterReflectionSourceLocator:
 		class: PHPStan\BetterReflection\SourceLocator\Type\SourceLocator
 		factory: @PHPStan\Reflection\BetterReflection\BetterReflectionSourceLocatorFactory::create

src/Analyser/RuleErrorTransformer.php

@@ -32,6 +32,7 @@ final class RuleErrorTransformer
 
 	public function __construct(
 		private Parser $parser,
+		private Differ $differ,
 	)
 	{
 	}
@@ -128,9 +129,8 @@ public function transform(
 
 			$printer = new PhpPrinter(['indent' => str_repeat($indentDetector->indentCharacter, $indentDetector->indentSize)]);
 			$newCode = $printer->printFormatPreserving($newStmts, $fileNodes, $oldTokens);
-			$differ = new Differ();
 
-			$fixedErrorDiff = new FixedErrorDiff($hash, $differ->diffToArray($oldCode, $newCode));
+			$fixedErrorDiff = new FixedErrorDiff($hash, $this->differ->diffToArray($oldCode, $newCode));
 		}
 
 		return new Error(

src/Command/AnalyseCommand.php

@@ -534,7 +534,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 					$fixableErrorsByFile[$fixFile][] = $fixableError;
 				}
 
-				$differ = new Differ();
+				$differ = $container->getByType(Differ::class);
 
 				foreach ($fixableErrorsByFile as $file => $fileFixableErrors) {
 					$fileContents = FileReader::read($file);

src/Testing/RuleTestCase.php

@@ -120,7 +120,7 @@ private function getAnalyser(DirectRuleRegistry $ruleRegistry): Analyser
 				$this->getParser(),
 				self::getContainer()->getByType(DependencyResolver::class),
 				new IgnoreErrorExtensionProvider(self::getContainer()),
-				new RuleErrorTransformer(self::getContainer()->getService('currentPhpVersionPhpParser')),
+				self::getContainer()->getByType(RuleErrorTransformer::class),
 				new LocalIgnoresProcessor(),
 			);
 			$this->analyser = new Analyser(
@@ -237,7 +237,7 @@ private function gatherAnalyserErrorsWithDelayedErrors(array $files): array
 		$finalizer = new AnalyserResultFinalizer(
 			$ruleRegistry,
 			new IgnoreErrorExtensionProvider(self::getContainer()),
-			new RuleErrorTransformer(self::getContainer()->getService('currentPhpVersionPhpParser')),
+			self::getContainer()->getByType(RuleErrorTransformer::class),
 			$this->createScopeFactory($reflectionProvider, $this->getTypeSpecifier()),
 			new LocalIgnoresProcessor(),
 			true,

tests/PHPStan/Analyser/AnalyserTest.php

@@ -670,7 +670,7 @@ private function runAnalyser(
 		$finalizer = new AnalyserResultFinalizer(
 			new DirectRuleRegistry([]),
 			new IgnoreErrorExtensionProvider(new NetteContainer(new Container([]))),
-			new RuleErrorTransformer(self::getContainer()->getService('currentPhpVersionPhpParser')),
+			self::getContainer()->getByType(RuleErrorTransformer::class),
 			$this->createScopeFactory(
 				$this->createReflectionProvider(),
 				self::getContainer()->getService('typeSpecifier'),
@@ -749,7 +749,7 @@ private function createAnalyser(): Analyser
 			),
 			new DependencyResolver($fileHelper, $reflectionProvider, new ExportedNodeResolver($reflectionProvider, $fileTypeMapper, new ExprPrinter(new Printer())), $fileTypeMapper),
 			new IgnoreErrorExtensionProvider(new NetteContainer(new Container([]))),
-			new RuleErrorTransformer(self::getContainer()->getService('currentPhpVersionPhpParser')),
+			self::getContainer()->getByType(RuleErrorTransformer::class),
 			new LocalIgnoresProcessor(),
 		);