Skip to content

Check for identifiers before identifier #4143

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Check for identifiers before identifier #4143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c6c28cd
Check for identifiers before identifier
VincentLanglet Jul 21, 2025
fc0dc5a
Add test
VincentLanglet Jul 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/Analyser/Ignore/IgnoredError.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,19 +31,19 @@ public static function stringifyPattern($ignoredError): string
if (isset($ignoredError['message'])) {
$message = $ignoredError['message'];
}
if (isset($ignoredError['identifier'])) {
if ($message === '') {
$message = $ignoredError['identifier'];
} else {
$message = sprintf('%s (%s)', $message, $ignoredError['identifier']);
}
} elseif (isset($ignoredError['identifiers'])) {
if (isset($ignoredError['identifiers'])) {
$identifierList = implode(', ', $ignoredError['identifiers']);
if ($message === '') {
$message = $identifierList;
} else {
$message = sprintf('%s (%s)', $message, $identifierList);
}
} elseif (isset($ignoredError['identifier'])) {
if ($message === '') {
$message = $ignoredError['identifier'];
} else {
$message = sprintf('%s (%s)', $message, $ignoredError['identifier']);
}
}

if ($message === '') {
Expand Down
10 changes: 10 additions & 0 deletions tests/PHPStan/Analyser/AnalyserTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,16 @@ public function testFileWithAnIgnoredWrongIdentifier(): void
$this->assertSame('Ignored error pattern wrong.identifier was not matched in reported errors.', $result[1]);
}

public function testFileWithAnIgnoredWithIdentifierAndIdentifiers(): void
{
$result = $this->runAnalyser([['identifier' => 'some.identifier', 'identifiers' => ['wrong.identifiers']]], true, __DIR__ . '/data/bootstrap-error.php', false);
$this->assertCount(2, $result);
assert($result[0] instanceof Error);
$this->assertSame('Fail.', $result[0]->getMessage());
assert(is_string($result[1]));
$this->assertSame('Ignored error pattern wrong.identifiers was not matched in reported errors.', $result[1]);
}

public function testFileWithAnIgnoredErrorMessageAndCorrectIdentifier(): void
{
$result = $this->runAnalyser([['message' => '#Fail\.#', 'identifier' => 'tests.alwaysFail']], true, __DIR__ . '/data/bootstrap-error.php', false);
Expand Down
Loading