TableErrorFormatter - always output identifiers

phpstan · Sep 30, 2024 · fc66c24 · fc66c24
1 parent 84a3354
commit fc66c24
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 30 deletions.
diff --git a/src/Command/ErrorFormatter/TableErrorFormatter.php b/src/Command/ErrorFormatter/TableErrorFormatter.php
@@ -9,12 +9,10 @@
 use PHPStan\File\RelativePathHelper;
 use PHPStan\File\SimpleRelativePathHelper;
 use Symfony\Component\Console\Formatter\OutputFormatter;
-use function array_key_exists;
 use function array_map;
 use function count;
 use function explode;
 use function getenv;
-use function in_array;
 use function is_string;
 use function ltrim;
 use function sprintf;
@@ -69,44 +67,20 @@ public function formatErrors(
 
 		/** @var array<string, Error[]> $fileErrors */
 		$fileErrors = [];
-		$outputIdentifiers = $output->isVerbose();
-		$outputIdentifiersInFile = [];
 		foreach ($analysisResult->getFileSpecificErrors() as $fileSpecificError) {
 			if (!isset($fileErrors[$fileSpecificError->getFile()])) {
 				$fileErrors[$fileSpecificError->getFile()] = [];
 			}
 
 			$fileErrors[$fileSpecificError->getFile()][] = $fileSpecificError;
-			if ($outputIdentifiers) {
-				continue;
-			}
-
-			$filePath = $fileSpecificError->getTraitFilePath() ?? $fileSpecificError->getFilePath();
-			if (array_key_exists($filePath, $outputIdentifiersInFile)) {
-				continue;
-			}
-
-			if ($fileSpecificError->getIdentifier() === null) {
-				continue;
-			}
-
-			if (!in_array($fileSpecificError->getIdentifier(), [
-				'ignore.unmatchedIdentifier',
-				'ignore.parseError',
-				'ignore.unmatched',
-			], true)) {
-				continue;
-			}
-
-			$outputIdentifiersInFile[$filePath] = true;
 		}
 
 		foreach ($fileErrors as $file => $errors) {
 			$rows = [];
 			foreach ($errors as $error) {
 				$message = $error->getMessage();
 				$filePath = $error->getTraitFilePath() ?? $error->getFilePath();
-				if (($outputIdentifiers || array_key_exists($filePath, $outputIdentifiersInFile)) && $error->getIdentifier() !== null && $error->canBeIgnored()) {
+				if ($error->getIdentifier() !== null && $error->canBeIgnored()) {
 					$message .= "\n";
 					$message .= '🪪  ' . $error->getIdentifier();
 				}

diff --git a/tests/PHPStan/Command/ErrorFormatter/TableErrorFormatterTest.php b/tests/PHPStan/Command/ErrorFormatter/TableErrorFormatterTest.php
@@ -190,12 +190,13 @@ public function dataFormatterOutputProvider(): iterable
 			'numGenericErrors' => 0,
 			'verbose' => false,
 			'extraEnvVars' => [],
-			'expected' => ' ------ ------------
+			'expected' => ' ------ ----------------
   Line   foo.php
- ------ ------------
+ ------ ----------------
   5      Foobar\Buz
+         🪪  foobar.buz
          💡 a tip
- ------ ------------
+ ------ ----------------
 
 
  [ERROR] Found 1 error