Merge pull request #23 from nutama/issue_no_event_on_initialized_proxies

Fixed issue no event on initialized proxies
hostnet · Sep 24, 2015 · 1bc501a · 1bc501a
2 parents c70af2e + 82a930c
commit 1bc501a
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 1 deletion.
diff --git a/src/Listener/EntityChangedListener.php b/src/Listener/EntityChangedListener.php
@@ -81,7 +81,9 @@ public function preFlush(PreFlushEventArgs $event)
             }
 
             foreach ($updates as $entity) {
-                if (!$this->meta_mutation_provider->isEntityManaged($em, $entity) || $entity instanceof Proxy) {
+                if (!$this->meta_mutation_provider->isEntityManaged($em, $entity)
+                    || ($entity instanceof Proxy && !$entity->__isInitialized())
+                ) {
                     continue;
                 }
 

diff --git a/test/Listener/EntityChangedListenerTest.php b/test/Listener/EntityChangedListenerTest.php
@@ -251,6 +251,52 @@ public function testPreFlushWithProxy()
         $this->listener->preFlush(new PreFlushEventArgs($this->em));
     }
 
+    public function testPreFlushWithInitializedProxy()
+    {
+        $original     = new \stdClass();
+        $original->id = 0;
+
+        $entity = $this->getMock('Doctrine\ORM\Proxy\Proxy');
+        $entity
+            ->expects($this->once())
+            ->method('__isInitialized')
+            ->willReturn(true);
+
+        $this->meta_mutation_provider
+            ->expects($this->once())
+            ->method('getFullChangeSet')
+            ->willReturn($this->genericEntityDataProvider($entity));
+
+        $this->meta_annotation_provider
+            ->expects($this->once())
+            ->method('isTracked')
+            ->willReturn(true);
+
+        $this->logger->expects($this->once())->method('info');
+
+        $this->meta_mutation_provider
+            ->expects($this->once())
+            ->method('isEntityManaged')
+            ->willReturn(true);
+
+        $this->meta_mutation_provider
+            ->expects($this->once())
+            ->method('createOriginalEntity')
+            ->willReturn($original);
+
+        $this->meta_mutation_provider
+            ->expects($this->once())
+            ->method('getMutatedFields')
+            ->willReturn(['id']);
+
+        $this->event_manager
+            ->expects($this->once())
+            ->method('dispatchEvent')
+            ->with('entityChanged', $this->isInstanceof('Hostnet\Component\EntityTracker\Event\EntityChangedEvent'));
+
+        $this->listener->preFlush(new PreFlushEventArgs($this->em));
+    }
+
     /**
      * @param  mixed $entity
      * @return array[]