From fb3d14e2038a0478bbacc4cd2fc534cb6889f436 Mon Sep 17 00:00:00 2001
From: Fedor Fomichev <79131391+fedorf4@users.noreply.github.com>
Date: Mon, 13 Jan 2025 12:41:59 +0300
Subject: [PATCH 1/3] Update InnerHits add array sorts

---
 src/Search/Collapsing/InnerHits.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/Search/Collapsing/InnerHits.php b/src/Search/Collapsing/InnerHits.php
index a8cab5b..9a9b84f 100644
--- a/src/Search/Collapsing/InnerHits.php
+++ b/src/Search/Collapsing/InnerHits.php
@@ -12,6 +12,7 @@ public function __construct(
         protected string $name,
         protected int $size,
         protected ?Sort $sort,
+        protected array $sorts = [],
     ) {
         Assert::stringNotEmpty(trim($name));
     }
@@ -27,6 +28,13 @@ public function toDSL(): array
             $dsl['sort'] = $this->sort->toDSL();
         }
 
+        if ($this->sorts) {
+            $dsl['sort'] = [];
+            foreach ($this->sorts as $sort) {
+                $dsl['sort'][] = $sort->toDSL();
+            }
+        }
+
         return $dsl;
     }
 }

From fe60db56fb9fa8bc9529a845910e56121bd72f1d Mon Sep 17 00:00:00 2001
From: Fedor Fomichev <79131391+fedorf4@users.noreply.github.com>
Date: Mon, 13 Jan 2025 14:10:06 +0300
Subject: [PATCH 2/3] InnerHits fix

---
 src/Search/Collapsing/InnerHits.php | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/Search/Collapsing/InnerHits.php b/src/Search/Collapsing/InnerHits.php
index 9a9b84f..4e65f14 100644
--- a/src/Search/Collapsing/InnerHits.php
+++ b/src/Search/Collapsing/InnerHits.php
@@ -11,8 +11,7 @@ class InnerHits implements DSLAware
     public function __construct(
         protected string $name,
         protected int $size,
-        protected ?Sort $sort,
-        protected array $sorts = [],
+        protected Sort|SortCollection|null $sort,
     ) {
         Assert::stringNotEmpty(trim($name));
     }
@@ -28,13 +27,6 @@ public function toDSL(): array
             $dsl['sort'] = $this->sort->toDSL();
         }
 
-        if ($this->sorts) {
-            $dsl['sort'] = [];
-            foreach ($this->sorts as $sort) {
-                $dsl['sort'][] = $sort->toDSL();
-            }
-        }
-
         return $dsl;
     }
 }

From fc715a381deea97518d7c627a058d6a993379871 Mon Sep 17 00:00:00 2001
From: Fedor Fomichev <79131391+fedorf4@users.noreply.github.com>
Date: Mon, 13 Jan 2025 14:29:03 +0300
Subject: [PATCH 3/3] InnerHits fix

---
 src/Search/Collapsing/InnerHits.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Search/Collapsing/InnerHits.php b/src/Search/Collapsing/InnerHits.php
index 4e65f14..a64cda4 100644
--- a/src/Search/Collapsing/InnerHits.php
+++ b/src/Search/Collapsing/InnerHits.php
@@ -4,6 +4,7 @@
 
 use Ensi\LaravelElasticQuery\Contracts\DSLAware;
 use Ensi\LaravelElasticQuery\Search\Sorting\Sort;
+use Ensi\LaravelElasticQuery\Search\Sorting\SortCollection;
 use Webmozart\Assert\Assert;
 
 class InnerHits implements DSLAware