Fix Doctrine source iterators

sonata-project · Sep 30, 2020 · b5ea9b1 · b5ea9b1
1 parent 9d2ca11
commit b5ea9b1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/Source/DoctrineODMQuerySourceIterator.php b/src/Source/DoctrineODMQuerySourceIterator.php
@@ -36,7 +36,11 @@ public function current()
     {
         $current = $this->iterator->current();
 
-        return $this->getCurrentData($current[0]);
+        $data = $this->getCurrentData($current[0]);
+
+        $this->query->getDocumentManager()->clear();
+
+        return $data;
     }
 
     public function rewind(): void

diff --git a/src/Source/DoctrineORMQuerySourceIterator.php b/src/Source/DoctrineORMQuerySourceIterator.php
@@ -43,7 +43,11 @@ public function current()
     {
         $current = $this->iterator->current();
 
-        return $this->getCurrentData($current[0]);
+        $data = $this->getCurrentData($current[0]);
+
+        $this->query->getEntityManager()->clear();
+
+        return $data;
     }
 
     final public function rewind(): void