Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 5 additions & 0 deletions src/ClassMapGenerator.php
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,11 @@ private function filterByNamespace(array $classes, string $filePath, string $bas
foreach ($classes as $class) {
// transform class name to file path and validate
if ('psr-0' === $namespaceType) {
if ('' !== $baseNamespace && !str_starts_with($class, $baseNamespace)) {
$rejectedClasses[] = $class;
continue;
}

$namespaceLength = strrpos($class, '\\');
if (false !== $namespaceLength) {
$namespace = substr($class, 0, $namespaceLength + 1);
Expand Down
32 changes: 32 additions & 0 deletions tests/ClassMapGeneratorTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -437,6 +437,38 @@ protected static function assertEqualsNormalized(array $expected, array $actual,
self::assertEquals($expected, $actual, $message);
}

public function testPsr0OptimizedClassmapRespectsNamespacePrefix(): void
{
$this->generator->scanPaths(
__DIR__ . '/Fixtures/psr0NamespacePrefix',
null,
'psr-0',
'Acme_'
);

$classMap = $this->generator->getClassMap();
$map = $classMap->getMap();

self::assertArrayHasKey('Acme_Utils_Helper', $map);
self::assertArrayHasKey('Acme_Logger', $map);

self::assertArrayNotHasKey('Other\\Controller\\Page', $map);
self::assertArrayNotHasKey('Other\\Widget', $map);

self::assertArrayNotHasKey('Other_Service', $map);

$violations = $classMap->getPsrViolations();
sort($violations);
self::assertSame(
[
'Class Other\\Controller\\Page located in ./tests/Fixtures/psr0NamespacePrefix/Other/Controller/Page.php does not comply with psr-0 autoloading standard (rule: Acme_ => ./tests/Fixtures/psr0NamespacePrefix). Skipping.',
'Class Other\\Widget located in ./tests/Fixtures/psr0NamespacePrefix/Other/Widget.php does not comply with psr-0 autoloading standard (rule: Acme_ => ./tests/Fixtures/psr0NamespacePrefix). Skipping.',
'Class Other_Service located in ./tests/Fixtures/psr0NamespacePrefix/Other/Service.php does not comply with psr-0 autoloading standard (rule: Acme_ => ./tests/Fixtures/psr0NamespacePrefix). Skipping.',
],
$violations
);
}

public static function getUniqueTmpDirectory(): string
{
$attempts = 5;
Expand Down
5 changes: 5 additions & 0 deletions tests/Fixtures/psr0NamespacePrefix/Acme/Logger.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?php

class Acme_Logger
{
}
5 changes: 5 additions & 0 deletions tests/Fixtures/psr0NamespacePrefix/Acme/Utils/Helper.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?php

class Acme_Utils_Helper
{
}
7 changes: 7 additions & 0 deletions tests/Fixtures/psr0NamespacePrefix/Other/Controller/Page.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?php

namespace Other\Controller;

class Page
{
}
5 changes: 5 additions & 0 deletions tests/Fixtures/psr0NamespacePrefix/Other/Service.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?php

class Other_Service
{
}
7 changes: 7 additions & 0 deletions tests/Fixtures/psr0NamespacePrefix/Other/Widget.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?php

namespace Other;

class Widget
{
}
Loading