Prepare release-5.2.0 (#1286)

* Update liniting

CHANGELOG.md

@@ -1,12 +1,23 @@
 # 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.1.0...master)
+## [Unreleased](https://github.com/ruflin/Elastica/compare/5.2.0...master)
 
 ### Backward Compatibility Breaks
 
 ### Bugfixes
 
+### Added
+
+### Improvements
+
+### Deprecated
+
+
+## [Unreleased](https://github.com/ruflin/Elastica/compare/5.1.0...5.2.0)
+
+### 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'. [#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)

composer.json

@@ -38,7 +38,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "5.1.x-dev"
+            "dev-master": "5.2.x-dev"
         }
     }
 }

lib/Elastica/Client.php

@@ -690,9 +690,10 @@ public function request($path, $method = Request::GET, $data = [], array $query
     }
 
     /**
-     * Makes calls to the elasticsearch server with usage official client Endpoint
+     * Makes calls to the elasticsearch server with usage official client Endpoint.
      *
      * @param AbstractEndpoint $endpoint
+     *
      * @return Response
      */
     public function requestEndpoint(AbstractEndpoint $endpoint)

lib/Elastica/Cluster/Health.php

@@ -3,7 +3,6 @@
 
 use Elastica\Client;
 use Elastica\Cluster\Health\Index;
-use Elastica\Request;
 
 /**
  * Elastic cluster health.

lib/Elastica/Index.php

@@ -526,6 +526,7 @@ public function setSettings(array $data)
     {
         $endpoint = new Put();
         $endpoint->setBody($data);
+
         return $this->requestEndpoint($endpoint);
     }
 
@@ -547,15 +548,17 @@ public function request($path, $method, $data = [], array $query = [])
     }
 
     /**
-     * Makes calls to the elasticsearch server with usage official client Endpoint based on this index
+     * Makes calls to the elasticsearch server with usage official client Endpoint based on this index.
      *
      * @param AbstractEndpoint $endpoint
+     *
      * @return Response
      */
     public function requestEndpoint(AbstractEndpoint $endpoint)
     {
         $cloned = clone $endpoint;
         $cloned->setIndex($this->getName());
+
         return $this->getClient()->requestEndpoint($cloned);
     }
 

lib/Elastica/Index/Stats.php

@@ -2,7 +2,6 @@
 namespace Elastica\Index;
 
 use Elastica\Index as BaseIndex;
-use Elastica\Request;
 
 /**
  * Elastica index stats object.

lib/Elastica/Node/Info.php

@@ -2,7 +2,6 @@
 namespace Elastica\Node;
 
 use Elastica\Node as BaseNode;
-use Elastica\Request;
 
 /**
  * Elastica cluster node object.

lib/Elastica/Node/Stats.php

@@ -2,7 +2,6 @@
 namespace Elastica\Node;
 
 use Elastica\Node as BaseNode;
-use Elastica\Request;
 
 /**
  * Elastica cluster node object.

lib/Elastica/Query.php

@@ -3,7 +3,6 @@
 
 use Elastica\Aggregation\AbstractAggregation;
 use Elastica\Exception\InvalidException;
-use Elastica\Exception\NotImplementedException;
 use Elastica\Query\AbstractQuery;
 use Elastica\Query\MatchAll;
 use Elastica\Query\QueryString;

lib/Elastica/Scroll.php

@@ -32,7 +32,7 @@ class Scroll implements \Iterator
 
     /**
      * 0: scroll<br>
-     * 1: scroll id
+     * 1: scroll id.
      *
      * @var array
      */
@@ -142,7 +142,7 @@ public function rewind()
     protected function _setScrollId(ResultSet $resultSet)
     {
         $this->_currentResultSet = $resultSet;
-        $this->currentPage++;
+        ++$this->currentPage;
         $this->totalPages = $resultSet->count() > 0 ? ceil($resultSet->getTotalHits() / $resultSet->count()) : 0;
         $this->_nextScrollId = $resultSet->getResponse()->isOk() ? $resultSet->getResponse()->getScrollId() : null;
     }

lib/Elastica/Search.php

@@ -291,7 +291,7 @@ protected function _validateOption($key)
             case self::OPTION_SEARCH_IGNORE_UNAVAILABLE:
             case self::OPTION_QUERY_CACHE:
             case self::OPTION_TERMINATE_AFTER:
-            case self::OPTION_SHARD_REQUEST_CACHE:    
+            case self::OPTION_SHARD_REQUEST_CACHE:
                 return true;
         }
 

lib/Elastica/Type.php

@@ -508,15 +508,17 @@ public function request($path, $method, $data = [], array $query = [])
     }
 
     /**
-     * Makes calls to the elasticsearch server with usage official client Endpoint based on this type
+     * Makes calls to the elasticsearch server with usage official client Endpoint based on this type.
      *
      * @param AbstractEndpoint $endpoint
+     *
      * @return Response
      */
     public function requestEndpoint(AbstractEndpoint $endpoint)
     {
         $cloned = clone $endpoint;
         $cloned->setType($this->getName());
+
         return $this->getIndex()->requestEndpoint($cloned);
     }
 

lib/Elastica/Type/Mapping.php

@@ -2,7 +2,6 @@
 namespace Elastica\Type;
 
 use Elastica\Exception\InvalidException;
-use Elastica\Request;
 use Elastica\Type;
 use Elasticsearch\Endpoints\Indices\Mapping\Put;
 

test/Elastica/IndexTest.php

@@ -923,8 +923,8 @@ public function testRequestEndpoint()
         $index = $this->_createIndex();
         $index->refresh();
         $endpoint = new Analyze();
-        $endpoint->setIndex("fooIndex");
-        $endpoint->setBody("foo");
+        $endpoint->setIndex('fooIndex');
+        $endpoint->setBody('foo');
         $returnedTokens = $index->requestEndpoint($endpoint)->getData()['tokens'];
 
         $tokens = [

test/Elastica/TypeTest.php

@@ -970,16 +970,16 @@ public function testGetMappingAlias()
     public function testRequestEndpoint()
     {
         $index = $this->_createIndex();
-        $type = new Type($index, "foo");
+        $type = new Type($index, 'foo');
 
         $mapping = new Mapping($type, $expect = [
             'id' => ['type' => 'integer', 'store' => true],
         ]);
         $type->setMapping($mapping);
 
         $endpoint = new Get();
-        $endpoint->setIndex("nonExistsIndex");
-        $endpoint->setType("nonExistsType");
+        $endpoint->setIndex('nonExistsIndex');
+        $endpoint->setType('nonExistsType');
 
         $response = $type->requestEndpoint($endpoint);
         $data = $response->getData();