Skip to content

make:entity Use the namespace instead of the full class name for MappingDriver #1054

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
jrushlow merged 2 commits into from
May 4, 2022
Merged

make:entity Use the namespace instead of the full class name for MappingDriver #1054

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d04fdec
Use the namespace of a newly created entity instead of the full class…
michaelphillpotts Feb 16, 2022
2bb6e95
Add comment on intention (Extract namespace from new class).
michaelphillpotts Feb 28, 2022
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
9 changes: 8 additions & 1 deletion src/Doctrine/DoctrineHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,14 @@ public function doesClassUseDriver(string $className, string $driverClass): bool
// if the class should be generated with attributes or annotations. If this exception is thrown, we will check based on the
// namespaces for the given $className and compare it with the doctrine configuration to get the correct MappingDriver.

return $this->isInstanceOf($this->getMappingDriverForNamespace($className), $driverClass);
// extract the new class's namespace from the full $className to check the namespace of the new class against the doctrine configuration.
$classNameComponents = explode('\\', $className);
if (1 < \count($classNameComponents)) {
array_pop($classNameComponents);
}
$classNamespace = implode('\\', $classNameComponents);
Copy link
Member

@weaverryan weaverryan Feb 22, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you add a comment about which situation this is addressing? A test would be ideal, though I don't know how easy that would be to add.

Thanks!


return $this->isInstanceOf($this->getMappingDriverForNamespace($classNamespace), $driverClass);
}

if (null === $em) {
Expand Down