Merge pull request #555 from krzaczek/master

Global Aggregation
ruflin · Feb 18, 2014 · 42d91ed · 42d91ed
2 parents 0770bb8 + 6340b35
commit 42d91ed
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/changes.txt b/changes.txt
@@ -1,6 +1,7 @@
 CHANGES
 2014-02-17
 - Throw PartialShardFailureException if response has failed shards
+- Issue #555: Elastica/Aggregations/GlobalAggragation not allowed as sub aggragation
 
 2014-02-14
 - Add methods setSize, setShardSize to Elastica/Aggregation/Terms

diff --git a/lib/Elastica/Aggregation/AbstractAggregation.php b/lib/Elastica/Aggregation/AbstractAggregation.php
@@ -2,8 +2,8 @@
 
 namespace Elastica\Aggregation;
 
-
 use Elastica\Param;
+use Elastica\Exception\InvalidException;
 
 abstract class AbstractAggregation extends Param
 {
@@ -57,10 +57,15 @@ public function getAggs()
     /**
      * Add a sub-aggregation
      * @param AbstractAggregation $aggregation
+     * @throws \Elastica\Exception\InvalidException
      * @return AbstractAggregation
      */
     public function addAggregation(AbstractAggregation $aggregation)
     {
+        if(is_a($aggregation, 'Elastica\Aggregation\GlobalAggregation')) {
+            throw new InvalidException('Global aggregators can only be placed as top level aggregators');
+        }
+
         $this->_aggs[$aggregation->getName()] = $aggregation->toArray();
         return $this;
     }