Skip to content

fix: Stop treating .class.php files as PSR-4 aliases in Psr4NamespaceRule #516

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
samsonasik merged 1 commit into from
Oct 24, 2026
Merged

fix: Stop treating .class.php files as PSR-4 aliases in Psr4NamespaceRule #516

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 0 additions & 2 deletions src/Rule/Rules/Composer/Psr4NamespaceRule.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
use function file_exists;
use function ltrim;
use function max;
use function preg_replace;
use function sprintf;
use function str_ends_with;
use function str_replace;
Expand Down Expand Up @@ -113,7 +112,6 @@ private function expectedClassNames(string $file): array
}

$relativeClass = substr($relativeClass, 0, -4);
$relativeClass = (string) preg_replace('/\.class$/i', '', $relativeClass);
$relativeClass = str_replace('/', '\\', $relativeClass);

$className = $namespace . ltrim($relativeClass, '\\');
Expand Down
31 changes: 27 additions & 4 deletions tests/Rule/Composer/Psr4NamespaceRuleTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
use function file_put_contents;
use function json_encode;
use function mkdir;
use function sprintf;

#[CoversClass(Psr4NamespaceRule::class)]
final class Psr4NamespaceRuleTest extends TestCase
Expand Down Expand Up @@ -205,19 +206,41 @@ public function testPassesWhenRelativeFileIsNotPhpFile(): void
$this->assertNotInstanceOf(RuleViolation::class, $psr4NamespaceRule->evaluate($this->makeNode('Foo', $file)));
}

public function testStripsClassSuffixFromExpectedClassName(): void
public function testDoesNotTreatClassPhpSuffixAsPhpFile(): void
{
$basePath = $this->makeTempProject();
$file = $basePath . '/tests/Foo.class.php';
mkdir($basePath . '/tests/Service');

file_put_contents($file, '<?php namespace App\Tests; class Foo {}');
file_put_contents($basePath . '/tests/Foo.php', '<?php namespace App\Tests; class Foo {}');

$psr4NamespaceRule = new Psr4NamespaceRule('Source');

$this->assertNotInstanceOf(
RuleViolation::class,
$psr4NamespaceRule->evaluate($this->makeNode('App\\Tests\\Foo', $file))
$psr4NamespaceRule->evaluate($this->makeNode('App\\Tests\\Foo', $basePath . '/tests/Foo.php'))
);

foreach ($this->classPhpSuffixFiles() as $relativeFile => [$className, $expectedClassName]) {
$file = $basePath . '/tests/' . $relativeFile;
file_put_contents($file, '<?php class Foo {}');

$violation = $psr4NamespaceRule->evaluate($this->makeNode($className, $file));

$this->assertInstanceOf(RuleViolation::class, $violation, $relativeFile);
$this->assertSame(
sprintf('Class [%s] must match PSR-4 class [%s]', $className, $expectedClassName),
$violation->message,
$relativeFile
);
}
}

/** @return iterable<string, array{string, string}> */
private function classPhpSuffixFiles(): iterable
{
yield 'Foo.class.php' => ['App\\Tests\\Foo', 'App\\Tests\\Foo.class'];
yield 'Bar.class.php' => ['App\\Tests\\BarClass', 'App\\Tests\\Bar.class'];
yield 'Service/Foo.class.php' => ['App\\Tests\\Service\\Foo', 'App\\Tests\\Service\\Foo.class'];
}

public function testFailsWhenTraitNameDoesNotMatchFilename(): void
Expand Down
Loading