Merge pull request #55 from mvar/cleanup

Replace BoolFilter with BoolQuery where possible

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

docs/Filter/index.md

 # 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].
 

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:

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.

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)

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;
 
 /**

src/SearchEndpoint/PostFilterEndpoint.php

@@ -11,7 +11,6 @@
 
 namespace ONGR\ElasticsearchDSL\SearchEndpoint;
 
-use ONGR\ElasticsearchDSL\Filter\BoolFilter;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
 /**

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;
 
 /**

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;
 
 /**