From 814c3dd94e4b35bb84b68cd4fc1ef1642d9f2d46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simonas=20=C5=A0erlinskas?=
<saimaz@users.noreply.github.com>
Date: Tue, 8 Oct 2019 13:00:15 +0300
Subject: [PATCH] resolve merge conflicts
---
src/Query/Compound/FunctionScoreQuery.php | 10 ++++------
src/Search.php | 18 ------------------
2 files changed, 4 insertions(+), 24 deletions(-)
diff --git a/src/Query/Compound/FunctionScoreQuery.php b/src/Query/Compound/FunctionScoreQuery.php
index 13beeaf..f6199f0 100644
--- a/src/Query/Compound/FunctionScoreQuery.php
+++ b/src/Query/Compound/FunctionScoreQuery.php
@@ -65,16 +65,14 @@ class FunctionScoreQuery implements BuilderInterface
*/
public function addFieldValueFactorFunction($field, $factor, $modifier = 'none', BuilderInterface $query = null, $missing = null)
{
- $function = array_filter([
- 'field_value_factor' => [
+ $function = [
+ 'field_value_factor' => array_filter([
'field' => $field,
'factor' => $factor,
'modifier' => $modifier,
'missing' => $missing
- ],
- ], function ($item) {
- return $item !== null;
- });
+ ]),
+ ];
$this->applyFilter($function, $query);
diff --git a/src/Search.php b/src/Search.php
index a427430..404c68a 100644
--- a/src/Search.php
+++ b/src/Search.php
@@ -497,24 +497,6 @@ class Search
return $this;
}
- /**
- * @return bool
- */
- public function isTrackTotalHits()
- {
- return $this->trackTotalHits;
- }
-
- /**
- * @param bool $trackTotalHits
- * @return $this
- */
- public function setTrackTotalHits(bool $trackTotalHits)
- {
- $this->trackTotalHits = $trackTotalHits;
- return $this;
- }
-
/**
* @return int
*/
--
GitLab