Updated master with 7.x

Author: ezimuel

.github/workflows/test.yml

@@ -21,7 +21,6 @@ jobs:
       uses: shivammathur/setup-php@v2
       with:
         php-version: ${{ matrix.php-version }}
-        tools: prestissimo
       env:
         COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 

CHANGELOG.md

@@ -1,3 +1,43 @@
+# Release 7.11.0
+
+- [#1089](https://github.com/elastic/elasticsearch-php/pull/1089) Added the `X-Elastic-Client-Meta` header which is used by Elastic Cloud
+  and can be disabled with `ClientBuilder::setElasticMetaHeader(false)`
+- [#1075](https://github.com/elastic/elasticsearch-php/pull/1075) Replaced `array_walk` with `array_map` in `Connection::getURI` for PHP 8
+  compatibility
+- [#1069](https://github.com/elastic/elasticsearch-php/pull/1069) Remove unnecessary `InvalidArgumentExceptions`
+- [#1063](https://github.com/elastic/elasticsearch-php/pull/1063) Introducing PHP 8 compatibility
+- [#1062](https://github.com/elastic/elasticsearch-php/pull/1062) Replace Sami by Doctum and fix `.gitignore`
+
+## Release 7.10.0
+
+- Updated endpoints and namespaces for Elasticsearch 7.10
+  [3ceb748](https://github.com/elastic/elasticsearch-php/commit/3ceb7484a111aa20126168460c79f098c4fe0792)
+- Fixed ClientBuilder::fromConfig allowing multiple function
+  parameters (e.g. setApiKey)
+  [#1076](https://github.com/elastic/elasticsearch-php/pull/1076)
+- Refactored the YAML tests using generated PHPUnit code
+  [85fadc2](https://github.com/elastic/elasticsearch-php/commit/85fadc2bd4b2b309b19761a50ff13010d43a524d)
+
+## Release 7.9.1
+
+- Fixed using object instead of array in onFailure transport event
+  [#1066](https://github.com/elastic/elasticsearch-php/pull/1066)
+- Fixed reset custom header after endpoint call
+  [#1065](https://github.com/elastic/elasticsearch-php/pull/1065)
+- Show generic error messages when server returns no response
+  [#1056](https://github.com/elastic/elasticsearch-php/pull/1056)
+
+## Release 7.9.0
+
+- Updated endpoints and namespaces for Elasticsearch 7.9
+  [28bf0ed](https://github.com/elastic/elasticsearch-php/commit/28bf0ed6df6bc95f83f369509431d97907bfdeb0)
+- Moved `scroll_id` into `body` for search operations in the documentation
+  [#1052](https://github.com/elastic/elasticsearch-php/pull/1052)
+- Fixed PHP 7.4 preloading feature for autoload.php
+  [#1051](https://github.com/elastic/elasticsearch-php/pull/1051)
+- Improved message of JSON errors using `json_last_error_msg()`
+  [#1045](https://github.com/elastic/elasticsearch-php/pull/1045)
+
 ## Release 7.8.0
 
 - Updated endpoints and namespaces for Elasticsearch 7.8

README.md

@@ -3,7 +3,7 @@
 elasticsearch-php
 =================
 
- [![Build status](https://github.com/elastic/elasticsearch-php/workflows/PHP%20test/badge.svg)](https://github.com/elastic/elasticsearch-php/actions) [![Latest Stable Version](https://poser.pugx.org/elasticsearch/elasticsearch/v/stable)](https://packagist.org/packages/elasticsearch/elasticsearch) [![Total Downloads](https://poser.pugx.org/elasticsearch/elasticsearch/downloads)](https://packagist.org/packages/elasticsearch/elasticsearch)
+[![Build status](https://github.com/elastic/elasticsearch-php/workflows/PHP%20test/badge.svg)](https://github.com/elastic/elasticsearch-php/actions) [![Latest Stable Version](https://poser.pugx.org/elasticsearch/elasticsearch/v/stable)](https://packagist.org/packages/elasticsearch/elasticsearch) [![Total Downloads](https://poser.pugx.org/elasticsearch/elasticsearch/downloads)](https://packagist.org/packages/elasticsearch/elasticsearch)
 
 Official low-level client for Elasticsearch. Its goal is to provide common ground for all Elasticsearch-related code in PHP; because of this it tries to be opinion-free and very extendable.
 

composer.json

@@ -35,9 +35,6 @@
     "monolog/monolog": "Allows for client-level logging and tracing"
   },
   "autoload": {
-    "files": [
-      "src/autoload.php"
-    ],
     "psr-4": {
       "Elasticsearch\\": "src/Elasticsearch/"
     }

src/Elasticsearch/Client.php

@@ -38,6 +38,7 @@
 use GuzzleHttp\Ring\Client\Middleware;
 use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
+use ReflectionClass;
 
 class ClientBuilder
 {
@@ -134,7 +135,12 @@ class ClientBuilder
     private $sslVerification = null;
 
     /**
-     *  @var bool
+     * @var bool
+     */
+    private $elasticMetaHeader = true;
+
+    /**
+     * @var bool
      */
     private $includePortInHostHeader = false;
 
@@ -188,8 +194,14 @@ public static function fromConfig(array $config, bool $quiet = false): Client
         $builder = new static;
         foreach ($config as $key => $value) {
             $method = "set$key";
-            if (method_exists($builder, $method)) {
-                $builder->$method($value);
+            $reflection = new ReflectionClass($builder);
+            if ($reflection->hasMethod($method)) {
+                $func = $reflection->getMethod($method);
+                if ($func->getNumberOfParameters() > 1) {
+                    $builder->$method(...$value);
+                } else {
+                    $builder->$method($value);
+                }
                 unset($config[$key]);
             }
         }
@@ -337,7 +349,6 @@ public function setHosts(array $hosts): ClientBuilder
     /**
      * Set the APIKey Pair, consiting of the API Id and the ApiKey of the Response from /_security/api_key
      *
-         *
      * @throws AuthenticationConfigException
      */
     public function setApiKey(string $id, string $apiKey): ClientBuilder
@@ -382,19 +393,20 @@ public function setBasicAuthentication(string $username, string $password): Clie
     /**
      * Set Elastic Cloud ID to connect to Elastic Cloud
      *
-         *
      * @param string $cloudId
      */
     public function setElasticCloudId(string $cloudId): ClientBuilder
     {
         // Register the Hosts array
-        $this->setHosts([
+        $this->setHosts(
+            [
             [
                 'host'   => $this->parseElasticCloudId($cloudId),
                 'port'   => '',
                 'scheme' => 'https',
             ]
-        ]);
+            ]
+        );
 
         if (!isset($this->connectionParams['client']['curl'][CURLOPT_ENCODING])) {
             // Merge best practices for the connection (enable gzip)
@@ -456,7 +468,7 @@ public function setSSLKey(string $key, string $password = null): ClientBuilder
     }
 
     /**
-     *  @param bool|string $value
+     * @param bool|string $value
      */
     public function setSSLVerification($value = true): ClientBuilder
     {
@@ -465,8 +477,19 @@ public function setSSLVerification($value = true): ClientBuilder
         return $this;
     }
 
+    /**
+     * Set or disable the x-elastic-client-meta header
+     */
+    public function setElasticMetaHeader($value = true): ClientBuilder
+    {
+        $this->elasticMetaHeader = $value;
+
+        return $this;
+    }
+
     /**
      * Include the port in Host header
+     *
      * @see https://github.com/elastic/elasticsearch-php/issues/993
      */
     public function includePortInHostHeader(bool $enable): ClientBuilder
@@ -516,6 +539,7 @@ public function build(): Client
             $this->serializer = new $this->serializer;
         }
 
+        $this->connectionParams['client']['x-elastic-client-meta']= $this->elasticMetaHeader;
         $this->connectionParams['client']['port_in_header'] = $this->includePortInHostHeader;
 
         if (is_null($this->connectionFactory)) {
@@ -555,7 +579,11 @@ public function build(): Client
 
             $this->endpoint = function ($class) use ($serializer) {
                 $fullPath = '\\Elasticsearch\\Endpoints\\' . $class;
-                if ($class === 'Bulk' || $class === 'Msearch' || $class === 'MsearchTemplate' || $class === 'MPercolate') {
+                
+                $reflection = new ReflectionClass($fullPath);
+                $constructor = $reflection->getConstructor();
+
+                if ($constructor && $constructor->getParameters()) {
                     return new $fullPath($serializer);
                 } else {
                     return new $fullPath();

src/Elasticsearch/ClientBuilder.php

@@ -26,7 +26,6 @@
  *
  * Logger that doesn't do anything.  Similar to Monolog's NullHandler,
  * but avoids the overhead of partially loading Monolog
- *
  */
 class EmptyLogger extends AbstractLogger implements LoggerInterface
 {

src/Elasticsearch/Common/EmptyLogger.php

@@ -13,6 +13,7 @@
  * See the LICENSE file in the project root for more information.
  */
 
+
 declare(strict_types = 1);
 
 namespace Elasticsearch\Common\Exceptions;
@@ -21,7 +22,6 @@
  * BadMethodCallException
  *
  * Denote problems with a method call (e.g. incorrect number of arguments)
- *
  */
 class BadMethodCallException extends \BadMethodCallException implements ElasticsearchException
 {

src/Elasticsearch/Common/Exceptions/BadMethodCallException.php

@@ -18,10 +18,6 @@
 
 namespace Elasticsearch\Common\Exceptions;
 
-/**
- * BadRequest400Exception, thrown on 400 conflict http error
- *
- */
 class BadRequest400Exception extends \Exception implements ElasticsearchException
 {
 }

src/Elasticsearch/Common/Exceptions/BadRequest400Exception.php

@@ -20,6 +20,9 @@
 
 use Elasticsearch\Common\Exceptions\ElasticsearchException;
 
+/**
+ * Class JsonErrorException
+ */
 class JsonErrorException extends \Exception implements ElasticsearchException
 {
     /**