use UnitOfWork in EventPuller

gpslab · Aug 17, 2017 · 7abbc67 · 7abbc67
1 parent 1c47c35
commit 7abbc67
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 32 deletions.
diff --git a/src/Event/Listener/DomainEventPublisher.php b/src/Event/Listener/DomainEventPublisher.php
@@ -73,7 +73,7 @@ public function getSubscribedEvents()
     public function onFlush(OnFlushEventArgs $args)
     {
         // aggregate events from deleted entities
-        $this->events = $this->puller->pull($args->getEntityManager());
+        $this->events = $this->puller->pull($args->getEntityManager()->getUnitOfWork());
     }
 
     /**
@@ -82,7 +82,7 @@ public function onFlush(OnFlushEventArgs $args)
     public function postFlush(PostFlushEventArgs $args)
     {
         // aggregate PreRemove/PostRemove events
-        $events = array_merge($this->events, $this->puller->pull($args->getEntityManager()));
+        $events = array_merge($this->events, $this->puller->pull($args->getEntityManager()->getUnitOfWork()));
 
         // clear aggregate events before publish it
         // it necessary for fix recursive publish of events

diff --git a/src/Service/EventPuller.php b/src/Service/EventPuller.php
@@ -11,20 +11,19 @@
 namespace GpsLab\Bundle\DomainEvent\Service;
 
 use Doctrine\Common\Persistence\Proxy;
-use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\UnitOfWork;
 use GpsLab\Domain\Event\Aggregator\AggregateEvents;
 use GpsLab\Domain\Event\Event;
 
 class EventPuller
 {
     /**
-     * @param EntityManagerInterface $em
+     * @param UnitOfWork $uow
      *
      * @return Event[]
      */
-    public function pull(EntityManagerInterface $em)
+    public function pull(UnitOfWork $uow)
     {
-        $uow = $em->getUnitOfWork();
         $events = [];
 
         $events = array_merge($events, $this->pullFromEntities($uow->getScheduledEntityDeletions()));

diff --git a/tests/Event/Listener/DomainEventPublisherTest.php b/tests/Event/Listener/DomainEventPublisherTest.php
@@ -14,6 +14,7 @@
 use Doctrine\ORM\Event\OnFlushEventArgs;
 use Doctrine\ORM\Event\PostFlushEventArgs;
 use Doctrine\ORM\Events;
+use Doctrine\ORM\UnitOfWork;
 use GpsLab\Bundle\DomainEvent\Event\Listener\DomainEventPublisher;
 use GpsLab\Bundle\DomainEvent\Service\EventPuller;
 use GpsLab\Domain\Event\Bus\EventBus;
@@ -36,6 +37,11 @@ class DomainEventPublisherTest extends \PHPUnit_Framework_TestCase
      */
     private $em;
 
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|UnitOfWork
+     */
+    private $uow;
+
     /**
      * @var OnFlushEventArgs
      */
@@ -58,6 +64,11 @@ protected function setUp()
         $this->em = $this->getMock(EntityManagerInterface::class);
         $this->on_flush = new OnFlushEventArgs($this->em);
         $this->post_flush = new PostFlushEventArgs($this->em);
+        $this->uow = $this
+            ->getMockBuilder(UnitOfWork::class)
+            ->disableOriginalConstructor()
+            ->getMock()
+        ;
 
         $this->publisher = new DomainEventPublisher($this->puller, $this->bus, true);
     }
@@ -76,10 +87,16 @@ public function testEnabled()
 
     public function testPreFlush()
     {
+        $this->em
+            ->expects($this->once())
+            ->method('getUnitOfWork')
+            ->will($this->returnValue($this->uow))
+        ;
+
         $this->puller
             ->expects($this->once())
             ->method('pull')
-            ->with($this->em)
+            ->with($this->uow)
         ;
 
         $this->publisher->onFlush($this->on_flush);
@@ -121,13 +138,13 @@ public function testPublishEvents(array $remove_events, array $exist_events)
         $this->puller
             ->expects($this->at(0))
             ->method('pull')
-            ->with($this->em)
+            ->with($this->uow)
             ->will($this->returnValue($remove_events))
         ;
         $this->puller
             ->expects($this->at(1))
             ->method('pull')
-            ->with($this->em)
+            ->with($this->uow)
             ->will($this->returnValue($exist_events))
         ;
 
@@ -155,6 +172,11 @@ public function testPublishEvents(array $remove_events, array $exist_events)
                 ->method('flush')
             ;
         }
+        $this->em
+            ->expects($this->atLeastOnce())
+            ->method('getUnitOfWork')
+            ->will($this->returnValue($this->uow))
+        ;
 
         $this->publisher->onFlush($this->on_flush);
         $this->publisher->postFlush($this->post_flush);
@@ -181,28 +203,38 @@ public function testRecursivePublish()
             $this->getMock(Event::class),
         ];
 
+        $this->em
+            ->expects($this->atLeastOnce())
+            ->method('getUnitOfWork')
+            ->will($this->returnValue($this->uow))
+        ;
+        $this->em
+            ->expects($this->exactly(2))
+            ->method('flush')
+        ;
+
         $this->puller
             ->expects($this->at(0))
             ->method('pull')
-            ->with($this->em)
+            ->with($this->uow)
             ->will($this->returnValue($remove_events1))
         ;
         $this->puller
             ->expects($this->at(1))
             ->method('pull')
-            ->with($this->em)
+            ->with($this->uow)
             ->will($this->returnValue($exist_events1))
         ;
         $this->puller
             ->expects($this->at(2))
             ->method('pull')
-            ->with($this->em)
+            ->with($this->uow)
             ->will($this->returnValue($remove_events2))
         ;
         $this->puller
             ->expects($this->at(3))
             ->method('pull')
-            ->with($this->em)
+            ->with($this->uow)
             ->will($this->returnValue($exist_events2))
         ;
 
@@ -215,11 +247,6 @@ public function testRecursivePublish()
             ;
         }
 
-        $this->em
-            ->expects($this->exactly(2))
-            ->method('flush')
-        ;
-
         $this->publisher->onFlush($this->on_flush);
         $this->publisher->postFlush($this->post_flush);
         // recursive call

diff --git a/tests/Service/EventPullerTest.php b/tests/Service/EventPullerTest.php
@@ -11,19 +11,13 @@
 namespace GpsLab\Bundle\DomainEvent\Tests\Service;
 
 use Doctrine\Common\Persistence\Proxy;
-use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\UnitOfWork;
 use GpsLab\Bundle\DomainEvent\Service\EventPuller;
 use GpsLab\Domain\Event\Aggregator\AggregateEvents;
 use GpsLab\Domain\Event\Event;
 
 class EventPullerTest extends \PHPUnit_Framework_TestCase
 {
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|EntityManagerInterface
-     */
-    private $em;
-
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject|UnitOfWork
      */
@@ -42,13 +36,6 @@ protected function setUp()
             ->getMock()
         ;
 
-        $this->em = $this->getMock(EntityManagerInterface::class);
-        $this->em
-            ->expects($this->once())
-            ->method('getUnitOfWork')
-            ->will($this->returnValue($this->uow))
-        ;
-
         $this->puller = new EventPuller();
     }
 
@@ -172,7 +159,7 @@ public function testPull(
             $map_events
         );
 
-        $this->assertEquals($expected_events, $this->puller->pull($this->em));
+        $this->assertEquals($expected_events, $this->puller->pull($this->uow));
     }
 
     /**