Update dependency to elasticsearch 1.7.3

CHANGELOG.md

@@ -3,13 +3,20 @@ All notable changes to this project will be documented in this file based on the
 
 ## [Unreleased](https://github.com/ruflin/Elastica/compare/2.3.0...HEAD)
 - Filters aggregation: empty name is named bucket #935
+- Update elasticsearch dependency to elasticsearch 1.7.3 #957
+
 
 ### Backward Compatibility Breaks
 
 ### Bugfixes
 - Filters aggregation: empty name is named bucket #935
+- Prevent mix keys in filters (#936) #939
+- Fix empty string is not anonymous filter #935
 
 ### Added
+- Support for field_value_factor #953
+- Added setMinDocCount and setExtendedBounds options #947
+- Avoid environment dependecies in tests #938
 
 ### Improvements
 

Makefile

@@ -45,17 +45,17 @@ dependencies:
 		${SOURCE}
 .PHONY: phpunit
 phpunit:
-	-phpunit -c test/ --coverage-clover build/coverage/unit-coverage.xml --group unit
-	-phpunit -c test/ --coverage-clover build/coverage/functional-coverage.xml --group functional
-	-phpunit -c test/ --coverage-clover build/coverage/shutdown-coverage.xml --group shutdown
-	
+	phpunit -c test/ --coverage-clover build/coverage/unit-coverage.xml --group unit
+	phpunit -c test/ --coverage-clover build/coverage/functional-coverage.xml --group functional
+	phpunit -c test/ --coverage-clover build/coverage/shutdown-coverage.xml --group shutdown
+
 .PHONY: tests
 tests:
 	# Rebuild image to copy changes files to the image
 	make elastica-image
 	make setup
 	docker-compose run elastica make phpunit
-	
+
 # Makes it easy to run a single test file. Example to run IndexTest.php: make test TEST="IndexTest.php"
 .PHONY: test
 test:
@@ -73,7 +73,7 @@ lint:
 	${RUN_ENV} php-cs-fixer fix
 
 .PHONY: loc
-loc: 
+loc:
 	${RUN_ENV} cloc --by-file --xml --exclude-dir=build -out=build/cloc.xml .
 
 .PHONY: phploc
@@ -115,7 +115,7 @@ destroy-environment:
 remove-containers:
 	-docker stop $(shell docker ps -a -q)
 	-docker rm -v $(shell docker ps -a -q)
-	
+
 # Starts a shell inside the elastica image
 .PHONY: shell
 shell:
@@ -172,4 +172,4 @@ push-images: build-images
 
 # google-setup:
 # 	docker-machine create --driver google --google-project elastica-1024 --google-machine-type n1-standard-8 elastica
-# 	eval "$(docker-machine env elastica)"
+# 	eval "$(docker-machine env elastica)"

env/elasticsearch/Dockerfile

@@ -1,4 +1,4 @@
-FROM elasticsearch:1.7.2
+FROM elasticsearch:1.7.3
 MAINTAINER Nicolas Ruflin <spam@ruflin.com>
 
 # Dependencies

test/lib/Elastica/Test/Base.php

@@ -91,7 +91,8 @@ protected function _checkPlugin($plugin)
 
     protected function _checkVersion($version)
     {
-        $installedVersion = $this->_getClient()->request('/')->getData()['version']['number'];
+        $data = $this->_getClient()->request('/')->getData();
+        $installedVersion = $data['version']['number'];
 
         if (version_compare($installedVersion, $version) < 0) {
             $this->markTestSkipped('Test require '.$version.'+ version of Elasticsearch');

test/lib/Elastica/Test/SuggestTest.php

@@ -2,7 +2,7 @@
 namespace Elastica\Test;
 
 use Elastica\Exception\NotImplementedException;
-use Elastica\Filter\Bool;
+use Elastica\Filter\BoolFilter;
 use Elastica\Suggest;
 use Elastica\Test\Base as BaseTest;
 
@@ -44,7 +44,7 @@ public function testCreateWithSuggest()
     public function testCreateWithNonSuggest()
     {
         try {
-            Suggest::create(new Bool());
+            Suggest::create(new BoolFilter());
             $this->fail();
         } catch (NotImplementedException $e) {
         }