Repository::findAllIterator returns iterable

Adation to IterableResult deprecation.

Author: kitsunet

Neos.Flow/Classes/Persistence/Doctrine/Repository.php

@@ -13,10 +13,6 @@
 
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
-use Doctrine\ORM\Internal\Hydration\IterableResult;
-use Doctrine\ORM\OptimisticLockException;
-use Doctrine\ORM\ORMException;
-use Doctrine\ORM\TransactionRequiredException;
 use Doctrine\ORM\QueryBuilder;
 use Doctrine\Persistence\Mapping\ClassMetadata;
 use Neos\Flow\Annotations as Flow;
@@ -97,7 +93,6 @@ public function getEntityClassName(): string
      * @param object $object The object to add
      * @return void
      * @throws IllegalObjectTypeException
-     * @throws ORMException
      * @api
      */
     public function add($object): void
@@ -115,7 +110,6 @@ public function add($object): void
      * @param object $object The object to remove
      * @return void
      * @throws IllegalObjectTypeException
-     * @throws ORMException
      * @api
      */
     public function remove($object): void
@@ -142,51 +136,23 @@ public function findAll(): QueryResultInterface
     /**
      * Find all objects and return an IterableResult
      *
-     * @return IterableResult
+     * @return iterable
      */
-    public function findAllIterator(): IterableResult
+    public function findAllIterator(): iterable
     {
         /** @var QueryBuilder $queryBuilder */
         $queryBuilder = $this->entityManager->createQueryBuilder();
         return $queryBuilder
             ->select('entity')
             ->from($this->getEntityClassName(), 'entity')
-            ->getQuery()->iterate();
-    }
-
-    /**
-     * Iterate over an IterableResult and return a Generator
-     *
-     * This method is useful for batch processing a huge result set.
-     *
-     * @param IterableResult $iterator
-     * @param callable|null $callback
-     * @return \Generator
-     *
-     * @deprecated Will be removed with Flow 9. The {@see findAllIterator} will return an \iterable directly
-     */
-    public function iterate(IterableResult $iterator, callable $callback = null): ?\Generator
-    {
-        $iteration = 0;
-        foreach ($iterator as $object) {
-            $object = current($object);
-            yield $object;
-            if ($callback !== null) {
-                $callback($iteration, $object);
-            }
-
-            $iteration++;
-        }
+            ->getQuery()->toIterable();
     }
 
     /**
      * Finds an object matching the given identifier.
      *
      * @param mixed $identifier The identifier of the object to find
      * @return object|null The matching object if found, otherwise NULL
-     * @throws ORMException
-     * @throws OptimisticLockException
-     * @throws TransactionRequiredException
      * @api
      */
     public function findByIdentifier($identifier)
@@ -239,7 +205,6 @@ public function countAll(): int
      *
      * @return void
      * @throws IllegalObjectTypeException
-     * @throws ORMException
      * @todo maybe use DQL here, would be much more performant
      * @api
      */

Neos.Flow/Classes/Persistence/Doctrine/Service.php

@@ -41,7 +41,6 @@
 use Doctrine\Migrations\Version\Version;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Mapping\MappingException;
-use Doctrine\ORM\ORMException;
 use Doctrine\ORM\Tools\SchemaTool;
 use Doctrine\ORM\Tools\SchemaValidator;
 use Doctrine\ORM\Tools\ToolsException;
@@ -166,7 +165,6 @@ public function compileProxies(): void
      * mapping information contains errors or not.
      *
      * @return array
-     * @throws ORMException
      */
     public function getEntityStatus(): array
     {
@@ -626,15 +624,16 @@ public function generateMigration(bool $diffAgainstCurrent = true, string $filte
     }
 
     /**
-     * Get name of current database platform
+     * Get class name of current database platform
      *
      * @return string
      * @throws DBALException
      * @deprecated will be removed in Flow 9. Compare the connection class name instead.
      */
     public function getDatabasePlatformName(): string
     {
-        return ucfirst($this->entityManager->getConnection()->getDatabasePlatform()->getName());
+        $platform = $this->entityManager->getConnection()->getDatabasePlatform();
+        return $platform !== null ? get_class($platform) : '';
     }
 
     /**

Neos.Flow/Classes/ResourceManagement/ResourceRepository.php

@@ -12,7 +12,6 @@
  */
 
 use Doctrine\ORM\EntityManagerInterface;
-use Doctrine\ORM\Internal\Hydration\IterableResult;
 use Doctrine\ORM\QueryBuilder;
 use Neos\Flow\Annotations as Flow;
 use Neos\Flow\Persistence\PersistenceManagerInterface;

Neos.Flow/Tests/Functional/Persistence/Doctrine/RepositoryTest.php

@@ -248,7 +248,7 @@ public function findAllIteratorReturnsSubTypesOfTheManagedType()
         $iterator = $this->superEntityRepository->findAllIterator();
         $expectedCount = 0;
 
-        foreach ($this->superEntityRepository->iterate($iterator) as $entity) {
+        foreach ($iterator as $entity) {
             $expectedCount++;
         }