Fixed CS issues

Author: ezimuel

src/Elasticsearch/Client.php

@@ -134,7 +134,7 @@ class ClientBuilder
     private $sslVerification = null;
 
     /**
-     *  @var bool
+     * @var bool
      */
     private $includePortInHostHeader = false;
 
@@ -345,7 +345,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
@@ -390,19 +389,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)
@@ -464,7 +464,7 @@ public function setSSLKey(string $key, string $password = null): ClientBuilder
     }
 
     /**
-     *  @param bool|string $value
+     * @param bool|string $value
      */
     public function setSSLVerification($value = true): ClientBuilder
     {
@@ -475,6 +475,7 @@ public function setSSLVerification($value = true): ClientBuilder
 
     /**
      * Include the port in Host header
+     *
      * @see https://github.com/elastic/elasticsearch-php/issues/993
      */
     public function includePortInHostHeader(bool $enable): ClientBuilder

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

@@ -22,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

@@ -22,7 +22,6 @@
 
 /**
  * Class JsonErrorException
- *
  */
 class JsonErrorException extends \Exception implements ElasticsearchException
 {

src/Elasticsearch/Common/Exceptions/Serializer/JsonErrorException.php

@@ -70,8 +70,8 @@ class Connection implements ConnectionInterface
     protected $path;
 
     /**
-    * @var int
-    */
+     * @var int
+     */
     protected $port;
 
     /**
@@ -143,9 +143,10 @@ public function __construct(
 
         // Only Set the Basic if API Key is not set and setBasicAuthentication was not called prior
         if (isset($connectionParams['client']['headers']['Authorization']) === false
-                && isset($connectionParams['client']['curl'][CURLOPT_HTTPAUTH]) === false
-                && isset($hostDetails['user'])
-                && isset($hostDetails['pass'])) {
+            && isset($connectionParams['client']['curl'][CURLOPT_HTTPAUTH]) === false
+            && isset($hostDetails['user'])
+            && isset($hostDetails['pass'])
+        ) {
             $connectionParams['client']['curl'][CURLOPT_HTTPAUTH] = CURLAUTH_BASIC;
             $connectionParams['client']['curl'][CURLOPT_USERPWD] = $hostDetails['user'].':'.$hostDetails['pass'];
         }
@@ -252,86 +253,89 @@ private function wrapHandler(callable $handler): callable
             $this->lastRequest['request'] = $request;
 
             // Send the request using the wrapped handler.
-            $response =  Core::proxy($handler($request), function ($response) use ($connection, $transport, $request, $options) {
-
-                $this->lastRequest['response'] = $response;
-
-                if (isset($response['error']) === true) {
-                    if ($response['error'] instanceof ConnectException || $response['error'] instanceof RingException) {
-                        $this->log->warning("Curl exception encountered.");
-
-                        $exception = $this->getCurlRetryException($request, $response);
-
-                        $this->logRequestFail($request, $response, $exception);
-
-                        $node = $connection->getHost();
-                        $this->log->warning("Marking node $node dead.");
-                        $connection->markDead();
-
-                        // If the transport has not been set, we are inside a Ping or Sniff,
-                        // so we don't want to retrigger retries anyway.
-                        //
-                        // TODO this could be handled better, but we are limited because connectionpools do not
-                        // have access to Transport.  Architecturally, all of this needs to be refactored
-                        if (isset($transport) === true) {
-                            $transport->connectionPool->scheduleCheck();
-
-                            $neverRetry = isset($request['client']['never_retry']) ? $request['client']['never_retry'] : false;
-                            $shouldRetry = $transport->shouldRetry($request);
-                            $shouldRetryText = ($shouldRetry) ? 'true' : 'false';
-
-                            $this->log->warning("Retries left? $shouldRetryText");
-                            if ($shouldRetry && !$neverRetry) {
-                                return $transport->performRequest(
-                                    $request['http_method'],
-                                    $request['uri'],
-                                    [],
-                                    $request['body'],
-                                    $options
-                                );
+            $response =  Core::proxy(
+                $handler($request), 
+                function ($response) use ($connection, $transport, $request, $options) {
+
+                    $this->lastRequest['response'] = $response;
+
+                    if (isset($response['error']) === true) {
+                        if ($response['error'] instanceof ConnectException || $response['error'] instanceof RingException) {
+                            $this->log->warning("Curl exception encountered.");
+
+                            $exception = $this->getCurlRetryException($request, $response);
+
+                            $this->logRequestFail($request, $response, $exception);
+
+                            $node = $connection->getHost();
+                            $this->log->warning("Marking node $node dead.");
+                            $connection->markDead();
+
+                            // If the transport has not been set, we are inside a Ping or Sniff,
+                            // so we don't want to retrigger retries anyway.
+                            //
+                            // TODO this could be handled better, but we are limited because connectionpools do not
+                            // have access to Transport.  Architecturally, all of this needs to be refactored
+                            if (isset($transport) === true) {
+                                $transport->connectionPool->scheduleCheck();
+
+                                $neverRetry = isset($request['client']['never_retry']) ? $request['client']['never_retry'] : false;
+                                $shouldRetry = $transport->shouldRetry($request);
+                                $shouldRetryText = ($shouldRetry) ? 'true' : 'false';
+
+                                $this->log->warning("Retries left? $shouldRetryText");
+                                if ($shouldRetry && !$neverRetry) {
+                                    return $transport->performRequest(
+                                        $request['http_method'],
+                                        $request['uri'],
+                                        [],
+                                        $request['body'],
+                                        $options
+                                    );
+                                }
                             }
-                        }
 
-                        $this->log->warning("Out of retries, throwing exception from $node");
-                        // Only throw if we run out of retries
-                        throw $exception;
+                            $this->log->warning("Out of retries, throwing exception from $node");
+                            // Only throw if we run out of retries
+                            throw $exception;
+                        } else {
+                            // Something went seriously wrong, bail
+                            $exception = new TransportException($response['error']->getMessage());
+                            $this->logRequestFail($request, $response, $exception);
+                            throw $exception;
+                        }
                     } else {
-                        // Something went seriously wrong, bail
-                        $exception = new TransportException($response['error']->getMessage());
-                        $this->logRequestFail($request, $response, $exception);
-                        throw $exception;
-                    }
-                } else {
-                    $connection->markAlive();
+                        $connection->markAlive();
 
-                    if (isset($response['headers']['Warning'])) {
-                        $this->logWarning($request, $response);
-                    }
-                    if (isset($response['body']) === true) {
-                        $response['body'] = stream_get_contents($response['body']);
-                        $this->lastRequest['response']['body'] = $response['body'];
-                    }
+                        if (isset($response['headers']['Warning'])) {
+                            $this->logWarning($request, $response);
+                        }
+                        if (isset($response['body']) === true) {
+                            $response['body'] = stream_get_contents($response['body']);
+                            $this->lastRequest['response']['body'] = $response['body'];
+                        }
 
-                    if ($response['status'] >= 400 && $response['status'] < 500) {
-                        $ignore = $request['client']['ignore'] ?? [];
-                        // Skip 404 if succeeded true in the body (e.g. clear_scroll)
-                        $body = $response['body'] ?? '';
-                        if (strpos($body, '"succeeded":true') !== false) {
-                             $ignore[] = 404;
+                        if ($response['status'] >= 400 && $response['status'] < 500) {
+                            $ignore = $request['client']['ignore'] ?? [];
+                            // Skip 404 if succeeded true in the body (e.g. clear_scroll)
+                            $body = $response['body'] ?? '';
+                            if (strpos($body, '"succeeded":true') !== false) {
+                                 $ignore[] = 404;
+                            }
+                            $this->process4xxError($request, $response, $ignore);
+                        } elseif ($response['status'] >= 500) {
+                            $ignore = $request['client']['ignore'] ?? [];
+                            $this->process5xxError($request, $response, $ignore);
                         }
-                        $this->process4xxError($request, $response, $ignore);
-                    } elseif ($response['status'] >= 500) {
-                        $ignore = $request['client']['ignore'] ?? [];
-                        $this->process5xxError($request, $response, $ignore);
+
+                        // No error, deserialize
+                        $response['body'] = $this->serializer->deserialize($response['body'], $response['transfer_stats']);
                     }
+                    $this->logRequestSuccess($request, $response);
 
-                    // No error, deserialize
-                    $response['body'] = $this->serializer->deserialize($response['body'], $response['transfer_stats']);
+                    return isset($request['client']['verbose']) && $request['client']['verbose'] === true ? $response : $response['body'];
                 }
-                $this->logRequestSuccess($request, $response);
-
-                return isset($request['client']['verbose']) && $request['client']['verbose'] === true ? $response : $response['body'];
-            });
+            );
 
             return $response;
         };
@@ -374,8 +378,8 @@ public function logWarning(array $request, array $response): void
     /**
      * Log a successful request
      *
-     * @param array $request
-     * @param array $response
+     * @param  array $request
+     * @param  array $response
      * @return void
      */
     public function logRequestSuccess(array $request, array $response): void
@@ -412,8 +416,8 @@ public function logRequestSuccess(array $request, array $response): void
     /**
      * Log a failed request
      *
-     * @param array $request
-     * @param array $response
+     * @param array      $request
+     * @param array      $response
      * @param \Exception $exception
      *
      * @return void
@@ -571,7 +575,7 @@ protected function getCurlRetryException(array $request, array $response): Elast
      * Get the OS version using php_uname if available
      * otherwise it returns an empty string
      *
-     * @see  https://github.com/elastic/elasticsearch-php/issues/922
+     * @see https://github.com/elastic/elasticsearch-php/issues/922
      */
     private function getOSVersion(): string
     {

src/Elasticsearch/Connections/Connection.php

@@ -23,7 +23,6 @@
  * Class Delete
  * Elasticsearch API name async_search.delete
  * Generated running $ php util/GenerateEndpoints.php 7.9
- *
  */
 class Delete extends AbstractEndpoint
 {

src/Elasticsearch/Endpoints/AsyncSearch/Delete.php

@@ -23,7 +23,6 @@
  * Class Get
  * Elasticsearch API name async_search.get
  * Generated running $ php util/GenerateEndpoints.php 7.9
- *
  */
 class Get extends AbstractEndpoint
 {

src/Elasticsearch/Endpoints/AsyncSearch/Get.php

@@ -22,7 +22,6 @@
  * Class Submit
  * Elasticsearch API name async_search.submit
  * Generated running $ php util/GenerateEndpoints.php 7.9
- *
  */
 class Submit extends AbstractEndpoint
 {

src/Elasticsearch/Endpoints/AsyncSearch/Submit.php

@@ -23,7 +23,6 @@
  * Class DeleteAutoscalingPolicy
  * Elasticsearch API name autoscaling.delete_autoscaling_policy
  * Generated running $ php util/GenerateEndpoints.php 7.9
- *
  */
 class DeleteAutoscalingPolicy extends AbstractEndpoint
 {