Remove specific hack for global aggregation (#1827)

* Remove specific hack for global aggregation * Fix test
ruflin · Oct 26, 2020 · e40a6be · e40a6be · harrisnl · Nov 1, 2020
1 parent 788711f
commit e40a6be
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/Aggregation/AbstractAggregation.php b/src/Aggregation/AbstractAggregation.php
@@ -128,10 +128,6 @@ public function toArray(): array
     {
         $array = parent::toArray();
 
-        if (\array_key_exists('global_aggregation', $array)) {
-            // compensate for class name GlobalAggregation
-            $array = ['global' => new \stdClass()];
-        }
         if (\count($this->_aggs)) {
             $array['aggs'] = $this->_convertArrayable($this->_aggs);
         }

diff --git a/src/Aggregation/GlobalAggregation.php b/src/Aggregation/GlobalAggregation.php
@@ -9,4 +9,8 @@
  */
 class GlobalAggregation extends AbstractAggregation
 {
+    protected function _getBaseName()
+    {
+        return 'global';
+    }
 }
diff --git a/tests/Aggregation/GlobalAggregationTest.php b/tests/Aggregation/GlobalAggregationTest.php
@@ -16,7 +16,7 @@ class GlobalAggregationTest extends BaseAggregationTest
     public function testToArray(): void
     {
         $expected = [
-            'global' => new \stdClass(),
+            'global' => [],
             'aggs' => [
                 'avg_price' => ['avg' => ['field' => 'price']],
             ],