Skip to content
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

Jump to bottom

Support for trait mapping files #224

Open
wants to merge 1 commit into
base: 2.4.x
Choose a base branch
from
Open

Support for trait mapping files #224

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
9 changes: 7 additions & 2 deletions lib/Doctrine/Persistence/Mapping/RuntimeReflectionService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,19 @@ public function __construct()
*/
public function getParentClasses($class)
{
if (! class_exists($class)) {
if (! (class_exists($class) || trait_exists($class)) ) {
throw MappingException::nonExistingClass($class);
}

$parents = class_parents($class);
$parents = class_parents($class) + class_uses($class);
Copy link
Member

Choose a reason for hiding this comment

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

This introduces a violation of this method's signature:

persistence/lib/Doctrine/Persistence/Mapping/ReflectionService.php

Line 23 in 9f22673

* @psalm-return class-string[]

Also, it's inconsistent with its name.


assert($parents !== false);

// Support traits from parent classes
foreach ($parents as $parentClass) {
$parents = array_merge($parents, $this->getParentClasses($parentClass));
}

return $parents;
}

Expand Down