Skip to content

Commit 0b21429

Browse files
committed
update to es6-rc2 and solved a BC break on innerHits Query, remove xdebug from Dockerfile.
1 parent 0a4c708 commit 0b21429

File tree

5 files changed

+4
-8
lines changed

5 files changed

+4
-8
lines changed

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ All notable changes to this project will be documented in this file based on the
55
## [Unreleased](https://github.com/ruflin/Elastica/compare/6.0.0-beta1...master)
66

77
### Backward Compatibility Breaks
8+
- Return the [_source of inner hit nested](https://github.com/elastic/elasticsearch/pull/26982) as is without wrapping it into its full path context [#1382](https://github.com/ruflin/Elastica/pull/1382)
89

910
### Bugfixes
1011

env/elastica/Docker70

-3
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@ RUN docker-php-ext-install sockets xsl
1818

1919
RUN rm -r /var/lib/apt/lists/*
2020

21-
# Xdebug for coverage report
22-
RUN pecl install xdebug-2.4.0
23-
2421
## PHP Configuration
2522

2623
RUN echo "memory_limit=1024M" >> /usr/local/etc/php/conf.d/memory-limit.ini

env/elastica/Docker71

-3
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@ RUN docker-php-ext-install sockets xsl
1818

1919
RUN rm -r /var/lib/apt/lists/*
2020

21-
# Xdebug for coverage report
22-
RUN pecl install xdebug-2.4.0
23-
2421
## PHP Configuration
2522

2623
RUN echo "memory_limit=1024M" >> /usr/local/etc/php/conf.d/memory-limit.ini

env/elasticsearch/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM docker.elastic.co/elasticsearch/elasticsearch:6.0.0-rc1
1+
FROM docker.elastic.co/elasticsearch/elasticsearch:6.0.0-rc2
22
MAINTAINER Nicolas Ruflin <[email protected]>
33

44
RUN /usr/share/elasticsearch/bin/elasticsearch-plugin install ingest-attachment

test/Elastica/Query/InnerHitsTest.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,8 @@ public function testInnerHitsNested()
343343
$innerHitsResults = $firstResult->getInnerHits();
344344

345345
$this->assertEquals($firstResult->getId(), 4);
346-
$this->assertEquals($innerHitsResults['users']['hits']['hits'][0]['_source']['users']['name'], 'Newton');
346+
$this->assertEquals($innerHitsResults['users']['hits']['hits'][0]['_source']['name'], 'Newton');
347+
347348
}
348349

349350
/**

0 commit comments

Comments
 (0)