Replace calls to execute()

phansys · franmomu · commit 126a87843b83 · 2023-09-04T13:35:38.000+02:00
diff --git a/src/Loggable/Document/Repository/LogEntryRepository.php b/src/Loggable/Document/Repository/LogEntryRepository.php
@@ -9,7 +9,6 @@
 
 namespace Gedmo\Loggable\Document\Repository;
 
-use Doctrine\ODM\MongoDB\Iterator\Iterator;
 use Doctrine\ODM\MongoDB\Mapping\ClassMetadata;
 use Doctrine\ODM\MongoDB\Repository\DocumentRepository;
 use Gedmo\Exception\RuntimeException;
diff --git a/src/Sluggable/Mapping/Event/Adapter/ODM.php b/src/Sluggable/Mapping/Event/Adapter/ODM.php
@@ -9,7 +9,6 @@
 
 namespace Gedmo\Sluggable\Mapping\Event\Adapter;
 
-use Doctrine\ODM\MongoDB\Iterator\Iterator;
 use Gedmo\Mapping\Event\Adapter\ODM as BaseAdapterODM;
 use Gedmo\Sluggable\Mapping\Event\SluggableAdapter;
 use Gedmo\Tool\Wrapper\AbstractWrapper;
diff --git a/src/Sluggable/Mapping/Event/Adapter/ORM.php b/src/Sluggable/Mapping/Event/Adapter/ORM.php
@@ -10,7 +10,6 @@
 namespace Gedmo\Sluggable\Mapping\Event\Adapter;
 
 use Doctrine\ORM\Mapping\ClassMetadataInfo;
-use Doctrine\ORM\Query;
 use Gedmo\Mapping\Event\Adapter\ORM as BaseAdapterORM;
 use Gedmo\Sluggable\Mapping\Event\SluggableAdapter;
 use Gedmo\Tool\Wrapper\AbstractWrapper;
@@ -76,10 +75,8 @@ public function getSimilarSlugs($object, $meta, array $config, $slug)
                 $qb->setParameter($namedId, $value, $meta->getTypeOfField($namedId));
             }
         }
-        $q = $qb->getQuery();
-        $q->setHydrationMode(Query::HYDRATE_ARRAY);
 
-        return $q->execute();
+        return $qb->getQuery()->getArrayResult();
     }
 
     public function replaceRelative($object, array $config, $target, $replacement)
diff --git a/src/Translatable/Document/Repository/TranslationRepository.php b/src/Translatable/Document/Repository/TranslationRepository.php
@@ -10,7 +10,6 @@
 namespace Gedmo\Translatable\Document\Repository;
 
 use Doctrine\ODM\MongoDB\DocumentManager;
-use Doctrine\ODM\MongoDB\Iterator\Iterator;
 use Doctrine\ODM\MongoDB\Mapping\ClassMetadata;
 use Doctrine\ODM\MongoDB\Repository\DocumentRepository;
 use Doctrine\ODM\MongoDB\Types\Type;
diff --git a/src/Translatable/Entity/Repository/TranslationRepository.php b/src/Translatable/Entity/Repository/TranslationRepository.php
@@ -141,14 +141,14 @@ public function findTranslations($entity)
             $qb->select('trans.content, trans.field, trans.locale')
                 ->from($translationClass, 'trans')
                 ->where('trans.foreignKey = :entityId', 'trans.objectClass = :entityClass')
-                ->orderBy('trans.locale');
+                ->orderBy('trans.locale')
+                ->setParameters([
+                    'entityId' => $entityId,
+                    'entityClass' => $entityClass,
+                ]);
             $q = $qb->getQuery();
-            $data = $q->execute(
-                compact('entityId', 'entityClass'),
-                Query::HYDRATE_ARRAY
-            );
 
-            foreach ($data as $row) {
+            foreach ($q->getArrayResult() as $row) {
                 $result[$row['locale']][$row['field']] = $row['content'];
             }
         }
@@ -210,14 +210,11 @@ public function findTranslationsByObjectId($id)
             $qb->select('trans.content, trans.field, trans.locale')
                 ->from($translationMeta->rootEntityName, 'trans')
                 ->where('trans.foreignKey = :entityId')
-                ->orderBy('trans.locale');
+                ->orderBy('trans.locale')
+                ->setParameter('entityId', $id);
             $q = $qb->getQuery();
-            $data = $q->execute(
-                ['entityId' => $id],
-                Query::HYDRATE_ARRAY
-            );
 
-            foreach ($data as $row) {
+            foreach ($q->getArrayResult() as $row) {
                 $result[$row['locale']][$row['field']] = $row['content'];
             }
         }
diff --git a/src/Translatable/Mapping/Event/Adapter/ODM.php b/src/Translatable/Mapping/Event/Adapter/ODM.php
@@ -9,7 +9,6 @@
 
 namespace Gedmo\Translatable\Mapping\Event\Adapter;
 
-use Doctrine\ODM\MongoDB\Iterator\Iterator;
 use Doctrine\ODM\MongoDB\Mapping\ClassMetadata;
 use Doctrine\ODM\MongoDB\Types\Type;
 use Gedmo\Exception\RuntimeException;
diff --git a/src/Tree/Document/MongoDB/Repository/MaterializedPathRepository.php b/src/Tree/Document/MongoDB/Repository/MaterializedPathRepository.php
@@ -58,7 +58,7 @@ public function getTreeQuery($rootNode = null)
      */
     public function getTree($rootNode = null): Iterator
     {
-        return $this->getTreeQuery($rootNode)->execute();
+        return $this->getTreeQuery($rootNode)->getIterator();
     }
 
     public function getRootNodesQueryBuilder($sortByField = null, $direction = 'asc')
@@ -152,7 +152,7 @@ public function getChildrenQuery($node = null, $direct = false, $sortByField = n
 
     public function getChildren($node = null, $direct = false, $sortByField = null, $direction = 'asc', $includeNode = false)
     {
-        return $this->getChildrenQuery($node, $direct, $sortByField, $direction, $includeNode)->execute();
+        return $this->getChildrenQuery($node, $direct, $sortByField, $direction, $includeNode)->getIterator();
     }
 
     public function getNodesHierarchyQueryBuilder($node = null, $direct = false, array $options = [], $includeNode = false)
diff --git a/src/Tree/Entity/Repository/MaterializedPathRepository.php b/src/Tree/Entity/Repository/MaterializedPathRepository.php
@@ -57,7 +57,7 @@ public function getTreeQuery($rootNode = null)
      */
     public function getTree($rootNode = null)
     {
-        return $this->getTreeQuery($rootNode)->execute();
+        return $this->getTreeQuery($rootNode)->getResult();
     }
 
     public function getRootNodesQueryBuilder($sortByField = null, $direction = 'asc')
@@ -72,7 +72,7 @@ public function getRootNodesQuery($sortByField = null, $direction = 'asc')
 
     public function getRootNodes($sortByField = null, $direction = 'asc')
     {
-        return $this->getRootNodesQuery($sortByField, $direction)->execute();
+        return $this->getRootNodesQuery($sortByField, $direction)->getResult();
     }
 
     /**
@@ -219,7 +219,7 @@ public function getChildrenQuery($node = null, $direct = false, $sortByField = n
 
     public function getChildren($node = null, $direct = false, $sortByField = null, $direction = 'asc', $includeNode = false)
     {
-        return $this->getChildrenQuery($node, $direct, $sortByField, $direction, $includeNode)->execute();
+        return $this->getChildrenQuery($node, $direct, $sortByField, $direction, $includeNode)->getResult();
     }
 
     public function getNodesHierarchyQueryBuilder($node = null, $direct = false, array $options = [], $includeNode = false)
diff --git a/src/Tree/RepositoryInterface.php b/src/Tree/RepositoryInterface.php
@@ -50,7 +50,7 @@ public function getNodesHierarchy($node = null, $direct = false, array $options
      * @param string|string[]      $direction   Sort order ('asc'|'desc'|'ASC'|'DESC'). If $sortByField is an array, this may also be an array with matching number of elements
      * @param bool                 $includeNode Include the root node in results?
      *
-     * @return array<int|string, object> List of children
+     * @return iterable|null List of children
      *
      * @phpstan-param 'asc'|'desc'|'ASC'|'DESC'|array<int, 'asc'|'desc'|'ASC'|'DESC'> $direction
      */
diff --git a/src/Tree/Strategy/ODM/MongoDB/MaterializedPath.php b/src/Tree/Strategy/ODM/MongoDB/MaterializedPath.php
@@ -38,7 +38,7 @@ public function removeNode($om, $meta, $config, $node)
             ->find($meta->getName())
             ->field($config['path'])->equals(new Regex('^'.preg_quote($wrapped->getPropertyValue($config['path'])).'.?+'))
             ->getQuery()
-            ->execute();
+            ->getIterator();
 
         foreach ($results as $node) {
             $uow->scheduleForDelete($node);
@@ -55,7 +55,7 @@ public function getChildren($om, $meta, $config, $originalPath)
             ->field($config['path'])->equals(new Regex('^'.preg_quote($originalPath).'.+'))
             ->sort($config['path'], 'asc')      // This may save some calls to updateNode
             ->getQuery()
-            ->execute();
+            ->getIterator();
     }
 
     /**
diff --git a/src/Tree/Strategy/ORM/MaterializedPath.php b/src/Tree/Strategy/ORM/MaterializedPath.php
@@ -50,7 +50,7 @@ public function removeNode($om, $meta, $config, $node)
         }
 
         $results = $qb->getQuery()
-            ->execute();
+            ->toIterable();
 
         foreach ($results as $node) {
             $uow->scheduleForDelete($node);
@@ -71,7 +71,6 @@ public function getChildren($om, $meta, $config, $path)
             ->orderBy('e.'.$config['path'], 'asc');      // This may save some calls to updateNode
         $qb->setParameter('path', $path);
 
-        return $qb->getQuery()
-            ->execute();
+        return $qb->getQuery()->getResult();
     }
 }
diff --git a/tests/Gedmo/Translatable/TranslatableTest.php b/tests/Gedmo/Translatable/TranslatableTest.php
@@ -12,7 +12,6 @@
 namespace Gedmo\Tests\Translatable;
 
 use Doctrine\Common\EventManager;
-use Doctrine\ORM\Query;
 use Gedmo\Tests\Tool\BaseTestCaseORM;
 use Gedmo\Tests\Translatable\Fixture\Article;
 use Gedmo\Tests\Translatable\Fixture\Comment;
@@ -144,12 +143,10 @@ public function testShouldGenerateTranslations(): void
         $qb = $this->em->createQueryBuilder();
         $qb->select('art')
             ->from(self::ARTICLE, 'art')
-            ->where('art.id = :id');
+            ->where('art.id = :id')
+            ->setParameter('id', $article->getId());
         $q = $qb->getQuery();
-        $result = $q->execute(
-            ['id' => $article->getId()],
-            Query::HYDRATE_ARRAY
-        );
+        $result = $q->getArrayResult();
         static::assertCount(1, $result);
         static::assertSame('title in en', $result[0]['title']);
         static::assertSame('content in en', $result[0]['content']);
diff --git a/tests/Gedmo/Translator/TranslatableTest.php b/tests/Gedmo/Translator/TranslatableTest.php
@@ -66,7 +66,7 @@ public function testTranslatable(): void
             ->select('p, t')
             ->join('p.translations', 't')
             ->getQuery()
-            ->execute();
+            ->getResult();
         $person = $persons[0];
 
         static::assertSame('Jen', $person->getName());
@@ -84,7 +84,7 @@ public function testTranslatable(): void
             ->select('p, t')
             ->join('p.translations', 't')
             ->getQuery()
-            ->execute();
+            ->getResult();
         $person = $persons[0];
 
         static::assertSame('Jen', $person->getName());
@@ -208,7 +208,7 @@ public function testTranslatableWithCustomProxy(): void
             ->select('p, t')
             ->join('p.translations', 't')
             ->getQuery()
-            ->execute();
+            ->getResult();
         $person = $persons[0];
 
         static::assertSame('Jen', $person->getName());
@@ -226,7 +226,7 @@ public function testTranslatableWithCustomProxy(): void
             ->select('p, t')
             ->join('p.translations', 't')
             ->getQuery()
-            ->execute();
+            ->getResult();
         $person = $persons[0];
 
         static::assertSame('Jen', $person->getName());
diff --git a/tests/Gedmo/Tree/MaterializedPathODMMongoDBTest.php b/tests/Gedmo/Tree/MaterializedPathODMMongoDBTest.php
@@ -111,7 +111,7 @@ public function testInsertUpdateAndRemove(): void
         $this->dm->remove($category2);
         $this->dm->flush();
 
-        $result = $this->dm->createQueryBuilder()->find(self::CATEGORY)->getQuery()->execute();
+        $result = $this->dm->createQueryBuilder()->find(self::CATEGORY)->getQuery()->getIterator();
 
         static::assertInstanceOf(Iterator::class, $result);
 
diff --git a/tests/Gedmo/Tree/MaterializedPathORMRootAssociationTest.php b/tests/Gedmo/Tree/MaterializedPathORMRootAssociationTest.php
@@ -119,7 +119,7 @@ public function testInsertUpdateAndRemove(): void
         $this->em->remove($category2);
         $this->em->flush();
 
-        $result = $this->em->createQueryBuilder()->select('c')->from(self::CATEGORY, 'c')->getQuery()->execute();
+        $result = $this->em->createQueryBuilder()->select('c')->from(self::CATEGORY, 'c')->getQuery()->getResult();
 
         $firstResult = $result[0];
 
diff --git a/tests/Gedmo/Tree/MaterializedPathORMTest.php b/tests/Gedmo/Tree/MaterializedPathORMTest.php
@@ -120,7 +120,7 @@ public function testInsertUpdateAndRemove(): void
         $this->em->remove($category2);
         $this->em->flush();
 
-        $result = $this->em->createQueryBuilder()->select('c')->from(self::CATEGORY, 'c')->getQuery()->execute();
+        $result = $this->em->createQueryBuilder()->select('c')->from(self::CATEGORY, 'c')->getQuery()->getResult();
 
         $firstResult = $result[0];
 

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@`
`10`	`10`	`namespace Gedmo\Sluggable\Mapping\Event\Adapter;`
`11`	`11`
`12`	`12`	`use Doctrine\ORM\Mapping\ClassMetadataInfo;`
`13`		`-use Doctrine\ORM\Query;`
`14`	`13`	`use Gedmo\Mapping\Event\Adapter\ORM as BaseAdapterORM;`
`15`	`14`	`use Gedmo\Sluggable\Mapping\Event\SluggableAdapter;`
`16`	`15`	`use Gedmo\Tool\Wrapper\AbstractWrapper;`
`@@ -76,10 +75,8 @@ public function getSimilarSlugs($object, $meta, array $config, $slug)`
`76`	`75`	`$qb->setParameter($namedId, $value, $meta->getTypeOfField($namedId));`
`77`	`76`	`}`
`78`	`77`	`}`
`79`		`- $q = $qb->getQuery();`
`80`		`- $q->setHydrationMode(Query::HYDRATE_ARRAY);`
`81`	`78`
`82`		`- return $q->execute();`
	`79`	`+ return $qb->getQuery()->getArrayResult();`
`83`	`80`	`}`
`84`	`81`
`85`	`82`	`public function replaceRelative($object, array $config, $target, $replacement)`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ public function getTreeQuery($rootNode = null)`
`58`	`58`	`*/`
`59`	`59`	`public function getTree($rootNode = null): Iterator`
`60`	`60`	`{`
`61`		`- return $this->getTreeQuery($rootNode)->execute();`
	`61`	`+ return $this->getTreeQuery($rootNode)->getIterator();`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`public function getRootNodesQueryBuilder($sortByField = null, $direction = 'asc')`
`@@ -152,7 +152,7 @@ public function getChildrenQuery($node = null, $direct = false, $sortByField = n`
`152`	`152`
`153`	`153`	`public function getChildren($node = null, $direct = false, $sortByField = null, $direction = 'asc', $includeNode = false)`
`154`	`154`	`{`
`155`		`- return $this->getChildrenQuery($node, $direct, $sortByField, $direction, $includeNode)->execute();`
	`155`	`+ return $this->getChildrenQuery($node, $direct, $sortByField, $direction, $includeNode)->getIterator();`
`156`	`156`	`}`
`157`	`157`
`158`	`158`	`public function getNodesHierarchyQueryBuilder($node = null, $direct = false, array $options = [], $includeNode = false)`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public function getTreeQuery($rootNode = null)`
`57`	`57`	`*/`
`58`	`58`	`public function getTree($rootNode = null)`
`59`	`59`	`{`
`60`		`- return $this->getTreeQuery($rootNode)->execute();`
	`60`	`+ return $this->getTreeQuery($rootNode)->getResult();`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`public function getRootNodesQueryBuilder($sortByField = null, $direction = 'asc')`
`@@ -72,7 +72,7 @@ public function getRootNodesQuery($sortByField = null, $direction = 'asc')`
`72`	`72`
`73`	`73`	`public function getRootNodes($sortByField = null, $direction = 'asc')`
`74`	`74`	`{`
`75`		`- return $this->getRootNodesQuery($sortByField, $direction)->execute();`
	`75`	`+ return $this->getRootNodesQuery($sortByField, $direction)->getResult();`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`/**`
`@@ -219,7 +219,7 @@ public function getChildrenQuery($node = null, $direct = false, $sortByField = n`
`219`	`219`
`220`	`220`	`public function getChildren($node = null, $direct = false, $sortByField = null, $direction = 'asc', $includeNode = false)`
`221`	`221`	`{`
`222`		`- return $this->getChildrenQuery($node, $direct, $sortByField, $direction, $includeNode)->execute();`
	`222`	`+ return $this->getChildrenQuery($node, $direct, $sortByField, $direction, $includeNode)->getResult();`
`223`	`223`	`}`
`224`	`224`
`225`	`225`	`public function getNodesHierarchyQueryBuilder($node = null, $direct = false, array $options = [], $includeNode = false)`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public function getNodesHierarchy($node = null, $direct = false, array $options`
`50`	`50`	`* @param string\|string[] $direction Sort order ('asc'\|'desc'\|'ASC'\|'DESC'). If $sortByField is an array, this may also be an array with matching number of elements`
`51`	`51`	`* @param bool $includeNode Include the root node in results?`
`52`	`52`	`*`
`53`		`- * @return array<int\|string, object> List of children`
	`53`	`+ * @return iterable\|null List of children`
`54`	`54`	`*`
`55`	`55`	`* @phpstan-param 'asc'\|'desc'\|'ASC'\|'DESC'\|array<int, 'asc'\|'desc'\|'ASC'\|'DESC'> $direction`
`56`	`56`	`*/`