From ce444a5e93f631e65fe9f805eb0176bc5b2298fd Mon Sep 17 00:00:00 2001
From: Mantas Varatiejus <mantas.varatiejus@nfq.com>
Date: Wed, 6 Jan 2016 18:02:22 +0200
Subject: [PATCH] Replace BoolFilter with BoolQuery where possible

Also removed unused imports
---
 docs/Filter/Bool.md                            | 2 +-
 docs/Filter/index.md                           | 2 +-
 docs/HowTo/HowToSearch.md                      | 2 +-
 src/Aggregation/FilterAggregation.php          | 1 -
 src/Search.php                                 | 5 ++---
 src/SearchEndpoint/AggregationsEndpoint.php    | 1 -
 src/SearchEndpoint/PostFilterEndpoint.php      | 1 -
 src/SearchEndpoint/QueryEndpoint.php           | 3 ---
 src/SearchEndpoint/SearchEndpointInterface.php | 1 -
 9 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/docs/Filter/Bool.md b/docs/Filter/Bool.md
index 51bb746..a9efc2b 100644
--- a/docs/Filter/Bool.md
+++ b/docs/Filter/Bool.md
@@ -93,4 +93,4 @@ You will get this query:
 
 
 [1]: https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-bool-filter.html
-[2]: ../Query/Bool.md
\ No newline at end of file
+[2]: ../Query/Bool.md
diff --git a/docs/Filter/index.md b/docs/Filter/index.md
index 5cb432f..d07b941 100644
--- a/docs/Filter/index.md
+++ b/docs/Filter/index.md
@@ -1,6 +1,6 @@
 # Filter
 
-> WARNING: Filters are deprecated since 1.1 and will be removed in 2.0. Elasticsearch from 2.0 casts queries the same way as filters, so there is no reason to have both. More information in [the elasticsearch docs](https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html)
+> __WARNING:__ Filters are deprecated since 1.1 and will be removed in 2.0. Elasticsearch from 2.0 casts queries the same way as filters, so there is no reason to have both. More information in [the elasticsearch docs](https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html)
 
 Objective filter builder represents all available [Elasticsearch filters][1].
 
diff --git a/docs/HowTo/HowToSearch.md b/docs/HowTo/HowToSearch.md
index d1e95c8..e891441 100644
--- a/docs/HowTo/HowToSearch.md
+++ b/docs/HowTo/HowToSearch.md
@@ -119,7 +119,7 @@ $missingFilter = new MissingFilter('disabled');
 $existsFilter = new ExistsFilter('tag');
 $search->addFilter($termFilter);
 $search->addFilter($missingFilter);
-$search->addFilter($existsFilter, BoolFilter::MUST_NOT);
+$search->addFilter($existsFilter, BoolQuery::MUST_NOT);
 ```
 
 Elasticsearch DSL will form this query:
diff --git a/src/Aggregation/FilterAggregation.php b/src/Aggregation/FilterAggregation.php
index 3e49b7d..2e512ba 100644
--- a/src/Aggregation/FilterAggregation.php
+++ b/src/Aggregation/FilterAggregation.php
@@ -13,7 +13,6 @@ namespace ONGR\ElasticsearchDSL\Aggregation;
 
 use ONGR\ElasticsearchDSL\Aggregation\Type\BucketingTrait;
 use ONGR\ElasticsearchDSL\BuilderInterface;
-use ONGR\ElasticsearchDSL\Filter\BoolFilter;
 
 /**
  * Class representing FilterAggregation.
diff --git a/src/Search.php b/src/Search.php
index 828d5f3..b9d9d9d 100644
--- a/src/Search.php
+++ b/src/Search.php
@@ -12,7 +12,6 @@
 namespace ONGR\ElasticsearchDSL;
 
 use ONGR\ElasticsearchDSL\Aggregation\AbstractAggregation;
-use ONGR\ElasticsearchDSL\Filter\BoolFilter;
 use ONGR\ElasticsearchDSL\Highlight\Highlight;
 use ONGR\ElasticsearchDSL\Query\BoolQuery;
 use ONGR\ElasticsearchDSL\SearchEndpoint\AbstractSearchEndpoint;
@@ -220,7 +219,7 @@ class Search
      *
      * @return $this
      */
-    public function addFilter(BuilderInterface $filter, $boolType = BoolFilter::MUST, $key = null)
+    public function addFilter(BuilderInterface $filter, $boolType = BoolQuery::MUST, $key = null)
     {
         $this->getEndpoint(QueryEndpoint::NAME);
         $endpoint = $this->getEndpoint(FilterEndpoint::NAME);
@@ -267,7 +266,7 @@ class Search
      *
      * @return int Key of post filter.
      */
-    public function addPostFilter(BuilderInterface $filter, $boolType = BoolFilter::MUST, $key = null)
+    public function addPostFilter(BuilderInterface $filter, $boolType = BoolQuery::MUST, $key = null)
     {
         $this
             ->getEndpoint(PostFilterEndpoint::NAME)
diff --git a/src/SearchEndpoint/AggregationsEndpoint.php b/src/SearchEndpoint/AggregationsEndpoint.php
index 2f39291..079a6a5 100644
--- a/src/SearchEndpoint/AggregationsEndpoint.php
+++ b/src/SearchEndpoint/AggregationsEndpoint.php
@@ -12,7 +12,6 @@
 namespace ONGR\ElasticsearchDSL\SearchEndpoint;
 
 use ONGR\ElasticsearchDSL\Aggregation\AbstractAggregation;
-use ONGR\ElasticsearchDSL\BuilderBag;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
 /**
diff --git a/src/SearchEndpoint/PostFilterEndpoint.php b/src/SearchEndpoint/PostFilterEndpoint.php
index 3fadc68..4eff244 100644
--- a/src/SearchEndpoint/PostFilterEndpoint.php
+++ b/src/SearchEndpoint/PostFilterEndpoint.php
@@ -11,7 +11,6 @@
 
 namespace ONGR\ElasticsearchDSL\SearchEndpoint;
 
-use ONGR\ElasticsearchDSL\Filter\BoolFilter;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
 /**
diff --git a/src/SearchEndpoint/QueryEndpoint.php b/src/SearchEndpoint/QueryEndpoint.php
index 9b610b5..f723e92 100644
--- a/src/SearchEndpoint/QueryEndpoint.php
+++ b/src/SearchEndpoint/QueryEndpoint.php
@@ -12,12 +12,9 @@
 namespace ONGR\ElasticsearchDSL\SearchEndpoint;
 
 use ONGR\ElasticsearchDSL\BuilderInterface;
-use ONGR\ElasticsearchDSL\Filter\BoolFilter;
-use ONGR\ElasticsearchDSL\ParametersTrait;
 use ONGR\ElasticsearchDSL\Query\BoolQuery;
 use ONGR\ElasticsearchDSL\Query\FilteredQuery;
 use ONGR\ElasticsearchDSL\Serializer\Normalizer\OrderedNormalizerInterface;
-use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
 /**
diff --git a/src/SearchEndpoint/SearchEndpointInterface.php b/src/SearchEndpoint/SearchEndpointInterface.php
index e899f31..9bda408 100644
--- a/src/SearchEndpoint/SearchEndpointInterface.php
+++ b/src/SearchEndpoint/SearchEndpointInterface.php
@@ -12,7 +12,6 @@
 namespace ONGR\ElasticsearchDSL\SearchEndpoint;
 
 use ONGR\ElasticsearchDSL\BuilderInterface;
-use ONGR\ElasticsearchDSL\Query\BoolQuery;
 use Symfony\Component\Serializer\Normalizer\NormalizableInterface;
 
 /**
-- 
GitLab