Use iterators instead of arrays for query results where possible

doctrine-extensions · Sep 7, 2023 · 4010c0c · 4010c0c
1 parent 25c63bb
commit 4010c0c
Show file tree

Hide file tree

Showing 10 changed files with 50 additions and 48 deletions.
diff --git a/src/Loggable/Entity/Repository/LogEntryRepository.php b/src/Loggable/Entity/Repository/LogEntryRepository.php
@@ -53,9 +53,7 @@ class LogEntryRepository extends EntityRepository
      */
     public function getLogEntries($entity)
     {
-        $q = $this->getLogEntriesQuery($entity);
-
-        return $q->getResult();
+        return $this->getLogEntriesQuery($entity)->getResult();
     }
 
     /**
@@ -112,7 +110,7 @@ public function revert($entity, $version = 1)
         $dql .= ' WHERE log.objectId = :objectId';
         $dql .= ' AND log.objectClass = :objectClass';
         $dql .= ' AND log.version <= :version';
-        $dql .= ' ORDER BY log.version ASC';
+        $dql .= ' ORDER BY log.version DESC';
 
         $objectId = (string) $wrapped->getIdentifier(false, true);
         $q = $this->_em->createQuery($dql);
@@ -121,16 +119,18 @@ public function revert($entity, $version = 1)
             'objectClass' => $objectClass,
             'version' => $version,
         ]);
-        $logs = $q->getResult();
-
-        if ([] === $logs) {
-            throw new UnexpectedValueException('Could not find any log entries under version: '.$version);
-        }
 
         $config = $this->getLoggableListener()->getConfiguration($this->_em, $objectMeta->getName());
         $fields = $config['versioned'];
         $filled = false;
-        while (($log = array_pop($logs)) && !$filled) {
+        $logsFound = false;
+
+        $logs = $q->toIterable();
+        assert($logs instanceof \Generator);
+
+        while ((null !== $log = $logs->current()) && !$filled) {
+            $logsFound = true;
+            $logs->next();
             if ($data = $log->getData()) {
                 foreach ($data as $field => $value) {
                     if (in_array($field, $fields, true)) {
@@ -142,6 +142,11 @@ public function revert($entity, $version = 1)
             }
             $filled = [] === $fields;
         }
+
+        if (!$logsFound) {
+            throw new UnexpectedValueException('Could not find any log entries under version: '.$version);
+        }
+
         /*if (count($fields)) {
             throw new \Gedmo\Exception\UnexpectedValueException('Could not fully revert the entity to version: '.$version);
         }*/

diff --git a/src/Sortable/Mapping/Event/Adapter/ORM.php b/src/Sortable/Mapping/Event/Adapter/ORM.php
@@ -43,9 +43,9 @@ public function getMaxPosition(array $config, $meta, $groups)
         $query = $qb->getQuery();
         $query->useQueryCache(false);
         $query->disableResultCache();
-        $res = $query->getResult();
+        $query->setMaxResults(1);
 
-        return $res[0][1];
+        return $query->getSingleScalarResult();
     }
 
     /**

diff --git a/src/Translatable/Document/Repository/TranslationRepository.php b/src/Translatable/Document/Repository/TranslationRepository.php
@@ -183,9 +183,9 @@ public function findObjectByTranslatedField($field, $value, $class)
             ->getQuery();
 
         $q->setHydrate(false);
-        $result = $q->getIterator()->toArray();
+        $result = $q->getSingleResult();
 
-        $id = $result[0]['foreign_key'] ?? null;
+        $id = $result['foreign_key'] ?? null;
 
         if (null === $id) {
             return null;

diff --git a/src/Translatable/Entity/Repository/TranslationRepository.php b/src/Translatable/Entity/Repository/TranslationRepository.php
@@ -151,9 +151,8 @@ public function findTranslations($entity)
                     'entityId' => $entityId,
                     'entityClass' => $entityClass,
                 ]);
-            $q = $qb->getQuery();
 
-            foreach ($q->getArrayResult() as $row) {
+            foreach ($qb->getQuery()->toIterable([], Query::HYDRATE_ARRAY) as $row) {
                 $result[$row['locale']][$row['field']] = $row['content'];
             }
         }
@@ -191,8 +190,7 @@ public function findObjectByTranslatedField($field, $value, $class)
                 'value' => $value,
             ]);
             $q->setMaxResults(1);
-            $result = $q->getArrayResult();
-            $id = $result[0]['foreignKey'] ?? null;
+            $id = $q->getSingleScalarResult();
 
             if (null !== $id) {
                 $entity = $this->_em->find($class, $id);
@@ -223,7 +221,7 @@ public function findTranslationsByObjectId($id)
                 ->setParameter('entityId', $id);
             $q = $qb->getQuery();
 
-            foreach ($q->getArrayResult() as $row) {
+            foreach ($q->toIterable([], Query::HYDRATE_ARRAY) as $row) {
                 $result[$row['locale']][$row['field']] = $row['content'];
             }
         }

diff --git a/src/Translatable/Mapping/Event/Adapter/ORM.php b/src/Translatable/Mapping/Event/Adapter/ORM.php
@@ -162,13 +162,8 @@ public function findTranslation(AbstractWrapper $wrapped, $locale, $field, $tran
         }
         $q = $qb->getQuery();
         $q->setMaxResults(1);
-        $result = $q->getResult();
 
-        if ($result) {
-            return array_shift($result);
-        }
-
-        return null;
+        return $q->getOneOrNullResult();
     }
 
     public function removeAssociatedTranslations(AbstractWrapper $wrapped, $transClass, $objectClass)

diff --git a/src/Tree/Entity/Repository/ClosureTreeRepository.php b/src/Tree/Entity/Repository/ClosureTreeRepository.php
@@ -272,7 +272,7 @@ public function removeFromTree($node)
         $dql .= " WHERE node.{$config['parent']} = :node";
         $q = $this->_em->createQuery($dql);
         $q->setParameter('node', $node);
-        $nodesToReparent = $q->getResult();
+        $nodesToReparent = $q->toIterable();
         // process updates in transaction
         $this->_em->getConnection()->beginTransaction();
 

diff --git a/src/Tree/Entity/Repository/MaterializedPathRepository.php b/src/Tree/Entity/Repository/MaterializedPathRepository.php
@@ -250,7 +250,7 @@ public function getNodesHierarchy($node = null, $direct = false, array $options
         $nodes = $this->getNodesHierarchyQuery($node, $direct, $options, $includeNode)->getArrayResult();
         usort(
             $nodes,
-            static function ($a, $b) use ($path) {
+            static function (array $a, array $b) use ($path): int {
                 return strcmp($a[$path], $b[$path]);
             }
         );

diff --git a/src/Tree/Entity/Repository/NestedTreeRepository.php b/src/Tree/Entity/Repository/NestedTreeRepository.php
@@ -409,9 +409,7 @@ public function childrenQuery($node = null, $direct = false, $sortByField = null
      */
     public function children($node = null, $direct = false, $sortByField = null, $direction = 'ASC', $includeNode = false)
     {
-        $q = $this->childrenQuery($node, $direct, $sortByField, $direction, $includeNode);
-
-        return $q->getResult();
+        return $this->childrenQuery($node, $direct, $sortByField, $direction, $includeNode)->getResult();
     }
 
     public function getChildrenQueryBuilder($node = null, $direct = false, $sortByField = null, $direction = 'ASC', $includeNode = false)
@@ -802,7 +800,7 @@ public function removeFromTree($node)
 
                     $qb->andWhere($qb->expr()->eq('node.'.$config['parent'], ':pid'));
                     $qb->setParameter('pid', $nodeId);
-                    $nodes = $qb->getQuery()->getArrayResult();
+                    $nodes = $qb->getQuery()->toIterable([], Query::HYDRATE_ARRAY);
 
                     // go through each of the node's children
                     foreach ($nodes as $newRoot) {
@@ -1235,13 +1233,17 @@ private function verifyTree(array &$errors, ?object $root = null): void
             $qb->andWhere($qb->expr()->eq('node.'.$config['root'], ':rid'));
             $qb->setParameter('rid', $rootId);
         }
-        $nodes = $qb->getQuery()->getArrayResult();
-        if ([] !== $nodes) {
-            foreach ($nodes as $node) {
-                $errors[] = "node [{$node[$identifier]}] has missing parent".($root ? ' on tree root: '.$rootId : '');
-            }
 
-            return; // loading broken relation can cause infinite loop
+        $areMissingParents = false;
+
+        foreach ($qb->getQuery()->toIterable([], Query::HYDRATE_ARRAY) as $node) {
+            $areMissingParents = true;
+            $errors[] = "node [{$node[$identifier]}] has missing parent".($root ? ' on tree root: '.$rootId : '');
+        }
+
+        // loading broken relation can cause infinite loop
+        if ($areMissingParents) {
+            return;
         }
 
         // check for nodes that have a right value lower than the left
@@ -1272,9 +1274,8 @@ private function verifyTree(array &$errors, ?object $root = null): void
             $qb->andWhere($qb->expr()->eq('node.'.$config['root'], ':rid'));
             $qb->setParameter('rid', $rootId);
         }
-        $nodes = $qb->getQuery()->getResult(Query::HYDRATE_OBJECT);
 
-        foreach ($nodes as $node) {
+        foreach ($qb->getQuery()->toIterable() as $node) {
             $right = $meta->getReflectionProperty($config['right'])->getValue($node);
             $left = $meta->getReflectionProperty($config['left'])->getValue($node);
             $id = $meta->getReflectionProperty($identifier)->getValue($node);

diff --git a/src/Tree/Strategy/ORM/Closure.php b/src/Tree/Strategy/ORM/Closure.php
@@ -13,6 +13,7 @@
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Mapping\ClassMetadata as ORMClassMetadata;
 use Doctrine\ORM\Mapping\ClassMetadataInfo;
+use Doctrine\ORM\Query;
 use Doctrine\Persistence\Mapping\AbstractClassMetadataFactory;
 use Doctrine\Persistence\Mapping\ClassMetadata;
 use Doctrine\Persistence\ObjectManager;
@@ -302,23 +303,26 @@ public function processPostPersist($em, $entity, AdapterInterface $ea)
                 $dql .= ' WHERE c.descendant = :parent';
                 $q = $em->createQuery($dql);
                 $q->setParameter('parent', $parent);
-                $ancestors = $q->getArrayResult();
 
-                if ([] === $ancestors) {
-                    // The parent has been persisted after the child, postpone the evaluation
-                    $this->pendingChildNodeInserts[$emHash][] = $node;
+                $mustPostpone = true;
 
-                    continue;
-                }
+                foreach ($q->toIterable([], Query::HYDRATE_ARRAY) as $ancestor) {
+                    $mustPostpone = false;
 
-                foreach ($ancestors as $ancestor) {
                     $entries[] = [
                         $ancestorColumnName => $ancestor['ancestor'][$identifier],
                         $descendantColumnName => $nodeId,
                         $depthColumnName => $ancestor['depth'] + 1,
                     ];
                 }
 
+                if ($mustPostpone) {
+                    // The parent has been persisted after the child, postpone the evaluation
+                    $this->pendingChildNodeInserts[$emHash][] = $node;
+
+                    continue;
+                }
+
                 if (isset($config['level'])) {
                     $this->pendingNodesLevelProcess[$nodeId] = $node;
                 }

diff --git a/src/Tree/Strategy/ORM/Nested.php b/src/Tree/Strategy/ORM/Nested.php
@@ -223,8 +223,7 @@ public function processScheduledDelete($em, $node)
             }
             $q = $qb->getQuery();
             // get nodes for deletion
-            $nodes = $q->getResult();
-            foreach ((array) $nodes as $removalNode) {
+            foreach ($q->toIterable() as $removalNode) {
                 $uow->scheduleForDelete($removalNode);
             }
         }