From 008b4add92b865e0b3ca1830d41c83982794c06e Mon Sep 17 00:00:00 2001 From: pmishev Date: Thu, 11 Mar 2021 14:07:31 +0000 Subject: [PATCH] Allow null 'format' in DateRangeAggregation, as it is not required --- src/Aggregation/Bucketing/DateRangeAggregation.php | 8 +++++--- .../Aggregation/Bucketing/DateRangeAggregationTest.php | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/Aggregation/Bucketing/DateRangeAggregation.php b/src/Aggregation/Bucketing/DateRangeAggregation.php index 3ca14e29..561e951a 100644 --- a/src/Aggregation/Bucketing/DateRangeAggregation.php +++ b/src/Aggregation/Bucketing/DateRangeAggregation.php @@ -128,17 +128,19 @@ function ($v) { */ public function getArray() { - if ($this->getField() && $this->getFormat() && !empty($this->ranges)) { + if ($this->getField() && !empty($this->ranges)) { $data = [ - 'format' => $this->getFormat(), 'field' => $this->getField(), 'ranges' => $this->ranges, 'keyed' => $this->keyed, ]; + if ($this->getFormat()) { + $data['format'] = $this->getFormat(); + } return $data; } - throw new \LogicException('Date range aggregation must have field, format set and range added.'); + throw new \LogicException('Date range aggregation must have field and range added.'); } /** diff --git a/tests/Unit/Aggregation/Bucketing/DateRangeAggregationTest.php b/tests/Unit/Aggregation/Bucketing/DateRangeAggregationTest.php index 49966b9b..2a37ddef 100644 --- a/tests/Unit/Aggregation/Bucketing/DateRangeAggregationTest.php +++ b/tests/Unit/Aggregation/Bucketing/DateRangeAggregationTest.php @@ -21,7 +21,7 @@ class DateRangeAggregationTest extends \PHPUnit\Framework\TestCase public function testIfExceptionIsThrownWhenNoParametersAreSet() { $this->expectException(\LogicException::class); - $this->expectExceptionMessage('Date range aggregation must have field, format set and range added.'); + $this->expectExceptionMessage('Date range aggregation must have field and range added.'); $agg = new DateRangeAggregation('test_agg'); $agg->getArray(); }