[Turbo] Fix broadcast with composite primary key #1857
Conversation
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
chapterjason
force-pushed
the
fix-composite-primary-key
branch
from
d868350 to
cba61dc
Compare
kbond
changed the title
smnandre
reviewed
Jun 22, 2024
Comment on lines
+135
to
+137
| if (!isset($this->broadcastedClasses[$entityClass])) { | ||
| $this->broadcastedClasses[$entityClass] = []; | ||
| $r = new \ReflectionClass($entityClass); |
There was a problem hiding this comment.
Not sure this is worth the change.
smnandre
reviewed
Jun 22, 2024
| if ('createdEntities' !== $property) { | ||
| $id = $em->getClassMetadata($class)->getIdentifierValues($entity); | ||
| $id = $this->doctrineIdAccessor->getEntityId($entity, $em); |
There was a problem hiding this comment.
Could you illustrate precisely what cannot be done before, what it would look like, and same after your changes ? :)
smnandre
reviewed
Jun 22, 2024
Comment on lines
+37
to
+39
| if (!$this->doctrine) { | ||
| return $class; | ||
| } |
smnandre
reviewed
Jun 22, 2024
Comment on lines
+22
to
+27
| private $doctrine; | ||
|
|
||
| public function __construct(?ManagerRegistry $doctrine = null) | ||
| { | ||
| $this->doctrine = $doctrine; | ||
| } |
smnandre
reviewed
Jun 22, 2024
Comment on lines
+48
to
+54
| $values = $em->getClassMetadata($entity::class)->getIdentifierValues($entity); | ||
|
|
||
| foreach ($values as $key => $value) { | ||
| if (\is_object($value)) { | ||
| $values[$key] = $this->getIdentifierValues($em, $value); | ||
| } | ||
| } |
There was a problem hiding this comment.
Could you add some doc/example here ?
smnandre
reviewed
Jun 22, 2024
Comment on lines
+50
to
+66
| $container->addCompilerPass(new class() implements CompilerPassInterface { | ||
| public function process(ContainerBuilder $container): void | ||
| { | ||
| $serviceIds = [ | ||
| ...$container->findTaggedServiceIds('turbo.broadcaster'), | ||
| ...$container->findTaggedServiceIds('turbo.renderer.stream_listen'), | ||
| ]; | ||
|
|
||
| foreach ($serviceIds as $serviceId => $tags) { | ||
| $definition = $container->getDefinition($serviceId); | ||
|
|
||
| $definition | ||
| ->addArgument(new Reference('turbo.id_formatter')) | ||
| ->addArgument(new Reference('turbo.doctrine_class_resolver')); | ||
| } | ||
| } | ||
| }); |
There was a problem hiding this comment.
Those tags refer to BroadcasterInterface and TurboStreamListenRendererInterface services, so you cannot add those arguments there as it would potentially impact other services which don't use them.
Kocal
added
Status: Needs Work
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Kind of a feature as it adds support for using broadcast with entities using a composite primary key.
IdAccessorinto anotherDoctrineIdAccessorto prevent duplicated codeIdFormatterto format the values returned from the doctrine functiongetIdentifierValuesDoctrineClassResolverto resolve real entity class names. (Doctrine;Proxy)Others
CONTRIBUTING.mdSong.php)Last workflow issue with phpstan is fixed in #1854
Fixed more than I wanted, a bit unsure about the injection of services into
Broadcasterin the Mercure integration, was even confused that the turbo services for the Mercure integration are registered in the MercureBundle.