Merge pull request #12485 from seb-jean/fix/cursor-paginator-manytoone-association

[CursorPaginator] Fix cursor building when ordering by ManyToOne association

Author: greg0ire

src/Tools/Pagination/CursorPaginator.php

@@ -325,7 +325,13 @@ private function getParametersForItem(mixed $item): array
             $fieldName     = $orderByItem->expression->field;
             $orderMetadata = $orderByItem->metadata ?? $metadata;
             $value         = $metadata?->getFieldValue($item, $fieldName) ?? $item->$fieldName;
-            $type          = PersisterHelper::getTypeOfField($fieldName, $orderMetadata, $em)[0];
+
+            if ($value !== null && $orderMetadata !== null && isset($orderMetadata->associationMappings[$fieldName])) {
+                $targetMetadata = $em->getClassMetadata($orderMetadata->associationMappings[$fieldName]->targetEntity);
+                $value          = $targetMetadata->getIdentifierValues($value)[$targetMetadata->getSingleIdentifierFieldName()] ?? null;
+            }
+
+            $type = PersisterHelper::getTypeOfField($fieldName, $orderMetadata, $em)[0];
 
             $result[$orderByItem->paramKey] = $connection->convertToDatabaseValue($value, $type);
         }

tests/Tests/ORM/Tools/Pagination/CursorPaginatorTest.php

@@ -482,4 +482,32 @@ public function testCloneQueryCopiesExistingHints(): void
 
         self::assertSame(1, $paginator->countPageItems());
     }
+
+    public function testGetNextCursorUnwrapsManyToOneAssociationToIdentifier(): void
+    {
+        $author            = new Author();
+        $author->id        = 42;
+        $blogPost1         = new BlogPost();
+        $blogPost1->author = $author;
+
+        $author2           = new Author();
+        $author2->id       = 43;
+        $blogPost2         = new BlogPost();
+        $blogPost2->author = $author2;
+
+        $this->hydrator->method('hydrateAll')->willReturn([$blogPost1, $blogPost2]);
+        $result = $this->createMock(Result::class);
+        $this->connection->method('executeQuery')->willReturn($result);
+
+        $query = new Query($this->em);
+        $query->setDQL('SELECT b FROM Doctrine\Tests\ORM\Tools\Pagination\BlogPost b ORDER BY b.author ASC');
+
+        $paginator = new CursorPaginator($query, queryProducesDuplicates: false);
+        $paginator->paginate(null, 1);
+
+        self::assertTrue($paginator->hasNextPage());
+
+        $cursor = $paginator->getNextCursor();
+        self::assertSame(42, $cursor->getParameters()['b.author']);
+    }
 }