Skip to content

Commit fc66c24

Browse files
committed
TableErrorFormatter - always output identifiers
1 parent 84a3354 commit fc66c24

File tree

2 files changed

+5
-30
lines changed

2 files changed

+5
-30
lines changed

src/Command/ErrorFormatter/TableErrorFormatter.php

+1-27
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,10 @@
99
use PHPStan\File\RelativePathHelper;
1010
use PHPStan\File\SimpleRelativePathHelper;
1111
use Symfony\Component\Console\Formatter\OutputFormatter;
12-
use function array_key_exists;
1312
use function array_map;
1413
use function count;
1514
use function explode;
1615
use function getenv;
17-
use function in_array;
1816
use function is_string;
1917
use function ltrim;
2018
use function sprintf;
@@ -69,44 +67,20 @@ public function formatErrors(
6967

7068
/** @var array<string, Error[]> $fileErrors */
7169
$fileErrors = [];
72-
$outputIdentifiers = $output->isVerbose();
73-
$outputIdentifiersInFile = [];
7470
foreach ($analysisResult->getFileSpecificErrors() as $fileSpecificError) {
7571
if (!isset($fileErrors[$fileSpecificError->getFile()])) {
7672
$fileErrors[$fileSpecificError->getFile()] = [];
7773
}
7874

7975
$fileErrors[$fileSpecificError->getFile()][] = $fileSpecificError;
80-
if ($outputIdentifiers) {
81-
continue;
82-
}
83-
84-
$filePath = $fileSpecificError->getTraitFilePath() ?? $fileSpecificError->getFilePath();
85-
if (array_key_exists($filePath, $outputIdentifiersInFile)) {
86-
continue;
87-
}
88-
89-
if ($fileSpecificError->getIdentifier() === null) {
90-
continue;
91-
}
92-
93-
if (!in_array($fileSpecificError->getIdentifier(), [
94-
'ignore.unmatchedIdentifier',
95-
'ignore.parseError',
96-
'ignore.unmatched',
97-
], true)) {
98-
continue;
99-
}
100-
101-
$outputIdentifiersInFile[$filePath] = true;
10276
}
10377

10478
foreach ($fileErrors as $file => $errors) {
10579
$rows = [];
10680
foreach ($errors as $error) {
10781
$message = $error->getMessage();
10882
$filePath = $error->getTraitFilePath() ?? $error->getFilePath();
109-
if (($outputIdentifiers || array_key_exists($filePath, $outputIdentifiersInFile)) && $error->getIdentifier() !== null && $error->canBeIgnored()) {
83+
if ($error->getIdentifier() !== null && $error->canBeIgnored()) {
11084
$message .= "\n";
11185
$message .= '🪪 ' . $error->getIdentifier();
11286
}

tests/PHPStan/Command/ErrorFormatter/TableErrorFormatterTest.php

+4-3
Original file line numberDiff line numberDiff line change
@@ -190,12 +190,13 @@ public function dataFormatterOutputProvider(): iterable
190190
'numGenericErrors' => 0,
191191
'verbose' => false,
192192
'extraEnvVars' => [],
193-
'expected' => ' ------ ------------
193+
'expected' => ' ------ ----------------
194194
Line foo.php
195-
------ ------------
195+
------ ----------------
196196
5 Foobar\Buz
197+
🪪 foobar.buz
197198
💡 a tip
198-
------ ------------
199+
------ ----------------
199200
200201
201202
[ERROR] Found 1 error

0 commit comments

Comments
 (0)