Skip to content

Commit

Permalink
Update elasticsearch test version to 5.2
Browse files Browse the repository at this point in the history
* Update elasticsearch-php dependency to 5.2
* Update incompatible test
* Update README page
* Update CHANGELOG
  • Loading branch information
ruflin committed Apr 13, 2017
1 parent fcf2bc3 commit 1380d09
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 12 deletions.
14 changes: 8 additions & 6 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,34 +1,36 @@
# Change Log
All notable changes to this project will be documented in this file based on the [Keep a Changelog](http://keepachangelog.com/) Standard. This project adheres to [Semantic Versioning](http://semver.org/).

## [Unreleased](https://github.com/ruflin/Elastica/compare/5.0.0...master)
## [Unreleased](https://github.com/ruflin/Elastica/compare/5.1.0...master)

### Backward Compatibility Breaks

### Bugfixes

- Fix reading bool index settings like `\Elastica\Index\Settings::getBlocksWrite`. Elasticsearch returns all settings as strings and does not normalize bool values.
The getters now return the right bool value for whichever string representation is used like 'true', '1', 'on', 'yes'.
- Fix for QueryBuilder version check `\Elastica\QueryBuilder\Version\Version240.php` added all new query types to queries array.
- Do not modify the original query in `\Elastica\Search::count`.
The getters now return the right bool value for whichever string representation is used like 'true', '1', 'on', 'yes'. [#1251](https://github.com/ruflin/Elastica/pull/1251)
- Fix for QueryBuilder version check `\Elastica\QueryBuilder\Version\Version240.php` added all new query types to queries array. [#1266](https://github.com/ruflin/Elastica/pull/1266) [#1269](https://github.com/ruflin/Elastica/pull/1269)
- Do not modify the original query in `\Elastica\Search::count`. [#1276](https://github.com/ruflin/Elastica/pull/1276)

### Added

- Added `\Elastica\Client::requestEndpoint`, `\Elastica\Index::requestEndpoint`, `\Elastica\Type::requestEndpoint` that allow make requests with official client Endpoint usage. [#1275](https://github.com/ruflin/Elastica/pull/1275)
- Added `\Elastica\Aggregation\GeoBounds` that computes the bounding box containing all geo_point values for a field. [#1271](https://github.com/ruflin/Elastica/pull/1271)
- Added `\Elastica\Query\MatchNone` the inverse of MatchAll.
- Added `\Elastica\Query\MatchNone` the inverse of MatchAll. [#1276](https://github.com/ruflin/Elastica/pull/1276)

### Improvements

- added support for the "explain" flag of AnalyzeAPI [#1254](https://github.com/ruflin/Elastica/pull/1254)
- added support for the "request_cache" search option [#1243](https://github.com/ruflin/Elastica/pull/1243)
- skip sending "retry_on_conflict=0" default query param to improve compatibility with Amazon Elasticsearch [#1047](https://github.com/ruflin/Elastica/pull/1047)
- optimized `\Elastica\Scroll` to avoid one request [#1273](https://github.com/ruflin/Elastica/pull/1273)
- Update elasticsearch-php dependency to 5.2.0 [#1245](https://github.com/ruflin/Elastica/pull/1245)
- Update elasticsearch testing dependency to 5.2.2 [#1245](https://github.com/ruflin/Elastica/pull/1245)

### Deprecated

- Deprecated `\Elastica\Exception\ElasticsearchException` which is irrelevant since Elasticsearch now exposes the errors as a structured array instead of a single string.
Use `\Elastica\Exception\ResponseException::getResponse::getFullError` instead.
Use `\Elastica\Exception\ResponseException::getResponse::getFullError` instead. [#1251](https://github.com/ruflin/Elastica/pull/1251)

## [5.1.0](https://github.com/ruflin/Elastica/compare/5.0.0...5.1.0)

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ All library issues should go to the [issue tracker from github](https://github.c

Compatibility
-------------
This release is compatible with all elasticsearch 5.x releases. It was tested with version 5.1.2.
This release is compatible with all elasticsearch 5.x releases. It was tested with version 5.2.2.


Contributing
Expand All @@ -29,4 +29,4 @@ Dependencies
------------
| Project | Version | Required |
|---------|---------|----------|
|[Elasticsearch](https://github.com/elasticsearch/elasticsearch/tree/5.1)|5.1|yes|
|[Elasticsearch](https://github.com/elasticsearch/elasticsearch/tree/5.2)|5.2|yes|
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"require": {
"php": ">=5.6.0",
"psr/log": "~1.0",
"elasticsearch/elasticsearch": "^5.1"
"elasticsearch/elasticsearch": "5.2.0"
},
"require-dev": {
"aws/aws-sdk-php": "~3.0",
Expand Down
2 changes: 1 addition & 1 deletion env/elasticsearch/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM docker.elastic.co/elasticsearch/elasticsearch:5.1.2
FROM docker.elastic.co/elasticsearch/elasticsearch:5.2.2
MAINTAINER Nicolas Ruflin <[email protected]>

RUN /usr/share/elasticsearch/bin/elasticsearch-plugin install mapper-attachments
Expand Down
3 changes: 1 addition & 2 deletions test/Elastica/Type/MappingTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ public function testDynamicTemplate()
'mapping' => [
'type' => '{dynamic_type}',
'fields' => [
'raw' => ['type' => 'keyword', 'include_in_all' => false],
'raw' => ['type' => 'keyword'],
],
],
]],
Expand All @@ -247,7 +247,6 @@ public function testDynamicTemplate()
'fields' => [
'raw' => [
'type' => 'keyword',
'include_in_all' => false,
],
],
],
Expand Down

0 comments on commit 1380d09

Please sign in to comment.