Use different methods than execute() when retrieving results

Author: phansys

src/Loggable/Document/Repository/LogEntryRepository.php

@@ -59,14 +59,8 @@ public function getLogEntries($document)
         $qb->field('objectId')->equals($objectId);
         $qb->field('objectClass')->equals($wrapped->getMetadata()->getName());
         $qb->sort('version', 'DESC');
-        $q = $qb->getQuery();
 
-        $result = $q->execute();
-        if ($result instanceof Iterator) {
-            $result = $result->toArray();
-        }
-
-        return $result;
+        return $qb->getQuery()->getIterator()->toArray();
     }
 
     /**
@@ -95,12 +89,8 @@ public function revert($document, $version = 1)
         $qb->field('objectClass')->equals($objectMeta->getName());
         $qb->field('version')->lte((int) $version);
         $qb->sort('version', 'ASC');
-        $q = $qb->getQuery();
 
-        $logs = $q->execute();
-        if ($logs instanceof Iterator) {
-            $logs = $logs->toArray();
-        }
+        $logs = $qb->getQuery()->getIterator()->toArray();
 
         if ([] === $logs) {
             throw new UnexpectedValueException('Count not find any log entries under version: '.$version);

src/Sluggable/Mapping/Event/Adapter/ODM.php

@@ -47,12 +47,7 @@ public function getSimilarSlugs($object, $meta, array $config, $slug)
         $q = $qb->getQuery();
         $q->setHydrate(false);
 
-        $result = $q->execute();
-        if ($result instanceof Iterator) {
-            $result = $result->toArray();
-        }
-
-        return $result;
+        return $q->getIterator()->toArray();
     }
 
     /**
@@ -74,14 +69,11 @@ public function replaceRelative($object, array $config, $target, $replacement)
             ->getQuery()
         ;
         $q->setHydrate(false);
-        $result = $q->execute();
-
-        if (!$result instanceof Iterator) {
-            return 0;
-        }
+        $result = $q->getIterator();
+        $count = 0;
 
-        $result = $result->toArray();
         foreach ($result as $targetObject) {
+            ++$count;
             $slug = preg_replace("@^{$target}@smi", $replacement.$config['pathSeparator'], $targetObject[$config['slug']]);
             $dm
                 ->createQueryBuilder()
@@ -93,7 +85,7 @@ public function replaceRelative($object, array $config, $target, $replacement)
             ;
         }
 
-        return count($result);
+        return $count;
     }
 
     /**
@@ -113,14 +105,11 @@ public function replaceInverseRelative($object, array $config, $target, $replace
             ->getQuery()
         ;
         $q->setHydrate(false);
-        $result = $q->execute();
-
-        if (!$result instanceof Iterator) {
-            return 0;
-        }
+        $result = $q->getIterator();
+        $count = 0;
 
-        $result = $result->toArray();
         foreach ($result as $targetObject) {
+            ++$count;
             $slug = preg_replace("@^{$replacement}@smi", $target, $targetObject[$config['slug']]);
             $dm
                 ->createQueryBuilder()
@@ -132,6 +121,6 @@ public function replaceInverseRelative($object, array $config, $target, $replace
             ;
         }
 
-        return count($result);
+        return $count;
     }
 }

src/Translatable/Document/Repository/TranslationRepository.php

@@ -142,12 +142,9 @@ public function findTranslations($document)
                 ->getQuery();
 
             $q->setHydrate(false);
-            $data = $q->execute();
 
-            if (is_iterable($data)) {
-                foreach ($data as $row) {
-                    $result[$row['locale']][$row['field']] = $row['content'];
-                }
+            foreach ($q->getIterator() as $row) {
+                $result[$row['locale']][$row['field']] = $row['content'];
             }
         }
 
@@ -182,11 +179,7 @@ public function findObjectByTranslatedField($field, $value, $class)
             ->getQuery();
 
         $q->setHydrate(false);
-        $result = $q->execute();
-
-        if ($result instanceof Iterator) {
-            $result = $result->toArray();
-        }
+        $result = $q->getIterator()->toArray();
 
         $id = $result[0]['foreign_key'] ?? null;
 
@@ -216,12 +209,9 @@ public function findTranslationsByObjectId($id)
                 ->getQuery();
 
             $q->setHydrate(false);
-            $data = $q->execute();
 
-            if (is_iterable($data)) {
-                foreach ($data as $row) {
-                    $result[$row['locale']][$row['field']] = $row['content'];
-                }
+            foreach ($q->getIterator() as $row) {
+                $result[$row['locale']][$row['field']] = $row['content'];
             }
         }
 

src/Translatable/Mapping/Event/Adapter/ODM.php

@@ -90,12 +90,8 @@ public function loadTranslations($object, $translationClass, $locale, $objectCla
             ;
         }
         $q->setHydrate(false);
-        $result = $q->execute();
-        if ($result instanceof Iterator) {
-            $result = $result->toArray();
-        }
 
-        return $result;
+        return $q->getIterator()->toArray();
     }
 
     public function findTranslation(AbstractWrapper $wrapped, $locale, $field, $translationClass, $objectClass)