[Messenger] Support DoctrineMessageBusHook for Doctrine ODM

mpoiriert · Jan 2, 2024 · 1897ec3 · 1897ec3
1 parent 046b885
commit 1897ec3
Show file tree

Hide file tree

Showing 21 changed files with 29 additions and 32 deletions.
diff --git a/app/src/Entity/User.php b/app/src/Entity/User.php
@@ -22,8 +22,8 @@
 use Draw\Bundle\UserBundle\Security\TwoFactorAuthentication\Entity\TwoFactorAuthenticationUserInterface;
 use Draw\Component\EntityMigrator\MigrationTargetEntityInterface;
 use Draw\Component\Mailer\Recipient\LocalizationAwareInterface;
-use Draw\Component\Messenger\DoctrineMessageBusHook\Entity\MessageHolderInterface;
-use Draw\Component\Messenger\DoctrineMessageBusHook\Entity\MessageHolderTrait;
+use Draw\Component\Messenger\DoctrineMessageBusHook\Model\MessageHolderInterface;
+use Draw\Component\Messenger\DoctrineMessageBusHook\Model\MessageHolderTrait;
 use Draw\DoctrineExtra\Common\Collections\CollectionUtil;
 use JMS\Serializer\Annotation as Serializer;
 use Ramsey\Uuid\Uuid;

diff --git a/packages/messenger/DoctrineMessageBusHook/EnvelopeFactory/BasicEnvelopeFactory.php b/packages/messenger/DoctrineMessageBusHook/EnvelopeFactory/BasicEnvelopeFactory.php
@@ -2,8 +2,8 @@
 
 namespace Draw\Component\Messenger\DoctrineMessageBusHook\EnvelopeFactory;
 
-use Draw\Component\Messenger\DoctrineMessageBusHook\Entity\MessageHolderInterface;
 use Draw\Component\Messenger\DoctrineMessageBusHook\Event\EnvelopeCreatedEvent;
+use Draw\Component\Messenger\DoctrineMessageBusHook\Model\MessageHolderInterface;
 use Symfony\Component\Messenger\Envelope;
 use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
 

diff --git a/packages/messenger/DoctrineMessageBusHook/EnvelopeFactory/EnvelopeFactoryInterface.php b/packages/messenger/DoctrineMessageBusHook/EnvelopeFactory/EnvelopeFactoryInterface.php
@@ -2,7 +2,7 @@
 
 namespace Draw\Component\Messenger\DoctrineMessageBusHook\EnvelopeFactory;
 
-use Draw\Component\Messenger\DoctrineMessageBusHook\Entity\MessageHolderInterface;
+use Draw\Component\Messenger\DoctrineMessageBusHook\Model\MessageHolderInterface;
 use Symfony\Component\Messenger\Envelope;
 
 interface EnvelopeFactoryInterface

diff --git a/packages/messenger/DoctrineMessageBusHook/Event/EnvelopeCreatedEvent.php b/packages/messenger/DoctrineMessageBusHook/Event/EnvelopeCreatedEvent.php
@@ -2,7 +2,7 @@
 
 namespace Draw\Component\Messenger\DoctrineMessageBusHook\Event;
 
-use Draw\Component\Messenger\DoctrineMessageBusHook\Entity\MessageHolderInterface;
+use Draw\Component\Messenger\DoctrineMessageBusHook\Model\MessageHolderInterface;
 use Symfony\Component\Messenger\Envelope;
 use Symfony\Contracts\EventDispatcher\Event;
 

diff --git a/packages/messenger/DoctrineMessageBusHook/EventListener/DoctrineBusMessageListener.php b/packages/messenger/DoctrineMessageBusHook/EventListener/DoctrineBusMessageListener.php
@@ -2,13 +2,12 @@
 
 namespace Draw\Component\Messenger\DoctrineMessageBusHook\EventListener;
 
-use Doctrine\ORM\EntityManagerInterface;
-use Doctrine\ORM\Event\OnClearEventArgs;
 use Doctrine\Persistence\Event\LifecycleEventArgs;
+use Doctrine\Persistence\Event\OnClearEventArgs;
 use Doctrine\Persistence\Proxy;
-use Draw\Component\Messenger\DoctrineMessageBusHook\Entity\MessageHolderInterface;
 use Draw\Component\Messenger\DoctrineMessageBusHook\EnvelopeFactory\EnvelopeFactoryInterface;
 use Draw\Component\Messenger\DoctrineMessageBusHook\Message\LifeCycleAwareMessageInterface;
+use Draw\Component\Messenger\DoctrineMessageBusHook\Model\MessageHolderInterface;
 use Symfony\Component\Messenger\MessageBusInterface;
 use Symfony\Contracts\Service\ResetInterface;
 
@@ -72,9 +71,6 @@ public function postFlush(): void
         }
     }
 
-    /**
-     * @param LifecycleEventArgs<EntityManagerInterface> $event
-     */
     private function trackMessageHolder(LifecycleEventArgs $event): void
     {
         $entity = $event->getObject();
@@ -86,7 +82,11 @@ private function trackMessageHolder(LifecycleEventArgs $event): void
         $entityManager = $event->getObjectManager();
 
         $classMetadata = $entityManager->getClassMetadata($entity::class);
-        $className = $classMetadata->rootEntityName;
+
+        $className = $classMetadata->rootDocumentName
+            ?? $classMetadata->rootEntityName
+            ?? $classMetadata->getName();
+
         $this->messageHolders[$className][spl_object_id($entity)] = $entity;
     }
 

diff --git a/packages/messenger/DoctrineMessageBusHook/Message/LifeCycleAwareMessageInterface.php b/packages/messenger/DoctrineMessageBusHook/Message/LifeCycleAwareMessageInterface.php
@@ -2,7 +2,7 @@
 
 namespace Draw\Component\Messenger\DoctrineMessageBusHook\Message;
 
-use Draw\Component\Messenger\DoctrineMessageBusHook\Entity\MessageHolderInterface;
+use Draw\Component\Messenger\DoctrineMessageBusHook\Model\MessageHolderInterface;
 
 interface LifeCycleAwareMessageInterface
 {

diff --git a/...BusHook/Entity/MessageHolderInterface.php → ...eBusHook/Model/MessageHolderInterface.php b/...BusHook/Entity/MessageHolderInterface.php → ...eBusHook/Model/MessageHolderInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Draw\Component\Messenger\DoctrineMessageBusHook\Entity;
+namespace Draw\Component\Messenger\DoctrineMessageBusHook\Model;
 
 interface MessageHolderInterface
 {

diff --git a/...sageBusHook/Entity/MessageHolderTrait.php → ...ssageBusHook/Model/MessageHolderTrait.php b/...sageBusHook/Entity/MessageHolderTrait.php → ...ssageBusHook/Model/MessageHolderTrait.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Draw\Component\Messenger\DoctrineMessageBusHook\Entity;
+namespace Draw\Component\Messenger\DoctrineMessageBusHook\Model;
 
 trait MessageHolderTrait
 {

diff --git a/packages/messenger/Tests/DoctrineMessageBusHook/Entity/MessageHolderTraitTest.php b/packages/messenger/Tests/DoctrineMessageBusHook/Entity/MessageHolderTraitTest.php
@@ -2,7 +2,7 @@
 
 namespace Draw\Component\Messenger\Tests\DoctrineMessageBusHook\Entity;
 
-use Draw\Component\Messenger\DoctrineMessageBusHook\Entity\MessageHolderTrait;
+use Draw\Component\Messenger\DoctrineMessageBusHook\Model\MessageHolderTrait;
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 

diff --git a/packages/messenger/Tests/DoctrineMessageBusHook/EnvelopeFactory/BasicEnvelopeFactoryTest.php b/packages/messenger/Tests/DoctrineMessageBusHook/EnvelopeFactory/BasicEnvelopeFactoryTest.php
@@ -2,9 +2,9 @@
 
 namespace Draw\Component\Messenger\Tests\DoctrineMessageBusHook\EnvelopeFactory;
 
-use Draw\Component\Messenger\DoctrineMessageBusHook\Entity\MessageHolderInterface;
 use Draw\Component\Messenger\DoctrineMessageBusHook\EnvelopeFactory\BasicEnvelopeFactory;
 use Draw\Component\Messenger\DoctrineMessageBusHook\Event\EnvelopeCreatedEvent;
+use Draw\Component\Messenger\DoctrineMessageBusHook\Model\MessageHolderInterface;
 use Draw\Component\Tester\MockTrait;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;

diff --git a/packages/messenger/Tests/DoctrineMessageBusHook/Event/EnvelopeCreatedEventTest.php b/packages/messenger/Tests/DoctrineMessageBusHook/Event/EnvelopeCreatedEventTest.php
@@ -2,8 +2,8 @@
 
 namespace Draw\Component\Messenger\Tests\DoctrineMessageBusHook\Event;
 
-use Draw\Component\Messenger\DoctrineMessageBusHook\Entity\MessageHolderInterface;
 use Draw\Component\Messenger\DoctrineMessageBusHook\Event\EnvelopeCreatedEvent;
+use Draw\Component\Messenger\DoctrineMessageBusHook\Model\MessageHolderInterface;
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;

diff --git a/...s/messenger/Tests/DoctrineMessageBusHook/EventListener/DoctrineBusMessageListenerTest.php b/...s/messenger/Tests/DoctrineMessageBusHook/EventListener/DoctrineBusMessageListenerTest.php
@@ -8,10 +8,10 @@
 use Doctrine\Persistence\Event\LifecycleEventArgs;
 use Doctrine\Persistence\Proxy;
 use Draw\Component\Core\Reflection\ReflectionAccessor;
-use Draw\Component\Messenger\DoctrineMessageBusHook\Entity\MessageHolderInterface;
 use Draw\Component\Messenger\DoctrineMessageBusHook\EnvelopeFactory\EnvelopeFactoryInterface;
 use Draw\Component\Messenger\DoctrineMessageBusHook\EventListener\DoctrineBusMessageListener;
 use Draw\Component\Messenger\DoctrineMessageBusHook\Message\LifeCycleAwareMessageInterface;
+use Draw\Component\Messenger\DoctrineMessageBusHook\Model\MessageHolderInterface;
 use Draw\Component\Tester\MockTrait;
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\MockObject\MockObject;

diff --git a/...nger/Tests/DoctrineMessageBusHook/EventListener/EnvelopeFactoryDelayStampListenerTest.php b/...nger/Tests/DoctrineMessageBusHook/EventListener/EnvelopeFactoryDelayStampListenerTest.php
@@ -2,9 +2,9 @@
 
 namespace Draw\Component\Messenger\Tests\DoctrineMessageBusHook\EventListener;
 
-use Draw\Component\Messenger\DoctrineMessageBusHook\Entity\MessageHolderInterface;
 use Draw\Component\Messenger\DoctrineMessageBusHook\Event\EnvelopeCreatedEvent;
 use Draw\Component\Messenger\DoctrineMessageBusHook\EventListener\EnvelopeFactoryDelayStampListener;
+use Draw\Component\Messenger\DoctrineMessageBusHook\Model\MessageHolderInterface;
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;

diff --git a/...eMessageBusHook/EventListener/EnvelopeFactoryDispatchAfterCurrentBusStampListenerTest.php b/...eMessageBusHook/EventListener/EnvelopeFactoryDispatchAfterCurrentBusStampListenerTest.php
@@ -2,9 +2,9 @@
 
 namespace Draw\Component\Messenger\Tests\DoctrineMessageBusHook\EventListener;
 
-use Draw\Component\Messenger\DoctrineMessageBusHook\Entity\MessageHolderInterface;
 use Draw\Component\Messenger\DoctrineMessageBusHook\Event\EnvelopeCreatedEvent;
 use Draw\Component\Messenger\DoctrineMessageBusHook\EventListener\EnvelopeFactoryDispatchAfterCurrentBusStampListener;
+use Draw\Component\Messenger\DoctrineMessageBusHook\Model\MessageHolderInterface;
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;

diff --git a/packages/user-bundle/Entity/LockableUserTrait.php b/packages/user-bundle/Entity/LockableUserTrait.php
@@ -7,8 +7,7 @@
 use Doctrine\ORM\Mapping as ORM;
 use Draw\Bundle\UserBundle\Message\NewUserLockMessage;
 use Draw\Bundle\UserBundle\Message\TemporaryUnlockedMessage;
-
-use Draw\Component\Messenger\DoctrineMessageBusHook\Entity\MessageHolderTrait;
+use Draw\Component\Messenger\DoctrineMessageBusHook\Model\MessageHolderTrait;
 
 use function Draw\Component\Core\use_trait;
 

diff --git a/packages/user-bundle/Entity/OnBoardingLifeCycleHookUserTrait.php b/packages/user-bundle/Entity/OnBoardingLifeCycleHookUserTrait.php
@@ -4,8 +4,7 @@
 
 use Doctrine\ORM\Mapping as ORM;
 use Draw\Bundle\UserBundle\Message\NewUserMessage;
-
-use Draw\Component\Messenger\DoctrineMessageBusHook\Entity\MessageHolderTrait;
+use Draw\Component\Messenger\DoctrineMessageBusHook\Model\MessageHolderTrait;
 
 use function Draw\Component\Core\use_trait;
 

diff --git a/packages/user-bundle/Entity/PasswordChangeEnforcerUserTrait.php b/packages/user-bundle/Entity/PasswordChangeEnforcerUserTrait.php
@@ -4,8 +4,7 @@
 
 use Doctrine\ORM\Mapping as ORM;
 use Draw\Bundle\UserBundle\Message\PasswordChangeRequestedMessage;
-
-use Draw\Component\Messenger\DoctrineMessageBusHook\Entity\MessageHolderTrait;
+use Draw\Component\Messenger\DoctrineMessageBusHook\Model\MessageHolderTrait;
 
 use function Draw\Component\Core\use_trait;
 

diff --git a/packages/user-bundle/Message/PasswordChangeRequestedMessage.php b/packages/user-bundle/Message/PasswordChangeRequestedMessage.php
@@ -3,8 +3,8 @@
 namespace Draw\Bundle\UserBundle\Message;
 
 use Draw\Bundle\UserBundle\Entity\PasswordChangeUserInterface;
-use Draw\Component\Messenger\DoctrineMessageBusHook\Entity\MessageHolderInterface;
 use Draw\Component\Messenger\DoctrineMessageBusHook\Message\LifeCycleAwareMessageInterface;
+use Draw\Component\Messenger\DoctrineMessageBusHook\Model\MessageHolderInterface;
 
 class PasswordChangeRequestedMessage implements LifeCycleAwareMessageInterface
 {

diff --git a/packages/user-bundle/Message/TemporaryUnlockedMessage.php b/packages/user-bundle/Message/TemporaryUnlockedMessage.php
@@ -4,8 +4,8 @@
 
 use Draw\Bundle\UserBundle\Entity\LockableUserInterface;
 use Draw\Component\Core\DateTimeUtils;
-use Draw\Component\Messenger\DoctrineMessageBusHook\Entity\MessageHolderInterface;
 use Draw\Component\Messenger\DoctrineMessageBusHook\Message\LifeCycleAwareMessageInterface;
+use Draw\Component\Messenger\DoctrineMessageBusHook\Model\MessageHolderInterface;
 
 class TemporaryUnlockedMessage implements LifeCycleAwareMessageInterface
 {

diff --git a/packages/user-bundle/Tests/AccountLocker/Entity/LockableUserTraitTest.php b/packages/user-bundle/Tests/AccountLocker/Entity/LockableUserTraitTest.php
@@ -8,7 +8,7 @@
 use Draw\Bundle\UserBundle\Entity\SecurityUserTrait;
 use Draw\Bundle\UserBundle\Entity\UserLock;
 use Draw\Bundle\UserBundle\Message\TemporaryUnlockedMessage;
-use Draw\Component\Messenger\DoctrineMessageBusHook\Entity\MessageHolderTrait;
+use Draw\Component\Messenger\DoctrineMessageBusHook\Model\MessageHolderTrait;
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 

diff --git a/packages/user-bundle/Tests/Message/TemporaryUnlockedMessageTest.php b/packages/user-bundle/Tests/Message/TemporaryUnlockedMessageTest.php
@@ -6,8 +6,8 @@
 use Draw\Bundle\UserBundle\Entity\LockableUserTrait;
 use Draw\Bundle\UserBundle\Entity\SecurityUserTrait;
 use Draw\Bundle\UserBundle\Message\TemporaryUnlockedMessage;
-use Draw\Component\Messenger\DoctrineMessageBusHook\Entity\MessageHolderInterface;
-use Draw\Component\Messenger\DoctrineMessageBusHook\Entity\MessageHolderTrait;
+use Draw\Component\Messenger\DoctrineMessageBusHook\Model\MessageHolderInterface;
+use Draw\Component\Messenger\DoctrineMessageBusHook\Model\MessageHolderTrait;
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;