Update tests

lib/Doctrine/ORM/Tools/Pagination/Paginator.php

@@ -21,7 +21,9 @@
 use function array_key_exists;
 use function array_map;
 use function array_sum;
+use function assert;
 use function count;
+use function is_string;
 
 /**
  * The paginator can handle various complex scenarios with DQL.

tests/Doctrine/Tests/ORM/Functional/Ticket/GH7820Test.php

@@ -16,6 +16,7 @@
 use PHPUnit\Framework\Assert;
 use Psr\Cache\CacheItemInterface;
 use Symfony\Component\Cache\Adapter\ArrayAdapter;
+use Symfony\Component\Cache\CacheItem;
 
 use function array_map;
 use function is_string;
@@ -112,6 +113,35 @@ public function save(CacheItemInterface $item): bool
         $this->fetchSongLinesWithPaginator();
     }
 
+    public function testPaginatorQueriesWillBeCached(): void
+    {
+        $cache = new class extends ArrayAdapter {
+            /** @var bool */
+            private $failOnCacheMiss = false;
+
+            public function failOnCacheMiss(): void
+            {
+                $this->failOnCacheMiss = true;
+            }
+
+            public function getItem(mixed $key): CacheItem
+            {
+                $item = parent::getItem($key);
+                Assert::assertTrue(! $this->failOnCacheMiss || $item->isHit(), 'cache was missed');
+
+                return $item;
+            }
+        };
+        $this->_em->getConfiguration()->setQueryCache($cache);
+
+        // Prime the cache
+        $this->fetchSongLinesWithPaginator();
+
+        $cache->failOnCacheMiss();
+
+        $this->fetchSongLinesWithPaginator();
+    }
+
     private function fetchSongLinesWithPaginator(): array
     {
         $query = $this->_em->getRepository(GH7820Line::class)

tests/Doctrine/Tests/ORM/Tools/Pagination/RootTypeWalkerTest.php

@@ -0,0 +1,54 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\Tests\ORM\Tools\Pagination;
+
+use Doctrine\DBAL\Types\Type;
+use Doctrine\ORM\Query;
+use Doctrine\ORM\Tools\Pagination\RootTypeWalker;
+use Doctrine\Tests\DbalTypes\Rot13Type;
+use Doctrine\Tests\Models\ValueConversionType\AuxiliaryEntity;
+use Doctrine\Tests\Models\ValueConversionType\OwningManyToOneIdForeignKeyEntity;
+use Generator;
+
+class RootTypeWalkerTest extends PaginationTestCase
+{
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        if (! Type::hasType('rot13')) {
+            Type::addType('rot13', Rot13Type::class);
+        }
+    }
+
+    /**
+     * @dataProvider exampleQueries
+     */
+    public function testResolveTypeMapping(string $dqlQuery, string $expectedType): void
+    {
+        $query = $this->entityManager->createQuery($dqlQuery);
+        $query->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, RootTypeWalker::class);
+
+        self::assertSame($expectedType, $query->getSQL());
+    }
+
+    public function exampleQueries(): Generator
+    {
+        yield 'Entity with #Id column of special type' => [
+            'SELECT e.id4 FROM ' . AuxiliaryEntity::class . ' e',
+            'rot13',
+        ];
+
+        yield 'Entity where #Id is a to-one relation with special type identifier' => [
+            'SELECT e FROM ' . OwningManyToOneIdForeignKeyEntity::class . ' e',
+            'rot13',
+        ];
+
+        yield 'Simple integer ID in a query with a JOIN' => [
+            'SELECT u, g FROM Doctrine\Tests\ORM\Tools\Pagination\User u JOIN u.groups g',
+            'integer',
+        ];
+    }
+}