Fix Composite::addAfter(null)

ruflin · Nov 23, 2020 · c137b2c · c137b2c
1 parent 11ababf
commit c137b2c
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 0 deletions.
diff --git a/src/Aggregation/Composite.php b/src/Aggregation/Composite.php
@@ -25,6 +25,10 @@ public function addSource(AbstractAggregation $aggregation): self
      */
     public function addAfter(?array $checkpoint): self
     {
+        if (null === $checkpoint) {
+            return $this;
+        }
+
         return $this->setParam('after', $checkpoint);
     }
 }
diff --git a/tests/Aggregation/CompositeTest.php b/tests/Aggregation/CompositeTest.php
@@ -178,6 +178,43 @@ public function testCompositeWithAfterAggregation(): void
         $this->assertEquals($expected, $results);
     }
 
+    /**
+     * @group functional
+     */
+    public function testCompositeWithNullAfter(): void
+    {
+        $composite = new Composite('products');
+        $composite->setSize(2);
+        $composite->addSource((new Terms('color'))->setField('color.keyword'));
+        $composite->addAfter(null);
+
+        $query = new Query();
+        $query->addAggregation($composite);
+
+        $results = $this->_getIndexForTest()->search($query)->getAggregation('products');
+        $expected = [
+            'after_key' => [
+                'color' => 'green',
+            ],
+            'buckets' => [
+                [
+                    'key' => [
+                        'color' => 'blue',
+                    ],
+                    'doc_count' => 2,
+                ],
+                [
+                    'key' => [
+                        'color' => 'green',
+                    ],
+                    'doc_count' => 1,
+                ],
+            ],
+        ];
+
+        $this->assertEquals($expected, $results);
+    }
+
     protected function _getIndexForTest(): Index
     {
         $index = $this->_createIndex();