#88: Used ListenersInvoker instead of EventManager to dispatch events

Author: raymondschouten

src/EventSubscriber.php

@@ -25,6 +25,7 @@
 use Doctrine\Common\EventSubscriber as DoctrineEventSubscriber;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Event\LifecycleEventArgs;
+use Doctrine\ORM\Event\ListenersInvoker;
 use Doctrine\ORM\Event\OnFlushEventArgs;
 use Doctrine\ORM\Event\PostFlushEventArgs;
 use Doctrine\ORM\Event\PreUpdateEventArgs;
@@ -90,7 +91,8 @@ public function preUpdate(PreUpdateEventArgs $eventArgs): void
     {
         $entity = $eventArgs->getObject();
         $entityManager = $eventArgs->getEntityManager();
-        $eventManager = $entityManager->getEventManager();
+        $classMetadata = $entityManager->getClassMetadata(get_class($entity));
+        $listenersInvoker = new ListenersInvoker($entityManager);
         $connection = $entityManager->getConnection();
         $transactionNestingLevel = $connection->getTransactionNestingLevel();
 
@@ -99,14 +101,19 @@ public function preUpdate(PreUpdateEventArgs $eventArgs): void
 
         $eventArgs = new UpdateEventArgs($entity, $originalEntity, $entityManager);
 
-        $eventManager->dispatchEvent(Events::preUpdateEnhanced, $eventArgs);
+        $invoke = $listenersInvoker->getSubscribedSystems($classMetadata, Events::preUpdateEnhanced);
+
+        if ($invoke !== ListenersInvoker::INVOKE_NONE) {
+            $listenersInvoker->invoke($classMetadata, Events::preUpdateEnhanced, $entity, $eventArgs, $invoke);
+        }
     }
 
     public function postUpdate(LifecycleEventArgs $eventArgs): void
     {
         $entity = $eventArgs->getObject();
         $entityManager = $eventArgs->getEntityManager();
-        $eventManager = $entityManager->getEventManager();
+        $classMetadata = $entityManager->getClassMetadata(get_class($entity));
+        $listenersInvoker = new ListenersInvoker($entityManager);
         $connection = $entityManager->getConnection();
         $transactionNestingLevel = $connection->getTransactionNestingLevel();
 
@@ -115,7 +122,11 @@ public function postUpdate(LifecycleEventArgs $eventArgs): void
 
         $eventArgs = new UpdateEventArgs($entity, $originalEntity, $entityManager);
 
-        $eventManager->dispatchEvent(Events::postUpdateEnhanced, $eventArgs);
+        $invoke = $listenersInvoker->getSubscribedSystems($classMetadata, Events::postUpdateEnhanced);
+
+        if ($invoke !== ListenersInvoker::INVOKE_NONE) {
+            $listenersInvoker->invoke($classMetadata, Events::postUpdateEnhanced, $entity, $eventArgs, $invoke);
+        }
     }
 
     public function postFlush(PostFlushEventArgs $eventArgs): void