Skip to content

Commit 019dd83

Browse files
committed
TASK: Inline some useless local variables
1 parent b52d09d commit 019dd83

2 files changed

Lines changed: 3 additions & 7 deletions

File tree

Classes/Driver/Version6/Query/FunctionScoreQuery.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,12 +105,10 @@ protected function prepareRequest(): array
105105

106106
$functionScore = $this->functionScoreRequest;
107107
$functionScore['query'] = $currentQuery;
108-
$query = Arrays::arrayMergeRecursiveOverrule($baseQuery, [
108+
return Arrays::arrayMergeRecursiveOverrule($baseQuery, [
109109
'query' => [
110110
'function_score' => $functionScore
111111
]
112112
]);
113-
114-
return $query;
115113
}
116114
}

Classes/Eel/ElasticSearchQueryBuilder.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -628,8 +628,7 @@ protected function evaluateResult(array $result): SearchResult
628628
*/
629629
public function execute(bool $cacheResult = true): \Traversable
630630
{
631-
$elasticSearchQuery = new ElasticSearchQuery($this);
632-
return $elasticSearchQuery->execute($cacheResult);
631+
return (new ElasticSearchQuery($this))->execute($cacheResult);
633632
}
634633

635634
/**
@@ -641,8 +640,7 @@ public function execute(bool $cacheResult = true): \Traversable
641640
*/
642641
public function executeUncached(): ElasticSearchQueryResult
643642
{
644-
$elasticSearchQuery = new ElasticSearchQuery($this);
645-
return $elasticSearchQuery->execute();
643+
return (new ElasticSearchQuery($this))->execute();
646644
}
647645

648646
/**

0 commit comments

Comments
 (0)