Adapt aggregation base class to handle suffix (#1887)

ruflin · Dec 3, 2020 · c9d01b6 · c9d01b6
1 parent ef7b9e4
commit c9d01b6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/src/Aggregation/AbstractAggregation.php b/src/Aggregation/AbstractAggregation.php
@@ -5,6 +5,7 @@
 use Elastica\Exception\InvalidException;
 use Elastica\NameableInterface;
 use Elastica\Param;
+use Elastica\Util;
 
 abstract class AbstractAggregation extends Param implements NameableInterface
 {
@@ -134,4 +135,12 @@ public function toArray(): array
 
         return $array;
     }
+
+    protected function _getBaseName()
+    {
+        $shortName = (new \ReflectionClass($this))->getShortName();
+        $shortName = \preg_replace('/Aggregation$/', '', $shortName);
+
+        return Util::toSnakeCase($shortName);
+    }
 }
diff --git a/src/Aggregation/GlobalAggregation.php b/src/Aggregation/GlobalAggregation.php
@@ -17,9 +17,4 @@ public function toArray(): array
 
         return $array;
     }
-
-    protected function _getBaseName()
-    {
-        return 'global';
-    }
 }
diff --git a/src/Aggregation/ParentAggregation.php b/src/Aggregation/ParentAggregation.php
@@ -20,9 +20,4 @@ public function setType($type): self
     {
         return $this->setParam('type', $type);
     }
-
-    protected function _getBaseName()
-    {
-        return 'parent';
-    }
 }