nextcloud / fulltextsearch_elasticsearch

lib/Vendor/GuzzleHttp/Promise/RejectionException.php

Indentation +28 added lines, -28 removed lines

@@ -10,32 +10,32 @@
  */
 class RejectionException extends \RuntimeException
 {
-    /** @var mixed Rejection reason. */
-    private $reason;
-    /**
-     * @param mixed       $reason      Rejection reason.
-     * @param string|null $description Optional description.
-     */
-    public function __construct($reason, ?string $description = null)
-    {
-        $this->reason = $reason;
-        $message = 'The promise was rejected';
-        if ($description) {
-            $message .= ' with reason: ' . $description;
-        } elseif (\is_string($reason) || \is_object($reason) && \method_exists($reason, '__toString')) {
-            $message .= ' with reason: ' . $this->reason;
-        } elseif ($reason instanceof \JsonSerializable) {
-            $message .= ' with reason: ' . \json_encode($this->reason, \JSON_PRETTY_PRINT);
-        }
-        parent::__construct($message);
-    }
-    /**
-     * Returns the rejection reason.
-     *
-     * @return mixed
-     */
-    public function getReason()
-    {
-        return $this->reason;
-    }
+	/** @var mixed Rejection reason. */
+	private $reason;
+	/**
+	 * @param mixed       $reason      Rejection reason.
+	 * @param string|null $description Optional description.
+	 */
+	public function __construct($reason, ?string $description = null)
+	{
+		$this->reason = $reason;
+		$message = 'The promise was rejected';
+		if ($description) {
+			$message .= ' with reason: ' . $description;
+		} elseif (\is_string($reason) || \is_object($reason) && \method_exists($reason, '__toString')) {
+			$message .= ' with reason: ' . $this->reason;
+		} elseif ($reason instanceof \JsonSerializable) {
+			$message .= ' with reason: ' . \json_encode($this->reason, \JSON_PRETTY_PRINT);
+		}
+		parent::__construct($message);
+	}
+	/**
+	 * Returns the rejection reason.
+	 *
+	 * @return mixed
+	 */
+	public function getReason()
+	{
+		return $this->reason;
+	}
 }

lib/Vendor/GuzzleHttp/Promise/RejectedPromise.php

Indentation +62 added lines, -62 removed lines

@@ -13,66 +13,66 @@
  */
 class RejectedPromise implements PromiseInterface
 {
-    private $reason;
-    /**
-     * @param mixed $reason
-     */
-    public function __construct($reason)
-    {
-        if (\is_object($reason) && \method_exists($reason, 'then')) {
-            throw new \InvalidArgumentException('You cannot create a RejectedPromise with a promise.');
-        }
-        $this->reason = $reason;
-    }
-    public function then(?callable $onFulfilled = null, ?callable $onRejected = null) : PromiseInterface
-    {
-        // If there's no onRejected callback then just return self.
-        if (!$onRejected) {
-            return $this;
-        }
-        $queue = Utils::queue();
-        $reason = $this->reason;
-        $p = new Promise([$queue, 'run']);
-        $queue->add(static function () use($p, $reason, $onRejected) : void {
-            if (Is::pending($p)) {
-                try {
-                    // Return a resolved promise if onRejected does not throw.
-                    $p->resolve($onRejected($reason));
-                } catch (\Throwable $e) {
-                    // onRejected threw, so return a rejected promise.
-                    $p->reject($e);
-                }
-            }
-        });
-        return $p;
-    }
-    public function otherwise(callable $onRejected) : PromiseInterface
-    {
-        return $this->then(null, $onRejected);
-    }
-    public function wait(bool $unwrap = \true)
-    {
-        if ($unwrap) {
-            throw Create::exceptionFor($this->reason);
-        }
-        return null;
-    }
-    public function getState() : string
-    {
-        return self::REJECTED;
-    }
-    public function resolve($value) : void
-    {
-        throw new \LogicException('Cannot resolve a rejected promise');
-    }
-    public function reject($reason) : void
-    {
-        if ($reason !== $this->reason) {
-            throw new \LogicException('Cannot reject a rejected promise');
-        }
-    }
-    public function cancel() : void
-    {
-        // pass
-    }
+	private $reason;
+	/**
+	 * @param mixed $reason
+	 */
+	public function __construct($reason)
+	{
+		if (\is_object($reason) && \method_exists($reason, 'then')) {
+			throw new \InvalidArgumentException('You cannot create a RejectedPromise with a promise.');
+		}
+		$this->reason = $reason;
+	}
+	public function then(?callable $onFulfilled = null, ?callable $onRejected = null) : PromiseInterface
+	{
+		// If there's no onRejected callback then just return self.
+		if (!$onRejected) {
+			return $this;
+		}
+		$queue = Utils::queue();
+		$reason = $this->reason;
+		$p = new Promise([$queue, 'run']);
+		$queue->add(static function () use($p, $reason, $onRejected) : void {
+			if (Is::pending($p)) {
+				try {
+					// Return a resolved promise if onRejected does not throw.
+					$p->resolve($onRejected($reason));
+				} catch (\Throwable $e) {
+					// onRejected threw, so return a rejected promise.
+					$p->reject($e);
+				}
+			}
+		});
+		return $p;
+	}
+	public function otherwise(callable $onRejected) : PromiseInterface
+	{
+		return $this->then(null, $onRejected);
+	}
+	public function wait(bool $unwrap = \true)
+	{
+		if ($unwrap) {
+			throw Create::exceptionFor($this->reason);
+		}
+		return null;
+	}
+	public function getState() : string
+	{
+		return self::REJECTED;
+	}
+	public function resolve($value) : void
+	{
+		throw new \LogicException('Cannot resolve a rejected promise');
+	}
+	public function reject($reason) : void
+	{
+		if ($reason !== $this->reason) {
+			throw new \LogicException('Cannot reject a rejected promise');
+		}
+	}
+	public function cancel() : void
+	{
+		// pass
+	}
 }

lib/Vendor/GuzzleHttp/Promise/FulfilledPromise.php

Indentation +57 added lines, -57 removed lines

@@ -13,61 +13,61 @@
  */
 class FulfilledPromise implements PromiseInterface
 {
-    private $value;
-    /**
-     * @param mixed $value
-     */
-    public function __construct($value)
-    {
-        if (\is_object($value) && \method_exists($value, 'then')) {
-            throw new \InvalidArgumentException('You cannot create a FulfilledPromise with a promise.');
-        }
-        $this->value = $value;
-    }
-    public function then(?callable $onFulfilled = null, ?callable $onRejected = null) : PromiseInterface
-    {
-        // Return itself if there is no onFulfilled function.
-        if (!$onFulfilled) {
-            return $this;
-        }
-        $queue = Utils::queue();
-        $p = new Promise([$queue, 'run']);
-        $value = $this->value;
-        $queue->add(static function () use($p, $value, $onFulfilled) : void {
-            if (Is::pending($p)) {
-                try {
-                    $p->resolve($onFulfilled($value));
-                } catch (\Throwable $e) {
-                    $p->reject($e);
-                }
-            }
-        });
-        return $p;
-    }
-    public function otherwise(callable $onRejected) : PromiseInterface
-    {
-        return $this->then(null, $onRejected);
-    }
-    public function wait(bool $unwrap = \true)
-    {
-        return $unwrap ? $this->value : null;
-    }
-    public function getState() : string
-    {
-        return self::FULFILLED;
-    }
-    public function resolve($value) : void
-    {
-        if ($value !== $this->value) {
-            throw new \LogicException('Cannot resolve a fulfilled promise');
-        }
-    }
-    public function reject($reason) : void
-    {
-        throw new \LogicException('Cannot reject a fulfilled promise');
-    }
-    public function cancel() : void
-    {
-        // pass
-    }
+	private $value;
+	/**
+	 * @param mixed $value
+	 */
+	public function __construct($value)
+	{
+		if (\is_object($value) && \method_exists($value, 'then')) {
+			throw new \InvalidArgumentException('You cannot create a FulfilledPromise with a promise.');
+		}
+		$this->value = $value;
+	}
+	public function then(?callable $onFulfilled = null, ?callable $onRejected = null) : PromiseInterface
+	{
+		// Return itself if there is no onFulfilled function.
+		if (!$onFulfilled) {
+			return $this;
+		}
+		$queue = Utils::queue();
+		$p = new Promise([$queue, 'run']);
+		$value = $this->value;
+		$queue->add(static function () use($p, $value, $onFulfilled) : void {
+			if (Is::pending($p)) {
+				try {
+					$p->resolve($onFulfilled($value));
+				} catch (\Throwable $e) {
+					$p->reject($e);
+				}
+			}
+		});
+		return $p;
+	}
+	public function otherwise(callable $onRejected) : PromiseInterface
+	{
+		return $this->then(null, $onRejected);
+	}
+	public function wait(bool $unwrap = \true)
+	{
+		return $unwrap ? $this->value : null;
+	}
+	public function getState() : string
+	{
+		return self::FULFILLED;
+	}
+	public function resolve($value) : void
+	{
+		if ($value !== $this->value) {
+			throw new \LogicException('Cannot resolve a fulfilled promise');
+		}
+	}
+	public function reject($reason) : void
+	{
+		throw new \LogicException('Cannot reject a fulfilled promise');
+	}
+	public function cancel() : void
+	{
+		// pass
+	}
 }

lib/Vendor/GuzzleHttp/Promise/Each.php

Indentation +48 added lines, -48 removed lines

@@ -5,52 +5,52 @@
 
 final class Each
 {
-    /**
-     * Given an iterator that yields promises or values, returns a promise that
-     * is fulfilled with a null value when the iterator has been consumed or
-     * the aggregate promise has been fulfilled or rejected.
-     *
-     * $onFulfilled is a function that accepts the fulfilled value, iterator
-     * index, and the aggregate promise. The callback can invoke any necessary
-     * side effects and choose to resolve or reject the aggregate if needed.
-     *
-     * $onRejected is a function that accepts the rejection reason, iterator
-     * index, and the aggregate promise. The callback can invoke any necessary
-     * side effects and choose to resolve or reject the aggregate if needed.
-     *
-     * @param mixed $iterable Iterator or array to iterate over.
-     */
-    public static function of($iterable, ?callable $onFulfilled = null, ?callable $onRejected = null) : PromiseInterface
-    {
-        return (new EachPromise($iterable, ['fulfilled' => $onFulfilled, 'rejected' => $onRejected]))->promise();
-    }
-    /**
-     * Like of, but only allows a certain number of outstanding promises at any
-     * given time.
-     *
-     * $concurrency may be an integer or a function that accepts the number of
-     * pending promises and returns a numeric concurrency limit value to allow
-     * for dynamic a concurrency size.
-     *
-     * @param mixed        $iterable
-     * @param int|callable $concurrency
-     */
-    public static function ofLimit($iterable, $concurrency, ?callable $onFulfilled = null, ?callable $onRejected = null) : PromiseInterface
-    {
-        return (new EachPromise($iterable, ['fulfilled' => $onFulfilled, 'rejected' => $onRejected, 'concurrency' => $concurrency]))->promise();
-    }
-    /**
-     * Like limit, but ensures that no promise in the given $iterable argument
-     * is rejected. If any promise is rejected, then the aggregate promise is
-     * rejected with the encountered rejection.
-     *
-     * @param mixed        $iterable
-     * @param int|callable $concurrency
-     */
-    public static function ofLimitAll($iterable, $concurrency, ?callable $onFulfilled = null) : PromiseInterface
-    {
-        return self::ofLimit($iterable, $concurrency, $onFulfilled, function ($reason, $idx, PromiseInterface $aggregate) : void {
-            $aggregate->reject($reason);
-        });
-    }
+	/**
+	 * Given an iterator that yields promises or values, returns a promise that
+	 * is fulfilled with a null value when the iterator has been consumed or
+	 * the aggregate promise has been fulfilled or rejected.
+	 *
+	 * $onFulfilled is a function that accepts the fulfilled value, iterator
+	 * index, and the aggregate promise. The callback can invoke any necessary
+	 * side effects and choose to resolve or reject the aggregate if needed.
+	 *
+	 * $onRejected is a function that accepts the rejection reason, iterator
+	 * index, and the aggregate promise. The callback can invoke any necessary
+	 * side effects and choose to resolve or reject the aggregate if needed.
+	 *
+	 * @param mixed $iterable Iterator or array to iterate over.
+	 */
+	public static function of($iterable, ?callable $onFulfilled = null, ?callable $onRejected = null) : PromiseInterface
+	{
+		return (new EachPromise($iterable, ['fulfilled' => $onFulfilled, 'rejected' => $onRejected]))->promise();
+	}
+	/**
+	 * Like of, but only allows a certain number of outstanding promises at any
+	 * given time.
+	 *
+	 * $concurrency may be an integer or a function that accepts the number of
+	 * pending promises and returns a numeric concurrency limit value to allow
+	 * for dynamic a concurrency size.
+	 *
+	 * @param mixed        $iterable
+	 * @param int|callable $concurrency
+	 */
+	public static function ofLimit($iterable, $concurrency, ?callable $onFulfilled = null, ?callable $onRejected = null) : PromiseInterface
+	{
+		return (new EachPromise($iterable, ['fulfilled' => $onFulfilled, 'rejected' => $onRejected, 'concurrency' => $concurrency]))->promise();
+	}
+	/**
+	 * Like limit, but ensures that no promise in the given $iterable argument
+	 * is rejected. If any promise is rejected, then the aggregate promise is
+	 * rejected with the encountered rejection.
+	 *
+	 * @param mixed        $iterable
+	 * @param int|callable $concurrency
+	 */
+	public static function ofLimitAll($iterable, $concurrency, ?callable $onFulfilled = null) : PromiseInterface
+	{
+		return self::ofLimit($iterable, $concurrency, $onFulfilled, function ($reason, $idx, PromiseInterface $aggregate) : void {
+			$aggregate->reject($reason);
+		});
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare (strict_types=1);
+declare(strict_types=1);
 namespace OCA\FullTextSearch_Elasticsearch\Vendor\GuzzleHttp\Promise;
 
 final class Each
@@ -49,7 +49,7 @@ 
      */
     public static function ofLimitAll($iterable, $concurrency, ?callable $onFulfilled = null) : PromiseInterface
     {
-        return self::ofLimit($iterable, $concurrency, $onFulfilled, function ($reason, $idx, PromiseInterface $aggregate) : void {
+        return self::ofLimit($iterable, $concurrency, $onFulfilled, function($reason, $idx, PromiseInterface $aggregate) : void {
             $aggregate->reject($reason);
         });
     }

lib/Vendor/GuzzleHttp/RequestOptions.php

Indentation +232 added lines, -232 removed lines

@@ -9,236 +9,236 @@
  */
 final class RequestOptions
 {
-    /**
-     * allow_redirects: (bool|array) Controls redirect behavior. Pass false
-     * to disable redirects, pass true to enable redirects, pass an
-     * associative to provide custom redirect settings. Defaults to "false".
-     * This option only works if your handler has the RedirectMiddleware. When
-     * passing an associative array, you can provide the following key value
-     * pairs:
-     *
-     * - max: (int, default=5) maximum number of allowed redirects.
-     * - strict: (bool, default=false) Set to true to use strict redirects
-     *   meaning redirect POST requests with POST requests vs. doing what most
-     *   browsers do which is redirect POST requests with GET requests
-     * - referer: (bool, default=false) Set to true to enable the Referer
-     *   header.
-     * - protocols: (array, default=['http', 'https']) Allowed redirect
-     *   protocols.
-     * - on_redirect: (callable) PHP callable that is invoked when a redirect
-     *   is encountered. The callable is invoked with the request, the redirect
-     *   response that was received, and the effective URI. Any return value
-     *   from the on_redirect function is ignored.
-     */
-    public const ALLOW_REDIRECTS = 'allow_redirects';
-    /**
-     * auth: (array) Pass an array of HTTP authentication parameters to use
-     * with the request. The array must contain the username in index [0],
-     * the password in index [1], and you can optionally provide a built-in
-     * authentication type in index [2]. Pass null to disable authentication
-     * for a request.
-     */
-    public const AUTH = 'auth';
-    /**
-     * body: (resource|string|null|int|float|StreamInterface|callable|\Iterator)
-     * Body to send in the request.
-     */
-    public const BODY = 'body';
-    /**
-     * cert: (string|array) Set to a string to specify the path to a file
-     * containing a PEM formatted SSL client side certificate. If a password
-     * is required, then set cert to an array containing the path to the PEM
-     * file in the first array element followed by the certificate password
-     * in the second array element.
-     */
-    public const CERT = 'cert';
-    /**
-     * cookies: (bool|GuzzleHttp\Cookie\CookieJarInterface, default=false)
-     * Specifies whether or not cookies are used in a request or what cookie
-     * jar to use or what cookies to send. This option only works if your
-     * handler has the `cookie` middleware. Valid values are `false` and
-     * an instance of {@see Cookie\CookieJarInterface}.
-     */
-    public const COOKIES = 'cookies';
-    /**
-     * connect_timeout: (float, default=0) Float describing the number of
-     * seconds to wait while trying to connect to a server. Use 0 to wait
-     * 300 seconds (the default behavior).
-     */
-    public const CONNECT_TIMEOUT = 'connect_timeout';
-    /**
-     * crypto_method: (int) A value describing the minimum TLS protocol
-     * version to use.
-     *
-     * This setting must be set to one of the
-     * ``STREAM_CRYPTO_METHOD_TLS*_CLIENT`` constants. PHP 7.4 or higher is
-     * required in order to use TLS 1.3, and cURL 7.34.0 or higher is required
-     * in order to specify a crypto method, with cURL 7.52.0 or higher being
-     * required to use TLS 1.3.
-     */
-    public const CRYPTO_METHOD = 'crypto_method';
-    /**
-     * debug: (bool|resource) Set to true or set to a PHP stream returned by
-     * fopen()  enable debug output with the HTTP handler used to send a
-     * request.
-     */
-    public const DEBUG = 'debug';
-    /**
-     * decode_content: (bool, default=true) Specify whether or not
-     * Content-Encoding responses (gzip, deflate, etc.) are automatically
-     * decoded.
-     */
-    public const DECODE_CONTENT = 'decode_content';
-    /**
-     * delay: (int) The amount of time to delay before sending in milliseconds.
-     */
-    public const DELAY = 'delay';
-    /**
-     * expect: (bool|integer) Controls the behavior of the
-     * "Expect: 100-Continue" header.
-     *
-     * Set to `true` to enable the "Expect: 100-Continue" header for all
-     * requests that sends a body. Set to `false` to disable the
-     * "Expect: 100-Continue" header for all requests. Set to a number so that
-     * the size of the payload must be greater than the number in order to send
-     * the Expect header. Setting to a number will send the Expect header for
-     * all requests in which the size of the payload cannot be determined or
-     * where the body is not rewindable.
-     *
-     * By default, Guzzle will add the "Expect: 100-Continue" header when the
-     * size of the body of a request is greater than 1 MB and a request is
-     * using HTTP/1.1.
-     */
-    public const EXPECT = 'expect';
-    /**
-     * form_params: (array) Associative array of form field names to values
-     * where each value is a string or array of strings. Sets the Content-Type
-     * header to application/x-www-form-urlencoded when no Content-Type header
-     * is already present.
-     */
-    public const FORM_PARAMS = 'form_params';
-    /**
-     * headers: (array) Associative array of HTTP headers. Each value MUST be
-     * a string or array of strings.
-     */
-    public const HEADERS = 'headers';
-    /**
-     * http_errors: (bool, default=true) Set to false to disable exceptions
-     * when a non- successful HTTP response is received. By default,
-     * exceptions will be thrown for 4xx and 5xx responses. This option only
-     * works if your handler has the `httpErrors` middleware.
-     */
-    public const HTTP_ERRORS = 'http_errors';
-    /**
-     * idn: (bool|int, default=true) A combination of IDNA_* constants for
-     * idn_to_ascii() PHP's function (see "options" parameter). Set to false to
-     * disable IDN support completely, or to true to use the default
-     * configuration (IDNA_DEFAULT constant).
-     */
-    public const IDN_CONVERSION = 'idn_conversion';
-    /**
-     * json: (mixed) Adds JSON data to a request. The provided value is JSON
-     * encoded and a Content-Type header of application/json will be added to
-     * the request if no Content-Type header is already present.
-     */
-    public const JSON = 'json';
-    /**
-     * multipart: (array) Array of associative arrays, each containing a
-     * required "name" key mapping to the form field, name, a required
-     * "contents" key mapping to a StreamInterface|resource|string, an
-     * optional "headers" associative array of custom headers, and an
-     * optional "filename" key mapping to a string to send as the filename in
-     * the part. If no "filename" key is present, then no "filename" attribute
-     * will be added to the part.
-     */
-    public const MULTIPART = 'multipart';
-    /**
-     * on_headers: (callable) A callable that is invoked when the HTTP headers
-     * of the response have been received but the body has not yet begun to
-     * download.
-     */
-    public const ON_HEADERS = 'on_headers';
-    /**
-     * on_stats: (callable) allows you to get access to transfer statistics of
-     * a request and access the lower level transfer details of the handler
-     * associated with your client. ``on_stats`` is a callable that is invoked
-     * when a handler has finished sending a request. The callback is invoked
-     * with transfer statistics about the request, the response received, or
-     * the error encountered. Included in the data is the total amount of time
-     * taken to send the request.
-     */
-    public const ON_STATS = 'on_stats';
-    /**
-     * progress: (callable) Defines a function to invoke when transfer
-     * progress is made. The function accepts the following positional
-     * arguments: the total number of bytes expected to be downloaded, the
-     * number of bytes downloaded so far, the number of bytes expected to be
-     * uploaded, the number of bytes uploaded so far.
-     */
-    public const PROGRESS = 'progress';
-    /**
-     * proxy: (string|array) Pass a string to specify an HTTP proxy, or an
-     * array to specify different proxies for different protocols (where the
-     * key is the protocol and the value is a proxy string).
-     */
-    public const PROXY = 'proxy';
-    /**
-     * query: (array|string) Associative array of query string values to add
-     * to the request. This option uses PHP's http_build_query() to create
-     * the string representation. Pass a string value if you need more
-     * control than what this method provides
-     */
-    public const QUERY = 'query';
-    /**
-     * sink: (resource|string|StreamInterface) Where the data of the
-     * response is written to. Defaults to a PHP temp stream. Providing a
-     * string will write data to a file by the given name.
-     */
-    public const SINK = 'sink';
-    /**
-     * synchronous: (bool) Set to true to inform HTTP handlers that you intend
-     * on waiting on the response. This can be useful for optimizations. Note
-     * that a promise is still returned if you are using one of the async
-     * client methods.
-     */
-    public const SYNCHRONOUS = 'synchronous';
-    /**
-     * ssl_key: (array|string) Specify the path to a file containing a private
-     * SSL key in PEM format. If a password is required, then set to an array
-     * containing the path to the SSL key in the first array element followed
-     * by the password required for the certificate in the second element.
-     */
-    public const SSL_KEY = 'ssl_key';
-    /**
-     * stream: Set to true to attempt to stream a response rather than
-     * download it all up-front.
-     */
-    public const STREAM = 'stream';
-    /**
-     * verify: (bool|string, default=true) Describes the SSL certificate
-     * verification behavior of a request. Set to true to enable SSL
-     * certificate verification using the system CA bundle when available
-     * (the default). Set to false to disable certificate verification (this
-     * is insecure!). Set to a string to provide the path to a CA bundle on
-     * disk to enable verification using a custom certificate.
-     */
-    public const VERIFY = 'verify';
-    /**
-     * timeout: (float, default=0) Float describing the timeout of the
-     * request in seconds. Use 0 to wait indefinitely (the default behavior).
-     */
-    public const TIMEOUT = 'timeout';
-    /**
-     * read_timeout: (float, default=default_socket_timeout ini setting) Float describing
-     * the body read timeout, for stream requests.
-     */
-    public const READ_TIMEOUT = 'read_timeout';
-    /**
-     * version: (float) Specifies the HTTP protocol version to attempt to use.
-     */
-    public const VERSION = 'version';
-    /**
-     * force_ip_resolve: (bool) Force client to use only ipv4 or ipv6 protocol
-     */
-    public const FORCE_IP_RESOLVE = 'force_ip_resolve';
+	/**
+	 * allow_redirects: (bool|array) Controls redirect behavior. Pass false
+	 * to disable redirects, pass true to enable redirects, pass an
+	 * associative to provide custom redirect settings. Defaults to "false".
+	 * This option only works if your handler has the RedirectMiddleware. When
+	 * passing an associative array, you can provide the following key value
+	 * pairs:
+	 *
+	 * - max: (int, default=5) maximum number of allowed redirects.
+	 * - strict: (bool, default=false) Set to true to use strict redirects
+	 *   meaning redirect POST requests with POST requests vs. doing what most
+	 *   browsers do which is redirect POST requests with GET requests
+	 * - referer: (bool, default=false) Set to true to enable the Referer
+	 *   header.
+	 * - protocols: (array, default=['http', 'https']) Allowed redirect
+	 *   protocols.
+	 * - on_redirect: (callable) PHP callable that is invoked when a redirect
+	 *   is encountered. The callable is invoked with the request, the redirect
+	 *   response that was received, and the effective URI. Any return value
+	 *   from the on_redirect function is ignored.
+	 */
+	public const ALLOW_REDIRECTS = 'allow_redirects';
+	/**
+	 * auth: (array) Pass an array of HTTP authentication parameters to use
+	 * with the request. The array must contain the username in index [0],
+	 * the password in index [1], and you can optionally provide a built-in
+	 * authentication type in index [2]. Pass null to disable authentication
+	 * for a request.
+	 */
+	public const AUTH = 'auth';
+	/**
+	 * body: (resource|string|null|int|float|StreamInterface|callable|\Iterator)
+	 * Body to send in the request.
+	 */
+	public const BODY = 'body';
+	/**
+	 * cert: (string|array) Set to a string to specify the path to a file
+	 * containing a PEM formatted SSL client side certificate. If a password
+	 * is required, then set cert to an array containing the path to the PEM
+	 * file in the first array element followed by the certificate password
+	 * in the second array element.
+	 */
+	public const CERT = 'cert';
+	/**
+	 * cookies: (bool|GuzzleHttp\Cookie\CookieJarInterface, default=false)
+	 * Specifies whether or not cookies are used in a request or what cookie
+	 * jar to use or what cookies to send. This option only works if your
+	 * handler has the `cookie` middleware. Valid values are `false` and
+	 * an instance of {@see Cookie\CookieJarInterface}.
+	 */
+	public const COOKIES = 'cookies';
+	/**
+	 * connect_timeout: (float, default=0) Float describing the number of
+	 * seconds to wait while trying to connect to a server. Use 0 to wait
+	 * 300 seconds (the default behavior).
+	 */
+	public const CONNECT_TIMEOUT = 'connect_timeout';
+	/**
+	 * crypto_method: (int) A value describing the minimum TLS protocol
+	 * version to use.
+	 *
+	 * This setting must be set to one of the
+	 * ``STREAM_CRYPTO_METHOD_TLS*_CLIENT`` constants. PHP 7.4 or higher is
+	 * required in order to use TLS 1.3, and cURL 7.34.0 or higher is required
+	 * in order to specify a crypto method, with cURL 7.52.0 or higher being
+	 * required to use TLS 1.3.
+	 */
+	public const CRYPTO_METHOD = 'crypto_method';
+	/**
+	 * debug: (bool|resource) Set to true or set to a PHP stream returned by
+	 * fopen()  enable debug output with the HTTP handler used to send a
+	 * request.
+	 */
+	public const DEBUG = 'debug';
+	/**
+	 * decode_content: (bool, default=true) Specify whether or not
+	 * Content-Encoding responses (gzip, deflate, etc.) are automatically
+	 * decoded.
+	 */
+	public const DECODE_CONTENT = 'decode_content';
+	/**
+	 * delay: (int) The amount of time to delay before sending in milliseconds.
+	 */
+	public const DELAY = 'delay';
+	/**
+	 * expect: (bool|integer) Controls the behavior of the
+	 * "Expect: 100-Continue" header.
+	 *
+	 * Set to `true` to enable the "Expect: 100-Continue" header for all
+	 * requests that sends a body. Set to `false` to disable the
+	 * "Expect: 100-Continue" header for all requests. Set to a number so that
+	 * the size of the payload must be greater than the number in order to send
+	 * the Expect header. Setting to a number will send the Expect header for
+	 * all requests in which the size of the payload cannot be determined or
+	 * where the body is not rewindable.
+	 *
+	 * By default, Guzzle will add the "Expect: 100-Continue" header when the
+	 * size of the body of a request is greater than 1 MB and a request is
+	 * using HTTP/1.1.
+	 */
+	public const EXPECT = 'expect';
+	/**
+	 * form_params: (array) Associative array of form field names to values
+	 * where each value is a string or array of strings. Sets the Content-Type
+	 * header to application/x-www-form-urlencoded when no Content-Type header
+	 * is already present.
+	 */
+	public const FORM_PARAMS = 'form_params';
+	/**
+	 * headers: (array) Associative array of HTTP headers. Each value MUST be
+	 * a string or array of strings.
+	 */
+	public const HEADERS = 'headers';
+	/**
+	 * http_errors: (bool, default=true) Set to false to disable exceptions
+	 * when a non- successful HTTP response is received. By default,
+	 * exceptions will be thrown for 4xx and 5xx responses. This option only
+	 * works if your handler has the `httpErrors` middleware.
+	 */
+	public const HTTP_ERRORS = 'http_errors';
+	/**
+	 * idn: (bool|int, default=true) A combination of IDNA_* constants for
+	 * idn_to_ascii() PHP's function (see "options" parameter). Set to false to
+	 * disable IDN support completely, or to true to use the default
+	 * configuration (IDNA_DEFAULT constant).
+	 */
+	public const IDN_CONVERSION = 'idn_conversion';
+	/**
+	 * json: (mixed) Adds JSON data to a request. The provided value is JSON
+	 * encoded and a Content-Type header of application/json will be added to
+	 * the request if no Content-Type header is already present.
+	 */
+	public const JSON = 'json';
+	/**
+	 * multipart: (array) Array of associative arrays, each containing a
+	 * required "name" key mapping to the form field, name, a required
+	 * "contents" key mapping to a StreamInterface|resource|string, an
+	 * optional "headers" associative array of custom headers, and an
+	 * optional "filename" key mapping to a string to send as the filename in
+	 * the part. If no "filename" key is present, then no "filename" attribute
+	 * will be added to the part.
+	 */
+	public const MULTIPART = 'multipart';
+	/**
+	 * on_headers: (callable) A callable that is invoked when the HTTP headers
+	 * of the response have been received but the body has not yet begun to
+	 * download.
+	 */
+	public const ON_HEADERS = 'on_headers';
+	/**
+	 * on_stats: (callable) allows you to get access to transfer statistics of
+	 * a request and access the lower level transfer details of the handler
+	 * associated with your client. ``on_stats`` is a callable that is invoked
+	 * when a handler has finished sending a request. The callback is invoked
+	 * with transfer statistics about the request, the response received, or
+	 * the error encountered. Included in the data is the total amount of time
+	 * taken to send the request.
+	 */
+	public const ON_STATS = 'on_stats';
+	/**
+	 * progress: (callable) Defines a function to invoke when transfer
+	 * progress is made. The function accepts the following positional
+	 * arguments: the total number of bytes expected to be downloaded, the
+	 * number of bytes downloaded so far, the number of bytes expected to be
+	 * uploaded, the number of bytes uploaded so far.
+	 */
+	public const PROGRESS = 'progress';
+	/**
+	 * proxy: (string|array) Pass a string to specify an HTTP proxy, or an
+	 * array to specify different proxies for different protocols (where the
+	 * key is the protocol and the value is a proxy string).
+	 */
+	public const PROXY = 'proxy';
+	/**
+	 * query: (array|string) Associative array of query string values to add
+	 * to the request. This option uses PHP's http_build_query() to create
+	 * the string representation. Pass a string value if you need more
+	 * control than what this method provides
+	 */
+	public const QUERY = 'query';
+	/**
+	 * sink: (resource|string|StreamInterface) Where the data of the
+	 * response is written to. Defaults to a PHP temp stream. Providing a
+	 * string will write data to a file by the given name.
+	 */
+	public const SINK = 'sink';
+	/**
+	 * synchronous: (bool) Set to true to inform HTTP handlers that you intend
+	 * on waiting on the response. This can be useful for optimizations. Note
+	 * that a promise is still returned if you are using one of the async
+	 * client methods.
+	 */
+	public const SYNCHRONOUS = 'synchronous';
+	/**
+	 * ssl_key: (array|string) Specify the path to a file containing a private
+	 * SSL key in PEM format. If a password is required, then set to an array
+	 * containing the path to the SSL key in the first array element followed
+	 * by the password required for the certificate in the second element.
+	 */
+	public const SSL_KEY = 'ssl_key';
+	/**
+	 * stream: Set to true to attempt to stream a response rather than
+	 * download it all up-front.
+	 */
+	public const STREAM = 'stream';
+	/**
+	 * verify: (bool|string, default=true) Describes the SSL certificate
+	 * verification behavior of a request. Set to true to enable SSL
+	 * certificate verification using the system CA bundle when available
+	 * (the default). Set to false to disable certificate verification (this
+	 * is insecure!). Set to a string to provide the path to a CA bundle on
+	 * disk to enable verification using a custom certificate.
+	 */
+	public const VERIFY = 'verify';
+	/**
+	 * timeout: (float, default=0) Float describing the timeout of the
+	 * request in seconds. Use 0 to wait indefinitely (the default behavior).
+	 */
+	public const TIMEOUT = 'timeout';
+	/**
+	 * read_timeout: (float, default=default_socket_timeout ini setting) Float describing
+	 * the body read timeout, for stream requests.
+	 */
+	public const READ_TIMEOUT = 'read_timeout';
+	/**
+	 * version: (float) Specifies the HTTP protocol version to attempt to use.
+	 */
+	public const VERSION = 'version';
+	/**
+	 * force_ip_resolve: (bool) Force client to use only ipv4 or ipv6 protocol
+	 */
+	public const FORCE_IP_RESOLVE = 'force_ip_resolve';
 }

lib/Vendor/GuzzleHttp/BodySummarizer.php

Indentation +15 added lines, -15 removed lines

@@ -5,19 +5,19 @@
 use OCA\FullTextSearch_Elasticsearch\Vendor\Psr\Http\Message\MessageInterface;
 final class BodySummarizer implements BodySummarizerInterface
 {
-    /**
-     * @var int|null
-     */
-    private $truncateAt;
-    public function __construct(?int $truncateAt = null)
-    {
-        $this->truncateAt = $truncateAt;
-    }
-    /**
-     * Returns a summarized message body.
-     */
-    public function summarize(MessageInterface $message) : ?string
-    {
-        return $this->truncateAt === null ? Psr7\Message::bodySummary($message) : Psr7\Message::bodySummary($message, $this->truncateAt);
-    }
+	/**
+	 * @var int|null
+	 */
+	private $truncateAt;
+	public function __construct(?int $truncateAt = null)
+	{
+		$this->truncateAt = $truncateAt;
+	}
+	/**
+	 * Returns a summarized message body.
+	 */
+	public function summarize(MessageInterface $message) : ?string
+	{
+		return $this->truncateAt === null ? Psr7\Message::bodySummary($message) : Psr7\Message::bodySummary($message, $this->truncateAt);
+	}
 }

lib/Vendor/Elastic/Transport/Transport.php

Indentation +380 added lines, -380 removed lines

@@ -49,384 +49,384 @@
 use function strtolower;
 final class Transport implements ClientInterface, HttpAsyncClient
 {
-    const VERSION = "8.10.0";
-    private ClientInterface $client;
-    private LoggerInterface $logger;
-    private NodePoolInterface $nodePool;
-    private array $headers = [];
-    private string $user;
-    private string $password;
-    private RequestInterface $lastRequest;
-    private ResponseInterface $lastResponse;
-    private string $OSVersion;
-    private int $retries = 0;
-    private HttpAsyncClient $asyncClient;
-    private OnSuccessInterface $onAsyncSuccess;
-    private OnFailureInterface $onAsyncFailure;
-    private TracerInterface $otelTracer;
-    public function __construct(ClientInterface $client, NodePoolInterface $nodePool, LoggerInterface $logger)
-    {
-        $this->client = $client;
-        $this->nodePool = $nodePool;
-        $this->logger = $logger;
-    }
-    public function getClient() : ClientInterface
-    {
-        return $this->client;
-    }
-    public function getNodePool() : NodePoolInterface
-    {
-        return $this->nodePool;
-    }
-    public function getLogger() : LoggerInterface
-    {
-        return $this->logger;
-    }
-    public function getOTelTracer() : TracerInterface
-    {
-        if (empty($this->otelTracer)) {
-            $this->otelTracer = OpenTelemetry::getTracer(Globals::tracerProvider());
-        }
-        return $this->otelTracer;
-    }
-    public function setOTelTracer(TracerInterface $tracer) : self
-    {
-        $this->otelTracer = $tracer;
-        return $this;
-    }
-    public function setHeader(string $name, string $value) : self
-    {
-        $this->headers[$name] = $value;
-        return $this;
-    }
-    /**
-     * @throws InvalidArgumentException
-     */
-    public function setRetries(int $num) : self
-    {
-        if ($num < 0) {
-            throw new InvalidArgumentException('The retries number must be a positive integer');
-        }
-        $this->retries = $num;
-        return $this;
-    }
-    public function getRetries() : int
-    {
-        return $this->retries;
-    }
-    public function getHeaders() : array
-    {
-        return $this->headers;
-    }
-    public function setUserInfo(string $user, string $password = '') : self
-    {
-        $this->user = $user;
-        $this->password = $password;
-        return $this;
-    }
-    public function setUserAgent(string $name, string $version) : self
-    {
-        $this->headers['User-Agent'] = sprintf("%s/%s (%s %s; PHP %s)", $name, $version, \PHP_OS, $this->getOSVersion(), phpversion());
-        return $this;
-    }
-    /**
-     * Set the x-elastic-client-meta header
-     * 
-     * The header format is specified by the following regex:
-     * ^[a-z]{1,}=[a-z0-9\.\-]{1,}(?:,[a-z]{1,}=[a-z0-9\.\-]+)*$
-     */
-    public function setElasticMetaHeader(string $clientName, string $clientVersion, bool $async = \false) : self
-    {
-        $phpSemVersion = sprintf("%d.%d.%d", \PHP_MAJOR_VERSION, \PHP_MINOR_VERSION, \PHP_RELEASE_VERSION);
-        $meta = sprintf("%s=%s,php=%s,t=%s,a=%d", $clientName, $this->purgePreReleaseTag($clientVersion), $phpSemVersion, $this->purgePreReleaseTag(self::VERSION), $async ? 1 : 0);
-        $lib = $this->getClientLibraryInfo();
-        if (!empty($lib)) {
-            $meta .= sprintf(",%s=%s", $lib[0], $lib[1]);
-        }
-        $this->headers['x-elastic-client-meta'] = $meta;
-        return $this;
-    }
-    /**
-     * Remove pre-release suffix with a single 'p' letter
-     */
-    private function purgePreReleaseTag(string $version) : string
-    {
-        return str_replace(['alpha', 'beta', 'snapshot', 'rc', 'pre'], 'p', strtolower($version));
-    }
-    public function getLastRequest() : RequestInterface
-    {
-        return $this->lastRequest;
-    }
-    public function getLastResponse() : ResponseInterface
-    {
-        return $this->lastResponse;
-    }
-    /**
-     * Setup the headers, if not already present 
-     */
-    private function setupHeaders(RequestInterface $request) : RequestInterface
-    {
-        foreach ($this->headers as $name => $value) {
-            if (!$request->hasHeader($name)) {
-                $request = $request->withHeader($name, $value);
-            }
-        }
-        return $request;
-    }
-    /**
-     * Setup the user info, if not already present
-     */
-    private function setupUserInfo(RequestInterface $request) : RequestInterface
-    {
-        $uri = $request->getUri();
-        if (empty($uri->getUserInfo())) {
-            if (isset($this->user)) {
-                $request = $request->withUri($uri->withUserInfo($this->user, $this->password));
-            }
-        }
-        return $request;
-    }
-    /**
-     * Setup the connection Uri 
-     */
-    private function setupConnectionUri(Node $node, RequestInterface $request) : RequestInterface
-    {
-        $uri = $node->getUri();
-        $path = $request->getUri()->getPath();
-        $nodePath = $uri->getPath();
-        // If the node has a path we need to use it as prefix for the existing path
-        // @see https://github.com/elastic/elastic-transport-php/pull/20
-        if (!empty($nodePath)) {
-            $path = sprintf("%s/%s", \rtrim($nodePath, '/'), \ltrim($path, '/'));
-        }
-        // If the user information is not in the request, we check if it is present in the node uri
-        // @see https://github.com/elastic/elastic-transport-php/issues/18
-        if (empty($request->getUri()->getUserInfo()) && !empty($uri->getUserInfo())) {
-            $userInfo = \explode(':', $uri->getUserInfo());
-            $request = $request->withUri($request->getUri()->withUserInfo($userInfo[0], $userInfo[1] ?? null));
-        }
-        return $request->withUri($request->getUri()->withHost($uri->getHost())->withPort($uri->getPort())->withScheme($uri->getScheme())->withPath($path));
-    }
-    private function decorateRequest(RequestInterface $request) : RequestInterface
-    {
-        $request = $this->setupHeaders($request);
-        return $this->setupUserInfo($request);
-    }
-    private function logHeaders(MessageInterface $message) : void
-    {
-        $this->logger->debug(sprintf("Headers: %s\nBody: %s", json_encode($message->getHeaders()), (string) $message->getBody()));
-    }
-    private function logRequest(string $title, RequestInterface $request) : void
-    {
-        $this->logger->info(sprintf("%s: %s %s", $title, $request->getMethod(), (string) $request->getUri()), ['request' => $request]);
-        $this->logHeaders($request);
-    }
-    private function logResponse(string $title, ResponseInterface $response, int $retry) : void
-    {
-        $this->logger->info(sprintf("%s (retry %d): %d", $title, $retry, $response->getStatusCode()), ['response' => $response, 'retry' => $retry]);
-        $this->logHeaders($response);
-    }
-    /**
-     * @throws NoNodeAvailableException
-     * @throws ClientExceptionInterface
-     */
-    public function sendRequest(RequestInterface $request) : ResponseInterface
-    {
-        if (empty($request->getUri()->getHost())) {
-            $node = $this->nodePool->nextNode();
-            $request = $this->setupConnectionUri($node, $request);
-        }
-        $request = $this->decorateRequest($request);
-        $this->lastRequest = $request;
-        $this->logRequest("Request", $request);
-        // OpenTelemetry get tracer
-        if (\getenv(OpenTelemetry::ENV_VARIABLE_ENABLED)) {
-            $tracer = $this->getOTelTracer();
-        }
-        $count = -1;
-        while ($count < $this->getRetries()) {
-            try {
-                $count++;
-                // OpenTelemetry span start
-                if (!empty($tracer)) {
-                    if ($request instanceof ServerRequestInterface) {
-                        $opts = $request->getAttribute(OpenTelemetry::PSR7_OTEL_ATTRIBUTE_NAME, []);
-                    }
-                    $spanName = $opts['db.operation.name'] ?? $request->getUri()->getPath();
-                    $span = $tracer->spanBuilder($spanName)->startSpan();
-                    $span->setAttribute('http.request.method', $request->getMethod());
-                    $span->setAttribute('url.full', $this->getFullUrl($request));
-                    $span->setAttribute('server.address', $request->getUri()->getHost());
-                    $span->setAttribute('server.port', $request->getUri()->getPort());
-                    if (!empty($opts)) {
-                        $span->setAttributes($opts);
-                    }
-                }
-                $response = $this->client->sendRequest($request);
-                $this->lastResponse = $response;
-                $this->logResponse("Response", $response, $count);
-                return $response;
-            } catch (NetworkExceptionInterface $e) {
-                $this->logger->error(sprintf("Retry %d: %s", $count, $e->getMessage()));
-                if (!empty($span)) {
-                    $span->setAttribute('error.type', $e->getMessage());
-                }
-                if (isset($node)) {
-                    $node->markAlive(\false);
-                    $node = $this->nodePool->nextNode();
-                    $request = $this->setupConnectionUri($node, $request);
-                }
-            } catch (ClientExceptionInterface $e) {
-                $this->logger->error(sprintf("Retry %d: %s", $count, $e->getMessage()));
-                if (!empty($span)) {
-                    $span->setAttribute('error.type', $e->getMessage());
-                }
-                throw $e;
-            } finally {
-                // OpenTelemetry span end
-                if (!empty($span)) {
-                    $span->end();
-                }
-            }
-        }
-        $exceededMsg = sprintf("Exceeded maximum number of retries (%d)", $this->getRetries());
-        $this->logger->error($exceededMsg);
-        throw new NoNodeAvailableException($exceededMsg);
-    }
-    public function setAsyncClient(HttpAsyncClient $asyncClient) : self
-    {
-        $this->asyncClient = $asyncClient;
-        return $this;
-    }
-    /**
-     * @throws NoAsyncClientException
-     */
-    public function getAsyncClient() : HttpAsyncClient
-    {
-        if (!empty($this->asyncClient)) {
-            return $this->asyncClient;
-        }
-        if ($this->client instanceof HttpAsyncClient) {
-            return $this->client;
-        }
-        try {
-            $this->asyncClient = HttpAsyncClientDiscovery::find();
-        } catch (Exception $e) {
-            throw new NoAsyncClientException(sprintf("I did not find any HTTP library with HttpAsyncClient interface. " . "Make sure to install a package providing \"php-http/async-client-implementation\". " . "You can also set a specific async library using %s::setAsyncClient()", self::class));
-        }
-        return $this->asyncClient;
-    }
-    public function setAsyncOnSuccess(OnSuccessInterface $success) : self
-    {
-        $this->onAsyncSuccess = $success;
-        return $this;
-    }
-    public function getAsyncOnSuccess() : OnSuccessInterface
-    {
-        if (empty($this->onAsyncSuccess)) {
-            $this->onAsyncSuccess = new OnSuccessDefault();
-        }
-        return $this->onAsyncSuccess;
-    }
-    public function setAsyncOnFailure(OnFailureInterface $failure) : self
-    {
-        $this->onAsyncFailure = $failure;
-        return $this;
-    }
-    public function getAsyncOnFailure() : OnFailureInterface
-    {
-        if (empty($this->onAsyncFailure)) {
-            $this->onAsyncFailure = new OnFailureDefault();
-        }
-        return $this->onAsyncFailure;
-    }
-    /**
-     * @throws Exception
-     */
-    public function sendAsyncRequest(RequestInterface $request) : Promise
-    {
-        $client = $this->getAsyncClient();
-        $node = null;
-        if (empty($request->getUri()->getHost())) {
-            $node = $this->nodePool->nextNode();
-            $request = $this->setupConnectionUri($node, $request);
-        }
-        $request = $this->decorateRequest($request);
-        $this->lastRequest = $request;
-        $this->logRequest("Async Request", $request);
-        $count = 0;
-        $promise = $client->sendAsyncRequest($request);
-        // onFulfilled callable
-        $onFulfilled = function (ResponseInterface $response) use(&$count) {
-            $this->lastResponse = $response;
-            $this->logResponse("Async Response", $response, $count);
-            return $this->getAsyncOnSuccess()->success($response, $count);
-        };
-        // onRejected callable
-        $onRejected = function (Exception $e) use($client, $request, &$count, $node) {
-            $this->logger->error(sprintf("Retry %d: %s", $count, $e->getMessage()));
-            $this->getAsyncOnFailure()->failure($e, $request, $count, $node ?? null);
-            if (isset($node)) {
-                $node->markAlive(\false);
-                $node = $this->nodePool->nextNode();
-                $request = $this->setupConnectionUri($node, $request);
-            }
-            $count++;
-            return $client->sendAsyncRequest($request);
-        };
-        // Add getRetries() callables using then()
-        for ($i = 0; $i < $this->getRetries(); $i++) {
-            $promise = $promise->then($onFulfilled, $onRejected);
-        }
-        // Add the last getRetries()+1 callable for managing the exceeded error
-        $promise = $promise->then($onFulfilled, function (Exception $e) use(&$count) {
-            $exceededMsg = sprintf("Exceeded maximum number of retries (%d)", $this->getRetries());
-            $this->logger->error(sprintf("Retry %d: %s", $count, $e->getMessage()));
-            $this->logger->error($exceededMsg);
-            throw new NoNodeAvailableException(sprintf("%s: %s", $exceededMsg, $e->getMessage()));
-        });
-        return $promise;
-    }
-    /**
-     * Get the OS version using php_uname if available
-     * otherwise it returns an empty string
-     */
-    private function getOSVersion() : string
-    {
-        if (!isset($this->OSVersion)) {
-            $disable_functions = (string) ini_get('disable_functions');
-            $this->OSVersion = strpos(strtolower($disable_functions), 'php_uname') !== \false ? '' : php_uname("r");
-        }
-        return $this->OSVersion;
-    }
-    /**
-     * Returns the name and the version of the Client HTTP library used
-     * Here a list of supported libraries:
-     * gu => guzzlehttp/guzzle
-     * sy => symfony/http-client
-     */
-    private function getClientLibraryInfo() : array
-    {
-        $clientClass = get_class($this->client);
-        if (\false !== strpos($clientClass, 'OCA\\FullTextSearch_Elasticsearch\\Vendor\\GuzzleHttp\\Client')) {
-            return ['gu', InstalledVersions::getPrettyVersion('guzzlehttp/guzzle')];
-        }
-        if (\false !== strpos($clientClass, 'OCA\\FullTextSearch_Elasticsearch\\Vendor\\Symfony\\Component\\HttpClient')) {
-            return ['sy', InstalledVersions::getPrettyVersion('symfony/http-client')];
-        }
-        return [];
-    }
-    /**
-     * Return the full URL in the format
-     * scheme://host:port/path?query_string
-     */
-    private function getFullUrl(RequestInterface $request) : string
-    {
-        $fullUrl = sprintf("%s://%s:%s%s", $request->getUri()->getScheme(), $request->getUri()->getHost(), $request->getUri()->getPort(), $request->getUri()->getPath());
-        $queryString = $request->getUri()->getQuery();
-        if (!empty($queryString)) {
-            $fullUrl .= '?' . $queryString;
-        }
-        return $fullUrl;
-    }
+	const VERSION = "8.10.0";
+	private ClientInterface $client;
+	private LoggerInterface $logger;
+	private NodePoolInterface $nodePool;
+	private array $headers = [];
+	private string $user;
+	private string $password;
+	private RequestInterface $lastRequest;
+	private ResponseInterface $lastResponse;
+	private string $OSVersion;
+	private int $retries = 0;
+	private HttpAsyncClient $asyncClient;
+	private OnSuccessInterface $onAsyncSuccess;
+	private OnFailureInterface $onAsyncFailure;
+	private TracerInterface $otelTracer;
+	public function __construct(ClientInterface $client, NodePoolInterface $nodePool, LoggerInterface $logger)
+	{
+		$this->client = $client;
+		$this->nodePool = $nodePool;
+		$this->logger = $logger;
+	}
+	public function getClient() : ClientInterface
+	{
+		return $this->client;
+	}
+	public function getNodePool() : NodePoolInterface
+	{
+		return $this->nodePool;
+	}
+	public function getLogger() : LoggerInterface
+	{
+		return $this->logger;
+	}
+	public function getOTelTracer() : TracerInterface
+	{
+		if (empty($this->otelTracer)) {
+			$this->otelTracer = OpenTelemetry::getTracer(Globals::tracerProvider());
+		}
+		return $this->otelTracer;
+	}
+	public function setOTelTracer(TracerInterface $tracer) : self
+	{
+		$this->otelTracer = $tracer;
+		return $this;
+	}
+	public function setHeader(string $name, string $value) : self
+	{
+		$this->headers[$name] = $value;
+		return $this;
+	}
+	/**
+	 * @throws InvalidArgumentException
+	 */
+	public function setRetries(int $num) : self
+	{
+		if ($num < 0) {
+			throw new InvalidArgumentException('The retries number must be a positive integer');
+		}
+		$this->retries = $num;
+		return $this;
+	}
+	public function getRetries() : int
+	{
+		return $this->retries;
+	}
+	public function getHeaders() : array
+	{
+		return $this->headers;
+	}
+	public function setUserInfo(string $user, string $password = '') : self
+	{
+		$this->user = $user;
+		$this->password = $password;
+		return $this;
+	}
+	public function setUserAgent(string $name, string $version) : self
+	{
+		$this->headers['User-Agent'] = sprintf("%s/%s (%s %s; PHP %s)", $name, $version, \PHP_OS, $this->getOSVersion(), phpversion());
+		return $this;
+	}
+	/**
+	 * Set the x-elastic-client-meta header
+	 * 
+	 * The header format is specified by the following regex:
+	 * ^[a-z]{1,}=[a-z0-9\.\-]{1,}(?:,[a-z]{1,}=[a-z0-9\.\-]+)*$
+	 */
+	public function setElasticMetaHeader(string $clientName, string $clientVersion, bool $async = \false) : self
+	{
+		$phpSemVersion = sprintf("%d.%d.%d", \PHP_MAJOR_VERSION, \PHP_MINOR_VERSION, \PHP_RELEASE_VERSION);
+		$meta = sprintf("%s=%s,php=%s,t=%s,a=%d", $clientName, $this->purgePreReleaseTag($clientVersion), $phpSemVersion, $this->purgePreReleaseTag(self::VERSION), $async ? 1 : 0);
+		$lib = $this->getClientLibraryInfo();
+		if (!empty($lib)) {
+			$meta .= sprintf(",%s=%s", $lib[0], $lib[1]);
+		}
+		$this->headers['x-elastic-client-meta'] = $meta;
+		return $this;
+	}
+	/**
+	 * Remove pre-release suffix with a single 'p' letter
+	 */
+	private function purgePreReleaseTag(string $version) : string
+	{
+		return str_replace(['alpha', 'beta', 'snapshot', 'rc', 'pre'], 'p', strtolower($version));
+	}
+	public function getLastRequest() : RequestInterface
+	{
+		return $this->lastRequest;
+	}
+	public function getLastResponse() : ResponseInterface
+	{
+		return $this->lastResponse;
+	}
+	/**
+	 * Setup the headers, if not already present 
+	 */
+	private function setupHeaders(RequestInterface $request) : RequestInterface
+	{
+		foreach ($this->headers as $name => $value) {
+			if (!$request->hasHeader($name)) {
+				$request = $request->withHeader($name, $value);
+			}
+		}
+		return $request;
+	}
+	/**
+	 * Setup the user info, if not already present
+	 */
+	private function setupUserInfo(RequestInterface $request) : RequestInterface
+	{
+		$uri = $request->getUri();
+		if (empty($uri->getUserInfo())) {
+			if (isset($this->user)) {
+				$request = $request->withUri($uri->withUserInfo($this->user, $this->password));
+			}
+		}
+		return $request;
+	}
+	/**
+	 * Setup the connection Uri 
+	 */
+	private function setupConnectionUri(Node $node, RequestInterface $request) : RequestInterface
+	{
+		$uri = $node->getUri();
+		$path = $request->getUri()->getPath();
+		$nodePath = $uri->getPath();
+		// If the node has a path we need to use it as prefix for the existing path
+		// @see https://github.com/elastic/elastic-transport-php/pull/20
+		if (!empty($nodePath)) {
+			$path = sprintf("%s/%s", \rtrim($nodePath, '/'), \ltrim($path, '/'));
+		}
+		// If the user information is not in the request, we check if it is present in the node uri
+		// @see https://github.com/elastic/elastic-transport-php/issues/18
+		if (empty($request->getUri()->getUserInfo()) && !empty($uri->getUserInfo())) {
+			$userInfo = \explode(':', $uri->getUserInfo());
+			$request = $request->withUri($request->getUri()->withUserInfo($userInfo[0], $userInfo[1] ?? null));
+		}
+		return $request->withUri($request->getUri()->withHost($uri->getHost())->withPort($uri->getPort())->withScheme($uri->getScheme())->withPath($path));
+	}
+	private function decorateRequest(RequestInterface $request) : RequestInterface
+	{
+		$request = $this->setupHeaders($request);
+		return $this->setupUserInfo($request);
+	}
+	private function logHeaders(MessageInterface $message) : void
+	{
+		$this->logger->debug(sprintf("Headers: %s\nBody: %s", json_encode($message->getHeaders()), (string) $message->getBody()));
+	}
+	private function logRequest(string $title, RequestInterface $request) : void
+	{
+		$this->logger->info(sprintf("%s: %s %s", $title, $request->getMethod(), (string) $request->getUri()), ['request' => $request]);
+		$this->logHeaders($request);
+	}
+	private function logResponse(string $title, ResponseInterface $response, int $retry) : void
+	{
+		$this->logger->info(sprintf("%s (retry %d): %d", $title, $retry, $response->getStatusCode()), ['response' => $response, 'retry' => $retry]);
+		$this->logHeaders($response);
+	}
+	/**
+	 * @throws NoNodeAvailableException
+	 * @throws ClientExceptionInterface
+	 */
+	public function sendRequest(RequestInterface $request) : ResponseInterface
+	{
+		if (empty($request->getUri()->getHost())) {
+			$node = $this->nodePool->nextNode();
+			$request = $this->setupConnectionUri($node, $request);
+		}
+		$request = $this->decorateRequest($request);
+		$this->lastRequest = $request;
+		$this->logRequest("Request", $request);
+		// OpenTelemetry get tracer
+		if (\getenv(OpenTelemetry::ENV_VARIABLE_ENABLED)) {
+			$tracer = $this->getOTelTracer();
+		}
+		$count = -1;
+		while ($count < $this->getRetries()) {
+			try {
+				$count++;
+				// OpenTelemetry span start
+				if (!empty($tracer)) {
+					if ($request instanceof ServerRequestInterface) {
+						$opts = $request->getAttribute(OpenTelemetry::PSR7_OTEL_ATTRIBUTE_NAME, []);
+					}
+					$spanName = $opts['db.operation.name'] ?? $request->getUri()->getPath();
+					$span = $tracer->spanBuilder($spanName)->startSpan();
+					$span->setAttribute('http.request.method', $request->getMethod());
+					$span->setAttribute('url.full', $this->getFullUrl($request));
+					$span->setAttribute('server.address', $request->getUri()->getHost());
+					$span->setAttribute('server.port', $request->getUri()->getPort());
+					if (!empty($opts)) {
+						$span->setAttributes($opts);
+					}
+				}
+				$response = $this->client->sendRequest($request);
+				$this->lastResponse = $response;
+				$this->logResponse("Response", $response, $count);
+				return $response;
+			} catch (NetworkExceptionInterface $e) {
+				$this->logger->error(sprintf("Retry %d: %s", $count, $e->getMessage()));
+				if (!empty($span)) {
+					$span->setAttribute('error.type', $e->getMessage());
+				}
+				if (isset($node)) {
+					$node->markAlive(\false);
+					$node = $this->nodePool->nextNode();
+					$request = $this->setupConnectionUri($node, $request);
+				}
+			} catch (ClientExceptionInterface $e) {
+				$this->logger->error(sprintf("Retry %d: %s", $count, $e->getMessage()));
+				if (!empty($span)) {
+					$span->setAttribute('error.type', $e->getMessage());
+				}
+				throw $e;
+			} finally {
+				// OpenTelemetry span end
+				if (!empty($span)) {
+					$span->end();
+				}
+			}
+		}
+		$exceededMsg = sprintf("Exceeded maximum number of retries (%d)", $this->getRetries());
+		$this->logger->error($exceededMsg);
+		throw new NoNodeAvailableException($exceededMsg);
+	}
+	public function setAsyncClient(HttpAsyncClient $asyncClient) : self
+	{
+		$this->asyncClient = $asyncClient;
+		return $this;
+	}
+	/**
+	 * @throws NoAsyncClientException
+	 */
+	public function getAsyncClient() : HttpAsyncClient
+	{
+		if (!empty($this->asyncClient)) {
+			return $this->asyncClient;
+		}
+		if ($this->client instanceof HttpAsyncClient) {
+			return $this->client;
+		}
+		try {
+			$this->asyncClient = HttpAsyncClientDiscovery::find();
+		} catch (Exception $e) {
+			throw new NoAsyncClientException(sprintf("I did not find any HTTP library with HttpAsyncClient interface. " . "Make sure to install a package providing \"php-http/async-client-implementation\". " . "You can also set a specific async library using %s::setAsyncClient()", self::class));
+		}
+		return $this->asyncClient;
+	}
+	public function setAsyncOnSuccess(OnSuccessInterface $success) : self
+	{
+		$this->onAsyncSuccess = $success;
+		return $this;
+	}
+	public function getAsyncOnSuccess() : OnSuccessInterface
+	{
+		if (empty($this->onAsyncSuccess)) {
+			$this->onAsyncSuccess = new OnSuccessDefault();
+		}
+		return $this->onAsyncSuccess;
+	}
+	public function setAsyncOnFailure(OnFailureInterface $failure) : self
+	{
+		$this->onAsyncFailure = $failure;
+		return $this;
+	}
+	public function getAsyncOnFailure() : OnFailureInterface
+	{
+		if (empty($this->onAsyncFailure)) {
+			$this->onAsyncFailure = new OnFailureDefault();
+		}
+		return $this->onAsyncFailure;
+	}
+	/**
+	 * @throws Exception
+	 */
+	public function sendAsyncRequest(RequestInterface $request) : Promise
+	{
+		$client = $this->getAsyncClient();
+		$node = null;
+		if (empty($request->getUri()->getHost())) {
+			$node = $this->nodePool->nextNode();
+			$request = $this->setupConnectionUri($node, $request);
+		}
+		$request = $this->decorateRequest($request);
+		$this->lastRequest = $request;
+		$this->logRequest("Async Request", $request);
+		$count = 0;
+		$promise = $client->sendAsyncRequest($request);
+		// onFulfilled callable
+		$onFulfilled = function (ResponseInterface $response) use(&$count) {
+			$this->lastResponse = $response;
+			$this->logResponse("Async Response", $response, $count);
+			return $this->getAsyncOnSuccess()->success($response, $count);
+		};
+		// onRejected callable
+		$onRejected = function (Exception $e) use($client, $request, &$count, $node) {
+			$this->logger->error(sprintf("Retry %d: %s", $count, $e->getMessage()));
+			$this->getAsyncOnFailure()->failure($e, $request, $count, $node ?? null);
+			if (isset($node)) {
+				$node->markAlive(\false);
+				$node = $this->nodePool->nextNode();
+				$request = $this->setupConnectionUri($node, $request);
+			}
+			$count++;
+			return $client->sendAsyncRequest($request);
+		};
+		// Add getRetries() callables using then()
+		for ($i = 0; $i < $this->getRetries(); $i++) {
+			$promise = $promise->then($onFulfilled, $onRejected);
+		}
+		// Add the last getRetries()+1 callable for managing the exceeded error
+		$promise = $promise->then($onFulfilled, function (Exception $e) use(&$count) {
+			$exceededMsg = sprintf("Exceeded maximum number of retries (%d)", $this->getRetries());
+			$this->logger->error(sprintf("Retry %d: %s", $count, $e->getMessage()));
+			$this->logger->error($exceededMsg);
+			throw new NoNodeAvailableException(sprintf("%s: %s", $exceededMsg, $e->getMessage()));
+		});
+		return $promise;
+	}
+	/**
+	 * Get the OS version using php_uname if available
+	 * otherwise it returns an empty string
+	 */
+	private function getOSVersion() : string
+	{
+		if (!isset($this->OSVersion)) {
+			$disable_functions = (string) ini_get('disable_functions');
+			$this->OSVersion = strpos(strtolower($disable_functions), 'php_uname') !== \false ? '' : php_uname("r");
+		}
+		return $this->OSVersion;
+	}
+	/**
+	 * Returns the name and the version of the Client HTTP library used
+	 * Here a list of supported libraries:
+	 * gu => guzzlehttp/guzzle
+	 * sy => symfony/http-client
+	 */
+	private function getClientLibraryInfo() : array
+	{
+		$clientClass = get_class($this->client);
+		if (\false !== strpos($clientClass, 'OCA\\FullTextSearch_Elasticsearch\\Vendor\\GuzzleHttp\\Client')) {
+			return ['gu', InstalledVersions::getPrettyVersion('guzzlehttp/guzzle')];
+		}
+		if (\false !== strpos($clientClass, 'OCA\\FullTextSearch_Elasticsearch\\Vendor\\Symfony\\Component\\HttpClient')) {
+			return ['sy', InstalledVersions::getPrettyVersion('symfony/http-client')];
+		}
+		return [];
+	}
+	/**
+	 * Return the full URL in the format
+	 * scheme://host:port/path?query_string
+	 */
+	private function getFullUrl(RequestInterface $request) : string
+	{
+		$fullUrl = sprintf("%s://%s:%s%s", $request->getUri()->getScheme(), $request->getUri()->getHost(), $request->getUri()->getPort(), $request->getUri()->getPath());
+		$queryString = $request->getUri()->getQuery();
+		if (!empty($queryString)) {
+			$fullUrl .= '?' . $queryString;
+		}
+		return $fullUrl;
+	}
 }

Spacing +9 added lines, -9 removed lines

@@ -11,7 +11,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\Transport;
 
 use Composer\InstalledVersions;
@@ -214,11 +214,11 @@ 
     }
     private function logHeaders(MessageInterface $message) : void
     {
-        $this->logger->debug(sprintf("Headers: %s\nBody: %s", json_encode($message->getHeaders()), (string) $message->getBody()));
+        $this->logger->debug(sprintf("Headers: %s\nBody: %s", json_encode($message->getHeaders()), (string)$message->getBody()));
     }
     private function logRequest(string $title, RequestInterface $request) : void
     {
-        $this->logger->info(sprintf("%s: %s %s", $title, $request->getMethod(), (string) $request->getUri()), ['request' => $request]);
+        $this->logger->info(sprintf("%s: %s %s", $title, $request->getMethod(), (string)$request->getUri()), ['request' => $request]);
         $this->logHeaders($request);
     }
     private function logResponse(string $title, ResponseInterface $response, int $retry) : void
@@ -312,7 +312,7 @@ 
         try {
             $this->asyncClient = HttpAsyncClientDiscovery::find();
         } catch (Exception $e) {
-            throw new NoAsyncClientException(sprintf("I did not find any HTTP library with HttpAsyncClient interface. " . "Make sure to install a package providing \"php-http/async-client-implementation\". " . "You can also set a specific async library using %s::setAsyncClient()", self::class));
+            throw new NoAsyncClientException(sprintf("I did not find any HTTP library with HttpAsyncClient interface. "."Make sure to install a package providing \"php-http/async-client-implementation\". "."You can also set a specific async library using %s::setAsyncClient()", self::class));
         }
         return $this->asyncClient;
     }
@@ -357,13 +357,13 @@ 
         $count = 0;
         $promise = $client->sendAsyncRequest($request);
         // onFulfilled callable
-        $onFulfilled = function (ResponseInterface $response) use(&$count) {
+        $onFulfilled = function(ResponseInterface $response) use(&$count) {
             $this->lastResponse = $response;
             $this->logResponse("Async Response", $response, $count);
             return $this->getAsyncOnSuccess()->success($response, $count);
         };
         // onRejected callable
-        $onRejected = function (Exception $e) use($client, $request, &$count, $node) {
+        $onRejected = function(Exception $e) use($client, $request, &$count, $node) {
             $this->logger->error(sprintf("Retry %d: %s", $count, $e->getMessage()));
             $this->getAsyncOnFailure()->failure($e, $request, $count, $node ?? null);
             if (isset($node)) {
@@ -379,7 +379,7 @@ 
             $promise = $promise->then($onFulfilled, $onRejected);
         }
         // Add the last getRetries()+1 callable for managing the exceeded error
-        $promise = $promise->then($onFulfilled, function (Exception $e) use(&$count) {
+        $promise = $promise->then($onFulfilled, function(Exception $e) use(&$count) {
             $exceededMsg = sprintf("Exceeded maximum number of retries (%d)", $this->getRetries());
             $this->logger->error(sprintf("Retry %d: %s", $count, $e->getMessage()));
             $this->logger->error($exceededMsg);
@@ -394,7 +394,7 @@ 
     private function getOSVersion() : string
     {
         if (!isset($this->OSVersion)) {
-            $disable_functions = (string) ini_get('disable_functions');
+            $disable_functions = (string)ini_get('disable_functions');
             $this->OSVersion = strpos(strtolower($disable_functions), 'php_uname') !== \false ? '' : php_uname("r");
         }
         return $this->OSVersion;
@@ -425,7 +425,7 @@ 
         $fullUrl = sprintf("%s://%s:%s%s", $request->getUri()->getScheme(), $request->getUri()->getHost(), $request->getUri()->getPort(), $request->getUri()->getPath());
         $queryString = $request->getUri()->getQuery();
         if (!empty($queryString)) {
-            $fullUrl .= '?' . $queryString;
+            $fullUrl .= '?'.$queryString;
         }
         return $fullUrl;
     }

lib/Vendor/Elastic/Transport/TransportBuilder.php

Indentation +80 added lines, -80 removed lines

@@ -27,84 +27,84 @@
 use Throwable;
 class TransportBuilder
 {
-    protected ClientInterface $client;
-    protected NodePoolInterface $nodePool;
-    protected LoggerInterface $logger;
-    protected array $hosts = [];
-    protected TracerInterface $OTelTracer;
-    public final function __construct()
-    {
-    }
-    public static function create() : TransportBuilder
-    {
-        return new static();
-    }
-    public function setClient(ClientInterface $client) : self
-    {
-        $this->client = $client;
-        return $this;
-    }
-    public function getClient() : ClientInterface
-    {
-        if (empty($this->client)) {
-            $this->client = Psr18ClientDiscovery::find();
-        }
-        return $this->client;
-    }
-    public function setNodePool(NodePoolInterface $nodePool) : self
-    {
-        $this->nodePool = $nodePool;
-        return $this;
-    }
-    public function getNodePool() : NodePoolInterface
-    {
-        if (empty($this->nodePool)) {
-            $this->nodePool = new SimpleNodePool(new RoundRobin(), new NoResurrect());
-        }
-        return $this->nodePool;
-    }
-    public function setLogger(LoggerInterface $logger) : self
-    {
-        $this->logger = $logger;
-        return $this;
-    }
-    public function getLogger() : LoggerInterface
-    {
-        if (empty($this->logger)) {
-            $this->logger = new NullLogger();
-        }
-        return $this->logger;
-    }
-    public function setHosts(array $hosts) : self
-    {
-        $this->hosts = $hosts;
-        return $this;
-    }
-    public function getHosts() : array
-    {
-        return $this->hosts;
-    }
-    public function setCloudId(string $cloudId) : self
-    {
-        $this->hosts = [$this->parseElasticCloudId($cloudId)];
-        return $this;
-    }
-    public function build() : Transport
-    {
-        return new Transport($this->getClient(), $this->getNodePool()->setHosts($this->hosts), $this->getLogger());
-    }
-    /**
-     * Return the URL of Elastic Cloud from the Cloud ID
-     */
-    private function parseElasticCloudId(string $cloudId) : string
-    {
-        try {
-            list($name, $encoded) = \explode(':', $cloudId);
-            list($uri, $uuids) = \explode('$', \base64_decode($encoded));
-            list($es, ) = \explode(':', $uuids);
-            return \sprintf("https://%s.%s", $es, $uri);
-        } catch (Throwable $t) {
-            throw new Exception\CloudIdParseException('Cloud ID not valid');
-        }
-    }
+	protected ClientInterface $client;
+	protected NodePoolInterface $nodePool;
+	protected LoggerInterface $logger;
+	protected array $hosts = [];
+	protected TracerInterface $OTelTracer;
+	public final function __construct()
+	{
+	}
+	public static function create() : TransportBuilder
+	{
+		return new static();
+	}
+	public function setClient(ClientInterface $client) : self
+	{
+		$this->client = $client;
+		return $this;
+	}
+	public function getClient() : ClientInterface
+	{
+		if (empty($this->client)) {
+			$this->client = Psr18ClientDiscovery::find();
+		}
+		return $this->client;
+	}
+	public function setNodePool(NodePoolInterface $nodePool) : self
+	{
+		$this->nodePool = $nodePool;
+		return $this;
+	}
+	public function getNodePool() : NodePoolInterface
+	{
+		if (empty($this->nodePool)) {
+			$this->nodePool = new SimpleNodePool(new RoundRobin(), new NoResurrect());
+		}
+		return $this->nodePool;
+	}
+	public function setLogger(LoggerInterface $logger) : self
+	{
+		$this->logger = $logger;
+		return $this;
+	}
+	public function getLogger() : LoggerInterface
+	{
+		if (empty($this->logger)) {
+			$this->logger = new NullLogger();
+		}
+		return $this->logger;
+	}
+	public function setHosts(array $hosts) : self
+	{
+		$this->hosts = $hosts;
+		return $this;
+	}
+	public function getHosts() : array
+	{
+		return $this->hosts;
+	}
+	public function setCloudId(string $cloudId) : self
+	{
+		$this->hosts = [$this->parseElasticCloudId($cloudId)];
+		return $this;
+	}
+	public function build() : Transport
+	{
+		return new Transport($this->getClient(), $this->getNodePool()->setHosts($this->hosts), $this->getLogger());
+	}
+	/**
+	 * Return the URL of Elastic Cloud from the Cloud ID
+	 */
+	private function parseElasticCloudId(string $cloudId) : string
+	{
+		try {
+			list($name, $encoded) = \explode(':', $cloudId);
+			list($uri, $uuids) = \explode('$', \base64_decode($encoded));
+			list($es, ) = \explode(':', $uuids);
+			return \sprintf("https://%s.%s", $es, $uri);
+		} catch (Throwable $t) {
+			throw new Exception\CloudIdParseException('Cloud ID not valid');
+		}
+	}
 }

lib/Vendor/Elastic/Transport/OpenTelemetry.php

Indentation +68 added lines, -68 removed lines

@@ -20,72 +20,72 @@
 use OCA\FullTextSearch_Elasticsearch\Vendor\OpenTelemetry\API\Trace\TracerProviderInterface;
 class OpenTelemetry
 {
-    const OTEL_TRACER_NAME = 'elasticsearch-api';
-    const PSR7_OTEL_ATTRIBUTE_NAME = 'otel-elastic-transport';
-    // Valid values for the enabled config are 'true' and 'false'
-    const ENV_VARIABLE_ENABLED = 'OTEL_PHP_INSTRUMENTATION_ELASTICSEARCH_ENABLED';
-    /**
-     * Describes how to handle search queries in the request body when assigned to
-     * span attribute.
-     * Valid values are 'raw', 'omit', 'sanitize'. Default is 'omit'
-     */
-    const ALLOWED_BODY_STRATEGIES = ['raw', 'omit', 'sanitize'];
-    const ENV_VARIABLE_BODY_STRATEGY = 'OTEL_PHP_INSTRUMENTATION_ELASTICSEARCH_CAPTURE_SEARCH_QUERY';
-    const DEFAULT_BODY_STRATEGY = 'omit';
-    /**
-     * A string list of keys whose values are redacted. This is only relevant if the body strategy is
-     * 'sanitize'. For example, a config 'sensitive-key,other-key' will redact the values at
-     * 'sensitive-key' and 'other-key' in addition to the default keys
-     */
-    const ENV_VARIABLE_BODY_SANITIZE_KEYS = 'OTEL_PHP_INSTRUMENTATION_ELASTICSEARCH_SEARCH_QUERY_SANITIZE_KEYS';
-    const DEFAULT_SANITIZER_KEY_PATTERNS = ['password', 'passwd', 'pwd', 'secret', 'key', 'token', 'session', 'credit', 'card', 'auth', 'set-cookie', 'email', 'tel', 'phone'];
-    const REDACTED_STRING = 'REDACTED';
-    public static function redactBody(string $body) : string
-    {
-        switch (self::getBodyStrategy()) {
-            case 'sanitize':
-                $sanitizeKeys = \getenv(self::ENV_VARIABLE_BODY_SANITIZE_KEYS);
-                $sanitizeKeys = \false !== $sanitizeKeys ? \explode(',', $sanitizeKeys) : [];
-                return self::sanitizeBody($body, $sanitizeKeys);
-            case 'raw':
-                return $body;
-            default:
-                return '';
-        }
-    }
-    private static function getBodyStrategy() : string
-    {
-        $strategy = \getenv(self::ENV_VARIABLE_BODY_STRATEGY);
-        if (\false === $strategy) {
-            $strategy = self::DEFAULT_BODY_STRATEGY;
-        }
-        if (!\in_array($strategy, self::ALLOWED_BODY_STRATEGIES)) {
-            throw new InvalidArgumentException(\sprintf('The body strategy specified %s is not valid. The available strategies are %s', $strategy, \implode(',', self::ALLOWED_BODY_STRATEGIES)));
-        }
-        return $strategy;
-    }
-    public static function getTracer(TracerProviderInterface $tracerProvider) : TracerInterface
-    {
-        return $tracerProvider->getTracer(self::OTEL_TRACER_NAME, Transport::VERSION);
-    }
-    private static function sanitizeBody(string $body, array $sanitizeKeys) : string
-    {
-        if (empty($body)) {
-            return '';
-        }
-        $json = \json_decode($body, \true);
-        if (!\is_array($json)) {
-            return '';
-        }
-        $patterns = \array_merge(self::DEFAULT_SANITIZER_KEY_PATTERNS, $sanitizeKeys);
-        // Convert the patterns array into a regex
-        $regex = \sprintf('/%s/', \implode('|', $patterns));
-        // Recursively traverse the array and redact the specified keys
-        \array_walk_recursive($json, function (&$value, $key) use($regex) {
-            if (\preg_match($regex, $key, $matches)) {
-                $value = self::REDACTED_STRING;
-            }
-        });
-        return JsonSerializer::serialize($json);
-    }
+	const OTEL_TRACER_NAME = 'elasticsearch-api';
+	const PSR7_OTEL_ATTRIBUTE_NAME = 'otel-elastic-transport';
+	// Valid values for the enabled config are 'true' and 'false'
+	const ENV_VARIABLE_ENABLED = 'OTEL_PHP_INSTRUMENTATION_ELASTICSEARCH_ENABLED';
+	/**
+	 * Describes how to handle search queries in the request body when assigned to
+	 * span attribute.
+	 * Valid values are 'raw', 'omit', 'sanitize'. Default is 'omit'
+	 */
+	const ALLOWED_BODY_STRATEGIES = ['raw', 'omit', 'sanitize'];
+	const ENV_VARIABLE_BODY_STRATEGY = 'OTEL_PHP_INSTRUMENTATION_ELASTICSEARCH_CAPTURE_SEARCH_QUERY';
+	const DEFAULT_BODY_STRATEGY = 'omit';
+	/**
+	 * A string list of keys whose values are redacted. This is only relevant if the body strategy is
+	 * 'sanitize'. For example, a config 'sensitive-key,other-key' will redact the values at
+	 * 'sensitive-key' and 'other-key' in addition to the default keys
+	 */
+	const ENV_VARIABLE_BODY_SANITIZE_KEYS = 'OTEL_PHP_INSTRUMENTATION_ELASTICSEARCH_SEARCH_QUERY_SANITIZE_KEYS';
+	const DEFAULT_SANITIZER_KEY_PATTERNS = ['password', 'passwd', 'pwd', 'secret', 'key', 'token', 'session', 'credit', 'card', 'auth', 'set-cookie', 'email', 'tel', 'phone'];
+	const REDACTED_STRING = 'REDACTED';
+	public static function redactBody(string $body) : string
+	{
+		switch (self::getBodyStrategy()) {
+			case 'sanitize':
+				$sanitizeKeys = \getenv(self::ENV_VARIABLE_BODY_SANITIZE_KEYS);
+				$sanitizeKeys = \false !== $sanitizeKeys ? \explode(',', $sanitizeKeys) : [];
+				return self::sanitizeBody($body, $sanitizeKeys);
+			case 'raw':
+				return $body;
+			default:
+				return '';
+		}
+	}
+	private static function getBodyStrategy() : string
+	{
+		$strategy = \getenv(self::ENV_VARIABLE_BODY_STRATEGY);
+		if (\false === $strategy) {
+			$strategy = self::DEFAULT_BODY_STRATEGY;
+		}
+		if (!\in_array($strategy, self::ALLOWED_BODY_STRATEGIES)) {
+			throw new InvalidArgumentException(\sprintf('The body strategy specified %s is not valid. The available strategies are %s', $strategy, \implode(',', self::ALLOWED_BODY_STRATEGIES)));
+		}
+		return $strategy;
+	}
+	public static function getTracer(TracerProviderInterface $tracerProvider) : TracerInterface
+	{
+		return $tracerProvider->getTracer(self::OTEL_TRACER_NAME, Transport::VERSION);
+	}
+	private static function sanitizeBody(string $body, array $sanitizeKeys) : string
+	{
+		if (empty($body)) {
+			return '';
+		}
+		$json = \json_decode($body, \true);
+		if (!\is_array($json)) {
+			return '';
+		}
+		$patterns = \array_merge(self::DEFAULT_SANITIZER_KEY_PATTERNS, $sanitizeKeys);
+		// Convert the patterns array into a regex
+		$regex = \sprintf('/%s/', \implode('|', $patterns));
+		// Recursively traverse the array and redact the specified keys
+		\array_walk_recursive($json, function (&$value, $key) use($regex) {
+			if (\preg_match($regex, $key, $matches)) {
+				$value = self::REDACTED_STRING;
+			}
+		});
+		return JsonSerializer::serialize($json);
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -11,7 +11,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\Transport;
 
 use OCA\FullTextSearch_Elasticsearch\Vendor\Elastic\Transport\Exception\InvalidArgumentException;
@@ -81,7 +81,7 @@ 
         // Convert the patterns array into a regex
         $regex = \sprintf('/%s/', \implode('|', $patterns));
         // Recursively traverse the array and redact the specified keys
-        \array_walk_recursive($json, function (&$value, $key) use($regex) {
+        \array_walk_recursive($json, function(&$value, $key) use($regex) {
             if (\preg_match($regex, $key, $matches)) {
                 $value = self::REDACTED_STRING;
             }

Braces +1 added lines, -2 removed lines

@@ -18,8 +18,7 @@
 use OCA\FullTextSearch_Elasticsearch\Vendor\Elastic\Transport\Serializer\JsonSerializer;
 use OCA\FullTextSearch_Elasticsearch\Vendor\OpenTelemetry\API\Trace\TracerInterface;
 use OCA\FullTextSearch_Elasticsearch\Vendor\OpenTelemetry\API\Trace\TracerProviderInterface;
-class OpenTelemetry
-{
+class OpenTelemetry {
     const OTEL_TRACER_NAME = 'elasticsearch-api';
     const PSR7_OTEL_ATTRIBUTE_NAME = 'otel-elastic-transport';
     // Valid values for the enabled config are 'true' and 'false'