Skip to content

Commit

Permalink
Merge pull request #58 from mvar/remove_filters
Browse files Browse the repository at this point in the history
Remove filters and filtered query
  • Loading branch information
mvar committed Jan 26, 2016
2 parents 766668b + 8d36311 commit 5ee3f67
Show file tree
Hide file tree
Showing 103 changed files with 154 additions and 4,796 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Expand Up @@ -5,6 +5,7 @@ v2.0.0 (2016-x)
---

- [BC break] Aggregation name is not prefixed anymore
- [BC break] Removed all filters and filtered query

v1.1.1 (2016-01-26)
---
Expand Down
9 changes: 5 additions & 4 deletions README.md
Expand Up @@ -10,6 +10,7 @@ If you have any questions, don't hesitate to ask them on [![Join the chat at htt
[![Latest Stable Version](https://poser.pugx.org/ongr/elasticsearch-dsl/v/stable)](https://packagist.org/packages/ongr/elasticsearch-dsl)
[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/ongr-io/ElasticsearchDSL/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/ongr-io/ElasticsearchDSL/?branch=master)

__This component requires Elasticsearch 2.0 or newer.__

## Documentation

Expand All @@ -21,8 +22,8 @@ If you have any questions, don't hesitate to ask them on [![Join the chat at htt

Install library with [composer](https://getcomposer.org):

```
composer require ongr/elasticsearch-dsl "~1.0"
```bash
$ composer require ongr/elasticsearch-dsl
```

### Search
Expand All @@ -33,8 +34,8 @@ If you dont want to use Symfony or Elasticsearch bundle, no worries, you can use

Install `elasticsearch-php`:

```
composer require "elasticsearch/elasticsearch": "~2.0"
```bash
$ composer require elasticsearch/elasticsearch
```

Create search:
Expand Down
2 changes: 1 addition & 1 deletion docs/Aggregation/Filter.md
Expand Up @@ -24,7 +24,7 @@ context to a specific set of documents.
And now the query via DSL:

```php
$termFilter = new TermFilter('color', 'red');
$termFilter = new TermQuery('color', 'red');
$avgAggregation = new AvgAggregation('avg_price', 'price');

$filterAggregation = new FilterAggregation('grades_stats', $termFilter);
Expand Down
8 changes: 4 additions & 4 deletions docs/Aggregation/Filters.md
Expand Up @@ -37,8 +37,8 @@ in exception.
And now the query via DSL:

```php
$errorTermFilter = new TermFilter('body', 'error');
$warningTermFilter = new TermFilter('body', 'warning');
$errorTermFilter = new TermQuery('body', 'error');
$warningTermFilter = new TermQuery('body', 'warning');

$histogramAggregation = new HistogramAggregation('monthly', 'timestamp');
$histogramAggregation->setInterval('1M');
Expand Down Expand Up @@ -86,8 +86,8 @@ $queryArray = $search->toArray();
And now the query via DSL:

```php
$errorTermFilter = new TermFilter('body', 'error');
$warningTermFilter = new TermFilter('body', 'warning');
$errorTermFilter = new TermQuery('body', 'error');
$warningTermFilter = new TermQuery('body', 'warning');

$histogramAggregation = new HistogramAggregation('monthly', 'timestamp');
$histogramAggregation->setInterval('1M');
Expand Down
51 changes: 0 additions & 51 deletions docs/Filter/And.md

This file was deleted.

96 changes: 0 additions & 96 deletions docs/Filter/Bool.md

This file was deleted.

31 changes: 0 additions & 31 deletions docs/Filter/Exists.md

This file was deleted.

90 changes: 0 additions & 90 deletions docs/Filter/GeoBoundingBox.md

This file was deleted.

43 changes: 0 additions & 43 deletions docs/Filter/GeoDistance.md

This file was deleted.

0 comments on commit 5ee3f67

Please sign in to comment.