Fix reporting unmatched ignored error from path that wasn't analysed

ondrejmirtes · ondrejmirtes · commit c9df2f43a3e2 · 2020-03-22T13:00:05.000+01:00
diff --git a/src/Analyser/IgnoredErrorHelperResult.php b/src/Analyser/IgnoredErrorHelperResult.php
@@ -74,9 +74,15 @@ public function getWarnings(): array
 
 	/**
 	 * @param Error[] $errors
+	 * @param string[] $analysedFiles
 	 * @return string[]|Error[]
 	 */
-	public function process(array $errors, bool $onlyFiles, bool $hasInternalErrors): array
+	public function process(
+		array $errors,
+		bool $onlyFiles,
+		array $analysedFiles,
+		bool $hasInternalErrors
+	): array
 	{
 		$unmatchedIgnoredErrors = $this->ignoreErrors;
 		$addErrors = [];
@@ -206,6 +212,8 @@ public function process(array $errors, bool $onlyFiles, bool $hasInternalErrors)
 
 		$errors = array_merge($errors, $addErrors);
 
+		$analysedFilesKeys = array_fill_keys($analysedFiles, true);
+
 		if ($this->reportUnmatchedIgnoredErrors && !$hasInternalErrors) {
 			foreach ($unmatchedIgnoredErrors as $unmatchedIgnoredError) {
 				if (
@@ -224,6 +232,10 @@ public function process(array $errors, bool $onlyFiles, bool $hasInternalErrors)
 						), $unmatchedIgnoredError['file'], $unmatchedIgnoredError['line'], false);
 					}
 				} elseif (isset($unmatchedIgnoredError['realPath'])) {
+					if (!array_key_exists($unmatchedIgnoredError['realPath'], $analysedFilesKeys)) {
+						continue;
+					}
+
 					$errors[] = new Error(
 						sprintf(
 							'Ignored error pattern %s was not matched in reported errors.',
diff --git a/src/Command/AnalyseApplication.php b/src/Command/AnalyseApplication.php
@@ -119,7 +119,7 @@ public function analyse(
 			$analyserResult = $this->resultCacheManager->process($intermediateAnalyserResult, $resultCache);
 			$hasInferrablePropertyTypesFromConstructor = $analyserResult->hasInferrablePropertyTypesFromConstructor();
 			$internalErrors = $analyserResult->getInternalErrors();
-			$errors = $ignoredErrorHelperResult->process($analyserResult->getErrors(), $onlyFiles, count($internalErrors) > 0 || $analyserResult->hasReachedInternalErrorsCountLimit());
+			$errors = $ignoredErrorHelperResult->process($analyserResult->getErrors(), $onlyFiles, $files, count($internalErrors) > 0 || $analyserResult->hasReachedInternalErrorsCountLimit());
 			$warnings = $ignoredErrorHelperResult->getWarnings();
 			if ($analyserResult->hasReachedInternalErrorsCountLimit()) {
 				$errors[] = sprintf('Reached internal errors count limit of %d, exiting...', $this->internalErrorsCountLimit);
diff --git a/tests/PHPStan/Analyser/AnalyserTest.php b/tests/PHPStan/Analyser/AnalyserTest.php
@@ -326,6 +326,28 @@ public function testReportMultipleParserErrorsAtOnce(): void
 		$this->assertSame(10, $errorTwo->getLine());
 	}
 
+	/**
+	 * @dataProvider dataTrueAndFalse
+	 * @param bool $onlyFiles
+	 */
+	public function testDoNotReportUnmatchedIgnoredErrorsFromPathIfPathWasNotAnalysed(bool $onlyFiles): void
+	{
+		$ignoreErrors = [
+			[
+				'message' => '#Fail\.#',
+				'path' => __DIR__ . '/data/bootstrap-error.php',
+			],
+			[
+				'message' => '#Fail\.#',
+				'path' => __DIR__ . '/data/two-fails.php',
+			],
+		];
+		$result = $this->runAnalyser($ignoreErrors, true, [
+			__DIR__ . '/data/two-fails.php',
+		], $onlyFiles);
+		$this->assertCount(0, $result);
+	}
+
 	/**
 	 * @param mixed[] $ignoreErrors
 	 * @param bool $reportUnmatchedIgnoredErrors
@@ -357,11 +379,13 @@ private function runAnalyser(
 			return $ignoredErrorHelperResult->getErrors();
 		}
 
-		$analyserResult = $analyser->analyse(array_map(function (string $path): string {
+		$normalizedFilePaths = array_map(function (string $path): string {
 			return $this->getFileHelper()->normalizePath($path);
-		}, $filePaths));
+		}, $filePaths);
+
+		$analyserResult = $analyser->analyse($normalizedFilePaths);
 
-		$errors = $ignoredErrorHelperResult->process($analyserResult->getErrors(), $onlyFiles, $analyserResult->hasReachedInternalErrorsCountLimit());
+		$errors = $ignoredErrorHelperResult->process($analyserResult->getErrors(), $onlyFiles, $normalizedFilePaths, $analyserResult->hasReachedInternalErrorsCountLimit());
 		if ($analyserResult->hasReachedInternalErrorsCountLimit()) {
 			$errors[] = sprintf('Reached internal errors count limit of %d, exiting...', 50);
 		}
