Skip to content

Fix asserting trait errors over different files #13

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

Merged
janedbal merged 2 commits into from
Jan 22, 2026
Merged

Fix asserting trait errors over different files #13

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
78935ef
Fix asserting of trait errors
janedbal Jan 22, 2026
a7f5fde
Support old PHP
janedbal Jan 22, 2026
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
5 changes: 3 additions & 2 deletions src/RuleTestCase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
use function sort;
use function sprintf;
use function str_replace;
use function strpos;
use function trim;
use function uniqid;
use const DIRECTORY_SEPARATOR;
Expand All @@ -48,7 +49,7 @@ protected function analyzeFiles(

if ($autofix) {
foreach ($files as $file) {
$fileErrors = array_filter($analyserErrors, static fn (Error $error): bool => $error->getFilePath() === $file);
$fileErrors = array_filter($analyserErrors, static fn (Error $error): bool => strpos($error->getFile(), $file) === 0);
$this->autofix($file, array_values($fileErrors));
}

Expand All @@ -59,7 +60,7 @@ protected function analyzeFiles(
}

foreach ($files as $file) {
$fileErrors = array_filter($analyserErrors, static fn (Error $error): bool => $error->getFilePath() === $file);
$fileErrors = array_filter($analyserErrors, static fn (Error $error): bool => strpos($error->getFile(), $file) === 0);
$actualErrors = $this->processActualErrors(array_values($fileErrors));
$expectedErrors = $this->parseExpectedErrors($file);

Expand Down
7 changes: 7 additions & 0 deletions tests/Rule/Data/DisallowDivisionByLiteralZeroRule/trait-user.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?php declare(strict_types = 1);

namespace DisallowDivisionByLiteralZeroRule;

class TraitUser {
use MyTrait;
}
3 changes: 0 additions & 3 deletions tests/Rule/Data/DisallowDivisionByLiteralZeroRule/trait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,3 @@ public function emitError(): float
}
}

class TraitUser {
use MyTrait;
}
5 changes: 4 additions & 1 deletion tests/RuleTestCaseTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,10 @@ public function testRule(): void

public function testTrait(): void
{
$this->analyzeFiles([__DIR__ . '/Rule/Data/DisallowDivisionByLiteralZeroRule/trait.php']);
$this->analyzeFiles([
__DIR__ . '/Rule/Data/DisallowDivisionByLiteralZeroRule/trait.php',
__DIR__ . '/Rule/Data/DisallowDivisionByLiteralZeroRule/trait-user.php',
]);
}

public function testMultipleErrorsOnSameLine(): void
Expand Down