fix: collect events at the beginning of `dispatchPostFlushDomainEvent…

…s()`, fix manual dispatching postFlush events without preFlush. (#98)

* fix: collect events at the beginning of `dispatchPostFlushDomainEvents()`, fix manual dispatching postFlush events without preFlush.

* add tests

* cs

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 2.3.4
+
+* fix: collect events at the beginning of `dispatchPostFlushDomainEvents()`, fix
+  manual dispatching postFlush events without preFlush.
+
 ## 2.3.3
 
 * fix: Should fix `ManagerRegistry::resetManager()`

packages/domain-event/src/Doctrine/DomainEventAwareEntityManager.php

@@ -160,6 +160,8 @@ private function preFlushDispatch(): int
 
     public function dispatchPostFlushDomainEvents(): int
     {
+        $this->collectEvents();
+
         $num = \count($this->postFlushDomainEvents);
         $events = $this->postFlushDomainEvents->pop();
         // for safeguard we also clear preflush events here

tests/Framework/EventListener/PostEventEventBusListener.php

@@ -52,7 +52,7 @@ public function onRemoveCalled(): bool
     {
         return $this->onRemoveCalled;
     }
-    
+
     public function onChangeCalled(): int
     {
         return $this->onChangeCalled;

tests/Framework/Tests/BasicDomainEventTest.php

@@ -57,4 +57,41 @@ public function testPostFlushListener(): void
 
         $this->assertTrue($listener->onCreateCalled());
     }
+
+    public function testManualPreFlush(): void
+    {
+        $entityManager = static::getEntityManager();
+        $listener = static::getContainer()->get(BookEventPreFlushListener::class);
+        $this->assertInstanceOf(BookEventPreFlushListener::class, $listener);
+
+        $entityManager->setAutoDispatchDomainEvents(false);
+
+        $this->assertFalse($listener->onCreateCalled());
+
+        $book = new Book('title', 'description');
+        $entityManager->persist($book);
+        $entityManager->dispatchPreFlushDomainEvents();
+        $entityManager->flush();
+        $entityManager->clearDomainEvents();
+
+        $this->assertTrue($listener->onCreateCalled());
+    }
+
+    public function testManualPostFlush(): void
+    {
+        $entityManager = static::getEntityManager();
+        $listener = static::getContainer()->get(BookEventPostFlushListener::class);
+        $this->assertInstanceOf(BookEventPostFlushListener::class, $listener);
+
+        $entityManager->setAutoDispatchDomainEvents(false);
+
+        $this->assertFalse($listener->onCreateCalled());
+
+        $book = new Book('title', 'description');
+        $entityManager->persist($book);
+        $entityManager->flush();
+        $entityManager->dispatchPostFlushDomainEvents();
+
+        $this->assertTrue($listener->onCreateCalled());
+    }
 }