use AnalysedFilesResolver more

Author: staabm

src/Analyser/AnalysedFilesResolver.php

@@ -11,13 +11,17 @@ final class AnalysedFilesResolver
 {
 
 	/** @var bool[] filePath(string) => bool(true) */
-	private array $analysedFiles = [];
+	private array $analysedFiles;
 
 	private bool $caseInsensitiveFilesystem;
 
-	public function __construct()
+	/**
+	 * @param string[] $files
+	 */
+	public function __construct(array $files = [])
 	{
 		$this->caseInsensitiveFilesystem = PHP_OS_FAMILY === 'Darwin';
+		$this->setAnalysedFiles($files);
 	}
 
 	/**

src/Analyser/Ignore/IgnoredErrorHelperResult.php

@@ -2,11 +2,10 @@
 
 namespace PHPStan\Analyser\Ignore;
 
+use PHPStan\Analyser\AnalysedFilesResolver;
 use PHPStan\Analyser\Error;
 use PHPStan\File\FileHelper;
 use PHPStan\ShouldNotHappenException;
-use function array_fill_keys;
-use function array_key_exists;
 use function array_values;
 use function count;
 use function is_array;
@@ -43,12 +42,11 @@ public function getErrors(): array
 
 	/**
 	 * @param Error[] $errors
-	 * @param string[] $analysedFiles
 	 */
 	public function process(
 		array $errors,
 		bool $onlyFiles,
-		array $analysedFiles,
+		AnalysedFilesResolver $analysedFilesResolver,
 		bool $hasInternalErrors,
 	): IgnoredErrorHelperProcessedResult
 	{
@@ -190,8 +188,6 @@ public function process(
 			), $unmatchedIgnoredError['file'], $unmatchedIgnoredError['line'], false))->withIdentifier('ignore.count');
 		}
 
-		$analysedFilesKeys = array_fill_keys($analysedFiles, true);
-
 		if (!$hasInternalErrors) {
 			foreach ($unmatchedIgnoredErrors as $unmatchedIgnoredError) {
 				$reportUnmatched = $unmatchedIgnoredError['reportUnmatched'] ?? $this->reportUnmatchedIgnoredErrors;
@@ -214,7 +210,8 @@ public function process(
 						), $unmatchedIgnoredError['file'], $unmatchedIgnoredError['line'], false))->withIdentifier('ignore.count');
 					}
 				} elseif (isset($unmatchedIgnoredError['realPath'])) {
-					if (!array_key_exists($unmatchedIgnoredError['realPath'], $analysedFilesKeys)) {
+
+					if (!$analysedFilesResolver->isInAnalyzedFiles($unmatchedIgnoredError['realPath'])) {
 						continue;
 					}
 

src/Command/AnalyseApplication.php

@@ -2,6 +2,7 @@
 
 namespace PHPStan\Command;
 
+use PHPStan\Analyser\AnalysedFilesResolver;
 use PHPStan\Analyser\AnalyserResult;
 use PHPStan\Analyser\AnalyserResultFinalizer;
 use PHPStan\Analyser\Ignore\IgnoredErrorHelper;
@@ -142,7 +143,7 @@ public function analyse(
 				}
 			}
 
-			$ignoredErrorHelperProcessedResult = $ignoredErrorHelperResult->process($errors, $onlyFiles, $files, $hasInternalErrors);
+			$ignoredErrorHelperProcessedResult = $ignoredErrorHelperResult->process($errors, $onlyFiles, new AnalysedFilesResolver($files), $hasInternalErrors);
 			$fileSpecificErrors = $ignoredErrorHelperProcessedResult->getNotIgnoredErrors();
 			$notFileSpecificErrors = $ignoredErrorHelperProcessedResult->getOtherIgnoreMessages();
 			$collectedData = $analyserResult->getCollectedData();

src/Command/FixerWorkerCommand.php

@@ -3,6 +3,7 @@
 namespace PHPStan\Command;
 
 use Clue\React\NDJson\Encoder;
+use PHPStan\Analyser\AnalysedFilesResolver;
 use PHPStan\Analyser\AnalyserResult;
 use PHPStan\Analyser\AnalyserResultFinalizer;
 use PHPStan\Analyser\Error;
@@ -300,7 +301,7 @@ function (array $errors, array $locallyIgnoredErrors, array $analysedFiles) use
 				$ignoredErrorHelperProcessedResult = $ignoredErrorHelperResult->process(
 					$finalizerResult->getErrors(),
 					$isOnlyFiles,
-					$inceptionFiles,
+					new AnalysedFilesResolver($inceptionFiles),
 					$hasInternalErrors,
 				);
 				$ignoreFileErrors = [];
@@ -355,7 +356,7 @@ private function transformErrorIntoInternalError(Error $error): InternalError
 	 */
 	private function filterErrors(array $errors, IgnoredErrorHelperResult $ignoredErrorHelperResult, bool $onlyFiles, array $inceptionFiles, bool $hasInternalErrors): array
 	{
-		$ignoredErrorHelperProcessedResult = $ignoredErrorHelperResult->process($errors, $onlyFiles, $inceptionFiles, $hasInternalErrors);
+		$ignoredErrorHelperProcessedResult = $ignoredErrorHelperResult->process($errors, $onlyFiles, new AnalysedFilesResolver($inceptionFiles), $hasInternalErrors);
 		$finalErrors = [];
 		foreach ($ignoredErrorHelperProcessedResult->getNotIgnoredErrors() as $error) {
 			if ($error->getIdentifier() === null) {

tests/PHPStan/Analyser/AnalyserTest.php

@@ -680,7 +680,7 @@ private function runAnalyser(
 		);
 		$analyserResult = $finalizer->finalize($analyserResult, $onlyFiles, false)->getAnalyserResult();
 
-		$ignoredErrorHelperProcessedResult = $ignoredErrorHelperResult->process($analyserResult->getErrors(), $onlyFiles, $normalizedFilePaths, $analyserResult->hasReachedInternalErrorsCountLimit());
+		$ignoredErrorHelperProcessedResult = $ignoredErrorHelperResult->process($analyserResult->getErrors(), $onlyFiles, new AnalysedFilesResolver($normalizedFilePaths), $analyserResult->hasReachedInternalErrorsCountLimit());
 		$errors = $ignoredErrorHelperProcessedResult->getNotIgnoredErrors();
 		$errors = array_merge($errors, $ignoredErrorHelperProcessedResult->getOtherIgnoreMessages());
 		if ($analyserResult->hasReachedInternalErrorsCountLimit()) {