Merge pull request #12 from peter-gribanov/doctrine_2.7

Compatible with Doctrine ORM >= 2.7

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"

src/Service/EventPuller.php

@@ -9,7 +9,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;
@@ -45,10 +46,18 @@ 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 Proxy && !$entity->__isInitialized()) ||
+                ($entity instanceof CommonProxy && !$entity->__isInitialized())
+            ) {
+                continue;
+            }
+
+            if ($entity instanceof AggregateEvents) {
                 $events = array_merge($events, $entity->pullEvents());
             }
         }

tests/Fixtures/SimpleObject.php

@@ -0,0 +1,56 @@
+<?php
+
+/**
+ * GpsLab component.
+ *
+ * @author    Peter Gribanov <[email protected]>
+ * @copyright Copyright (c) 2011, Peter Gribanov
+ * @license   http://opensource.org/licenses/MIT
+ */
+
+namespace GpsLab\Bundle\DomainEvent\Tests\Fixtures;
+
+class SimpleObject
+{
+    /**
+     * @var string
+     */
+    private $foo;
+
+    /**
+     * @var string
+     */
+    protected $camelCase = 'boo';
+
+    /**
+     * @return string
+     */
+    public function getFoo()
+    {
+        return $this->foo;
+    }
+
+    /**
+     * @param string $foo
+     */
+    public function setFoo($foo)
+    {
+        $this->foo = $foo;
+    }
+
+    /**
+     * @return string
+     */
+    public function getCamelCase()
+    {
+        return $this->camelCase;
+    }
+
+    /**
+     * @param string $camelCase
+     */
+    public function setCamelCase($camelCase)
+    {
+        $this->camelCase = $camelCase;
+    }
+}

tests/Fixtures/SimpleObjectProxy.php

@@ -0,0 +1,64 @@
+<?php
+
+/**
+ * GpsLab component.
+ *
+ * @author    Peter Gribanov <[email protected]>
+ * @copyright Copyright (c) 2011, Peter Gribanov
+ * @license   http://opensource.org/licenses/MIT
+ */
+
+namespace GpsLab\Bundle\DomainEvent\Tests\Fixtures;
+
+use Doctrine\Common\Persistence\Proxy as CommonProxy;
+use Doctrine\Persistence\Proxy;
+
+if (interface_exists(CommonProxy::class)) {
+    class SimpleObjectProxy extends SimpleObject implements CommonProxy
+    {
+        /**
+         * @var bool
+         */
+        public $__isInitialized__ = false;
+
+        public function __load()
+        {
+            if (!$this->__isInitialized__) {
+                $this->camelCase = 'proxy-boo';
+                $this->__isInitialized__ = true;
+            }
+        }
+
+        /**
+         * @return bool
+         */
+        public function __isInitialized()
+        {
+            return $this->__isInitialized__;
+        }
+    }
+} else {
+    class SimpleObjectProxy extends SimpleObject implements Proxy
+    {
+        /**
+         * @var bool
+         */
+        public $__isInitialized__ = false;
+
+        public function __load()
+        {
+            if (!$this->__isInitialized__) {
+                $this->camelCase = 'proxy-boo';
+                $this->__isInitialized__ = true;
+            }
+        }
+
+        /**
+         * @return bool
+         */
+        public function __isInitialized()
+        {
+            return $this->__isInitialized__;
+        }
+    }
+}

tests/Service/EventPullerTest.php

@@ -9,9 +9,10 @@
 
 namespace GpsLab\Bundle\DomainEvent\Tests\Service;
 
-use Doctrine\Common\Persistence\Proxy;
 use Doctrine\ORM\UnitOfWork;
 use GpsLab\Bundle\DomainEvent\Service\EventPuller;
+use GpsLab\Bundle\DomainEvent\Tests\Fixtures\SimpleObject;
+use GpsLab\Bundle\DomainEvent\Tests\Fixtures\SimpleObjectProxy;
 use GpsLab\Domain\Event\Aggregator\AggregateEvents;
 use GpsLab\Domain\Event\Event;
 use PHPUnit\Framework\TestCase;
@@ -115,16 +116,16 @@ public function testPull(
 
             $map = [
                 [
-                    $this->getMockBuilder(Proxy::class)->getMock(),
+                    $this->getMockBuilder(SimpleObjectProxy::class)->getMock(),
                     $aggregator1,
                 ],
                 [
                     $aggregator2,
-                    new \stdClass(),
+                    new SimpleObject(),
                 ],
                 [
-                    new \stdClass(),
-                    $this->getMockBuilder(Proxy::class)->getMock(),
+                    new SimpleObject(),
+                    $this->getMockBuilder(SimpleObjectProxy::class)->getMock(),
                 ],
             ];
         } else {
@@ -188,8 +189,8 @@ private function getEntitiesFroEvents(array $events)
         ;
 
         return [
-            $this->getMockBuilder(Proxy::class)->getMock(),
-            new \stdClass(),
+            $this->getMockBuilder(SimpleObjectProxy::class)->getMock(),
+            new SimpleObject(),
             $aggregator1,
             $aggregator2,
         ];