BUGFIX: Clone $request object to not change the original request

Author: daniellienert

Classes/Eel/ElasticSearchQueryBuilder.php

@@ -812,6 +812,7 @@ public function cacheLifetime(): int
      */
     protected function getNearestFutureDate(string $dateField)
     {
+        $request = clone $this->request;
 
         $convertDateResultToTimestamp = function (array $dateResult): int {
             if (!isset($dateResult['value_as_string'])) {
@@ -820,16 +821,16 @@ protected function getNearestFutureDate(string $dateField)
             return (new \DateTime($dateResult['value_as_string']))->getTimestamp();
         };
 
-        $this->request->queryFilter('range', [$dateField => ['gt' => 'now']], 'must');
-        $this->request->aggregation('min' . $dateField, [
+        $request->queryFilter('range', [$dateField => ['gt' => 'now']], 'must');
+        $request->aggregation('minTime', [
             'min' => [
                 'field' => $dateField
             ]
         ]);
 
-        $this->request->size(0);
+        $request->size(0);
 
-        $requestArray = $this->request->toArray();
+        $requestArray = $request->toArray();
 
         $mustNot = Arrays::getValueByPath($requestArray, 'query.bool.filter.bool.must_not');
 
@@ -844,7 +845,7 @@ protected function getNearestFutureDate(string $dateField)
 
         $result = $this->elasticSearchClient->getIndex()->request('GET', '/_search', [], $requestArray)->getTreatedContent();
 
-        return $convertDateResultToTimestamp(Arrays::getValueByPath($result, 'aggregations.min' . $dateField));
+        return $convertDateResultToTimestamp(Arrays::getValueByPath($result, 'aggregations.minTime'));
     }
 
     /**

Tests/Functional/Eel/ElasticSearchQueryTest.php

@@ -356,7 +356,7 @@ public function cacheLifetimeIsCalculatedCorrectly()
             ->sortAsc('title')
             ->cacheLifetime();
 
-        $this->assertEquals(3600, $cacheLifetime);
+        $this->assertEquals(600, $cacheLifetime);
     }
 
     /**
@@ -388,11 +388,11 @@ protected function createNodesForNodeSearchTest()
 
         // Nodes for cacheLifetime test
         $newContentNode2 = $newDocumentNode2->getNode('main')->createNode('document-2-text-1', $this->nodeTypeManager->getNodeType('Neos.NodeTypes:Text'));
-        $newContentNode2->setProperty('text', 'Hidden after 2030-01-01');
-        $newContentNode2->setHiddenAfterDateTime(new \DateTime('@1532635200'));
+        $newContentNode2->setProperty('text', 'Hidden after 2025-01-01');
+        $newContentNode2->setHiddenAfterDateTime(new \DateTime('@1735686000'));
         $newContentNode3 = $newDocumentNode2->getNode('main')->createNode('document-2-text-2', $this->nodeTypeManager->getNodeType('Neos.NodeTypes:Text'));
         $newContentNode3->setProperty('text', 'Hidden before 2018-07-18');
-        $newContentNode3->setHiddenBeforeDateTime(new \DateTime('@1532631600'));
+        $newContentNode3->setHiddenBeforeDateTime(new \DateTime('@1531864800'));
 
         $newDocumentNode3 = $this->siteNode->createNode('test-node-3', $this->nodeTypeManager->getNodeType('Neos.NodeTypes:Page'));
         $newDocumentNode3->setProperty('title', 'egg');
@@ -426,7 +426,7 @@ protected function createNodesForNodeSearchTest()
     protected function getQueryBuilder(): ElasticSearchQueryBuilder
     {
         $elasticSearchQueryBuilder = $this->objectManager->get(ElasticSearchQueryBuilder::class);
-        $this->inject($elasticSearchQueryBuilder, 'now', new \DateTimeImmutable('@1532628000'));
+        $this->inject($elasticSearchQueryBuilder, 'now', new \DateTimeImmutable('@1735685400')); // Dec. 31, 2024 23:50:00
 
         return $elasticSearchQueryBuilder->query($this->siteNode);
     }