From 612fe48f1536c621a76cb3c150c7297c7664a48a Mon Sep 17 00:00:00 2001
From: Philipp Daun <post@philippdaun.net>
Date: Tue, 5 Nov 2024 21:58:24 +0100
Subject: [PATCH 1/2] Ensure relationship fields are lists

---
 src/Fieldtypes/Relationship.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Fieldtypes/Relationship.php b/src/Fieldtypes/Relationship.php
index f785753cc79..dadd2d8464c 100644
--- a/src/Fieldtypes/Relationship.php
+++ b/src/Fieldtypes/Relationship.php
@@ -57,7 +57,7 @@ protected function configFieldItems(): array
 
     public function preProcess($data)
     {
-        return Arr::wrap($data);
+        return ($data = Arr::wrap($data)) ? array_values($data) : $data;
     }
 
     public function preProcessConfig($data)

From cff90dc127dd70c40bb9d3a853363709f575031b Mon Sep 17 00:00:00 2001
From: Philipp Daun <post@philippdaun.net>
Date: Tue, 5 Nov 2024 23:31:16 +0100
Subject: [PATCH 2/2] Remove keys on process

---
 src/Fieldtypes/Relationship.php | 2 +-
 src/Fieldtypes/Terms.php        | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Fieldtypes/Relationship.php b/src/Fieldtypes/Relationship.php
index dadd2d8464c..f785753cc79 100644
--- a/src/Fieldtypes/Relationship.php
+++ b/src/Fieldtypes/Relationship.php
@@ -57,7 +57,7 @@ protected function configFieldItems(): array
 
     public function preProcess($data)
     {
-        return ($data = Arr::wrap($data)) ? array_values($data) : $data;
+        return Arr::wrap($data);
     }
 
     public function preProcessConfig($data)
diff --git a/src/Fieldtypes/Terms.php b/src/Fieldtypes/Terms.php
index 3b4770999eb..440fa333157 100644
--- a/src/Fieldtypes/Terms.php
+++ b/src/Fieldtypes/Terms.php
@@ -207,6 +207,7 @@ public function process($data)
                 return explode('::', $id, 2)[1];
             })
                 ->unique()
+                ->values()
                 ->all();
 
             if ($this->field->get('max_items') === 1) {