Merge branch '1.3' into 2.1

Author: lukmzig

src/Model/DefaultSearch/Query/DateFilter.php

@@ -98,24 +98,19 @@ public function isEmpty(): bool
 
     public function getParams(): array
     {
-        $params = [
-            'format' => "yyyy-MM-dd'T'HH:mm:ssz",
-        ];
+        $params = ['format' => "yyyy-MM-dd'T'HH:mm:ssz"];
+
         if ($this->onDate) {
             $params['gte'] = $this->getStartOfDay($this->onDate)->format(DateTimeInterface::ATOM);
             $params['lte'] =  $this->getEndOfDay($this->onDate)->format(DateTimeInterface::ATOM);
-        } else {
-            if ($this->startDate) {
-                $params['gte'] = $this->getStartOfDay($this->startDate)->format(DateTimeInterface::ATOM);
-            }
-            if ($this->endDate) {
-                $params['lte'] = $this->getEndOfDay($this->endDate)->format(DateTimeInterface::ATOM);
-            }
+
+            return [$this->field => $params];
         }
 
-        return [
-            $this->field => $params,
-        ];
+        $params = $this->addStartParams($params);
+        $params = $this->addEndParams($params);
+
+        return [$this->field => $params];
     }
 
     public function toArray(bool $withType = false): array
@@ -162,6 +157,40 @@ public function getOnDate(): Carbon
         return $this->onDate;
     }
 
+    private function addStartParams(array $params): array
+    {
+        if (!$this->startDate) {
+            return $params;
+        }
+
+        if ($this->endDate) {
+            $params['gte'] = $this->getStartOfDay($this->startDate)->format(DateTimeInterface::ATOM);
+
+            return $params;
+        }
+
+        $params['gte'] = $this->getEndOfDay($this->startDate)->format(DateTimeInterface::ATOM);
+
+        return $params;
+    }
+
+    private function addEndParams(array $params): array
+    {
+        if (!$this->endDate) {
+            return $params;
+        }
+
+        if ($this->startDate) {
+            $params['lte'] = $this->getEndOfDay($this->endDate)->format(DateTimeInterface::ATOM);
+
+            return $params;
+        }
+
+        $params['lte'] = $this->getStartOfDay($this->endDate)->format(DateTimeInterface::ATOM);
+
+        return $params;
+    }
+
     private function getStartOfDay(Carbon $date): Carbon
     {
         if (!$this->roundToDay) {

tests/Unit/Model/DefaultSearch/Query/DateFilterTest.php

@@ -55,7 +55,7 @@ public function testToArray(): void
             'range' => [
                 'datefield' => [
                     'format' => "yyyy-MM-dd'T'HH:mm:ssz",
-                    'gte' => '2000-01-01T00:00:00+00:00',
+                    'gte' => '2000-01-01T23:59:59+00:00',
                 ],
             ],
         ], $dateFilter->toArray(true));
@@ -66,7 +66,7 @@ public function testToArray(): void
             'range' => [
                 'datefield' => [
                     'format' => "yyyy-MM-dd'T'HH:mm:ssz",
-                    'lte' => '2000-01-01T23:59:59+00:00',
+                    'lte' => '2000-01-01T00:00:00+00:00',
                 ],
             ],
         ], $dateFilter->toArray(true));
@@ -108,7 +108,7 @@ public function testGetParams(): void
         self::assertSame([
             'datefield' => [
                 'format' => "yyyy-MM-dd'T'HH:mm:ssz",
-                'gte' => '2000-01-01T00:00:00+00:00',
+                'gte' => '2000-01-01T23:59:59+00:00',
             ],
         ], $dateFilter->getParams());
 
@@ -117,7 +117,7 @@ public function testGetParams(): void
         self::assertSame([
             'datefield' => [
                 'format' => "yyyy-MM-dd'T'HH:mm:ssz",
-                'lte' => '2000-01-01T23:59:59+00:00',
+                'lte' => '2000-01-01T00:00:00+00:00',
             ],
         ], $dateFilter->getParams());
 

tests/Unit/SearchIndexAdapter/Asset/FieldDefinitionAdapter/DateAdapterTest.php

@@ -123,7 +123,7 @@ public function testApplySearchFilter()
                 'range' => [
                     'standard_fields.test.en' => [
                         'format' => "yyyy-MM-dd'T'HH:mm:ssz",
-                        'gte' => '2000-01-01T00:00:00+00:00',
+                        'gte' => '2000-01-01T23:59:59+00:00',
                     ],
                 ],
             ],
@@ -138,7 +138,7 @@ public function testApplySearchFilter()
                 'range' => [
                     'standard_fields.test.en' => [
                         'format' => "yyyy-MM-dd'T'HH:mm:ssz",
-                        'lte' => '2000-01-01T23:59:59+00:00',
+                        'lte' => '2000-01-01T00:00:00+00:00',
                     ],
                 ],
             ],