Merge 730f1a4 into 0342c65

gpslab · May 24, 2021 · db334d7 · db334d7
2 parents 0342c65 + 730f1a4
commit db334d7
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 7 deletions.
diff --git a/composer.json b/composer.json
@@ -20,7 +20,7 @@
         "symfony/http-kernel": "~2.3|~3.0|~4.0|~5.0",
         "symfony/dependency-injection": "~2.3|~3.0|~4.0|~5.0",
         "symfony/expression-language": "~2.3|~3.0|~4.0|~5.0",
-        "doctrine/orm": "~2.4|~2.5|~2.6"
+        "doctrine/orm": "~2.4"
     },
     "require-dev": {
         "phpunit/phpunit": "^4.8.36",

diff --git a/src/Service/EventPuller.php b/src/Service/EventPuller.php
@@ -10,7 +10,8 @@
 
 namespace GpsLab\Bundle\DomainEvent\Service;
 
-use Doctrine\Common\Persistence\Proxy;
+use Doctrine\Common\Persistence\Proxy as CommonProxy;
+use Doctrine\Persistence\Proxy;
 use Doctrine\ORM\UnitOfWork;
 use GpsLab\Domain\Event\Aggregator\AggregateEvents;
 use GpsLab\Domain\Event\Event;
@@ -46,10 +47,15 @@ public function pull(UnitOfWork $uow)
     private function pullFromEntities(array $entities)
     {
         $events = [];
+
         foreach ($entities as $entity) {
             // ignore Doctrine not initialized proxy classes
             // proxy class can't have a domain events
-            if ((!($entity instanceof Proxy) || $entity->__isInitialized()) && $entity instanceof AggregateEvents) {
+            if ((
+                    (!$entity instanceof CommonProxy && !$entity instanceof Proxy) || $entity->__isInitialized()
+                ) &&
+                $entity instanceof AggregateEvents
+            ) {
                 $events = array_merge($events, $entity->pullEvents());
             }
         }

diff --git a/tests/Service/EventPullerTest.php b/tests/Service/EventPullerTest.php
@@ -10,7 +10,8 @@
 
 namespace GpsLab\Bundle\DomainEvent\Tests\Service;
 
-use Doctrine\Common\Persistence\Proxy;
+use Doctrine\Common\Persistence\Proxy as CommonProxy;
+use Doctrine\Persistence\Proxy;
 use Doctrine\ORM\UnitOfWork;
 use GpsLab\Bundle\DomainEvent\Service\EventPuller;
 use GpsLab\Domain\Event\Aggregator\AggregateEvents;
@@ -116,7 +117,7 @@ public function testPull(
 
             $map = [
                 [
-                    $this->getMockBuilder(Proxy::class)->getMock(),
+                    $this->getProxyMock(),
                     $aggregator1,
                 ],
                 [
@@ -125,7 +126,7 @@ public function testPull(
                 ],
                 [
                     new \stdClass(),
-                    $this->getMockBuilder(Proxy::class)->getMock(),
+                    $this->getProxyMock(),
                 ],
             ];
         } else {
@@ -189,10 +190,22 @@ private function getEntitiesFroEvents(array $events)
         ;
 
         return [
-            $this->getMockBuilder(Proxy::class)->getMock(),
+            $this->getProxyMock(),
             new \stdClass(),
             $aggregator1,
             $aggregator2,
         ];
     }
+
+    /**
+     * @return CommonProxy|Proxy|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private function getProxyMock()
+    {
+        if (class_exists(CommonProxy::class)) {
+            return $this->getMockBuilder(CommonProxy::class)->getMock();
+        }
+
+        return $this->getMockBuilder(Proxy::class)->getMock();
+    }
 }