Merge pull request #2480 from franmomu/event_manager

Allow doctrine/event-manager 2

Author: malarzm

composer.json

@@ -27,7 +27,7 @@
         "doctrine/annotations": "^1.12",
         "doctrine/cache": "^1.11 || ^2.0",
         "doctrine/collections": "^1.5 || ^2.0",
-        "doctrine/event-manager": "^1.0",
+        "doctrine/event-manager": "^1.0 || ^2.0",
         "doctrine/instantiator": "^1.1",
         "doctrine/persistence": "^2.4 || ^3.0",
         "friendsofphp/proxy-manager-lts": "^1.0",

lib/Doctrine/ODM/MongoDB/Hydrator/HydratorFactory.php

@@ -472,9 +472,7 @@ public function hydrate(object $document, array $data, array $hints = []): array
             $metadata->invokeLifecycleCallbacks(Events::preLoad, $document, $args);
         }
 
-        if ($this->evm->hasListeners(Events::preLoad)) {
-            $this->evm->dispatchEvent(Events::preLoad, new PreLoadEventArgs($document, $this->dm, $data));
-        }
+        $this->evm->dispatchEvent(Events::preLoad, new PreLoadEventArgs($document, $this->dm, $data));
 
         // alsoLoadMethods may transform the document before hydration
         if (! empty($metadata->alsoLoadMethods)) {
@@ -511,9 +509,7 @@ public function hydrate(object $document, array $data, array $hints = []): array
             $metadata->invokeLifecycleCallbacks(Events::postLoad, $document, [new LifecycleEventArgs($document, $this->dm)]);
         }
 
-        if ($this->evm->hasListeners(Events::postLoad)) {
-            $this->evm->dispatchEvent(Events::postLoad, new LifecycleEventArgs($document, $this->dm));
-        }
+        $this->evm->dispatchEvent(Events::postLoad, new LifecycleEventArgs($document, $this->dm));
 
         return $data;
     }

lib/Doctrine/ODM/MongoDB/Mapping/ClassMetadataFactory.php

@@ -202,12 +202,10 @@ protected function doLoadMetadata($class, $parent, $rootEntityFound, array $nonS
 
         $class->setParentClasses($nonSuperclassParents);
 
-        if (! $this->evm->hasListeners(Events::loadClassMetadata)) {
-            return;
-        }
-
-        $eventArgs = new LoadClassMetadataEventArgs($class, $this->dm);
-        $this->evm->dispatchEvent(Events::loadClassMetadata, $eventArgs);
+        $this->evm->dispatchEvent(
+            Events::loadClassMetadata,
+            new LoadClassMetadataEventArgs($class, $this->dm)
+        );
 
         // phpcs:ignore SlevomatCodingStandard.ControlStructures.EarlyExit.EarlyExitNotUsed
         if ($class->isChangeTrackingNotify()) {

lib/Doctrine/ODM/MongoDB/UnitOfWork.php

@@ -416,9 +416,7 @@ public function setDocumentPersister(string $documentName, Persisters\DocumentPe
     public function commit(array $options = []): void
     {
         // Raise preFlush
-        if ($this->evm->hasListeners(Events::preFlush)) {
-            $this->evm->dispatchEvent(Events::preFlush, new Event\PreFlushEventArgs($this->dm));
-        }
+        $this->evm->dispatchEvent(Events::preFlush, new Event\PreFlushEventArgs($this->dm));
 
         // Compute changes done since last commit.
         $this->computeChangeSets();
@@ -448,9 +446,7 @@ public function commit(array $options = []): void
             }
 
             // Raise onFlush
-            if ($this->evm->hasListeners(Events::onFlush)) {
-                $this->evm->dispatchEvent(Events::onFlush, new Event\OnFlushEventArgs($this->dm));
-            }
+            $this->evm->dispatchEvent(Events::onFlush, new Event\OnFlushEventArgs($this->dm));
 
             foreach ($this->getClassesForCommitAction($this->documentUpserts) as $classAndDocuments) {
                 [$class, $documents] = $classAndDocuments;
@@ -473,9 +469,7 @@ public function commit(array $options = []): void
             }
 
             // Raise postFlush
-            if ($this->evm->hasListeners(Events::postFlush)) {
-                $this->evm->dispatchEvent(Events::postFlush, new Event\PostFlushEventArgs($this->dm));
-            }
+            $this->evm->dispatchEvent(Events::postFlush, new Event\PostFlushEventArgs($this->dm));
 
             // Clear up
             $this->documentInsertions          =
@@ -2437,10 +2431,6 @@ public function clear(?string $documentName = null): void
             }
         }
 
-        if (! $this->evm->hasListeners(Events::onClear)) {
-            return;
-        }
-
         $this->evm->dispatchEvent(Events::onClear, new Event\OnClearEventArgs($this->dm, $documentName));
     }