diff --git a/CHANGELOG.md b/CHANGELOG.md index 425f7583d7..149cd9d3fc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,7 @@ All notable changes to this project will be documented in this file based on the - Removed [native script](https://github.com/elastic/elasticsearch/pull/24726) [#1364](https://github.com/ruflin/Elastica/pull/1364) - Removed old / removed script language support : javascript, python, mvel [#1364](https://github.com/ruflin/Elastica/pull/1364) - Disable [_all](https://github.com/elastic/elasticsearch/pull/22144) by default, disallow configuring _all on 6.0+ indices [#1365](https://github.com/ruflin/Elastica/pull/1365) +- [Unfiltered nested source](https://github.com/elastic/elasticsearch/pull/26102) should keep its full path [#1366](https://github.com/ruflin/Elastica/pull/1366) ### Bugfixes - Enforce [Content-Type requirement on the layer Rest](https://github.com/elastic/elasticsearch/pull/23146), a [PR on Elastica #1301](https://github.com/ruflin/Elastica/issues/1301) solved it (it has been implemented only in the HTTP Transport), but it was not implemented in the Guzzle Transport. [#1349](https://github.com/ruflin/Elastica/pull/1349) diff --git a/env/elasticsearch/Dockerfile b/env/elasticsearch/Dockerfile index 2c777bc767..9de245958e 100644 --- a/env/elasticsearch/Dockerfile +++ b/env/elasticsearch/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.elastic.co/elasticsearch/elasticsearch:6.0.0-beta1 +FROM docker.elastic.co/elasticsearch/elasticsearch:6.0.0-beta2 MAINTAINER Nicolas Ruflin RUN /usr/share/elasticsearch/bin/elasticsearch-plugin install ingest-attachment diff --git a/test/Elastica/Query/InnerHitsTest.php b/test/Elastica/Query/InnerHitsTest.php index e9baedf9f8..b3f370ca59 100644 --- a/test/Elastica/Query/InnerHitsTest.php +++ b/test/Elastica/Query/InnerHitsTest.php @@ -324,7 +324,7 @@ public function testInnerHitsNested() $innerHitsResults = $firstResult->getInnerHits(); $this->assertEquals($firstResult->getId(), 4); - $this->assertEquals($innerHitsResults['users']['hits']['hits'][0]['_source']['name'], 'Newton'); + $this->assertEquals($innerHitsResults['users']['hits']['hits'][0]['_source']['users']['name'], 'Newton'); } /**