From d032b5a085ebe9a26b3a5ddb5833d3676db5b647 Mon Sep 17 00:00:00 2001
From: Gary PEGEOT <garypegeot@gmail.com>
Date: Mon, 1 Dec 2025 15:09:22 +0100
Subject: [PATCH 1/2] fix(Elasticsearch): use output config when provided

---
 src/Elasticsearch/State/CollectionProvider.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Elasticsearch/State/CollectionProvider.php b/src/Elasticsearch/State/CollectionProvider.php
index df84a52e32d..b27aa190b91 100644
--- a/src/Elasticsearch/State/CollectionProvider.php
+++ b/src/Elasticsearch/State/CollectionProvider.php
@@ -87,6 +87,10 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
             $documents = $documents->asArray();
         }
 
+        if (\is_string($operation->getOutput()) && class_exists($operation->getOutput())) {
+            $resourceClass = $operation->getOutput();
+        }
+
         return new Paginator(
             $this->denormalizer,
             $documents,

From 59404b51190d7ddd58fa931ce6bceecae17a3d9a Mon Sep 17 00:00:00 2001
From: Antoine Bluchet <soyuka@users.noreply.github.com>
Date: Thu, 11 Dec 2025 10:03:32 +0100
Subject: [PATCH 2/2] Update src/Elasticsearch/State/CollectionProvider.php

---
 src/Elasticsearch/State/CollectionProvider.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/Elasticsearch/State/CollectionProvider.php b/src/Elasticsearch/State/CollectionProvider.php
index b27aa190b91..1708a96a0f6 100644
--- a/src/Elasticsearch/State/CollectionProvider.php
+++ b/src/Elasticsearch/State/CollectionProvider.php
@@ -87,9 +87,7 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
             $documents = $documents->asArray();
         }
 
-        if (\is_string($operation->getOutput()) && class_exists($operation->getOutput())) {
-            $resourceClass = $operation->getOutput();
-        }
+        $resourceClass = $operation->getOutput()['class'] ?? $resourceClass;
 
         return new Paginator(
             $this->denormalizer,