Prepare 6.0.1 release (#1465)

CHANGELOG.md

@@ -6,6 +6,17 @@ All notable changes to this project will be documented in this file based on the
 
 ### Backward Compatibility Breaks
 
+### Bugfixes
+
+### Added
+
+### Improvements
+
+### Deprecated
+
+
+## [6.0.1](https://github.com/ruflin/Elastica/compare/6.0.0...6.0.1)
+
 ### Bugfixes
 - Characters "<" and ">" will be removed when a query term is passed to [`Util::escapeTerm`](https://github.com/ruflin/Elastica/pull/1415/files). Since v5.1 the [documentation](https://www.elastic.co/guide/en/elasticsearch/reference/5.1/query-dsl-query-string-query.html#_reserved_characters) states that these symbols cannot be escaped ever.
 - Remove [`each()`](http://www.php.net/each) usage to fix PHP 7.2 compatibility
@@ -19,10 +30,6 @@ All notable changes to this project will be documented in this file based on the
 * Added avg_bucket() and sum_bucket() in aggregations [PR#1443](https://github.com/ruflin/Elastica/pull/1443) - (https://github.com/ruflin/Elastica/issues/1279)
 * Added support for [terms lookup mechanism](https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-terms-query.html#query-dsl-terms-lookup) on terms query [#1452](https://github.com/ruflin/Elastica/pull/1452)
 
-### Improvements
-
-### Deprecated
-
 
 ## [6.0.0](https://github.com/ruflin/Elastica/compare/6.0.0-beta1...6.0.0)
 

lib/Elastica/Aggregation/AvgBucket.php

@@ -12,7 +12,7 @@ class AvgBucket extends AbstractAggregation
 {
     /**
      * @param string      $name
-     * @param string|null  $bucketsPath
+     * @param string|null $bucketsPath
      */
     public function __construct($name, $bucketsPath = null)
     {

lib/Elastica/Aggregation/SumBucket.php

@@ -12,7 +12,7 @@ class SumBucket extends AbstractAggregation
 {
     /**
      * @param string      $name
-     * @param string|null  $bucketsPath
+     * @param string|null $bucketsPath
      */
     public function __construct($name, $bucketsPath = null)
     {

lib/Elastica/Bulk/Action.php

@@ -206,7 +206,7 @@ public function toString()
                 $string .= $source;
             } elseif (is_array($source) && array_key_exists('doc', $source) && is_string($source['doc'])) {
                 if (isset($source['doc_as_upsert'])) {
-                    $docAsUpsert = ', "doc_as_upsert": ' . ($source['doc_as_upsert'] ? 'true' : 'false' );
+                    $docAsUpsert = ', "doc_as_upsert": '.($source['doc_as_upsert'] ? 'true' : 'false');
                 } else {
                     $docAsUpsert = '';
                 }

lib/Elastica/Index.php

@@ -118,7 +118,7 @@ public function getSettings()
     /**
      * Uses _bulk to send documents to the server.
      *
-     * @param array|\Elastica\Document[] $docs Array of Elastica\Document
+     * @param array|\Elastica\Document[] $docs    Array of Elastica\Document
      * @param array                      $options Array of query params to use for query. For possible options check es api
      *
      * @return \Elastica\Bulk\ResponseSet
@@ -137,7 +137,7 @@ public function updateDocuments(array $docs, array $options = [])
     /**
      * Uses _bulk to send documents to the server.
      *
-     * @param array|\Elastica\Document[] $docs Array of Elastica\Document
+     * @param array|\Elastica\Document[] $docs    Array of Elastica\Document
      * @param array                      $options Array of query params to use for query. For possible options check es api
      *
      * @return \Elastica\Bulk\ResponseSet

lib/Elastica/QueryBuilder/DSL/Aggregation.php

@@ -101,8 +101,8 @@ public function sum($name)
      *
      * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-pipeline-sum-bucket-aggregation.html
      *
-     * @param string $name
-     * @param string|null  $bucketsPath
+     * @param string      $name
+     * @param string|null $bucketsPath
      *
      * @return SumBucket
      */
@@ -125,13 +125,13 @@ public function avg($name)
         return new Avg($name);
     }
 
-     /**
+    /**
      * avg bucket aggregation.
      *
      * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-pipeline-avg-bucket-aggregation.html
      *
-     * @param string $name
-     * @param string|null  $bucketsPath
+     * @param string      $name
+     * @param string|null $bucketsPath
      *
      * @return AvgBucket
      */

lib/Elastica/Type.php

@@ -166,7 +166,7 @@ public function updateDocument($data, array $options = [])
     /**
      * Uses _bulk to send documents to the server.
      *
-     * @param array|\Elastica\Document[] $docs Array of Elastica\Document
+     * @param array|\Elastica\Document[] $docs    Array of Elastica\Document
      * @param array                      $options Array of query params to use for query. For possible options check es api
      *
      * @return \Elastica\Bulk\ResponseSet
@@ -185,8 +185,9 @@ public function updateDocuments(array $docs, array $options = [])
     /**
      * Uses _bulk to send documents to the server.
      *
-     * @param array|\Elastica\Document[] $docs Array of Elastica\Document
+     * @param array|\Elastica\Document[] $docs    Array of Elastica\Document
      * @param array                      $options Array of query params to use for query. For possible options check es api
+     *
      * @return \Elastica\Bulk\ResponseSet
      *
      * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/docs-bulk.html
@@ -204,9 +205,10 @@ public function addDocuments(array $docs, array $options = [])
      * Uses _bulk to send documents to the server.
      *
      * @param object[] $objects
-     * @param array     $options Array of query params to use for query. For possible options check es api
+     * @param array    $options Array of query params to use for query. For possible options check es api
      *
      * @return Bulk\ResponseSet
+     *
      * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/docs-bulk.html
      */
     public function addObjects(array $objects, array $options = [])

lib/Elastica/Util.php

@@ -74,7 +74,7 @@ public static function escapeDateMath($requestUri)
     /**
      * Replace known reserved words (e.g. AND OR NOT)
      * and
-     * escape known special characters (e.g. + - && || ! ( ) { } [ ] ^ " ~ * ? : etc.)
+     * escape known special characters (e.g. + - && || ! ( ) { } [ ] ^ " ~ * ? : etc.).
      *
      * @link https://www.elastic.co/guide/en/elasticsearch/reference/5.1/query-dsl-query-string-query.html#_boolean_operators
      * @link https://www.elastic.co/guide/en/elasticsearch/reference/5.1/query-dsl-query-string-query.html#_reserved_characters
@@ -111,7 +111,7 @@ public static function escapeTerm($term)
         foreach ($escapableChars as $char) {
             $result = str_replace($char, '\\'.$char, $result);
         }
-        
+
         // < and > cannot be escaped, so they should be removed
         // @see https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#_reserved_characters
         $nonEscapableChars = ['<', '>'];

test/Elastica/Aggregation/AvgBucketTest.php

@@ -42,8 +42,7 @@ public function testAvgBucketAggregation()
             ->addAggregation(
                 (new AvgBucket('avg_likes_by_page'))
                     ->setBucketsPath('pages>avg_likes')
-            )
-        ;
+            );
 
         $results = $this->_getIndexForTest()->search($query)->getAggregations();
 

test/Elastica/Aggregation/SumBucketTest.php

@@ -42,8 +42,7 @@ public function testSumBucketAggregation()
             ->addAggregation(
                 (new SumBucket('sum_likes_by_page'))
                     ->setBucketsPath('pages>sum_likes')
-            )
-        ;
+            );
 
         $results = $this->_getIndexForTest()->search($query)->getAggregations();
 

test/Elastica/Bulk/Action/UpdateDocumentTest.php

@@ -2,12 +2,12 @@
 namespace Elastica\Test\BulkAction;
 
 use Elastica\Bulk\Action\UpdateDocument;
+use Elastica\Document;
 use Elastica\Index;
 use Elastica\Test\Base as BaseTest;
 use Elastica\Type;
-use Elastica\Document;
 
-class ActionTest extends BaseTest
+class UpdateDocumentTest extends BaseTest
 {
     /**
      * @group unit
@@ -61,7 +61,6 @@ public function testUpdateDocument()
         $expected = '{"update":{"_index":"index2","_type":"type2","_id":1,"_routing":1}}'."\n";
         $expected .= $docExpected;
         $this->assertEquals($expected, $action->toString());
-
     }
 
     /**
@@ -77,7 +76,7 @@ public function testUpdateDocumentAsUpsert()
         $this->assertTrue($action->hasSource());
 
         $expected = '{"update":{"_index":"index","_type":"type","_id":1}}'."\n"
-                . '{"doc":{"foo":"bar"},"doc_as_upsert":true}'."\n";
+                .'{"doc":{"foo":"bar"},"doc_as_upsert":true}'."\n";
         $this->assertEquals($expected, $action->toString());
 
         $document->setDocAsUpsert(1);
@@ -87,7 +86,7 @@ public function testUpdateDocumentAsUpsert()
         $document->setDocAsUpsert(false);
         $action->setDocument($document);
         $expected = '{"update":{"_index":"index","_type":"type","_id":1}}'."\n"
-                . '{"doc":{"foo":"bar"}}'."\n";
+                .'{"doc":{"foo":"bar"}}'."\n";
         $this->assertEquals($expected, $action->toString());
 
         $document->setDocAsUpsert(0);

test/Elastica/BulkTest.php

@@ -562,7 +562,9 @@ public function testUpsert()
         $doc2 = $type->createDocument(2, ['name' => 'Beckenbauer']);
         $doc3 = $type->createDocument(3, ['name' => 'Baggio']);
         $doc4 = $type->createDocument(4, ['name' => 'Cruyff']);
-        $documents = array_map(function($d){ $d->setDocAsUpsert(true); return $d;}, [$doc1, $doc2, $doc3, $doc4]);
+        $documents = array_map(function ($d) { $d->setDocAsUpsert(true);
+
+return $d;}, [$doc1, $doc2, $doc3, $doc4]);
 
         //index some documents
         $bulk = new Bulk($client);

test/Elastica/Query/TermsTest.php

@@ -48,7 +48,7 @@ public function testFilteredSearchWithLookup()
         $lookupType = $lookupIndex->getType('user');
 
         $lookupType->addDocuments([
-            new Document(1, ['terms' => ['ruflin', 'nicolas']])
+            new Document(1, ['terms' => ['ruflin', 'nicolas']]),
         ]);
 
         $type->addDocuments([
@@ -63,7 +63,7 @@ public function testFilteredSearchWithLookup()
             'index' => $lookupIndex->getName(),
             'type' => $lookupType->getName(),
             'id' => '1',
-            'path' => 'terms'
+            'path' => 'terms',
         ]);
         $index->refresh();
         $lookupIndex->refresh();
@@ -113,7 +113,6 @@ public function testSetMinimum($minimum)
         $this->assertEquals($minimum, $data['terms']['minimum_match']);
     }
 
-
     /**
      * @group unit
      */
@@ -124,10 +123,10 @@ public function testSetTermsLookup()
             'index' => 'index_name',
             'type' => 'type_name',
              'id' => '1',
-            'path' => 'terms'
+            'path' => 'terms',
         ];
 
-        $query = new Terms;
+        $query = new Terms();
         $query->setTermsLookup($key, $terms);
         $data = $query->toArray();
         $this->assertEquals($terms, $data['terms'][$key]);

test/Elastica/Transport/AwsAuthV4Test.php

@@ -84,13 +84,12 @@ public function testSetHttpsIfItIsRequired()
             'aws_secret_access_key' => 'bar',
             'aws_session_token' => 'baz',
             'aws_region' => 'us-east-1',
-            'ssl' => true
+            'ssl' => true,
         ];
         $client = $this->_getClient($config);
 
         try {
             $client->request('_status', 'GET');
-
         } catch (GuzzleException $e) {
             $guzzleException = $e->getGuzzleException();
             if ($guzzleException instanceof RequestException) {