JSON serialization of arrays with non-consecutive indices in multivalue fields (#1048)

Co-authored-by: Markus Kalkbrenner <git@kalki.de>

Author: thomascorthals

CHANGELOG.md

@@ -5,7 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
-### Added
+### Fixed
+- JSON serialization of arrays with non-consecutive indices in multivalue fields
 
 
 ## [6.2.8]

src/QueryType/Update/Query/Document.php

@@ -499,6 +499,9 @@ public function jsonSerialize()
             if ($value instanceof \DateTimeInterface) {
                 $value = $this->getHelper()->formatDate($value);
             } elseif (\is_array($value) && is_numeric(array_key_first($value))) {
+                // ensure consecutive indices so it doesn't serialize to an object
+                $value = array_values($value);
+
                 foreach ($value as &$multivalue) {
                     if ($multivalue instanceof \DateTimeInterface) {
                         $multivalue = $this->getHelper()->formatDate($multivalue);

tests/QueryType/Update/RequestBuilder/JsonTest.php

@@ -231,6 +231,28 @@ public function testBuildAddJsonMultivalueFieldWithEmptyArray()
         );
     }
 
+    public function testBuildAddJsonMultivalueFieldWithNonConsecutiveArrayIndices()
+    {
+        $command = new AddCommand();
+        $command->addDocument(new Document(['id' => [0 => 1, 4 => 2, 6 => 3], 'text' => [1 => 'a', 2 => 'b', 3 => 'c']]));
+        $json = [];
+
+        $this->builder->buildAddJson($command, $json);
+
+        $this->assertCount(1, $json);
+        $this->assertJsonStringEqualsJsonString(
+            '{
+                "add": {
+                    "doc": {
+                        "id": [1, 2, 3],
+                        "text": ["a", "b", "c"]
+                    }
+                }
+            }',
+            '{'.$json[0].'}'
+        );
+    }
+
     public function testBuildAddJsonWithEmptyStrings()
     {
         $command = new AddCommand();
@@ -662,7 +684,7 @@ public function testBuildAddJsonWithDateTimeImmutable()
         );
     }
 
-    public function testBuildAddJsonWithMultivaluedDateTimes()
+    public function testBuildAddJsonWithMultivalueDateTimes()
     {
         $command = new AddCommand();
         $command->addDocument(

tests/QueryType/Update/RequestBuilder/XmlTest.php

@@ -174,6 +174,26 @@ public function testBuildAddXmlMultivalueFieldWithEmptyArray()
         );
     }
 
+    public function testBuildAddXmlMultivalueFieldWithNonConsecutiveArrayIndices()
+    {
+        $command = new AddCommand();
+        $command->addDocument(new Document(['id' => [0 => 1, 4 => 2, 6 => 3], 'text' => [1 => 'a', 2 => 'b', 3 => 'c']]));
+
+        $this->assertSame(
+            '<add>'.
+            '<doc>'.
+            '<field name="id">1</field>'.
+            '<field name="id">2</field>'.
+            '<field name="id">3</field>'.
+            '<field name="text">a</field>'.
+            '<field name="text">b</field>'.
+            '<field name="text">c</field>'.
+            '</doc>'.
+            '</add>',
+            $this->builder->buildAddXml($command)
+        );
+    }
+
     public function testBuildAddXmlWithEmptyStrings()
     {
         $command = new AddCommand();
@@ -489,7 +509,7 @@ public function testBuildAddXmlWithDateTimeImmutable()
         );
     }
 
-    public function testBuildAddXmlWithMultivaluedDateTimes()
+    public function testBuildAddXmlWithMultivalueDateTimes()
     {
         $command = new AddCommand();
         $command->addDocument(