nextcloud / fulltextsearch_elasticsearch

lib/Vendor/Elastic/Elasticsearch/Traits/NamespaceTrait.php

Braces +1 added lines, -2 removed lines

@@ -62,8 +62,7 @@
 /**
  * @generated This file is generated, please do not edit
  */
-trait NamespaceTrait
-{
+trait NamespaceTrait {
 	/** The endpoint namespace storage */
 	protected array $namespace;
 

lib/Vendor/Elastic/Elasticsearch/Traits/ResponseTrait.php

Indentation +10 added lines, -10 removed lines

@@ -18,16 +18,16 @@
 
 trait ResponseTrait
 {
-    protected ResponseInterface $response;
+	protected ResponseInterface $response;
 
-    public function setResponse(ResponseInterface $response): self
-    {
-        $this->response = $response;
-        return $this;
-    }
+	public function setResponse(ResponseInterface $response): self
+	{
+		$this->response = $response;
+		return $this;
+	}
 
-    public function getResponse(): ResponseInterface
-    {
-        return $this->response;
-    }
+	public function getResponse(): ResponseInterface
+	{
+		return $this->response;
+	}
 }
\ No newline at end of file

Braces +1 added lines, -2 removed lines

@@ -16,8 +16,7 @@
 
 use OCA\FullTextSearch_Elasticsearch\Vendor\Psr\Http\Message\ResponseInterface;
 
-trait ResponseTrait
-{
+trait ResponseTrait {
     protected ResponseInterface $response;
 
     public function setResponse(ResponseInterface $response): self

lib/Vendor/Elastic/Elasticsearch/Traits/EndpointTrait.php

Indentation +155 added lines, -155 removed lines

@@ -29,169 +29,169 @@
 
 trait EndpointTrait
 {
-    /**
-     * Check if an array containts nested array
-     */
-    private function isNestedArray(array $a): bool
-    {
-        foreach ($a as $v) {
-            if (is_array($v)) {
-                return true;
-            }
-        }
-        return false;
-    }
+	/**
+	 * Check if an array containts nested array
+	 */
+	private function isNestedArray(array $a): bool
+	{
+		foreach ($a as $v) {
+			if (is_array($v)) {
+				return true;
+			}
+		}
+		return false;
+	}
 
-    /**
-     * Check if an array is associative, i.e. has a string as key
-     */
-    protected function isAssociativeArray(array $array): bool
-    {
-        foreach ($array as $k => $v) {
-            if (is_string($k)) {
-                return true;
-            }
-        }
-        return false;
-    }
+	/**
+	 * Check if an array is associative, i.e. has a string as key
+	 */
+	protected function isAssociativeArray(array $array): bool
+	{
+		foreach ($array as $k => $v) {
+			if (is_string($k)) {
+				return true;
+			}
+		}
+		return false;
+	}
 
-    /**
-     * Converts array to comma-separated list;
-     * Converts boolean value to true', 'false' string
-     * 
-     * @param mixed $value
-     */
-    private function convertValue($value): string
-    {
-        // Convert a boolean value in 'true' or 'false' string
-        if (is_bool($value)) {
-            return $value ? 'true' : 'false';
-        // Convert to comma-separated list if array
-        } elseif (is_array($value) && $this->isNestedArray($value) === false) {
-            return implode(',', $value);
-        }
-        return (string) $value;
-    }
+	/**
+	 * Converts array to comma-separated list;
+	 * Converts boolean value to true', 'false' string
+	 * 
+	 * @param mixed $value
+	 */
+	private function convertValue($value): string
+	{
+		// Convert a boolean value in 'true' or 'false' string
+		if (is_bool($value)) {
+			return $value ? 'true' : 'false';
+		// Convert to comma-separated list if array
+		} elseif (is_array($value) && $this->isNestedArray($value) === false) {
+			return implode(',', $value);
+		}
+		return (string) $value;
+	}
 
-    /**
-     * Encode a value for a valid URL
-     * 
-     * @param mixed $value
-     */
-    protected function encode($value): string
-    {
-        return Utility::urlencode($this->convertValue($value));
-    }
+	/**
+	 * Encode a value for a valid URL
+	 * 
+	 * @param mixed $value
+	 */
+	protected function encode($value): string
+	{
+		return Utility::urlencode($this->convertValue($value));
+	}
 
-    /**
-     * Returns the URL with the query string from $params
-     * extracting the array keys specified in $keys
-     */
-    protected function addQueryString(string $url, array $params, array $keys): string
-    {
-        $queryParams = [];
-        foreach ($keys as $k) {
-            if (isset($params[$k])) {
-                $queryParams[$k] = $this->convertValue($params[$k]);
-            }
-        }
-        if (empty($queryParams)) {
-            return $url;
-        }
-        return $url . '?' . http_build_query($queryParams);
-    }
+	/**
+	 * Returns the URL with the query string from $params
+	 * extracting the array keys specified in $keys
+	 */
+	protected function addQueryString(string $url, array $params, array $keys): string
+	{
+		$queryParams = [];
+		foreach ($keys as $k) {
+			if (isset($params[$k])) {
+				$queryParams[$k] = $this->convertValue($params[$k]);
+			}
+		}
+		if (empty($queryParams)) {
+			return $url;
+		}
+		return $url . '?' . http_build_query($queryParams);
+	}
 
-    /**
-     * Serialize the body using the Content-Type
-     * 
-     * @param mixed $body
-     */
-    protected function bodySerialize($body, string $contentType): string
-    {
-        if (strpos($contentType, 'application/x-ndjson') !== false ||
-            strpos($contentType, 'application/vnd.elasticsearch+x-ndjson') !== false) {
-            return NDJsonSerializer::serialize($body, ['remove_null' => false]);
-        }
-        if (strpos($contentType, 'application/json') !== false ||
-            strpos($contentType, 'application/vnd.elasticsearch+json') !== false) {
-            return JsonSerializer::serialize($body, ['remove_null' => false]);
-        }
-        throw new ContentTypeException(sprintf(
-            "The Content-Type %s is not managed by Elasticsearch serializer",
-            $contentType
-        ));
-    }
+	/**
+	 * Serialize the body using the Content-Type
+	 * 
+	 * @param mixed $body
+	 */
+	protected function bodySerialize($body, string $contentType): string
+	{
+		if (strpos($contentType, 'application/x-ndjson') !== false ||
+			strpos($contentType, 'application/vnd.elasticsearch+x-ndjson') !== false) {
+			return NDJsonSerializer::serialize($body, ['remove_null' => false]);
+		}
+		if (strpos($contentType, 'application/json') !== false ||
+			strpos($contentType, 'application/vnd.elasticsearch+json') !== false) {
+			return JsonSerializer::serialize($body, ['remove_null' => false]);
+		}
+		throw new ContentTypeException(sprintf(
+			"The Content-Type %s is not managed by Elasticsearch serializer",
+			$contentType
+		));
+	}
 
-    /**
-     * Create a PSR-7 request
-     * 
-     * @param array|string $body
-     */
-    protected function createRequest(string $method, string $url, array $headers, $body = null): RequestInterface
-    {
-        $requestFactory = Psr17FactoryDiscovery::findRequestFactory();
-        $streamFactory = Psr17FactoryDiscovery::findStreamFactory();
+	/**
+	 * Create a PSR-7 request
+	 * 
+	 * @param array|string $body
+	 */
+	protected function createRequest(string $method, string $url, array $headers, $body = null): RequestInterface
+	{
+		$requestFactory = Psr17FactoryDiscovery::findRequestFactory();
+		$streamFactory = Psr17FactoryDiscovery::findStreamFactory();
 
-        $request = $requestFactory->createRequest($method, $url);
-        // Body request
-        if (!empty($body)) {
-            if (!isset($headers['Content-Type'])) {
-                throw new ContentTypeException(sprintf(
-                    "The Content-Type is missing for %s %s", 
-                    $method, 
-                    $url
-                ));
-            }
-            $content = is_string($body) ? $body : $this->bodySerialize($body, $headers['Content-Type']);
-            $request = $request->withBody($streamFactory->createStream($content));
-        }
-        $headers = $this->buildCompatibilityHeaders($headers);
+		$request = $requestFactory->createRequest($method, $url);
+		// Body request
+		if (!empty($body)) {
+			if (!isset($headers['Content-Type'])) {
+				throw new ContentTypeException(sprintf(
+					"The Content-Type is missing for %s %s", 
+					$method, 
+					$url
+				));
+			}
+			$content = is_string($body) ? $body : $this->bodySerialize($body, $headers['Content-Type']);
+			$request = $request->withBody($streamFactory->createStream($content));
+		}
+		$headers = $this->buildCompatibilityHeaders($headers);
 
-        // Headers
-        foreach ($headers as $name => $value) {
-            $request = $request->withHeader($name, $value);
-        }
-        return $request;
-    }
+		// Headers
+		foreach ($headers as $name => $value) {
+			$request = $request->withHeader($name, $value);
+		}
+		return $request;
+	}
 
-    /**
-     * Build the API compatibility headers
-     * transfrom Content-Type and Accept adding vnd.elasticsearch+ and compatible-with
-     * 
-     * @see https://github.com/elastic/elasticsearch-php/pull/1142
-     */
-    protected function buildCompatibilityHeaders(array $headers): array
-    {
-        if (isset($headers['Content-Type'])) {
-            if (preg_match('/application\/([^,]+)$/', $headers['Content-Type'], $matches)) {
-                $headers['Content-Type'] = sprintf(Client::API_COMPATIBILITY_HEADER, 'application', $matches[1]);
-            }
-        }
-        if (isset($headers['Accept'])) {
-            $values = explode(',', $headers['Accept']);
-            foreach ($values as &$value) {
-                if (preg_match('/(application|text)\/([^,]+)/', $value, $matches)) { 
-                    $value = sprintf(Client::API_COMPATIBILITY_HEADER, $matches[1], $matches[2]);
-                }
-            }
-            $headers['Accept'] = implode(',', $values);
-        }
-        return $headers;
-    }
+	/**
+	 * Build the API compatibility headers
+	 * transfrom Content-Type and Accept adding vnd.elasticsearch+ and compatible-with
+	 * 
+	 * @see https://github.com/elastic/elasticsearch-php/pull/1142
+	 */
+	protected function buildCompatibilityHeaders(array $headers): array
+	{
+		if (isset($headers['Content-Type'])) {
+			if (preg_match('/application\/([^,]+)$/', $headers['Content-Type'], $matches)) {
+				$headers['Content-Type'] = sprintf(Client::API_COMPATIBILITY_HEADER, 'application', $matches[1]);
+			}
+		}
+		if (isset($headers['Accept'])) {
+			$values = explode(',', $headers['Accept']);
+			foreach ($values as &$value) {
+				if (preg_match('/(application|text)\/([^,]+)/', $value, $matches)) { 
+					$value = sprintf(Client::API_COMPATIBILITY_HEADER, $matches[1], $matches[2]);
+				}
+			}
+			$headers['Accept'] = implode(',', $values);
+		}
+		return $headers;
+	}
 
-    /**
-     * Check if the $required parameters are present in $params
-     * @throws MissingParameterException
-     */
-    protected function checkRequiredParameters(array $required, array $params): void
-    {
-        foreach ($required as $req) {
-            if (!isset($params[$req])) {
-                throw new MissingParameterException(sprintf(
-                    'The parameter %s is required',
-                    $req
-                ));
-            }
-        }
-    }
+	/**
+	 * Check if the $required parameters are present in $params
+	 * @throws MissingParameterException
+	 */
+	protected function checkRequiredParameters(array $required, array $params): void
+	{
+		foreach ($required as $req) {
+			if (!isset($params[$req])) {
+				throw new MissingParameterException(sprintf(
+					'The parameter %s is required',
+					$req
+				));
+			}
+		}
+	}
 }
\ No newline at end of file

Spacing +3 added lines, -3 removed lines

@@ -10,7 +10,7 @@ 
  * Elasticsearch B.V licenses this file to you under the MIT License.
  * See the LICENSE file in the project root for more information.
  */
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace OCA\FullTextSearch_Elasticsearch\Vendor\Elastic\Elasticsearch\Traits;
 
@@ -70,7 +70,7 @@ 
         } elseif (is_array($value) && $this->isNestedArray($value) === false) {
             return implode(',', $value);
         }
-        return (string) $value;
+        return (string)$value;
     }
 
     /**
@@ -98,7 +98,7 @@ 
         if (empty($queryParams)) {
             return $url;
         }
-        return $url . '?' . http_build_query($queryParams);
+        return $url.'?'.http_build_query($queryParams);
     }
 
     /**

Braces +1 added lines, -2 removed lines

@@ -27,8 +27,7 @@
 use function strpos;
 use function sprintf;
 
-trait EndpointTrait
-{
+trait EndpointTrait {
     /**
      * Check if an array containts nested array
      */

lib/Vendor/Elastic/Elasticsearch/Response/Elasticsearch.php

Indentation +235 added lines, -235 removed lines

@@ -35,255 +35,255 @@
  */
 class Elasticsearch implements ElasticsearchInterface, ResponseInterface, ArrayAccess
 {
-    const HEADER_CHECK = 'X-Elastic-Product';
-    const PRODUCT_NAME = 'Elasticsearch';
+	const HEADER_CHECK = 'X-Elastic-Product';
+	const PRODUCT_NAME = 'Elasticsearch';
 
-    use ProductCheckTrait;
-    use MessageResponseTrait;
+	use ProductCheckTrait;
+	use MessageResponseTrait;
 
-    protected array $asArray;
-    protected object $asObject;
-    protected string $asString;
+	protected array $asArray;
+	protected object $asObject;
+	protected string $asString;
 
-    /**
-     * The PSR-7 response
-     */
-    protected ResponseInterface $response;
+	/**
+	 * The PSR-7 response
+	 */
+	protected ResponseInterface $response;
 
-    /**
-     * Enable or disable the response Exception
-     */
-    protected bool $responseException;
+	/**
+	 * Enable or disable the response Exception
+	 */
+	protected bool $responseException;
 
-    /**
-     * @throws ClientResponseException if status code 4xx
-     * @throws ServerResponseException if status code 5xx
-     */
-    public function setResponse(ResponseInterface $response, bool $throwException = true): void
-    {
-        $this->productCheck($response);
-        $this->response = $response;
-        $status = $response->getStatusCode();
-        if ($throwException && $status > 399 && $status < 500) {
-            $error = new ClientResponseException(
-                sprintf("%s %s: %s", $status, $response->getReasonPhrase(), (string) $response->getBody()),
-                $status
-            );
-            throw $error->setResponse($response);
-        } elseif ($throwException && $status > 499 && $status < 600) {
-            $error = new ServerResponseException(
-                sprintf("%s %s: %s", $status, $response->getReasonPhrase(), (string) $response->getBody()),
-                $status
-            );
-            throw $error->setResponse($response);
-        }
-    }
+	/**
+	 * @throws ClientResponseException if status code 4xx
+	 * @throws ServerResponseException if status code 5xx
+	 */
+	public function setResponse(ResponseInterface $response, bool $throwException = true): void
+	{
+		$this->productCheck($response);
+		$this->response = $response;
+		$status = $response->getStatusCode();
+		if ($throwException && $status > 399 && $status < 500) {
+			$error = new ClientResponseException(
+				sprintf("%s %s: %s", $status, $response->getReasonPhrase(), (string) $response->getBody()),
+				$status
+			);
+			throw $error->setResponse($response);
+		} elseif ($throwException && $status > 499 && $status < 600) {
+			$error = new ServerResponseException(
+				sprintf("%s %s: %s", $status, $response->getReasonPhrase(), (string) $response->getBody()),
+				$status
+			);
+			throw $error->setResponse($response);
+		}
+	}
 
-    /**
-     * Return true if status code is 2xx
-     */
-    public function asBool(): bool
-    {
-        return $this->response->getStatusCode() >=200 && $this->response->getStatusCode() < 300;
-    }
+	/**
+	 * Return true if status code is 2xx
+	 */
+	public function asBool(): bool
+	{
+		return $this->response->getStatusCode() >=200 && $this->response->getStatusCode() < 300;
+	}
 
-    /**
-     * Converts the body content to array, if possible.
-     * Otherwise, it throws an UnknownContentTypeException
-     * if Content-Type is not specified or unknown.
-     * 
-     * @throws UnknownContentTypeException
-     */
-    public function asArray(): array
-    {
-        if (isset($this->asArray)) {
-            return $this->asArray;
-        }
-        if (!$this->response->hasHeader('Content-Type')) {
-            throw new UnknownContentTypeException('No Content-Type specified in the response');
-        }
-        $contentType = $this->response->getHeaderLine('Content-Type');
-        if (strpos($contentType, 'application/json') !== false ||
-            strpos($contentType, 'application/vnd.elasticsearch+json') !== false) {
-            $this->asArray = JsonSerializer::unserialize($this->asString());
-            return $this->asArray;
-        }
-        if (strpos($contentType, 'application/x-ndjson') !== false ||
-            strpos($contentType, 'application/vnd.elasticsearch+x-ndjson') !== false) {
-            $this->asArray = NDJsonSerializer::unserialize($this->asString());
-            return $this->asArray;
-        }
-        if (strpos($contentType, 'text/csv') !== false) {
-            $this->asArray = CsvSerializer::unserialize($this->asString());
-            return $this->asArray;
-        }
-        throw new UnknownContentTypeException(sprintf(
-            "Cannot deserialize the reponse as array with Content-Type: %s",
-            $contentType
-        ));
-    }
+	/**
+	 * Converts the body content to array, if possible.
+	 * Otherwise, it throws an UnknownContentTypeException
+	 * if Content-Type is not specified or unknown.
+	 * 
+	 * @throws UnknownContentTypeException
+	 */
+	public function asArray(): array
+	{
+		if (isset($this->asArray)) {
+			return $this->asArray;
+		}
+		if (!$this->response->hasHeader('Content-Type')) {
+			throw new UnknownContentTypeException('No Content-Type specified in the response');
+		}
+		$contentType = $this->response->getHeaderLine('Content-Type');
+		if (strpos($contentType, 'application/json') !== false ||
+			strpos($contentType, 'application/vnd.elasticsearch+json') !== false) {
+			$this->asArray = JsonSerializer::unserialize($this->asString());
+			return $this->asArray;
+		}
+		if (strpos($contentType, 'application/x-ndjson') !== false ||
+			strpos($contentType, 'application/vnd.elasticsearch+x-ndjson') !== false) {
+			$this->asArray = NDJsonSerializer::unserialize($this->asString());
+			return $this->asArray;
+		}
+		if (strpos($contentType, 'text/csv') !== false) {
+			$this->asArray = CsvSerializer::unserialize($this->asString());
+			return $this->asArray;
+		}
+		throw new UnknownContentTypeException(sprintf(
+			"Cannot deserialize the reponse as array with Content-Type: %s",
+			$contentType
+		));
+	}
 
-    /**
-     * Converts the body content to object, if possible.
-     * Otherwise, it throws an UnknownContentTypeException
-     * if Content-Type is not specified or unknown.
-     * 
-     * @throws UnknownContentTypeException
-     */
-    public function asObject(): object
-    {
-        if (isset($this->asObject)) {
-            return $this->asObject;
-        }
-        $contentType = $this->response->getHeaderLine('Content-Type');
-        if (strpos($contentType, 'application/json') !== false ||
-            strpos($contentType, 'application/vnd.elasticsearch+json') !== false) {
-            $this->asObject = JsonSerializer::unserialize($this->asString(), ['type' => 'object']);
-            return $this->asObject;
-        }
-        if (strpos($contentType, 'application/x-ndjson') !== false ||
-            strpos($contentType, 'application/vnd.elasticsearch+x-ndjson') !== false) {
-            $this->asObject = NDJsonSerializer::unserialize($this->asString(), ['type' => 'object']);
-            return $this->asObject;
-        }
-        if (strpos($contentType, 'text/xml') !== false || strpos($contentType, 'application/xml') !== false) {
-            $this->asObject = XmlSerializer::unserialize($this->asString());
-            return $this->asObject;
-        }
-        throw new UnknownContentTypeException(sprintf(
-            "Cannot deserialize the reponse as object with Content-Type: %s",
-            $contentType
-        ));
-    }
+	/**
+	 * Converts the body content to object, if possible.
+	 * Otherwise, it throws an UnknownContentTypeException
+	 * if Content-Type is not specified or unknown.
+	 * 
+	 * @throws UnknownContentTypeException
+	 */
+	public function asObject(): object
+	{
+		if (isset($this->asObject)) {
+			return $this->asObject;
+		}
+		$contentType = $this->response->getHeaderLine('Content-Type');
+		if (strpos($contentType, 'application/json') !== false ||
+			strpos($contentType, 'application/vnd.elasticsearch+json') !== false) {
+			$this->asObject = JsonSerializer::unserialize($this->asString(), ['type' => 'object']);
+			return $this->asObject;
+		}
+		if (strpos($contentType, 'application/x-ndjson') !== false ||
+			strpos($contentType, 'application/vnd.elasticsearch+x-ndjson') !== false) {
+			$this->asObject = NDJsonSerializer::unserialize($this->asString(), ['type' => 'object']);
+			return $this->asObject;
+		}
+		if (strpos($contentType, 'text/xml') !== false || strpos($contentType, 'application/xml') !== false) {
+			$this->asObject = XmlSerializer::unserialize($this->asString());
+			return $this->asObject;
+		}
+		throw new UnknownContentTypeException(sprintf(
+			"Cannot deserialize the reponse as object with Content-Type: %s",
+			$contentType
+		));
+	}
 
-    /**
-     * Converts the body content to string
-     */
-    public function asString(): string
-    {
-        if (empty($this->asString)) {
-            $this->asString = (string) $this->response->getBody();
-        }
-        return $this->asString;
-    }
+	/**
+	 * Converts the body content to string
+	 */
+	public function asString(): string
+	{
+		if (empty($this->asString)) {
+			$this->asString = (string) $this->response->getBody();
+		}
+		return $this->asString;
+	}
 
-    /**
-     * Converts the body content to string
-     */
-    public function __toString(): string
-    {
-        return $this->asString();
-    }
+	/**
+	 * Converts the body content to string
+	 */
+	public function __toString(): string
+	{
+		return $this->asString();
+	}
 
-    /**
-     * Access the body content as object properties
-     * 
-     * @see https://www.php.net/manual/en/language.oop5.overloading.php#object.get
-     */
-    public function __get($name)
-    {
-        return $this->asObject()->$name ?? null;
-    }
+	/**
+	 * Access the body content as object properties
+	 * 
+	 * @see https://www.php.net/manual/en/language.oop5.overloading.php#object.get
+	 */
+	public function __get($name)
+	{
+		return $this->asObject()->$name ?? null;
+	}
 
-    /**
-     * ArrayAccess interface
-     * 
-     * @see https://www.php.net/manual/en/class.arrayaccess.php
-     */
-    public function offsetExists($offset): bool
-    {
-        return isset($this->asArray()[$offset]);
-    }
+	/**
+	 * ArrayAccess interface
+	 * 
+	 * @see https://www.php.net/manual/en/class.arrayaccess.php
+	 */
+	public function offsetExists($offset): bool
+	{
+		return isset($this->asArray()[$offset]);
+	}
  
-    /**
-     * ArrayAccess interface
-     * 
-     * @see https://www.php.net/manual/en/class.arrayaccess.php
-     *
-     * @return mixed
-     */
-    #[\ReturnTypeWillChange]
-    public function offsetGet($offset)
-    {
-        return $this->asArray()[$offset];
-    }
+	/**
+	 * ArrayAccess interface
+	 * 
+	 * @see https://www.php.net/manual/en/class.arrayaccess.php
+	 *
+	 * @return mixed
+	 */
+	#[\ReturnTypeWillChange]
+	public function offsetGet($offset)
+	{
+		return $this->asArray()[$offset];
+	}
 
-    /**
-     * ArrayAccess interface
-     * 
-     * @see https://www.php.net/manual/en/class.arrayaccess.php
-     */
-    public function offsetSet($offset, $value): void
-    {
-        throw new ArrayAccessException('The array is reading only');
-    }
+	/**
+	 * ArrayAccess interface
+	 * 
+	 * @see https://www.php.net/manual/en/class.arrayaccess.php
+	 */
+	public function offsetSet($offset, $value): void
+	{
+		throw new ArrayAccessException('The array is reading only');
+	}
 
-    /**
-     * ArrayAccess interface
-     * 
-     * @see https://www.php.net/manual/en/class.arrayaccess.php
-     */
-    public function offsetUnset($offset): void
-    {
-        throw new ArrayAccessException('The array is reading only');
-    }
+	/**
+	 * ArrayAccess interface
+	 * 
+	 * @see https://www.php.net/manual/en/class.arrayaccess.php
+	 */
+	public function offsetUnset($offset): void
+	{
+		throw new ArrayAccessException('The array is reading only');
+	}
 
-    /**
-     * Map the response body to an object of a specific class
-     * by default the class is the PHP standard one (stdClass)
-     * 
-     * This mapping works only for ES|QL results (with columns and values)
-     * @see https://www.elastic.co/guide/en/elasticsearch/reference/current/esql.html
-     * 
-     * @return object[] 
-     */
-    public function mapTo(string $class = stdClass::class): array
-    {
-        $response = $this->asArray();
-        if (!isset($response['columns']) || !isset($response['values'])) {
-            throw new UnknownContentTypeException(sprintf(
-                "The response is not a valid ES|QL result. I cannot mapTo(\"%s\")",
-                $class
-            )); 
-        }
-        $iterator = [];
-        $ncol = count($response['columns']);
-        foreach ($response['values'] as $value) {
-            $obj = new $class;
-            for ($i=0; $i < $ncol; $i++) {
-                $field = Utility::formatVariableName($response['columns'][$i]['name']);
-                if ($class !== stdClass::class && !property_exists($obj, $field)) {
-                    continue;
-                }
-                switch($response['columns'][$i]['type']) {
-                    case 'boolean':
-                        $obj->{$field} = (bool) $value[$i];
-                        break;
-                    case 'date':
-                        $obj->{$field} = new DateTime($value[$i]);
-                        break;
-                    case 'alias':
-                    case 'text':
-                    case 'keyword':
-                    case 'ip':
-                        $obj->{$field} = (string) $value[$i];
-                        break;
-                    case 'integer':
-                        $obj->{$field} = (int) $value[$i];
-                        break;
-                    case 'long':
-                    case 'double':
-                        $obj->{$field} = (float) $value[$i];
-                        break;
-                    case 'null':
-                        $obj->{$field} = null;
-                        break;
-                    default:
-                        $obj->{$field} = $value[$i];
-                }
-            }
-            $iterator[] = $obj;
-        }
-        return $iterator;
-    }
+	/**
+	 * Map the response body to an object of a specific class
+	 * by default the class is the PHP standard one (stdClass)
+	 * 
+	 * This mapping works only for ES|QL results (with columns and values)
+	 * @see https://www.elastic.co/guide/en/elasticsearch/reference/current/esql.html
+	 * 
+	 * @return object[] 
+	 */
+	public function mapTo(string $class = stdClass::class): array
+	{
+		$response = $this->asArray();
+		if (!isset($response['columns']) || !isset($response['values'])) {
+			throw new UnknownContentTypeException(sprintf(
+				"The response is not a valid ES|QL result. I cannot mapTo(\"%s\")",
+				$class
+			)); 
+		}
+		$iterator = [];
+		$ncol = count($response['columns']);
+		foreach ($response['values'] as $value) {
+			$obj = new $class;
+			for ($i=0; $i < $ncol; $i++) {
+				$field = Utility::formatVariableName($response['columns'][$i]['name']);
+				if ($class !== stdClass::class && !property_exists($obj, $field)) {
+					continue;
+				}
+				switch($response['columns'][$i]['type']) {
+					case 'boolean':
+						$obj->{$field} = (bool) $value[$i];
+						break;
+					case 'date':
+						$obj->{$field} = new DateTime($value[$i]);
+						break;
+					case 'alias':
+					case 'text':
+					case 'keyword':
+					case 'ip':
+						$obj->{$field} = (string) $value[$i];
+						break;
+					case 'integer':
+						$obj->{$field} = (int) $value[$i];
+						break;
+					case 'long':
+					case 'double':
+						$obj->{$field} = (float) $value[$i];
+						break;
+					case 'null':
+						$obj->{$field} = null;
+						break;
+					default:
+						$obj->{$field} = $value[$i];
+				}
+			}
+			$iterator[] = $obj;
+		}
+		return $iterator;
+	}
 }
\ No newline at end of file

Spacing +11 added lines, -11 removed lines

@@ -10,7 +10,7 @@ 
  * Elasticsearch B.V licenses this file to you under the MIT License.
  * See the LICENSE file in the project root for more information.
  */
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace OCA\FullTextSearch_Elasticsearch\Vendor\Elastic\Elasticsearch\Response;
 
@@ -66,13 +66,13 @@ 
         $status = $response->getStatusCode();
         if ($throwException && $status > 399 && $status < 500) {
             $error = new ClientResponseException(
-                sprintf("%s %s: %s", $status, $response->getReasonPhrase(), (string) $response->getBody()),
+                sprintf("%s %s: %s", $status, $response->getReasonPhrase(), (string)$response->getBody()),
                 $status
             );
             throw $error->setResponse($response);
         } elseif ($throwException && $status > 499 && $status < 600) {
             $error = new ServerResponseException(
-                sprintf("%s %s: %s", $status, $response->getReasonPhrase(), (string) $response->getBody()),
+                sprintf("%s %s: %s", $status, $response->getReasonPhrase(), (string)$response->getBody()),
                 $status
             );
             throw $error->setResponse($response);
@@ -84,7 +84,7 @@ 
      */
     public function asBool(): bool
     {
-        return $this->response->getStatusCode() >=200 && $this->response->getStatusCode() < 300;
+        return $this->response->getStatusCode() >= 200 && $this->response->getStatusCode() < 300;
     }
 
     /**
@@ -162,7 +162,7 @@ 
     public function asString(): string
     {
         if (empty($this->asString)) {
-            $this->asString = (string) $this->response->getBody();
+            $this->asString = (string)$this->response->getBody();
         }
         return $this->asString;
     }
@@ -250,14 +250,14 @@ 
         $ncol = count($response['columns']);
         foreach ($response['values'] as $value) {
             $obj = new $class;
-            for ($i=0; $i < $ncol; $i++) {
+            for ($i = 0; $i < $ncol; $i++) {
                 $field = Utility::formatVariableName($response['columns'][$i]['name']);
                 if ($class !== stdClass::class && !property_exists($obj, $field)) {
                     continue;
                 }
-                switch($response['columns'][$i]['type']) {
+                switch ($response['columns'][$i]['type']) {
                     case 'boolean':
-                        $obj->{$field} = (bool) $value[$i];
+                        $obj->{$field} = (bool)$value[$i];
                         break;
                     case 'date':
                         $obj->{$field} = new DateTime($value[$i]);
@@ -266,14 +266,14 @@ 
                     case 'text':
                     case 'keyword':
                     case 'ip':
-                        $obj->{$field} = (string) $value[$i];
+                        $obj->{$field} = (string)$value[$i];
                         break;
                     case 'integer':
-                        $obj->{$field} = (int) $value[$i];
+                        $obj->{$field} = (int)$value[$i];
                         break;
                     case 'long':
                     case 'double':
-                        $obj->{$field} = (float) $value[$i];
+                        $obj->{$field} = (float)$value[$i];
                         break;
                     case 'null':
                         $obj->{$field} = null;

lib/Vendor/Elastic/Elasticsearch/Response/ElasticsearchInterface.php

Indentation +4 added lines, -4 removed lines

@@ -18,8 +18,8 @@
 
 interface ElasticsearchInterface
 {
-    /**
-     * Set the HTTP PSR-7 response 
-     */
-    public function setResponse(ResponseInterface $response, bool $throwException = true): void;
+	/**
+	 * Set the HTTP PSR-7 response 
+	 */
+	public function setResponse(ResponseInterface $response, bool $throwException = true): void;
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
  * Elasticsearch B.V licenses this file to you under the MIT License.
  * See the LICENSE file in the project root for more information.
  */
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace OCA\FullTextSearch_Elasticsearch\Vendor\Elastic\Elasticsearch\Response;
 

Braces +1 added lines, -2 removed lines

@@ -16,8 +16,7 @@
 
 use OCA\FullTextSearch_Elasticsearch\Vendor\Psr\Http\Message\ResponseInterface;
 
-interface ElasticsearchInterface
-{
+interface ElasticsearchInterface {
     /**
      * Set the HTTP PSR-7 response 
      */

lib/Vendor/Elastic/Elasticsearch/ClientInterface.php

Indentation +39 added lines, -39 removed lines

@@ -22,51 +22,51 @@
 
 interface ClientInterface
 {
-    /**
-     * Get the OCA\FullTextSearch_Elasticsearch\Vendor\Elastic\Transport\Transport
-     */
-    public function getTransport(): Transport;
+	/**
+	 * Get the OCA\FullTextSearch_Elasticsearch\Vendor\Elastic\Transport\Transport
+	 */
+	public function getTransport(): Transport;
 
-    /**
-     * Get the PSR-3 logger
-     */
-    public function getLogger(): LoggerInterface;
+	/**
+	 * Get the PSR-3 logger
+	 */
+	public function getLogger(): LoggerInterface;
 
-     /**
-     * Set the asyncronous HTTP request
-     */
-    public function setAsync(bool $async): self;
+	 /**
+	  * Set the asyncronous HTTP request
+	  */
+	public function setAsync(bool $async): self;
 
-    /**
-     * Get the asyncronous HTTP request setting
-     */
-    public function getAsync(): bool;
+	/**
+	 * Get the asyncronous HTTP request setting
+	 */
+	public function getAsync(): bool;
 
-    /**
-     * Enable or disable the x-elastic-client-meta header
-     */
-    public function setElasticMetaHeader(bool $active): self;
+	/**
+	 * Enable or disable the x-elastic-client-meta header
+	 */
+	public function setElasticMetaHeader(bool $active): self;
 
-    /**
-     * Get the status of x-elastic-client-meta header
-     */
-    public function getElasticMetaHeader(): bool;
+	/**
+	 * Get the status of x-elastic-client-meta header
+	 */
+	public function getElasticMetaHeader(): bool;
 
-     /**
-     * Enable or disable the response Exception
-     */
-    public function setResponseException(bool $active): self;
+	 /**
+	  * Enable or disable the response Exception
+	  */
+	public function setResponseException(bool $active): self;
 
-     /**
-     * Get the status of response Exception
-     */
-    public function getResponseException(): bool;
+	 /**
+	  * Get the status of response Exception
+	  */
+	public function getResponseException(): bool;
 
-    /**
-     * Send the HTTP request using the Elastic Transport.
-     * It manages syncronous and asyncronus requests using Client::getAsync()
-     * 
-     * @return Elasticsearch|Promise
-     */
-    public function sendRequest(RequestInterface $request);
+	/**
+	 * Send the HTTP request using the Elastic Transport.
+	 * It manages syncronous and asyncronus requests using Client::getAsync()
+	 * 
+	 * @return Elasticsearch|Promise
+	 */
+	public function sendRequest(RequestInterface $request);
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
  * Elasticsearch B.V licenses this file to you under the MIT License.
  * See the LICENSE file in the project root for more information.
  */
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace OCA\FullTextSearch_Elasticsearch\Vendor\Elastic\Elasticsearch;
 

Braces +1 added lines, -2 removed lines

@@ -20,8 +20,7 @@
 use OCA\FullTextSearch_Elasticsearch\Vendor\Psr\Http\Message\RequestInterface;
 use OCA\FullTextSearch_Elasticsearch\Vendor\Psr\Log\LoggerInterface;
 
-interface ClientInterface
-{
+interface ClientInterface {
     /**
      * Get the OCA\FullTextSearch_Elasticsearch\Vendor\Elastic\Transport\Transport
      */

lib/Vendor/Elastic/Elasticsearch/ClientBuilder.php

Indentation +434 added lines, -434 removed lines

@@ -33,440 +33,440 @@
 
 class ClientBuilder
 {
-    const DEFAULT_HOST = 'localhost:9200';
-
-    /**
-     * PSR-18 client
-     */
-    private ClientInterface $httpClient;
-
-    /**
-     * The HTTP async client
-     */
-    private HttpAsyncClient $asyncHttpClient;
-
-    /**
-     * PSR-3 Logger
-     */
-    private LoggerInterface $logger;
-
-    /**
-     * The NodelPool
-     */
-    private NodePoolInterface $nodePool;
-
-    /**
-     * Hosts (elasticsearch nodes)
-     */
-    private array $hosts;
-
-    /**
-     * Elasticsearch API key
-     */
-    private string $apiKey;
-
-    /**
-     * Basic authentication username
-     */
-    private string $username;
-
-    /**
-     * Basic authentication password
-     */
-    private string $password;
-
-    /**
-     * Elastic cloud Id
-     */
-    private string $cloudId;
-
-    /**
-     * Retries
-     * 
-     * The default value is calculated during the client build
-     * and it is equal to the number of hosts
-     */
-    private int $retries;
-
-    /**
-     * SSL certificate 
-     * @var array [$cert, $password] $cert is the name of a file containing a PEM formatted certificate,
-     *              $password if the certificate requires a password 
-     */
-    private array $sslCert;
-
-    /**
-     * SSL key
-     * @var array [$key, $password] $key is the name of a file containing a private SSL key,
-     *              $password if the private key requires a password
-     */
-    private array $sslKey;
-
-    /**
-     * SSL verification
-     * 
-     * Enable or disable the SSL verfiication (default is true)
-     */
-    private bool $sslVerification = true;
-
-    /**
-     * SSL CA bundle
-     */
-    private string $sslCA;
-
-    /**
-     * Elastic meta header
-     * 
-     * Enable or disable the x-elastic-client-meta header (default is true)
-     */
-    private bool $elasticMetaHeader = true;
-
-    /**
-     * HTTP client options
-     */
-    private array $httpClientOptions = [];
-
-    /**
-     * Make the constructor final so cannot be overwritten
-     */
-    final public function __construct()
-    {
-    }
-
-    /**
-     * Create an instance of ClientBuilder
-     */
-    public static function create(): ClientBuilder
-    {
-        return new static();
-    }
-
-    /**
-     * Build a new client from the provided config.  Hash keys
-     * should correspond to the method name e.g. ['nodePool']
-     * corresponds to setNodePool().
-     *
-     * Missing keys will use the default for that setting if applicable
-     *
-     * Unknown keys will throw an exception by default, but this can be silenced
-     * by setting `quiet` to true
-     *
-     * @param  array $config
-     * @param  bool $quiet False if unknown settings throw exception, true to silently
-     *                     ignore unknown settings
-     * @throws ConfigException
-     */
-    public static function fromConfig(array $config, bool $quiet = false): Client
-    {
-        $builder = new static;
-        foreach ($config as $key => $value) {
-            $method = "set$key";
-            $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]);
-            }
-        }
-
-        if ($quiet === false && count($config) > 0) {
-            $unknown = implode(array_keys($config));
-            throw new ConfigException("Unknown parameters provided: $unknown");
-        }
-        return $builder->build();
-    }
-
-    public function setHttpClient(ClientInterface $httpClient): ClientBuilder
-    {
-        $this->httpClient = $httpClient;
-        return $this;
-    }
-
-    public function setAsyncHttpClient(HttpAsyncClient $asyncHttpClient): ClientBuilder
-    {
-        $this->asyncHttpClient = $asyncHttpClient;
-        return $this;
-    }
-
-    /**
-     * Set the PSR-3 Logger
-     */
-    public function setLogger(LoggerInterface $logger): ClientBuilder
-    {
-        $this->logger = $logger;
-        return $this;
-    }
-
-    /**
-     * Set the NodePool
-     */
-    public function setNodePool(NodePoolInterface $nodePool): ClientBuilder
-    {
-        $this->nodePool = $nodePool;
-        return $this;
-    }
-
-    /**
-     * Set the hosts (nodes)
-     */
-    public function setHosts(array $hosts): ClientBuilder
-    {
-        $this->hosts = $hosts;
-        return $this;
-    }
-
-    /**
-     * Set the ApiKey
-     * If the id is not specified we store the ApiKey otherwise
-     * we store as Base64(id:ApiKey)
-     *
-     * @see https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-create-api-key.html
-     */
-    public function setApiKey(string $apiKey, string $id = null): ClientBuilder
-    {
-        if (empty($id)) {
-            $this->apiKey = $apiKey;
-        } else {
-            $this->apiKey = base64_encode($id . ':' . $apiKey);
-        }
-        return $this;
-    }
-
-    /**
-     * Set the Basic Authentication
-     */
-    public function setBasicAuthentication(string $username, string $password): ClientBuilder
-    {
-        $this->username = $username;
-        $this->password = $password;
-        return $this;
-    }
-
-    public function setElasticCloudId(string $cloudId)
-    {
-        $this->cloudId = $cloudId;
-        return $this;
-    }
-
-    /**
-     * Set number or retries
-     * 
-     * @param int $retries
-     */
-    public function setRetries(int $retries): ClientBuilder
-    {
-        if ($retries < 0) {
-            throw new InvalidArgumentException('The retries number must be >= 0');
-        }
-        $this->retries = $retries;
-        return $this;
-    }
-
-    /**
-     * Set SSL certificate
-     * 
-     * @param string $cert The name of a file containing a PEM formatted certificate
-     * @param string $password if the certificate requires a password
-     */
-    public function setSSLCert(string $cert, string $password = null): ClientBuilder
-    {
-        $this->sslCert = [$cert, $password];
-        return $this;
-    }
-
-    /**
-     * Set the Certificate Authority (CA) bundle 
-     * 
-     * @param string $cert The name of a file containing a PEM formatted certificate
-     */
-    public function setCABundle(string $cert): ClientBuilder
-    {
-        $this->sslCA = $cert;
-        return $this;
-    }
-
-    /**
-     * Set SSL key
-     * 
-     * @param string $key The name of a file containing a private SSL key
-     * @param string $password if the private key requires a password
-     */
-    public function setSSLKey(string $key, string $password = null): ClientBuilder
-    {
-        $this->sslKey = [$key, $password];
-        return $this;
-    }
-
-    /**
-     * Enable or disable the SSL verification 
-     */
-    public function setSSLVerification(bool $value = true): ClientBuilder
-    {
-        $this->sslVerification = $value;
-        return $this;
-    }
-
-    /**
-     * Enable or disable the x-elastic-client-meta header
-     */
-    public function setElasticMetaHeader(bool $value = true): ClientBuilder
-    {
-        $this->elasticMetaHeader = $value;
-        return $this;
-    }
-
-    public function setHttpClientOptions(array $options): ClientBuilder
-    {
-        $this->httpClientOptions = $options;
-        return $this;
-    }
-
-    /**
-     * Build and returns the Client object
-     */
-    public function build(): Client
-    {
-        // Transport builder
-        $builder = TransportBuilder::create();
-
-        // Set the default hosts if empty
-        if (empty($this->hosts)) {
-            $this->hosts = [self::DEFAULT_HOST];
-        }
-        $builder->setHosts($this->hosts);
-
-        // Logger
-        if (!empty($this->logger)) {    
-            $builder->setLogger($this->logger);
-        }
-
-        // Http client
-        if (!empty($this->httpClient)) {
-            $builder->setClient($this->httpClient);
-        }
-        // Set HTTP client options
-        $builder->setClient(
-            $this->setOptions($builder->getClient(), $this->getConfig(), $this->httpClientOptions)
-        );
-
-        // Cloud id
-        if (!empty($this->cloudId)) {
-            $builder->setCloudId($this->cloudId);
-        }
-
-        // Node Pool
-        if (!empty($this->nodePool)) {
-            $builder->setNodePool($this->nodePool);
-        }
-
-        $transport = $builder->build();
+	const DEFAULT_HOST = 'localhost:9200';
+
+	/**
+	 * PSR-18 client
+	 */
+	private ClientInterface $httpClient;
+
+	/**
+	 * The HTTP async client
+	 */
+	private HttpAsyncClient $asyncHttpClient;
+
+	/**
+	 * PSR-3 Logger
+	 */
+	private LoggerInterface $logger;
+
+	/**
+	 * The NodelPool
+	 */
+	private NodePoolInterface $nodePool;
+
+	/**
+	 * Hosts (elasticsearch nodes)
+	 */
+	private array $hosts;
+
+	/**
+	 * Elasticsearch API key
+	 */
+	private string $apiKey;
+
+	/**
+	 * Basic authentication username
+	 */
+	private string $username;
+
+	/**
+	 * Basic authentication password
+	 */
+	private string $password;
+
+	/**
+	 * Elastic cloud Id
+	 */
+	private string $cloudId;
+
+	/**
+	 * Retries
+	 * 
+	 * The default value is calculated during the client build
+	 * and it is equal to the number of hosts
+	 */
+	private int $retries;
+
+	/**
+	 * SSL certificate 
+	 * @var array [$cert, $password] $cert is the name of a file containing a PEM formatted certificate,
+	 *              $password if the certificate requires a password 
+	 */
+	private array $sslCert;
+
+	/**
+	 * SSL key
+	 * @var array [$key, $password] $key is the name of a file containing a private SSL key,
+	 *              $password if the private key requires a password
+	 */
+	private array $sslKey;
+
+	/**
+	 * SSL verification
+	 * 
+	 * Enable or disable the SSL verfiication (default is true)
+	 */
+	private bool $sslVerification = true;
+
+	/**
+	 * SSL CA bundle
+	 */
+	private string $sslCA;
+
+	/**
+	 * Elastic meta header
+	 * 
+	 * Enable or disable the x-elastic-client-meta header (default is true)
+	 */
+	private bool $elasticMetaHeader = true;
+
+	/**
+	 * HTTP client options
+	 */
+	private array $httpClientOptions = [];
+
+	/**
+	 * Make the constructor final so cannot be overwritten
+	 */
+	final public function __construct()
+	{
+	}
+
+	/**
+	 * Create an instance of ClientBuilder
+	 */
+	public static function create(): ClientBuilder
+	{
+		return new static();
+	}
+
+	/**
+	 * Build a new client from the provided config.  Hash keys
+	 * should correspond to the method name e.g. ['nodePool']
+	 * corresponds to setNodePool().
+	 *
+	 * Missing keys will use the default for that setting if applicable
+	 *
+	 * Unknown keys will throw an exception by default, but this can be silenced
+	 * by setting `quiet` to true
+	 *
+	 * @param  array $config
+	 * @param  bool $quiet False if unknown settings throw exception, true to silently
+	 *                     ignore unknown settings
+	 * @throws ConfigException
+	 */
+	public static function fromConfig(array $config, bool $quiet = false): Client
+	{
+		$builder = new static;
+		foreach ($config as $key => $value) {
+			$method = "set$key";
+			$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]);
+			}
+		}
+
+		if ($quiet === false && count($config) > 0) {
+			$unknown = implode(array_keys($config));
+			throw new ConfigException("Unknown parameters provided: $unknown");
+		}
+		return $builder->build();
+	}
+
+	public function setHttpClient(ClientInterface $httpClient): ClientBuilder
+	{
+		$this->httpClient = $httpClient;
+		return $this;
+	}
+
+	public function setAsyncHttpClient(HttpAsyncClient $asyncHttpClient): ClientBuilder
+	{
+		$this->asyncHttpClient = $asyncHttpClient;
+		return $this;
+	}
+
+	/**
+	 * Set the PSR-3 Logger
+	 */
+	public function setLogger(LoggerInterface $logger): ClientBuilder
+	{
+		$this->logger = $logger;
+		return $this;
+	}
+
+	/**
+	 * Set the NodePool
+	 */
+	public function setNodePool(NodePoolInterface $nodePool): ClientBuilder
+	{
+		$this->nodePool = $nodePool;
+		return $this;
+	}
+
+	/**
+	 * Set the hosts (nodes)
+	 */
+	public function setHosts(array $hosts): ClientBuilder
+	{
+		$this->hosts = $hosts;
+		return $this;
+	}
+
+	/**
+	 * Set the ApiKey
+	 * If the id is not specified we store the ApiKey otherwise
+	 * we store as Base64(id:ApiKey)
+	 *
+	 * @see https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-create-api-key.html
+	 */
+	public function setApiKey(string $apiKey, string $id = null): ClientBuilder
+	{
+		if (empty($id)) {
+			$this->apiKey = $apiKey;
+		} else {
+			$this->apiKey = base64_encode($id . ':' . $apiKey);
+		}
+		return $this;
+	}
+
+	/**
+	 * Set the Basic Authentication
+	 */
+	public function setBasicAuthentication(string $username, string $password): ClientBuilder
+	{
+		$this->username = $username;
+		$this->password = $password;
+		return $this;
+	}
+
+	public function setElasticCloudId(string $cloudId)
+	{
+		$this->cloudId = $cloudId;
+		return $this;
+	}
+
+	/**
+	 * Set number or retries
+	 * 
+	 * @param int $retries
+	 */
+	public function setRetries(int $retries): ClientBuilder
+	{
+		if ($retries < 0) {
+			throw new InvalidArgumentException('The retries number must be >= 0');
+		}
+		$this->retries = $retries;
+		return $this;
+	}
+
+	/**
+	 * Set SSL certificate
+	 * 
+	 * @param string $cert The name of a file containing a PEM formatted certificate
+	 * @param string $password if the certificate requires a password
+	 */
+	public function setSSLCert(string $cert, string $password = null): ClientBuilder
+	{
+		$this->sslCert = [$cert, $password];
+		return $this;
+	}
+
+	/**
+	 * Set the Certificate Authority (CA) bundle 
+	 * 
+	 * @param string $cert The name of a file containing a PEM formatted certificate
+	 */
+	public function setCABundle(string $cert): ClientBuilder
+	{
+		$this->sslCA = $cert;
+		return $this;
+	}
+
+	/**
+	 * Set SSL key
+	 * 
+	 * @param string $key The name of a file containing a private SSL key
+	 * @param string $password if the private key requires a password
+	 */
+	public function setSSLKey(string $key, string $password = null): ClientBuilder
+	{
+		$this->sslKey = [$key, $password];
+		return $this;
+	}
+
+	/**
+	 * Enable or disable the SSL verification 
+	 */
+	public function setSSLVerification(bool $value = true): ClientBuilder
+	{
+		$this->sslVerification = $value;
+		return $this;
+	}
+
+	/**
+	 * Enable or disable the x-elastic-client-meta header
+	 */
+	public function setElasticMetaHeader(bool $value = true): ClientBuilder
+	{
+		$this->elasticMetaHeader = $value;
+		return $this;
+	}
+
+	public function setHttpClientOptions(array $options): ClientBuilder
+	{
+		$this->httpClientOptions = $options;
+		return $this;
+	}
+
+	/**
+	 * Build and returns the Client object
+	 */
+	public function build(): Client
+	{
+		// Transport builder
+		$builder = TransportBuilder::create();
+
+		// Set the default hosts if empty
+		if (empty($this->hosts)) {
+			$this->hosts = [self::DEFAULT_HOST];
+		}
+		$builder->setHosts($this->hosts);
+
+		// Logger
+		if (!empty($this->logger)) {    
+			$builder->setLogger($this->logger);
+		}
+
+		// Http client
+		if (!empty($this->httpClient)) {
+			$builder->setClient($this->httpClient);
+		}
+		// Set HTTP client options
+		$builder->setClient(
+			$this->setOptions($builder->getClient(), $this->getConfig(), $this->httpClientOptions)
+		);
+
+		// Cloud id
+		if (!empty($this->cloudId)) {
+			$builder->setCloudId($this->cloudId);
+		}
+
+		// Node Pool
+		if (!empty($this->nodePool)) {
+			$builder->setNodePool($this->nodePool);
+		}
+
+		$transport = $builder->build();
         
-        // The default retries is equal to the number of hosts
-        if (empty($this->retries)) {
-            $this->retries = count($this->hosts);
-        }
-        $transport->setRetries($this->retries);
-
-        // Async client
-        if (!empty($this->asyncHttpClient)) {
-            $transport->setAsyncClient($this->asyncHttpClient);
-        }
+		// The default retries is equal to the number of hosts
+		if (empty($this->retries)) {
+			$this->retries = count($this->hosts);
+		}
+		$transport->setRetries($this->retries);
+
+		// Async client
+		if (!empty($this->asyncHttpClient)) {
+			$transport->setAsyncClient($this->asyncHttpClient);
+		}
         
-        // Basic authentication
-        if (!empty($this->username) && !empty($this->password)) {
-            $transport->setUserInfo($this->username, $this->password);
-        }
-
-        // API key
-        if (!empty($this->apiKey)) {
-            if (!empty($this->username)) {
-                throw new AuthenticationException('You cannot use APIKey and Basic Authenication together');
-            }
-            $transport->setHeader('Authorization', sprintf("ApiKey %s", $this->apiKey));
-        }
-
-        /**
-         * Elastic cloud optimized with gzip
-         * @see https://github.com/elastic/elasticsearch-php/issues/1241 omit for Symfony HTTP Client    
-         */
-        if (!empty($this->cloudId) && !$this->isSymfonyHttpClient($transport)) {
-            $transport->setHeader('Accept-Encoding', 'gzip');
-        }
-
-        $client = new Client($transport, $transport->getLogger());
-        // Enable or disable the x-elastic-client-meta header
-        $client->setElasticMetaHeader($this->elasticMetaHeader);
-
-        return $client;
-    }
-
-    /**
-     * Returns true if the transport HTTP client is Symfony
-     */
-    protected function isSymfonyHttpClient(Transport $transport): bool
-    {
-        if (false !== strpos(get_class($transport->getClient()), 'Symfony\Component\HttpClient')) {
-            return true;
-        }
-        try {
-            if (false !== strpos(get_class($transport->getAsyncClient()), 'Symfony\Component\HttpClient')) {
-                return true;
-            }
-        } catch (NoAsyncClientException $e) {
-            return false;
-        }
-        return false;
-    }
-
-    /**
-     * Returns the configuration to be used in the HTTP client
-     */
-    protected function getConfig(): array
-    {
-        $config = [];
-        if (!empty($this->sslCert)) {
-            $config[RequestOptions::SSL_CERT] = $this->sslCert;
-        }
-        if (!empty($this->sslKey)) {
-            $config[RequestOptions::SSL_KEY] = $this->sslKey;
-        }
-        if (!$this->sslVerification) {
-            $config[RequestOptions::SSL_VERIFY] = false;
-        }
-        if (!empty($this->sslCA)) {
-            $config[RequestOptions::SSL_CA] = $this->sslCA;
-        }
-        return $config;
-    }
-
-    /**
-     * Set the configuration for the specific HTTP client using an adapter
-     */
-    protected function setOptions(ClientInterface $client, array $config, array $clientOptions = []): ClientInterface
-    {
-        if (empty($config) && empty($clientOptions)) {
-            return $client;
-        }
-        $class = get_class($client);
-        if (!isset(AdapterOptions::HTTP_ADAPTERS[$class])) {
-            throw new HttpClientException(sprintf(
-                "The HTTP client %s is not supported for custom options",
-                $class
-            ));
-        }
-        $adapterClass = AdapterOptions::HTTP_ADAPTERS[$class];
-        if (!class_exists($adapterClass) || !in_array(AdapterInterface::class, class_implements($adapterClass))) {
-            throw new HttpClientException(sprintf(
-                "The class %s does not exists or does not implement %s",
-                $adapterClass,
-                AdapterInterface::class
-            ));
-        }
-        $adapter = new $adapterClass;
-        return $adapter->setConfig($client, $config, $clientOptions);
-    }
+		// Basic authentication
+		if (!empty($this->username) && !empty($this->password)) {
+			$transport->setUserInfo($this->username, $this->password);
+		}
+
+		// API key
+		if (!empty($this->apiKey)) {
+			if (!empty($this->username)) {
+				throw new AuthenticationException('You cannot use APIKey and Basic Authenication together');
+			}
+			$transport->setHeader('Authorization', sprintf("ApiKey %s", $this->apiKey));
+		}
+
+		/**
+		 * Elastic cloud optimized with gzip
+		 * @see https://github.com/elastic/elasticsearch-php/issues/1241 omit for Symfony HTTP Client    
+		 */
+		if (!empty($this->cloudId) && !$this->isSymfonyHttpClient($transport)) {
+			$transport->setHeader('Accept-Encoding', 'gzip');
+		}
+
+		$client = new Client($transport, $transport->getLogger());
+		// Enable or disable the x-elastic-client-meta header
+		$client->setElasticMetaHeader($this->elasticMetaHeader);
+
+		return $client;
+	}
+
+	/**
+	 * Returns true if the transport HTTP client is Symfony
+	 */
+	protected function isSymfonyHttpClient(Transport $transport): bool
+	{
+		if (false !== strpos(get_class($transport->getClient()), 'Symfony\Component\HttpClient')) {
+			return true;
+		}
+		try {
+			if (false !== strpos(get_class($transport->getAsyncClient()), 'Symfony\Component\HttpClient')) {
+				return true;
+			}
+		} catch (NoAsyncClientException $e) {
+			return false;
+		}
+		return false;
+	}
+
+	/**
+	 * Returns the configuration to be used in the HTTP client
+	 */
+	protected function getConfig(): array
+	{
+		$config = [];
+		if (!empty($this->sslCert)) {
+			$config[RequestOptions::SSL_CERT] = $this->sslCert;
+		}
+		if (!empty($this->sslKey)) {
+			$config[RequestOptions::SSL_KEY] = $this->sslKey;
+		}
+		if (!$this->sslVerification) {
+			$config[RequestOptions::SSL_VERIFY] = false;
+		}
+		if (!empty($this->sslCA)) {
+			$config[RequestOptions::SSL_CA] = $this->sslCA;
+		}
+		return $config;
+	}
+
+	/**
+	 * Set the configuration for the specific HTTP client using an adapter
+	 */
+	protected function setOptions(ClientInterface $client, array $config, array $clientOptions = []): ClientInterface
+	{
+		if (empty($config) && empty($clientOptions)) {
+			return $client;
+		}
+		$class = get_class($client);
+		if (!isset(AdapterOptions::HTTP_ADAPTERS[$class])) {
+			throw new HttpClientException(sprintf(
+				"The HTTP client %s is not supported for custom options",
+				$class
+			));
+		}
+		$adapterClass = AdapterOptions::HTTP_ADAPTERS[$class];
+		if (!class_exists($adapterClass) || !in_array(AdapterInterface::class, class_implements($adapterClass))) {
+			throw new HttpClientException(sprintf(
+				"The class %s does not exists or does not implement %s",
+				$adapterClass,
+				AdapterInterface::class
+			));
+		}
+		$adapter = new $adapterClass;
+		return $adapter->setConfig($client, $config, $clientOptions);
+	}
 }
\ No newline at end of file

Spacing +2 added lines, -2 removed lines

@@ -10,7 +10,7 @@ 
  * Elasticsearch B.V licenses this file to you under the MIT License.
  * See the LICENSE file in the project root for more information.
  */
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace OCA\FullTextSearch_Elasticsearch\Vendor\Elastic\Elasticsearch;
 
@@ -231,7 +231,7 @@ 
         if (empty($id)) {
             $this->apiKey = $apiKey;
         } else {
-            $this->apiKey = base64_encode($id . ':' . $apiKey);
+            $this->apiKey = base64_encode($id.':'.$apiKey);
         }
         return $this;
     }

Braces +1 added lines, -2 removed lines

@@ -31,8 +31,7 @@
 use OCA\FullTextSearch_Elasticsearch\Vendor\Psr\Log\LoggerInterface;
 use ReflectionClass;
 
-class ClientBuilder
-{
+class ClientBuilder {
     const DEFAULT_HOST = 'localhost:9200';
 
     /**

lib/Vendor/Elastic/Elasticsearch/Endpoints/AsyncSearch.php

Spacing +8 added lines, -8 removed lines

@@ -52,10 +52,10 @@ 
 	public function delete(array $params = [])
 	{
 		$this->checkRequiredParameters(['id'], $params);
-		$url = '/_async_search/' . $this->encode($params['id']);
+		$url = '/_async_search/'.$this->encode($params['id']);
 		$method = 'DELETE';
 
-		$url = $this->addQueryString($url, $params, ['pretty','human','error_trace','source','filter_path']);
+		$url = $this->addQueryString($url, $params, ['pretty', 'human', 'error_trace', 'source', 'filter_path']);
 		$headers = [
 			'Accept' => 'application/json',
 		];
@@ -90,10 +90,10 @@ 
 	public function get(array $params = [])
 	{
 		$this->checkRequiredParameters(['id'], $params);
-		$url = '/_async_search/' . $this->encode($params['id']);
+		$url = '/_async_search/'.$this->encode($params['id']);
 		$method = 'GET';
 
-		$url = $this->addQueryString($url, $params, ['wait_for_completion_timeout','keep_alive','typed_keys','pretty','human','error_trace','source','filter_path']);
+		$url = $this->addQueryString($url, $params, ['wait_for_completion_timeout', 'keep_alive', 'typed_keys', 'pretty', 'human', 'error_trace', 'source', 'filter_path']);
 		$headers = [
 			'Accept' => 'application/json',
 		];
@@ -126,10 +126,10 @@ 
 	public function status(array $params = [])
 	{
 		$this->checkRequiredParameters(['id'], $params);
-		$url = '/_async_search/status/' . $this->encode($params['id']);
+		$url = '/_async_search/status/'.$this->encode($params['id']);
 		$method = 'GET';
 
-		$url = $this->addQueryString($url, $params, ['keep_alive','pretty','human','error_trace','source','filter_path']);
+		$url = $this->addQueryString($url, $params, ['keep_alive', 'pretty', 'human', 'error_trace', 'source', 'filter_path']);
 		$headers = [
 			'Accept' => 'application/json',
 		];
@@ -202,13 +202,13 @@ 
 	public function submit(array $params = [])
 	{
 		if (isset($params['index'])) {
-			$url = '/' . $this->encode($params['index']) . '/_async_search';
+			$url = '/'.$this->encode($params['index']).'/_async_search';
 			$method = 'POST';
 		} else {
 			$url = '/_async_search';
 			$method = 'POST';
 		}
-		$url = $this->addQueryString($url, $params, ['wait_for_completion_timeout','keep_on_completion','keep_alive','batched_reduce_size','request_cache','analyzer','analyze_wildcard','default_operator','df','explain','stored_fields','docvalue_fields','from','ignore_unavailable','ignore_throttled','allow_no_indices','expand_wildcards','lenient','preference','q','routing','search_type','size','sort','_source','_source_excludes','_source_includes','terminate_after','stats','suggest_field','suggest_mode','suggest_size','suggest_text','timeout','track_scores','track_total_hits','allow_partial_search_results','typed_keys','version','seq_no_primary_term','max_concurrent_shard_requests','pretty','human','error_trace','source','filter_path']);
+		$url = $this->addQueryString($url, $params, ['wait_for_completion_timeout', 'keep_on_completion', 'keep_alive', 'batched_reduce_size', 'request_cache', 'analyzer', 'analyze_wildcard', 'default_operator', 'df', 'explain', 'stored_fields', 'docvalue_fields', 'from', 'ignore_unavailable', 'ignore_throttled', 'allow_no_indices', 'expand_wildcards', 'lenient', 'preference', 'q', 'routing', 'search_type', 'size', 'sort', '_source', '_source_excludes', '_source_includes', 'terminate_after', 'stats', 'suggest_field', 'suggest_mode', 'suggest_size', 'suggest_text', 'timeout', 'track_scores', 'track_total_hits', 'allow_partial_search_results', 'typed_keys', 'version', 'seq_no_primary_term', 'max_concurrent_shard_requests', 'pretty', 'human', 'error_trace', 'source', 'filter_path']);
 		$headers = [
 			'Accept' => 'application/json',
 			'Content-Type' => 'application/json',

Braces +1 added lines, -2 removed lines

@@ -26,8 +26,7 @@
 /**
  * @generated This file is generated, please do not edit
  */
-class AsyncSearch extends AbstractEndpoint
-{
+class AsyncSearch extends AbstractEndpoint {
 	/**
 	 * Deletes an async search by ID. If the search is still running, the search request will be cancelled. Otherwise, the saved search results are deleted.
 	 *

lib/Vendor/Elastic/Elasticsearch/Endpoints/Ssl.php

Spacing +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
 		$url = '/_ssl/certificates';
 		$method = 'GET';
 
-		$url = $this->addQueryString($url, $params, ['pretty','human','error_trace','source','filter_path']);
+		$url = $this->addQueryString($url, $params, ['pretty', 'human', 'error_trace', 'source', 'filter_path']);
 		$headers = [
 			'Accept' => 'application/json',
 		];

Braces +1 added lines, -2 removed lines

@@ -26,8 +26,7 @@
 /**
  * @generated This file is generated, please do not edit
  */
-class Ssl extends AbstractEndpoint
-{
+class Ssl extends AbstractEndpoint {
 	/**
 	 * Retrieves information about the X.509 certificates used to encrypt communications in the cluster.
 	 *