Merge pull request #74 from summerKK/fix-missing-type-20250803

Fix missing parameter type restrictions in aggregations and sorts

Author: freekmurze

src/Aggregations/CardinalityAggregation.php

@@ -27,7 +27,7 @@ public function payload(): array
             'field' => $this->field,
         ];
 
-        if ($this->missing) {
+        if ($this->missing !== null) {
             $parameters['missing'] = $this->missing;
         }
 

src/Aggregations/Concerns/WithMissing.php

@@ -4,9 +4,9 @@
 
 trait WithMissing
 {
-    protected ?string $missing = null;
+    protected string|int|float|bool|null $missing = null;
 
-    public function missing(string $missingValue): self
+    public function missing(string|int|float|bool $missingValue): self
     {
         $this->missing = $missingValue;
 

src/Aggregations/MaxAggregation.php

@@ -27,7 +27,7 @@ public function payload(): array
             'field' => $this->field,
         ];
 
-        if ($this->missing) {
+        if ($this->missing !== null) {
             $parameters['missing'] = $this->missing;
         }
 

src/Aggregations/MinAggregation.php

@@ -27,7 +27,7 @@ public function payload(): array
             'field' => $this->field,
         ];
 
-        if ($this->missing) {
+        if ($this->missing !== null) {
             $parameters['missing'] = $this->missing;
         }
 

src/Aggregations/SumAggregation.php

@@ -27,7 +27,7 @@ public function payload(): array
             'field' => $this->field,
         ];
 
-        if ($this->missing) {
+        if ($this->missing !== null) {
             $parameters['missing'] = $this->missing;
         }
 

src/Aggregations/TermsAggregation.php

@@ -53,7 +53,7 @@ public function payload(): array
             $parameters['size'] = $this->size;
         }
 
-        if ($this->missing) {
+        if ($this->missing !== null) {
             $parameters['missing'] = $this->missing;
         }
 

src/Sorts/Concerns/HasMissing.php

@@ -4,9 +4,9 @@
 
 trait HasMissing
 {
-    protected ?string $missing = null;
+    protected string|int|float|bool|null $missing = null;
 
-    public function missing(string $missing): static
+    public function missing(string|int|float|bool $missing): static
     {
         $this->missing = $missing;
 

src/Sorts/NestedSort.php

@@ -61,23 +61,29 @@ public function maxChildren(int $maxChildren): self
 
     public function toArray(): array
     {
+        $payload = array_filter(
+            [
+                'order' => $this->order,
+                'mode' => $this->mode,
+                'unmapped_type' => $this->unmappedType,
+                'nested' => array_filter(
+                    [
+                        'path' => $this->path,
+                        'filter' => $this->filter?->toArray(),
+                        'nested' => $this->nested?->toArray(),
+                        'max_children' => $this->maxChildren,
+                    ]
+                ),
+            ]
+        );
+
+        // missing can be empty string or zero value
+        if ($this->missing !== null) {
+            $payload['missing'] = $this->missing;
+        }
+
         return [
-            $this->field => array_filter(
-                [
-                    'order' => $this->order,
-                    'mode' => $this->mode,
-                    'missing' => $this->missing,
-                    'unmapped_type' => $this->unmappedType,
-                    'nested' => array_filter(
-                        [
-                            'path' => $this->path,
-                            'filter' => $this->filter?->toArray(),
-                            'nested' => $this->nested?->toArray(),
-                            'max_children' => $this->maxChildren,
-                        ]
-                    ),
-                ]
-            ),
+            $this->field => $payload,
         ];
     }
 }

src/Sorts/Sort.php

@@ -23,15 +23,22 @@ public function __construct(protected string $field, protected string $order)
 
     public function toArray(): array
     {
-        return [
-            $this->field => array_filter(
-                [
+        $payload = array_filter(
+            [
                     'order' => $this->order,
                     'missing' => $this->missing,
                     'unmapped_type' => $this->unmappedType,
                     'mode' => $this->mode,
-                ]
-            ),
+            ]
+        );
+
+        // missing can be empty string or zero value
+        if ($this->missing !== null) {
+            $payload['missing'] = $this->missing;
+        }
+
+        return [
+            $this->field => $payload,
         ];
     }
 }

tests/Queries/CollapseTest.php

@@ -10,7 +10,6 @@
 
 class CollapseTest extends TestCase
 {
-
     private Builder $builder;
 
     private Client $client;