Merge pull request #2 from bistrosk/8.0

fix empty objects being normalized as arrays

Author: C0mp4ct

src/Aggregation/AbstractAggregation.php

@@ -41,7 +41,7 @@ abstract protected function supportsNesting(): bool;
     /**
      * @return array|\stdClass
      */
-    abstract public function getArray(): array;
+    abstract public function getArray(): array|\stdClass;
 
     /**
      * Inner aggregations container init.
@@ -122,11 +122,11 @@ public function getAggregation($name)
     /**
      * {@inheritdoc}
      */
-    public function toArray(): array
+    public function toArray(): array|\stdClass
     {
         $array = $this->getArray();
         $result = [
-            $this->getType() => $this->processArray($array),
+            $this->getType() => is_array($array) ? $this->processArray($array) : $array,
         ];
 
         if ($this->supportsNesting()) {

src/Aggregation/Bucketing/AdjacencyMatrixAggregation.php

@@ -61,7 +61,7 @@ public function addFilter(string $name, BuilderInterface $filter): static
     /**
      * {@inheritdoc}
      */
-    public function getArray(): array
+    public function getArray(): array|\stdClass
     {
         return $this->filters;
     }

src/Aggregation/Bucketing/AutoDateHistogramAggregation.php

@@ -50,7 +50,7 @@ public function __construct(string $name, $field, $buckets = null, $format = nul
     /**
      * {@inheritdoc}
      */
-    public function getArray(): array
+    public function getArray(): array|\stdClass
     {
         return array_filter(
             [

src/Aggregation/Bucketing/ChildrenAggregation.php

@@ -55,7 +55,7 @@ public function getType(): string
     /**
      * {@inheritdoc}
      */
-    public function getArray(): array
+    public function getArray(): array|\stdClass
     {
         if (count($this->getAggregations()) == 0) {
             throw new \LogicException(sprintf('Children aggregation `%s` has no aggregations added', $this->getName()));

src/Aggregation/Bucketing/CompositeAggregation.php

@@ -63,7 +63,7 @@ public function addSource(AbstractAggregation $agg): static
     /**
      * {@inheritdoc}
      */
-    public function getArray(): array
+    public function getArray(): array|\stdClass
     {
         $array = [
             'sources' => $this->sources,

src/Aggregation/Bucketing/DateHistogramAggregation.php

@@ -68,7 +68,7 @@ public function getType(): string
     /**
      * {@inheritdoc}
      */
-    public function getArray(): array
+    public function getArray(): array|\stdClass
     {
         if (!$this->getField() || !$this->getInterval()) {
             throw new \LogicException('Date histogram aggregation must have field and interval set.');

src/Aggregation/Bucketing/DateRangeAggregation.php

@@ -98,7 +98,7 @@ public function addRange(mixed $from = null, mixed $to = null, mixed $key = null
     /**
      * {@inheritdoc}
      */
-    public function getArray(): array
+    public function getArray(): array|\stdClass
     {
         if ($this->getField() && $this->getFormat() && !empty($this->ranges)) {
             return [

src/Aggregation/Bucketing/DiversifiedSamplerAggregation.php

@@ -73,7 +73,7 @@ public function getType(): string
     /**
      * @inheritdoc
      */
-    public function getArray(): array
+    public function getArray(): array|\stdClass
     {
         return array_filter(
             [

src/Aggregation/Bucketing/FilterAggregation.php

@@ -67,7 +67,7 @@ public function setField($field): void
     /**
      * {@inheritdoc}
      */
-    public function getArray(): array
+    public function getArray(): array|\stdClass
     {
         if (!$this->filter) {
             throw new \LogicException(sprintf('Filter aggregation `%s` has no filter added', $this->getName()));

src/Aggregation/Bucketing/FiltersAggregation.php

@@ -78,7 +78,7 @@ public function addFilter(BuilderInterface $filter, string $name = ''): static
     /**
      * {@inheritdoc}
      */
-    public function getArray(): array
+    public function getArray(): array|\stdClass
     {
         return $this->filters;
     }

src/Aggregation/Bucketing/GeoDistanceAggregation.php

@@ -122,7 +122,7 @@ public function addRange(mixed $from = null, mixed $to = null): static
     /**
      * {@inheritdoc}
      */
-    public function getArray(): array
+    public function getArray(): array|\stdClass
     {
         $data = [];
 

src/Aggregation/Bucketing/GeoHashGridAggregation.php

@@ -120,7 +120,7 @@ public function setShardSize($shardSize)
     /**
      * {@inheritdoc}
      */
-    public function getArray(): array
+    public function getArray(): array|\stdClass
     {
         $data = [];
 

src/Aggregation/Bucketing/GlobalAggregation.php

@@ -42,8 +42,8 @@ public function getType(): string
     /**
      * {@inheritdoc}
      */
-    public function getArray(): array
+    public function getArray(): array|\stdClass
     {
-        return [];
+        return new \stdClass();
     }
 }

src/Aggregation/Bucketing/HistogramAggregation.php

@@ -218,7 +218,7 @@ public function getType(): string
     /**
      * {@inheritdoc}
      */
-    public function getArray(): array
+    public function getArray(): array|\stdClass
     {
         $out = array_filter(
             [

src/Aggregation/Bucketing/Ipv4RangeAggregation.php

@@ -83,7 +83,7 @@ public function getType(): string
     /**
      * {@inheritdoc}
      */
-    public function getArray(): array
+    public function getArray(): array|\stdClass
     {
         if ($this->getField() && !empty($this->ranges)) {
             return [

src/Aggregation/Bucketing/MissingAggregation.php

@@ -36,7 +36,7 @@ public function __construct(string $name, mixed $field = null)
     /**
      * {@inheritdoc}
      */
-    public function getArray(): array
+    public function getArray(): array|\stdClass
     {
         if ($this->getField()) {
             return ['field' => $this->getField()];

src/Aggregation/Bucketing/NestedAggregation.php

@@ -74,7 +74,7 @@ public function getType(): string
     /**
      * {@inheritdoc}
      */
-    public function getArray(): array
+    public function getArray(): array|\stdClass
     {
         return ['path' => $this->getPath()];
     }

src/Aggregation/Bucketing/RangeAggregation.php

@@ -112,7 +112,7 @@ public function removeRangeByKey(string $key): bool
     /**
      * {@inheritdoc}
      */
-    public function getArray(): array
+    public function getArray(): array|\stdClass
     {
         $data = [
             'keyed' => $this->keyed,

src/Aggregation/Bucketing/ReverseNestedAggregation.php

@@ -68,9 +68,9 @@ public function getType(): string
     /**
      * {@inheritdoc}
      */
-    public function getArray(): array
+    public function getArray(): array|\stdClass
     {
-        $output = [];
+        $output = new \stdClass();
         if ($this->getPath()) {
             $output = ['path' => $this->getPath()];
         }

src/Aggregation/Bucketing/SamplerAggregation.php

@@ -75,7 +75,7 @@ public function getType(): string
     /**
      * {@inheritdoc}
      */
-    public function getArray(): array
+    public function getArray(): array|\stdClass
     {
         return array_filter(
             [

src/Aggregation/Bucketing/TermsAggregation.php

@@ -51,7 +51,7 @@ public function getType(): string
     /**
      * {@inheritdoc}
      */
-    public function getArray(): array
+    public function getArray(): array|\stdClass
     {
         return array_filter(
             [

src/Aggregation/Matrix/MatrixStatsAggregation.php

@@ -92,7 +92,7 @@ public function getType(): string
         return 'matrix_stats';
     }
 
-    public function getArray(): array
+    public function getArray(): array|\stdClass
     {
         $out = [];
         if ($this->getField()) {

src/Aggregation/Metric/CardinalityAggregation.php

@@ -38,7 +38,7 @@ class CardinalityAggregation extends AbstractAggregation
     /**
      * {@inheritdoc}
      */
-    public function getArray(): array
+    public function getArray(): array|\stdClass
     {
         $out = array_filter(
             [

src/Aggregation/Metric/ExtendedStatsAggregation.php

@@ -78,7 +78,7 @@ public function getType(): string
     /**
      * {@inheritdoc}
      */
-    public function getArray(): array
+    public function getArray(): array|\stdClass
     {
         return array_filter(
             [

src/Aggregation/Metric/GeoBoundsAggregation.php

@@ -54,7 +54,7 @@ public function setWrapLongitude(bool $wrapLongitude): static
     /**
      * {@inheritdoc}
      */
-    public function getArray(): array
+    public function getArray(): array|\stdClass
     {
         $data = [];
         if ($this->getField()) {

src/Aggregation/Metric/GeoCentroidAggregation.php

@@ -36,7 +36,7 @@ public function __construct(string $name, ?string $field = null)
     /**
      * {@inheritdoc}
      */
-    public function getArray(): array
+    public function getArray(): array|\stdClass
     {
         $data = [];
         if ($this->getField()) {

src/Aggregation/Metric/PercentileRanksAggregation.php

@@ -105,7 +105,7 @@ public function getType(): string
     /**
      * {@inheritdoc}
      */
-    public function getArray(): array
+    public function getArray(): array|\stdClass
     {
         $out = array_filter(
             [

src/Aggregation/Metric/PercentilesAggregation.php

@@ -105,7 +105,7 @@ public function getType(): string
     /**
      * {@inheritdoc}
      */
-    public function getArray(): array
+    public function getArray(): array|\stdClass
     {
         $out = array_filter(
             [

src/Aggregation/Metric/ScriptedMetricAggregation.php

@@ -151,7 +151,7 @@ public function setReduceScript(mixed $reduceScript)
     /**
      * {@inheritdoc}
      */
-    public function getArray(): array
+    public function getArray(): array|\stdClass
     {
         return array_filter(
             [

src/Aggregation/Metric/StatsAggregation.php

@@ -47,7 +47,7 @@ public function getType(): string
     /**
      * {@inheritdoc}
      */
-    public function getArray(): array
+    public function getArray(): array|\stdClass
     {
         $out = [];
         if ($this->getField()) {

src/Aggregation/Metric/TopHitsAggregation.php

@@ -117,7 +117,7 @@ public function getType(): string
     /**
      * {@inheritdoc}
      */
-    public function getArray(): array
+    public function getArray(): array|\stdClass
     {
         $sortsOutput = null;
         $addedSorts = array_filter($this->getSorts());
@@ -136,6 +136,6 @@ public function getArray(): array
             static fn($val): bool => $val || is_array($val) || ($val || is_numeric($val))
         );
 
-        return empty($output) ? [] : $output;
+        return empty($output) ? new \stdClass() : $output;
     }
 }

src/Aggregation/Pipeline/AbstractPipelineAggregation.php

@@ -47,7 +47,7 @@ public function setBucketsPath($bucketsPath)
     /**
      * {@inheritdoc}
      */
-    public function getArray(): array
+    public function getArray(): array|\stdClass
     {
         return ['buckets_path' => $this->getBucketsPath()];
     }

src/Aggregation/Pipeline/BucketScriptAggregation.php

@@ -52,7 +52,7 @@ public function getType(): string
     /**
      * {@inheritdoc}
      */
-    public function getArray(): array
+    public function getArray(): array|\stdClass
     {
         if (!$this->getScript()) {
             throw new \LogicException(

src/Aggregation/Pipeline/BucketSortAggregation.php

@@ -68,7 +68,7 @@ public function getType(): string
     /**
      * {@inheritdoc}
      */
-    public function getArray(): array
+    public function getArray(): array|\stdClass
     {
         return array_filter(
             [

src/Aggregation/Pipeline/PercentilesBucketAggregation.php

@@ -49,7 +49,7 @@ public function setPercents(array $percents)
     /**
      * {@inheritdoc}
      */
-    public function getArray(): array
+    public function getArray(): array|\stdClass
     {
         $data = ['buckets_path' => $this->getBucketsPath()];
 

src/BuilderBag.php

@@ -106,7 +106,7 @@ public function all($type = null): array
     /**
      * {@inheritdoc}
      */
-    public function toArray(): array
+    public function toArray(): array|\stdClass
     {
         $output = [];
         foreach ($this->all() as $builder) {

src/BuilderInterface.php

@@ -21,7 +21,7 @@ interface BuilderInterface
      *
      * @return array
      */
-    public function toArray(): array;
+    public function toArray(): array|\stdClass;
 
     /**
      * Returns element type.

src/Highlight/Highlight.php

@@ -58,7 +58,7 @@ public function getType(): string
     /**
      * {@inheritdoc}
      */
-    public function toArray(): array
+    public function toArray(): array|\stdClass
     {
         $output = [];
 
@@ -69,7 +69,7 @@ public function toArray(): array
         $output = $this->processArray($output);
 
         foreach ($this->fields as $field => $params) {
-            $output['fields'][$field] = count($params) ? $params : [];
+            $output['fields'][$field] = count($params) ? $params : new \stdClass();
         }
 
         return $output;

src/InnerHit/NestedInnerHit.php

@@ -77,9 +77,9 @@ public function getType(): string
     /**
      * {@inheritdoc}
      */
-    public function toArray(): array
+    public function toArray(): array|\stdClass
     {
-        $out = $this->getSearch() ? $this->getSearch()->toArray() : [];
+        $out = $this->getSearch() ? $this->getSearch()->toArray() : new \stdClass();
 
         return [
             $this->getPathType() => [