-
-
Notifications
You must be signed in to change notification settings - Fork 383
[LiveComponent] Add support for interfaces while (de)hydrating a Doctrine entity #2834
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.
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
pink6440
wants to merge
16
commits into
symfony:2.x
Choose a base branch
from
pink6440:doctrine_alias_support
base: 2.x
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 11 commits
Commits
Show all changes
16 commits
Select commit
Hold shift + click to select a range
41ace4f
Update DoctrineEntityHydrationExtension.php, support for interface al…
pink6440 c971111
Updating hydrator
pink6440 75df169
Optimization
pink6440 2efae98
Code styling
pink6440 e9afa14
Code styling
pink6440 ed2b787
Code styling
pink6440 afcaa5e
Code styling
pink6440 8b2cc83
Code styling
pink6440 bbe7716
Refactored : explicit separation between classes and interfaces
pink6440 b134d9f
Code styling
pink6440 7c3bdd9
Code styling
pink6440 7b26409
Update src/LiveComponent/tests/Fixtures/Kernel.php
pink6440 85cfd35
Update src/LiveComponent/tests/Integration/Hydration/DoctrineEntityHy…
pink6440 1eebe17
Update src/LiveComponent/tests/Integration/Hydration/DoctrineEntityHy…
pink6440 251d673
Apply suggestions from code review
pink6440 b8a071e
Update DoctrineEntityHydrationExtension.php
pink6440 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -13,6 +13,7 @@ | |
|
||
use Doctrine\ORM\EntityManagerInterface; | ||
use Doctrine\Persistence\ManagerRegistry; | ||
use Doctrine\Persistence\Mapping\MappingException; | ||
use Doctrine\Persistence\ObjectManager; | ||
|
||
/** | ||
|
@@ -61,8 +62,7 @@ public function dehydrate(object $object): mixed | |
$id = $this | ||
->objectManagerFor($class = $object::class) | ||
->getClassMetadata($class) | ||
->getIdentifierValues($object) | ||
; | ||
->getIdentifierValues($object); | ||
|
||
// Dehydrate ID values in case they are other entities | ||
$id = array_map(fn ($id) => \is_object($id) && $this->supports($id::class) ? $this->dehydrate($id) : $id, $id); | ||
|
@@ -81,14 +81,44 @@ public function dehydrate(object $object): mixed | |
|
||
private function objectManagerFor(string $class): ?ObjectManager | ||
{ | ||
if (!class_exists($class)) { | ||
if (class_exists($class)) { | ||
// Keep the standard way for a class | ||
// todo cache/warmup an array of classes that are "doctrine objects" | ||
foreach ($this->managerRegistries as $registry) { | ||
if ($om = $registry->getManagerForClass($class)) { | ||
return self::ensureManagedObject($om, $class); | ||
} | ||
} | ||
|
||
return null; | ||
} | ||
|
||
// todo cache/warmup an array of classes that are "doctrine objects" | ||
foreach ($this->managerRegistries as $registry) { | ||
if ($om = $registry->getManagerForClass($class)) { | ||
return self::ensureManagedObject($om, $class); | ||
if (interface_exists($class)) { | ||
// special handler for interfaces | ||
// For use cases : @see https://symfony.com/doc/current/doctrine/resolve_target_entity.html | ||
// As today, getManagerForClass don't resolve nicely aliased interfaces | ||
// The workaround is to enum over each object manager and trying to get metadata | ||
// The metadata are indeed, resolved nicely | ||
// Fore more details : | ||
Comment on lines
+95
to
+100
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Can we turn this into two or three lines, insisting more on what we "do" than on what "was" the problem ? |
||
// @see \Doctrine\ORM\Tools\ResolveTargetEntityListener | ||
pink6440 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
// todo cache/warmup an array of interfaces that are resolved "doctrine objects" | ||
pink6440 marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
foreach ($this->managerRegistries as $registry) { | ||
foreach ($registry->getManagers() as $om) { | ||
// the getClassMetaData can indeed throw an exception | ||
// so, we | ||
pink6440 marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
try { | ||
if (null !== $om->getClassMetadata($class)) { | ||
return self::ensureManagedObject($om, $class); | ||
} | ||
} catch (MappingException $e) { | ||
// I did not find a nice way to check if it is because the class is really unknown | ||
// It is good to check for a specific exception ? | ||
// eg: \Doctrine\Persistence\Mapping\MappingException | ||
// @see \Doctrine\Persistence\Mapping\AbstractClassMetadataFactory::getMetadataFor | ||
// throw $e; | ||
pink6440 marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
} | ||
} | ||
} | ||
} | ||
|
||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
<?php | ||
|
||
namespace Symfony\UX\LiveComponent\Tests\Fixtures\Dto; | ||
|
||
class Aliased | ||
{ | ||
// public string $address; | ||
pink6440 marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
public string $name; | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
<?php | ||
|
||
/* | ||
* This file is part of the Symfony package. | ||
* | ||
* (c) Fabien Potencier <[email protected]> | ||
* | ||
* For the full copyright and license information, please view the LICENSE | ||
* file that was distributed with this source code. | ||
*/ | ||
|
||
namespace Symfony\UX\LiveComponent\Tests\Fixtures\Entity; | ||
|
||
use Doctrine\ORM\Mapping as ORM; | ||
use Doctrine\ORM\Mapping\Column; | ||
|
||
#[ORM\Entity] | ||
class AliasedEntity implements AliasedEntityInterface | ||
{ | ||
#[ORM\Id] | ||
#[ORM\GeneratedValue] | ||
#[ORM\Column(type: 'integer')] | ||
public $id; | ||
|
||
#[Column(type: 'string')] | ||
public ?string $name = null; | ||
} |
7 changes: 7 additions & 0 deletions
7
src/LiveComponent/tests/Fixtures/Entity/AliasedEntityInterface.php
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
<?php | ||
|
||
namespace Symfony\UX\LiveComponent\Tests\Fixtures\Entity; | ||
|
||
interface AliasedEntityInterface { | ||
|
||
pink6440 marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.