From f891e3d720f88f25631c1b0b58d7f3ff1dee87d1 Mon Sep 17 00:00:00 2001
From: Nicolas Ruflin <spam@ruflin.com>
Date: Wed, 15 Nov 2017 10:53:33 +1100
Subject: [PATCH] Prepare 6.0.0 release (#1408)

* Run linting
* Update Docker image to Elasticsearch 6.0.0
* Update elasticsearch-php lib dependency to 6.0.0
---
 CHANGELOG.md                             | 19 ++++++++++++++-----
 README.md                                |  2 +-
 composer.json                            |  2 +-
 env/elasticsearch/Dockerfile             |  2 +-
 lib/Elastica/Aggregation/StatsBucket.php |  3 +--
 lib/Elastica/Param.php                   |  2 +-
 lib/Elastica/Query/GeoPolygon.php        |  3 +--
 test/Elastica/IndexTest.php              |  1 -
 8 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0ca5b48446..fbfeadfa11 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,16 +2,27 @@
 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/6.0.0-beta1...master)
+## [Unreleased](https://github.com/ruflin/Elastica/compare/6.0.0...master)
 
 ### Backward Compatibility Breaks
-- Return the [_source of inner hit nested](https://github.com/elastic/elasticsearch/pull/26982) as is without wrapping it into its full path context [#1398](https://github.com/ruflin/Elastica/pull/1398)
-- Removed CrossIndex Class as from now use Reindex. [#1411](https://github.com/ruflin/Elastica/pull/1411)
 
 ### Bugfixes
 
 ### Added
 
+### Improvements
+
+### Deprecated
+
+
+## [6.0.0](https://github.com/ruflin/Elastica/compare/6.0.0-beta1...6.0.0)
+
+### Backward Compatibility Breaks
+- Return the [_source of inner hit nested](https://github.com/elastic/elasticsearch/pull/26982) as is without wrapping it into its full path context [#1398](https://github.com/ruflin/Elastica/pull/1398)
+- Removed CrossIndex Class as from now use Reindex. [#1411](https://github.com/ruflin/Elastica/pull/1411)
+
+### Added
+
 - Added clear() to `Scroll` for closing search context on ES manually
 - Added Elastica\Aggregation\StatsBucket
 
@@ -19,8 +30,6 @@ All notable changes to this project will be documented in this file based on the
 
 - Clear search context on ES after usage in `Scroll`
 
-### Deprecated
-
 
 ## [6.0.0-beta1](https://github.com/ruflin/Elastica/compare/5.3.0...6.0.0-beta1)
 
diff --git a/README.md b/README.md
index e855d0d55d..ab20762c0f 100644
--- a/README.md
+++ b/README.md
@@ -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 6.x releases. It was tested with version 6.0.0-rc1.
+This release is compatible with all Elasticsearch 6.x releases. It was tested with version 6.0.0.
 
 
 Contributing
diff --git a/composer.json b/composer.json
index 946e025809..0d8da7d560 100644
--- a/composer.json
+++ b/composer.json
@@ -14,7 +14,7 @@
     "require": {
         "php": "^7.0",
         "psr/log": "~1.0",
-        "elasticsearch/elasticsearch": "6.0.0-beta1"
+        "elasticsearch/elasticsearch": "6.0.0"
     },
     "require-dev": {
         "aws/aws-sdk-php": "~3.0",
diff --git a/env/elasticsearch/Dockerfile b/env/elasticsearch/Dockerfile
index 20d0b63494..26eee0721f 100644
--- a/env/elasticsearch/Dockerfile
+++ b/env/elasticsearch/Dockerfile
@@ -1,4 +1,4 @@
-FROM docker.elastic.co/elasticsearch/elasticsearch:6.0.0-rc2
+FROM docker.elastic.co/elasticsearch/elasticsearch:6.0.0
 MAINTAINER Nicolas Ruflin <spam@ruflin.com>
 
 RUN /usr/share/elasticsearch/bin/elasticsearch-plugin install ingest-attachment
diff --git a/lib/Elastica/Aggregation/StatsBucket.php b/lib/Elastica/Aggregation/StatsBucket.php
index 330661b606..690a06e1bb 100644
--- a/lib/Elastica/Aggregation/StatsBucket.php
+++ b/lib/Elastica/Aggregation/StatsBucket.php
@@ -1,5 +1,4 @@
 <?php
-
 namespace Elastica\Aggregation;
 
 use Elastica\Exception\InvalidException;
@@ -12,7 +11,7 @@
 class StatsBucket extends AbstractAggregation
 {
     /**
-     * @param string     $name
+     * @param string      $name
      * @param string|null $bucketsPath
      */
     public function __construct($name, $bucketsPath = null)
diff --git a/lib/Elastica/Param.php b/lib/Elastica/Param.php
index 48de122399..b8ea4f358b 100644
--- a/lib/Elastica/Param.php
+++ b/lib/Elastica/Param.php
@@ -182,7 +182,7 @@ public function getParams()
     }
 
     /**
-     * @inheritdoc
+     * {@inheritdoc}
      *
      * @return int
      */
diff --git a/lib/Elastica/Query/GeoPolygon.php b/lib/Elastica/Query/GeoPolygon.php
index 9df8e5c66e..ce16cbcd8c 100644
--- a/lib/Elastica/Query/GeoPolygon.php
+++ b/lib/Elastica/Query/GeoPolygon.php
@@ -55,7 +55,7 @@ public function toArray()
     }
 
     /**
-     * @inheritdoc
+     * {@inheritdoc}
      *
      * @return int
      */
@@ -63,5 +63,4 @@ public function count()
     {
         return count($this->_key);
     }
-
 }
diff --git a/test/Elastica/IndexTest.php b/test/Elastica/IndexTest.php
index 8de2613d78..317274ebcc 100644
--- a/test/Elastica/IndexTest.php
+++ b/test/Elastica/IndexTest.php
@@ -249,7 +249,6 @@ public function testDeleteByQueryWithQueryAndOptions()
         $doc->setRouting($routing1);
         $type->addDocument($doc);
 
-
         $doc = new Document(2, ['name' => 'ruflin']);
         $doc->setRouting($routing1);
         $type->addDocument($doc);