From 2b494c9219c4cbc219e2a20f354a0655f81c4686 Mon Sep 17 00:00:00 2001
From: Martynas Sudintas <martynas.sudintas@ongr.io>
Date: Fri, 27 Feb 2015 15:37:16 +0200
Subject: [PATCH] Search#query property is not modified anymore after execution
---
Search.php | 20 ++++++++------------
1 file changed, 8 insertions(+), 12 deletions(-)
diff --git a/Search.php b/Search.php
index 1564ad7..f7d4155 100644
--- a/Search.php
+++ b/Search.php
@@ -549,7 +549,7 @@ class Search
*/
public function getQueries()
{
- return $this->queries;
+ return $this->query;
}
/**
@@ -623,26 +623,22 @@ class Search
{
$output = [];
- if ($this->filters !== null) {
- if ($this->query === null) {
- $queryForFiltered = null;
- } else {
- $queryForFiltered = clone $this->query;
- }
+ $query = $this->query;
- $filteredQuery = new FilteredQuery($queryForFiltered);
+ if ($this->filters !== null) {
+ $filteredQuery = new FilteredQuery($query === null ? null : $query);
$filteredQuery->setFilter($this->filters);
if ($this->boolFilterParams) {
$filteredQuery->setBoolParameters($this->boolFilterParams);
}
- $this->destroyQuery();
- $this->addQuery($filteredQuery);
+ $query = new Query();
+ $query->addQuery($filteredQuery);
}
- if ($this->query !== null) {
- $output[$this->query->getType()] = $this->query->toArray();
+ if ($query !== null) {
+ $output[$query->getType()] = $query->toArray();
}
if ($this->postFilters !== null) {
--
GitLab