Skip to content

Handle root-namespace classes in SymfonyFileLocator #521

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

Open
Junaid-PK wants to merge 1 commit into
base: 4.2.x
Choose a base branch
from
Open

Handle root-namespace classes in SymfonyFileLocator #521

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
8 changes: 3 additions & 5 deletions src/Mapping/Driver/SymfonyFileLocator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,8 @@
use RuntimeException;

use function array_keys;
use function assert;
use function is_dir;
use function is_file;
use function is_int;
use function realpath;
use function sprintf;
use function str_replace;
Expand Down Expand Up @@ -222,12 +220,12 @@ public function findMappingFile(string $className): string
}
}

$pos = strrpos($className, '\\');
assert(is_int($pos));
$pos = strrpos($className, '\\');
$shortClassName = $pos === false ? $className : substr($className, $pos + 1);

throw MappingException::mappingFileNotFound(
$className,
substr($className, $pos + 1) . $this->fileExtension,
$shortClassName . $this->fileExtension,
);
}

Expand Down
9 changes: 9 additions & 0 deletions tests/Mapping/SymfonyFileLocatorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,15 @@ public function testFindMappingFileNotFound(): void
$locator->findMappingFile('Foo\\stdClass2');
}

public function testFindMappingFileNotFoundForClassInRootNamespace(): void
{
$locator = new SymfonyFileLocator([], '.yml');

$this->expectException(MappingException::class);
$this->expectExceptionMessage("No mapping file found named 'DateTime.yml' for class 'DateTime'.");
$locator->findMappingFile('DateTime');
}

public function testFindMappingFileLeastSpecificNamespaceFirst(): void
{
// Low -> High
Expand Down