nextcloud / fulltextsearch_elasticsearch

lib/Vendor/GuzzleHttp/RetryMiddleware.php

Indentation +101 added lines, -101 removed lines

@@ -15,105 +15,105 @@
  */
 class RetryMiddleware
 {
-    /**
-     * @var callable(RequestInterface, array): PromiseInterface
-     */
-    private $nextHandler;
-
-    /**
-     * @var callable
-     */
-    private $decider;
-
-    /**
-     * @var callable(int)
-     */
-    private $delay;
-
-    /**
-     * @param callable                                            $decider     Function that accepts the number of retries,
-     *                                                                         a request, [response], and [exception] and
-     *                                                                         returns true if the request is to be
-     *                                                                         retried.
-     * @param callable(RequestInterface, array): PromiseInterface $nextHandler Next handler to invoke.
-     * @param (callable(int): int)|null                           $delay       Function that accepts the number of retries
-     *                                                                         and returns the number of
-     *                                                                         milliseconds to delay.
-     */
-    public function __construct(callable $decider, callable $nextHandler, callable $delay = null)
-    {
-        $this->decider = $decider;
-        $this->nextHandler = $nextHandler;
-        $this->delay = $delay ?: __CLASS__.'::exponentialDelay';
-    }
-
-    /**
-     * Default exponential backoff delay function.
-     *
-     * @return int milliseconds.
-     */
-    public static function exponentialDelay(int $retries): int
-    {
-        return (int) 2 ** ($retries - 1) * 1000;
-    }
-
-    public function __invoke(RequestInterface $request, array $options): PromiseInterface
-    {
-        if (!isset($options['retries'])) {
-            $options['retries'] = 0;
-        }
-
-        $fn = $this->nextHandler;
-
-        return $fn($request, $options)
-            ->then(
-                $this->onFulfilled($request, $options),
-                $this->onRejected($request, $options)
-            );
-    }
-
-    /**
-     * Execute fulfilled closure
-     */
-    private function onFulfilled(RequestInterface $request, array $options): callable
-    {
-        return function ($value) use ($request, $options) {
-            if (!($this->decider)(
-                $options['retries'],
-                $request,
-                $value,
-                null
-            )) {
-                return $value;
-            }
-
-            return $this->doRetry($request, $options, $value);
-        };
-    }
-
-    /**
-     * Execute rejected closure
-     */
-    private function onRejected(RequestInterface $req, array $options): callable
-    {
-        return function ($reason) use ($req, $options) {
-            if (!($this->decider)(
-                $options['retries'],
-                $req,
-                null,
-                $reason
-            )) {
-                return P\Create::rejectionFor($reason);
-            }
-
-            return $this->doRetry($req, $options);
-        };
-    }
-
-    private function doRetry(RequestInterface $request, array $options, ResponseInterface $response = null): PromiseInterface
-    {
-        $options['delay'] = ($this->delay)(++$options['retries'], $response, $request);
-
-        return $this($request, $options);
-    }
+	/**
+	 * @var callable(RequestInterface, array): PromiseInterface
+	 */
+	private $nextHandler;
+
+	/**
+	 * @var callable
+	 */
+	private $decider;
+
+	/**
+	 * @var callable(int)
+	 */
+	private $delay;
+
+	/**
+	 * @param callable                                            $decider     Function that accepts the number of retries,
+	 *                                                                         a request, [response], and [exception] and
+	 *                                                                         returns true if the request is to be
+	 *                                                                         retried.
+	 * @param callable(RequestInterface, array): PromiseInterface $nextHandler Next handler to invoke.
+	 * @param (callable(int): int)|null                           $delay       Function that accepts the number of retries
+	 *                                                                         and returns the number of
+	 *                                                                         milliseconds to delay.
+	 */
+	public function __construct(callable $decider, callable $nextHandler, callable $delay = null)
+	{
+		$this->decider = $decider;
+		$this->nextHandler = $nextHandler;
+		$this->delay = $delay ?: __CLASS__.'::exponentialDelay';
+	}
+
+	/**
+	 * Default exponential backoff delay function.
+	 *
+	 * @return int milliseconds.
+	 */
+	public static function exponentialDelay(int $retries): int
+	{
+		return (int) 2 ** ($retries - 1) * 1000;
+	}
+
+	public function __invoke(RequestInterface $request, array $options): PromiseInterface
+	{
+		if (!isset($options['retries'])) {
+			$options['retries'] = 0;
+		}
+
+		$fn = $this->nextHandler;
+
+		return $fn($request, $options)
+			->then(
+				$this->onFulfilled($request, $options),
+				$this->onRejected($request, $options)
+			);
+	}
+
+	/**
+	 * Execute fulfilled closure
+	 */
+	private function onFulfilled(RequestInterface $request, array $options): callable
+	{
+		return function ($value) use ($request, $options) {
+			if (!($this->decider)(
+				$options['retries'],
+				$request,
+				$value,
+				null
+			)) {
+				return $value;
+			}
+
+			return $this->doRetry($request, $options, $value);
+		};
+	}
+
+	/**
+	 * Execute rejected closure
+	 */
+	private function onRejected(RequestInterface $req, array $options): callable
+	{
+		return function ($reason) use ($req, $options) {
+			if (!($this->decider)(
+				$options['retries'],
+				$req,
+				null,
+				$reason
+			)) {
+				return P\Create::rejectionFor($reason);
+			}
+
+			return $this->doRetry($req, $options);
+		};
+	}
+
+	private function doRetry(RequestInterface $request, array $options, ResponseInterface $response = null): PromiseInterface
+	{
+		$options['delay'] = ($this->delay)(++$options['retries'], $response, $request);
+
+		return $this($request, $options);
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -54,7 +54,7 @@ 
      */
     public static function exponentialDelay(int $retries): int
     {
-        return (int) 2 ** ($retries - 1) * 1000;
+        return (int)2 ** ($retries - 1) * 1000;
     }
 
     public function __invoke(RequestInterface $request, array $options): PromiseInterface
@@ -77,7 +77,7 @@ 
      */
     private function onFulfilled(RequestInterface $request, array $options): callable
     {
-        return function ($value) use ($request, $options) {
+        return function($value) use ($request, $options) {
             if (!($this->decider)(
                 $options['retries'],
                 $request,
@@ -96,7 +96,7 @@ 
      */
     private function onRejected(RequestInterface $req, array $options): callable
     {
-        return function ($reason) use ($req, $options) {
+        return function($reason) use ($req, $options) {
             if (!($this->decider)(
                 $options['retries'],
                 $req,

Braces +1 added lines, -2 removed lines

@@ -13,8 +13,7 @@
  *
  * @final
  */
-class RetryMiddleware
-{
+class RetryMiddleware {
     /**
      * @var callable(RequestInterface, array): PromiseInterface
      */

lib/Vendor/GuzzleHttp/MessageFormatterInterface.php

Indentation +8 added lines, -8 removed lines

@@ -7,12 +7,12 @@
 
 interface MessageFormatterInterface
 {
-    /**
-     * Returns a formatted message string.
-     *
-     * @param RequestInterface       $request  Request that was sent
-     * @param ResponseInterface|null $response Response that was received
-     * @param \Throwable|null        $error    Exception that was received
-     */
-    public function format(RequestInterface $request, ResponseInterface $response = null, \Throwable $error = null): string;
+	/**
+	 * Returns a formatted message string.
+	 *
+	 * @param RequestInterface       $request  Request that was sent
+	 * @param ResponseInterface|null $response Response that was received
+	 * @param \Throwable|null        $error    Exception that was received
+	 */
+	public function format(RequestInterface $request, ResponseInterface $response = null, \Throwable $error = null): string;
 }

Braces +1 added lines, -2 removed lines

@@ -5,8 +5,7 @@
 use OCA\FullTextSearch_Elasticsearch\Vendor\Psr\Http\Message\RequestInterface;
 use OCA\FullTextSearch_Elasticsearch\Vendor\Psr\Http\Message\ResponseInterface;
 
-interface MessageFormatterInterface
-{
+interface MessageFormatterInterface {
     /**
      * Returns a formatted message string.
      *

lib/Vendor/GuzzleHttp/Pool.php

Indentation +91 added lines, -91 removed lines

@@ -23,103 +23,103 @@
  */
 class Pool implements PromisorInterface
 {
-    /**
-     * @var EachPromise
-     */
-    private $each;
+	/**
+	 * @var EachPromise
+	 */
+	private $each;
 
-    /**
-     * @param ClientInterface $client   Client used to send the requests.
-     * @param array|\Iterator $requests Requests or functions that return
-     *                                  requests to send concurrently.
-     * @param array           $config   Associative array of options
-     *                                  - concurrency: (int) Maximum number of requests to send concurrently
-     *                                  - options: Array of request options to apply to each request.
-     *                                  - fulfilled: (callable) Function to invoke when a request completes.
-     *                                  - rejected: (callable) Function to invoke when a request is rejected.
-     */
-    public function __construct(ClientInterface $client, $requests, array $config = [])
-    {
-        if (!isset($config['concurrency'])) {
-            $config['concurrency'] = 25;
-        }
+	/**
+	 * @param ClientInterface $client   Client used to send the requests.
+	 * @param array|\Iterator $requests Requests or functions that return
+	 *                                  requests to send concurrently.
+	 * @param array           $config   Associative array of options
+	 *                                  - concurrency: (int) Maximum number of requests to send concurrently
+	 *                                  - options: Array of request options to apply to each request.
+	 *                                  - fulfilled: (callable) Function to invoke when a request completes.
+	 *                                  - rejected: (callable) Function to invoke when a request is rejected.
+	 */
+	public function __construct(ClientInterface $client, $requests, array $config = [])
+	{
+		if (!isset($config['concurrency'])) {
+			$config['concurrency'] = 25;
+		}
 
-        if (isset($config['options'])) {
-            $opts = $config['options'];
-            unset($config['options']);
-        } else {
-            $opts = [];
-        }
+		if (isset($config['options'])) {
+			$opts = $config['options'];
+			unset($config['options']);
+		} else {
+			$opts = [];
+		}
 
-        $iterable = P\Create::iterFor($requests);
-        $requests = static function () use ($iterable, $client, $opts) {
-            foreach ($iterable as $key => $rfn) {
-                if ($rfn instanceof RequestInterface) {
-                    yield $key => $client->sendAsync($rfn, $opts);
-                } elseif (\is_callable($rfn)) {
-                    yield $key => $rfn($opts);
-                } else {
-                    throw new \InvalidArgumentException('Each value yielded by the iterator must be a Psr7\Http\Message\RequestInterface or a callable that returns a promise that fulfills with a Psr7\Message\Http\ResponseInterface object.');
-                }
-            }
-        };
+		$iterable = P\Create::iterFor($requests);
+		$requests = static function () use ($iterable, $client, $opts) {
+			foreach ($iterable as $key => $rfn) {
+				if ($rfn instanceof RequestInterface) {
+					yield $key => $client->sendAsync($rfn, $opts);
+				} elseif (\is_callable($rfn)) {
+					yield $key => $rfn($opts);
+				} else {
+					throw new \InvalidArgumentException('Each value yielded by the iterator must be a Psr7\Http\Message\RequestInterface or a callable that returns a promise that fulfills with a Psr7\Message\Http\ResponseInterface object.');
+				}
+			}
+		};
 
-        $this->each = new EachPromise($requests(), $config);
-    }
+		$this->each = new EachPromise($requests(), $config);
+	}
 
-    /**
-     * Get promise
-     */
-    public function promise(): PromiseInterface
-    {
-        return $this->each->promise();
-    }
+	/**
+	 * Get promise
+	 */
+	public function promise(): PromiseInterface
+	{
+		return $this->each->promise();
+	}
 
-    /**
-     * Sends multiple requests concurrently and returns an array of responses
-     * and exceptions that uses the same ordering as the provided requests.
-     *
-     * IMPORTANT: This method keeps every request and response in memory, and
-     * as such, is NOT recommended when sending a large number or an
-     * indeterminate number of requests concurrently.
-     *
-     * @param ClientInterface $client   Client used to send the requests
-     * @param array|\Iterator $requests Requests to send concurrently.
-     * @param array           $options  Passes through the options available in
-     *                                  {@see \OCA\FullTextSearch_Elasticsearch\Vendor\GuzzleHttp\Pool::__construct}
-     *
-     * @return array Returns an array containing the response or an exception
-     *               in the same order that the requests were sent.
-     *
-     * @throws \InvalidArgumentException if the event format is incorrect.
-     */
-    public static function batch(ClientInterface $client, $requests, array $options = []): array
-    {
-        $res = [];
-        self::cmpCallback($options, 'fulfilled', $res);
-        self::cmpCallback($options, 'rejected', $res);
-        $pool = new static($client, $requests, $options);
-        $pool->promise()->wait();
-        \ksort($res);
+	/**
+	 * Sends multiple requests concurrently and returns an array of responses
+	 * and exceptions that uses the same ordering as the provided requests.
+	 *
+	 * IMPORTANT: This method keeps every request and response in memory, and
+	 * as such, is NOT recommended when sending a large number or an
+	 * indeterminate number of requests concurrently.
+	 *
+	 * @param ClientInterface $client   Client used to send the requests
+	 * @param array|\Iterator $requests Requests to send concurrently.
+	 * @param array           $options  Passes through the options available in
+	 *                                  {@see \OCA\FullTextSearch_Elasticsearch\Vendor\GuzzleHttp\Pool::__construct}
+	 *
+	 * @return array Returns an array containing the response or an exception
+	 *               in the same order that the requests were sent.
+	 *
+	 * @throws \InvalidArgumentException if the event format is incorrect.
+	 */
+	public static function batch(ClientInterface $client, $requests, array $options = []): array
+	{
+		$res = [];
+		self::cmpCallback($options, 'fulfilled', $res);
+		self::cmpCallback($options, 'rejected', $res);
+		$pool = new static($client, $requests, $options);
+		$pool->promise()->wait();
+		\ksort($res);
 
-        return $res;
-    }
+		return $res;
+	}
 
-    /**
-     * Execute callback(s)
-     */
-    private static function cmpCallback(array &$options, string $name, array &$results): void
-    {
-        if (!isset($options[$name])) {
-            $options[$name] = static function ($v, $k) use (&$results) {
-                $results[$k] = $v;
-            };
-        } else {
-            $currentFn = $options[$name];
-            $options[$name] = static function ($v, $k) use (&$results, $currentFn) {
-                $currentFn($v, $k);
-                $results[$k] = $v;
-            };
-        }
-    }
+	/**
+	 * Execute callback(s)
+	 */
+	private static function cmpCallback(array &$options, string $name, array &$results): void
+	{
+		if (!isset($options[$name])) {
+			$options[$name] = static function ($v, $k) use (&$results) {
+				$results[$k] = $v;
+			};
+		} else {
+			$currentFn = $options[$name];
+			$options[$name] = static function ($v, $k) use (&$results, $currentFn) {
+				$currentFn($v, $k);
+				$results[$k] = $v;
+			};
+		}
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -52,7 +52,7 @@ 
         }
 
         $iterable = P\Create::iterFor($requests);
-        $requests = static function () use ($iterable, $client, $opts) {
+        $requests = static function() use ($iterable, $client, $opts) {
             foreach ($iterable as $key => $rfn) {
                 if ($rfn instanceof RequestInterface) {
                     yield $key => $client->sendAsync($rfn, $opts);
@@ -111,12 +111,12 @@ 
     private static function cmpCallback(array &$options, string $name, array &$results): void
     {
         if (!isset($options[$name])) {
-            $options[$name] = static function ($v, $k) use (&$results) {
+            $options[$name] = static function($v, $k) use (&$results) {
                 $results[$k] = $v;
             };
         } else {
             $currentFn = $options[$name];
-            $options[$name] = static function ($v, $k) use (&$results, $currentFn) {
+            $options[$name] = static function($v, $k) use (&$results, $currentFn) {
                 $currentFn($v, $k);
                 $results[$k] = $v;
             };

Braces +1 added lines, -2 removed lines

@@ -21,8 +21,7 @@
  *
  * @final
  */
-class Pool implements PromisorInterface
-{
+class Pool implements PromisorInterface {
     /**
      * @var EachPromise
      */

lib/Vendor/GuzzleHttp/MessageFormatter.php

Indentation +147 added lines, -147 removed lines

@@ -37,163 +37,163 @@
  */
 class MessageFormatter implements MessageFormatterInterface
 {
-    /**
-     * Apache Common Log Format.
-     *
-     * @see https://httpd.apache.org/docs/2.4/logs.html#common
-     *
-     * @var string
-     */
-    public const CLF = '{hostname} {req_header_User-Agent} - [{date_common_log}] "{method} {target} HTTP/{version}" {code} {res_header_Content-Length}';
-    public const DEBUG = ">>>>>>>>\n{request}\n<<<<<<<<\n{response}\n--------\n{error}";
-    public const SHORT = '[{ts}] "{method} {target} HTTP/{version}" {code}';
+	/**
+	 * Apache Common Log Format.
+	 *
+	 * @see https://httpd.apache.org/docs/2.4/logs.html#common
+	 *
+	 * @var string
+	 */
+	public const CLF = '{hostname} {req_header_User-Agent} - [{date_common_log}] "{method} {target} HTTP/{version}" {code} {res_header_Content-Length}';
+	public const DEBUG = ">>>>>>>>\n{request}\n<<<<<<<<\n{response}\n--------\n{error}";
+	public const SHORT = '[{ts}] "{method} {target} HTTP/{version}" {code}';
 
-    /**
-     * @var string Template used to format log messages
-     */
-    private $template;
+	/**
+	 * @var string Template used to format log messages
+	 */
+	private $template;
 
-    /**
-     * @param string $template Log message template
-     */
-    public function __construct(?string $template = self::CLF)
-    {
-        $this->template = $template ?: self::CLF;
-    }
+	/**
+	 * @param string $template Log message template
+	 */
+	public function __construct(?string $template = self::CLF)
+	{
+		$this->template = $template ?: self::CLF;
+	}
 
-    /**
-     * Returns a formatted message string.
-     *
-     * @param RequestInterface       $request  Request that was sent
-     * @param ResponseInterface|null $response Response that was received
-     * @param \Throwable|null        $error    Exception that was received
-     */
-    public function format(RequestInterface $request, ResponseInterface $response = null, \Throwable $error = null): string
-    {
-        $cache = [];
+	/**
+	 * Returns a formatted message string.
+	 *
+	 * @param RequestInterface       $request  Request that was sent
+	 * @param ResponseInterface|null $response Response that was received
+	 * @param \Throwable|null        $error    Exception that was received
+	 */
+	public function format(RequestInterface $request, ResponseInterface $response = null, \Throwable $error = null): string
+	{
+		$cache = [];
 
-        /** @var string */
-        return \preg_replace_callback(
-            '/{\s*([A-Za-z_\-\.0-9]+)\s*}/',
-            function (array $matches) use ($request, $response, $error, &$cache) {
-                if (isset($cache[$matches[1]])) {
-                    return $cache[$matches[1]];
-                }
+		/** @var string */
+		return \preg_replace_callback(
+			'/{\s*([A-Za-z_\-\.0-9]+)\s*}/',
+			function (array $matches) use ($request, $response, $error, &$cache) {
+				if (isset($cache[$matches[1]])) {
+					return $cache[$matches[1]];
+				}
 
-                $result = '';
-                switch ($matches[1]) {
-                    case 'request':
-                        $result = Psr7\Message::toString($request);
-                        break;
-                    case 'response':
-                        $result = $response ? Psr7\Message::toString($response) : '';
-                        break;
-                    case 'req_headers':
-                        $result = \trim($request->getMethod()
-                                .' '.$request->getRequestTarget())
-                            .' HTTP/'.$request->getProtocolVersion()."\r\n"
-                            .$this->headers($request);
-                        break;
-                    case 'res_headers':
-                        $result = $response ?
-                            \sprintf(
-                                'HTTP/%s %d %s',
-                                $response->getProtocolVersion(),
-                                $response->getStatusCode(),
-                                $response->getReasonPhrase()
-                            )."\r\n".$this->headers($response)
-                            : 'NULL';
-                        break;
-                    case 'req_body':
-                        $result = $request->getBody()->__toString();
-                        break;
-                    case 'res_body':
-                        if (!$response instanceof ResponseInterface) {
-                            $result = 'NULL';
-                            break;
-                        }
+				$result = '';
+				switch ($matches[1]) {
+					case 'request':
+						$result = Psr7\Message::toString($request);
+						break;
+					case 'response':
+						$result = $response ? Psr7\Message::toString($response) : '';
+						break;
+					case 'req_headers':
+						$result = \trim($request->getMethod()
+								.' '.$request->getRequestTarget())
+							.' HTTP/'.$request->getProtocolVersion()."\r\n"
+							.$this->headers($request);
+						break;
+					case 'res_headers':
+						$result = $response ?
+							\sprintf(
+								'HTTP/%s %d %s',
+								$response->getProtocolVersion(),
+								$response->getStatusCode(),
+								$response->getReasonPhrase()
+							)."\r\n".$this->headers($response)
+							: 'NULL';
+						break;
+					case 'req_body':
+						$result = $request->getBody()->__toString();
+						break;
+					case 'res_body':
+						if (!$response instanceof ResponseInterface) {
+							$result = 'NULL';
+							break;
+						}
 
-                        $body = $response->getBody();
+						$body = $response->getBody();
 
-                        if (!$body->isSeekable()) {
-                            $result = 'RESPONSE_NOT_LOGGEABLE';
-                            break;
-                        }
+						if (!$body->isSeekable()) {
+							$result = 'RESPONSE_NOT_LOGGEABLE';
+							break;
+						}
 
-                        $result = $response->getBody()->__toString();
-                        break;
-                    case 'ts':
-                    case 'date_iso_8601':
-                        $result = \gmdate('c');
-                        break;
-                    case 'date_common_log':
-                        $result = \date('d/M/Y:H:i:s O');
-                        break;
-                    case 'method':
-                        $result = $request->getMethod();
-                        break;
-                    case 'version':
-                        $result = $request->getProtocolVersion();
-                        break;
-                    case 'uri':
-                    case 'url':
-                        $result = $request->getUri()->__toString();
-                        break;
-                    case 'target':
-                        $result = $request->getRequestTarget();
-                        break;
-                    case 'req_version':
-                        $result = $request->getProtocolVersion();
-                        break;
-                    case 'res_version':
-                        $result = $response
-                            ? $response->getProtocolVersion()
-                            : 'NULL';
-                        break;
-                    case 'host':
-                        $result = $request->getHeaderLine('Host');
-                        break;
-                    case 'hostname':
-                        $result = \gethostname();
-                        break;
-                    case 'code':
-                        $result = $response ? $response->getStatusCode() : 'NULL';
-                        break;
-                    case 'phrase':
-                        $result = $response ? $response->getReasonPhrase() : 'NULL';
-                        break;
-                    case 'error':
-                        $result = $error ? $error->getMessage() : 'NULL';
-                        break;
-                    default:
-                        // handle prefixed dynamic headers
-                        if (\strpos($matches[1], 'req_header_') === 0) {
-                            $result = $request->getHeaderLine(\substr($matches[1], 11));
-                        } elseif (\strpos($matches[1], 'res_header_') === 0) {
-                            $result = $response
-                                ? $response->getHeaderLine(\substr($matches[1], 11))
-                                : 'NULL';
-                        }
-                }
+						$result = $response->getBody()->__toString();
+						break;
+					case 'ts':
+					case 'date_iso_8601':
+						$result = \gmdate('c');
+						break;
+					case 'date_common_log':
+						$result = \date('d/M/Y:H:i:s O');
+						break;
+					case 'method':
+						$result = $request->getMethod();
+						break;
+					case 'version':
+						$result = $request->getProtocolVersion();
+						break;
+					case 'uri':
+					case 'url':
+						$result = $request->getUri()->__toString();
+						break;
+					case 'target':
+						$result = $request->getRequestTarget();
+						break;
+					case 'req_version':
+						$result = $request->getProtocolVersion();
+						break;
+					case 'res_version':
+						$result = $response
+							? $response->getProtocolVersion()
+							: 'NULL';
+						break;
+					case 'host':
+						$result = $request->getHeaderLine('Host');
+						break;
+					case 'hostname':
+						$result = \gethostname();
+						break;
+					case 'code':
+						$result = $response ? $response->getStatusCode() : 'NULL';
+						break;
+					case 'phrase':
+						$result = $response ? $response->getReasonPhrase() : 'NULL';
+						break;
+					case 'error':
+						$result = $error ? $error->getMessage() : 'NULL';
+						break;
+					default:
+						// handle prefixed dynamic headers
+						if (\strpos($matches[1], 'req_header_') === 0) {
+							$result = $request->getHeaderLine(\substr($matches[1], 11));
+						} elseif (\strpos($matches[1], 'res_header_') === 0) {
+							$result = $response
+								? $response->getHeaderLine(\substr($matches[1], 11))
+								: 'NULL';
+						}
+				}
 
-                $cache[$matches[1]] = $result;
+				$cache[$matches[1]] = $result;
 
-                return $result;
-            },
-            $this->template
-        );
-    }
+				return $result;
+			},
+			$this->template
+		);
+	}
 
-    /**
-     * Get headers from message as string
-     */
-    private function headers(MessageInterface $message): string
-    {
-        $result = '';
-        foreach ($message->getHeaders() as $name => $values) {
-            $result .= $name.': '.\implode(', ', $values)."\r\n";
-        }
+	/**
+	 * Get headers from message as string
+	 */
+	private function headers(MessageInterface $message): string
+	{
+		$result = '';
+		foreach ($message->getHeaders() as $name => $values) {
+			$result .= $name.': '.\implode(', ', $values)."\r\n";
+		}
 
-        return \trim($result);
-    }
+		return \trim($result);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -75,7 +75,7 @@
         /** @var string */
         return \preg_replace_callback(
             '/{\s*([A-Za-z_\-\.0-9]+)\s*}/',
-            function (array $matches) use ($request, $response, $error, &$cache) {
+            function(array $matches) use ($request, $response, $error, &$cache) {
                 if (isset($cache[$matches[1]])) {
                     return $cache[$matches[1]];
                 }

Braces +1 added lines, -2 removed lines

@@ -35,8 +35,7 @@
  *
  * @final
  */
-class MessageFormatter implements MessageFormatterInterface
-{
+class MessageFormatter implements MessageFormatterInterface {
     /**
      * Apache Common Log Format.
      *

lib/Vendor/GuzzleHttp/Client.php

Indentation +464 added lines, -464 removed lines

@@ -16,468 +16,468 @@
  */
 class Client implements ClientInterface, \OCA\FullTextSearch_Elasticsearch\Vendor\Psr\Http\Client\ClientInterface
 {
-    use ClientTrait;
-
-    /**
-     * @var array Default request options
-     */
-    private $config;
-
-    /**
-     * Clients accept an array of constructor parameters.
-     *
-     * Here's an example of creating a client using a base_uri and an array of
-     * default request options to apply to each request:
-     *
-     *     $client = new Client([
-     *         'base_uri'        => 'http://www.foo.com/1.0/',
-     *         'timeout'         => 0,
-     *         'allow_redirects' => false,
-     *         'proxy'           => '192.168.16.1:10'
-     *     ]);
-     *
-     * Client configuration settings include the following options:
-     *
-     * - handler: (callable) Function that transfers HTTP requests over the
-     *   wire. The function is called with a Psr7\Http\Message\RequestInterface
-     *   and array of transfer options, and must return a
-     *   OCA\FullTextSearch_Elasticsearch\Vendor\GuzzleHttp\Promise\PromiseInterface that is fulfilled with a
-     *   Psr7\Http\Message\ResponseInterface on success.
-     *   If no handler is provided, a default handler will be created
-     *   that enables all of the request options below by attaching all of the
-     *   default middleware to the handler.
-     * - base_uri: (string|UriInterface) Base URI of the client that is merged
-     *   into relative URIs. Can be a string or instance of UriInterface.
-     * - **: any request option
-     *
-     * @param array $config Client configuration settings.
-     *
-     * @see \OCA\FullTextSearch_Elasticsearch\Vendor\GuzzleHttp\RequestOptions for a list of available request options.
-     */
-    public function __construct(array $config = [])
-    {
-        if (!isset($config['handler'])) {
-            $config['handler'] = HandlerStack::create();
-        } elseif (!\is_callable($config['handler'])) {
-            throw new InvalidArgumentException('handler must be a callable');
-        }
-
-        // Convert the base_uri to a UriInterface
-        if (isset($config['base_uri'])) {
-            $config['base_uri'] = Psr7\Utils::uriFor($config['base_uri']);
-        }
-
-        $this->configureDefaults($config);
-    }
-
-    /**
-     * @param string $method
-     * @param array  $args
-     *
-     * @return PromiseInterface|ResponseInterface
-     *
-     * @deprecated Client::__call will be removed in guzzlehttp/guzzle:8.0.
-     */
-    public function __call($method, $args)
-    {
-        if (\count($args) < 1) {
-            throw new InvalidArgumentException('Magic request methods require a URI and optional options array');
-        }
-
-        $uri = $args[0];
-        $opts = $args[1] ?? [];
-
-        return \substr($method, -5) === 'Async'
-            ? $this->requestAsync(\substr($method, 0, -5), $uri, $opts)
-            : $this->request($method, $uri, $opts);
-    }
-
-    /**
-     * Asynchronously send an HTTP request.
-     *
-     * @param array $options Request options to apply to the given
-     *                       request and to the transfer. See \OCA\FullTextSearch_Elasticsearch\Vendor\GuzzleHttp\RequestOptions.
-     */
-    public function sendAsync(RequestInterface $request, array $options = []): PromiseInterface
-    {
-        // Merge the base URI into the request URI if needed.
-        $options = $this->prepareDefaults($options);
-
-        return $this->transfer(
-            $request->withUri($this->buildUri($request->getUri(), $options), $request->hasHeader('Host')),
-            $options
-        );
-    }
-
-    /**
-     * Send an HTTP request.
-     *
-     * @param array $options Request options to apply to the given
-     *                       request and to the transfer. See \OCA\FullTextSearch_Elasticsearch\Vendor\GuzzleHttp\RequestOptions.
-     *
-     * @throws GuzzleException
-     */
-    public function send(RequestInterface $request, array $options = []): ResponseInterface
-    {
-        $options[RequestOptions::SYNCHRONOUS] = true;
-
-        return $this->sendAsync($request, $options)->wait();
-    }
-
-    /**
-     * The HttpClient PSR (PSR-18) specify this method.
-     *
-     * {@inheritDoc}
-     */
-    public function sendRequest(RequestInterface $request): ResponseInterface
-    {
-        $options[RequestOptions::SYNCHRONOUS] = true;
-        $options[RequestOptions::ALLOW_REDIRECTS] = false;
-        $options[RequestOptions::HTTP_ERRORS] = false;
-
-        return $this->sendAsync($request, $options)->wait();
-    }
-
-    /**
-     * Create and send an asynchronous HTTP request.
-     *
-     * Use an absolute path to override the base path of the client, or a
-     * relative path to append to the base path of the client. The URL can
-     * contain the query string as well. Use an array to provide a URL
-     * template and additional variables to use in the URL template expansion.
-     *
-     * @param string              $method  HTTP method
-     * @param string|UriInterface $uri     URI object or string.
-     * @param array               $options Request options to apply. See \OCA\FullTextSearch_Elasticsearch\Vendor\GuzzleHttp\RequestOptions.
-     */
-    public function requestAsync(string $method, $uri = '', array $options = []): PromiseInterface
-    {
-        $options = $this->prepareDefaults($options);
-        // Remove request modifying parameter because it can be done up-front.
-        $headers = $options['headers'] ?? [];
-        $body = $options['body'] ?? null;
-        $version = $options['version'] ?? '1.1';
-        // Merge the URI into the base URI.
-        $uri = $this->buildUri(Psr7\Utils::uriFor($uri), $options);
-        if (\is_array($body)) {
-            throw $this->invalidBody();
-        }
-        $request = new Psr7\Request($method, $uri, $headers, $body, $version);
-        // Remove the option so that they are not doubly-applied.
-        unset($options['headers'], $options['body'], $options['version']);
-
-        return $this->transfer($request, $options);
-    }
-
-    /**
-     * Create and send an HTTP request.
-     *
-     * Use an absolute path to override the base path of the client, or a
-     * relative path to append to the base path of the client. The URL can
-     * contain the query string as well.
-     *
-     * @param string              $method  HTTP method.
-     * @param string|UriInterface $uri     URI object or string.
-     * @param array               $options Request options to apply. See \OCA\FullTextSearch_Elasticsearch\Vendor\GuzzleHttp\RequestOptions.
-     *
-     * @throws GuzzleException
-     */
-    public function request(string $method, $uri = '', array $options = []): ResponseInterface
-    {
-        $options[RequestOptions::SYNCHRONOUS] = true;
-
-        return $this->requestAsync($method, $uri, $options)->wait();
-    }
-
-    /**
-     * Get a client configuration option.
-     *
-     * These options include default request options of the client, a "handler"
-     * (if utilized by the concrete client), and a "base_uri" if utilized by
-     * the concrete client.
-     *
-     * @param string|null $option The config option to retrieve.
-     *
-     * @return mixed
-     *
-     * @deprecated Client::getConfig will be removed in guzzlehttp/guzzle:8.0.
-     */
-    public function getConfig(string $option = null)
-    {
-        return $option === null
-            ? $this->config
-            : ($this->config[$option] ?? null);
-    }
-
-    private function buildUri(UriInterface $uri, array $config): UriInterface
-    {
-        if (isset($config['base_uri'])) {
-            $uri = Psr7\UriResolver::resolve(Psr7\Utils::uriFor($config['base_uri']), $uri);
-        }
-
-        if (isset($config['idn_conversion']) && ($config['idn_conversion'] !== false)) {
-            $idnOptions = ($config['idn_conversion'] === true) ? \IDNA_DEFAULT : $config['idn_conversion'];
-            $uri = Utils::idnUriConvert($uri, $idnOptions);
-        }
-
-        return $uri->getScheme() === '' && $uri->getHost() !== '' ? $uri->withScheme('http') : $uri;
-    }
-
-    /**
-     * Configures the default options for a client.
-     */
-    private function configureDefaults(array $config): void
-    {
-        $defaults = [
-            'allow_redirects' => RedirectMiddleware::$defaultSettings,
-            'http_errors' => true,
-            'decode_content' => true,
-            'verify' => true,
-            'cookies' => false,
-            'idn_conversion' => false,
-        ];
-
-        // Use the standard Linux HTTP_PROXY and HTTPS_PROXY if set.
-
-        // We can only trust the HTTP_PROXY environment variable in a CLI
-        // process due to the fact that PHP has no reliable mechanism to
-        // get environment variables that start with "HTTP_".
-        if (\PHP_SAPI === 'cli' && ($proxy = Utils::getenv('HTTP_PROXY'))) {
-            $defaults['proxy']['http'] = $proxy;
-        }
-
-        if ($proxy = Utils::getenv('HTTPS_PROXY')) {
-            $defaults['proxy']['https'] = $proxy;
-        }
-
-        if ($noProxy = Utils::getenv('NO_PROXY')) {
-            $cleanedNoProxy = \str_replace(' ', '', $noProxy);
-            $defaults['proxy']['no'] = \explode(',', $cleanedNoProxy);
-        }
-
-        $this->config = $config + $defaults;
-
-        if (!empty($config['cookies']) && $config['cookies'] === true) {
-            $this->config['cookies'] = new CookieJar();
-        }
-
-        // Add the default user-agent header.
-        if (!isset($this->config['headers'])) {
-            $this->config['headers'] = ['User-Agent' => Utils::defaultUserAgent()];
-        } else {
-            // Add the User-Agent header if one was not already set.
-            foreach (\array_keys($this->config['headers']) as $name) {
-                if (\strtolower($name) === 'user-agent') {
-                    return;
-                }
-            }
-            $this->config['headers']['User-Agent'] = Utils::defaultUserAgent();
-        }
-    }
-
-    /**
-     * Merges default options into the array.
-     *
-     * @param array $options Options to modify by reference
-     */
-    private function prepareDefaults(array $options): array
-    {
-        $defaults = $this->config;
-
-        if (!empty($defaults['headers'])) {
-            // Default headers are only added if they are not present.
-            $defaults['_conditional'] = $defaults['headers'];
-            unset($defaults['headers']);
-        }
-
-        // Special handling for headers is required as they are added as
-        // conditional headers and as headers passed to a request ctor.
-        if (\array_key_exists('headers', $options)) {
-            // Allows default headers to be unset.
-            if ($options['headers'] === null) {
-                $defaults['_conditional'] = [];
-                unset($options['headers']);
-            } elseif (!\is_array($options['headers'])) {
-                throw new InvalidArgumentException('headers must be an array');
-            }
-        }
-
-        // Shallow merge defaults underneath options.
-        $result = $options + $defaults;
-
-        // Remove null values.
-        foreach ($result as $k => $v) {
-            if ($v === null) {
-                unset($result[$k]);
-            }
-        }
-
-        return $result;
-    }
-
-    /**
-     * Transfers the given request and applies request options.
-     *
-     * The URI of the request is not modified and the request options are used
-     * as-is without merging in default options.
-     *
-     * @param array $options See \OCA\FullTextSearch_Elasticsearch\Vendor\GuzzleHttp\RequestOptions.
-     */
-    private function transfer(RequestInterface $request, array $options): PromiseInterface
-    {
-        $request = $this->applyOptions($request, $options);
-        /** @var HandlerStack $handler */
-        $handler = $options['handler'];
-
-        try {
-            return P\Create::promiseFor($handler($request, $options));
-        } catch (\Exception $e) {
-            return P\Create::rejectionFor($e);
-        }
-    }
-
-    /**
-     * Applies the array of request options to a request.
-     */
-    private function applyOptions(RequestInterface $request, array &$options): RequestInterface
-    {
-        $modify = [
-            'set_headers' => [],
-        ];
-
-        if (isset($options['headers'])) {
-            if (array_keys($options['headers']) === range(0, count($options['headers']) - 1)) {
-                throw new InvalidArgumentException('The headers array must have header name as keys.');
-            }
-            $modify['set_headers'] = $options['headers'];
-            unset($options['headers']);
-        }
-
-        if (isset($options['form_params'])) {
-            if (isset($options['multipart'])) {
-                throw new InvalidArgumentException('You cannot use '
-                    .'form_params and multipart at the same time. Use the '
-                    .'form_params option if you want to send application/'
-                    .'x-www-form-urlencoded requests, and the multipart '
-                    .'option to send multipart/form-data requests.');
-            }
-            $options['body'] = \http_build_query($options['form_params'], '', '&');
-            unset($options['form_params']);
-            // Ensure that we don't have the header in different case and set the new value.
-            $options['_conditional'] = Psr7\Utils::caselessRemove(['Content-Type'], $options['_conditional']);
-            $options['_conditional']['Content-Type'] = 'application/x-www-form-urlencoded';
-        }
-
-        if (isset($options['multipart'])) {
-            $options['body'] = new Psr7\MultipartStream($options['multipart']);
-            unset($options['multipart']);
-        }
-
-        if (isset($options['json'])) {
-            $options['body'] = Utils::jsonEncode($options['json']);
-            unset($options['json']);
-            // Ensure that we don't have the header in different case and set the new value.
-            $options['_conditional'] = Psr7\Utils::caselessRemove(['Content-Type'], $options['_conditional']);
-            $options['_conditional']['Content-Type'] = 'application/json';
-        }
-
-        if (!empty($options['decode_content'])
-            && $options['decode_content'] !== true
-        ) {
-            // Ensure that we don't have the header in different case and set the new value.
-            $options['_conditional'] = Psr7\Utils::caselessRemove(['Accept-Encoding'], $options['_conditional']);
-            $modify['set_headers']['Accept-Encoding'] = $options['decode_content'];
-        }
-
-        if (isset($options['body'])) {
-            if (\is_array($options['body'])) {
-                throw $this->invalidBody();
-            }
-            $modify['body'] = Psr7\Utils::streamFor($options['body']);
-            unset($options['body']);
-        }
-
-        if (!empty($options['auth']) && \is_array($options['auth'])) {
-            $value = $options['auth'];
-            $type = isset($value[2]) ? \strtolower($value[2]) : 'basic';
-            switch ($type) {
-                case 'basic':
-                    // Ensure that we don't have the header in different case and set the new value.
-                    $modify['set_headers'] = Psr7\Utils::caselessRemove(['Authorization'], $modify['set_headers']);
-                    $modify['set_headers']['Authorization'] = 'Basic '
-                        .\base64_encode("$value[0]:$value[1]");
-                    break;
-                case 'digest':
-                    // @todo: Do not rely on curl
-                    $options['curl'][\CURLOPT_HTTPAUTH] = \CURLAUTH_DIGEST;
-                    $options['curl'][\CURLOPT_USERPWD] = "$value[0]:$value[1]";
-                    break;
-                case 'ntlm':
-                    $options['curl'][\CURLOPT_HTTPAUTH] = \CURLAUTH_NTLM;
-                    $options['curl'][\CURLOPT_USERPWD] = "$value[0]:$value[1]";
-                    break;
-            }
-        }
-
-        if (isset($options['query'])) {
-            $value = $options['query'];
-            if (\is_array($value)) {
-                $value = \http_build_query($value, '', '&', \PHP_QUERY_RFC3986);
-            }
-            if (!\is_string($value)) {
-                throw new InvalidArgumentException('query must be a string or array');
-            }
-            $modify['query'] = $value;
-            unset($options['query']);
-        }
-
-        // Ensure that sink is not an invalid value.
-        if (isset($options['sink'])) {
-            // TODO: Add more sink validation?
-            if (\is_bool($options['sink'])) {
-                throw new InvalidArgumentException('sink must not be a boolean');
-            }
-        }
-
-        if (isset($options['version'])) {
-            $modify['version'] = $options['version'];
-        }
-
-        $request = Psr7\Utils::modifyRequest($request, $modify);
-        if ($request->getBody() instanceof Psr7\MultipartStream) {
-            // Use a multipart/form-data POST if a Content-Type is not set.
-            // Ensure that we don't have the header in different case and set the new value.
-            $options['_conditional'] = Psr7\Utils::caselessRemove(['Content-Type'], $options['_conditional']);
-            $options['_conditional']['Content-Type'] = 'multipart/form-data; boundary='
-                .$request->getBody()->getBoundary();
-        }
-
-        // Merge in conditional headers if they are not present.
-        if (isset($options['_conditional'])) {
-            // Build up the changes so it's in a single clone of the message.
-            $modify = [];
-            foreach ($options['_conditional'] as $k => $v) {
-                if (!$request->hasHeader($k)) {
-                    $modify['set_headers'][$k] = $v;
-                }
-            }
-            $request = Psr7\Utils::modifyRequest($request, $modify);
-            // Don't pass this internal value along to middleware/handlers.
-            unset($options['_conditional']);
-        }
-
-        return $request;
-    }
-
-    /**
-     * Return an InvalidArgumentException with pre-set message.
-     */
-    private function invalidBody(): InvalidArgumentException
-    {
-        return new InvalidArgumentException('Passing in the "body" request '
-            .'option as an array to send a request is not supported. '
-            .'Please use the "form_params" request option to send a '
-            .'application/x-www-form-urlencoded request, or the "multipart" '
-            .'request option to send a multipart/form-data request.');
-    }
+	use ClientTrait;
+
+	/**
+	 * @var array Default request options
+	 */
+	private $config;
+
+	/**
+	 * Clients accept an array of constructor parameters.
+	 *
+	 * Here's an example of creating a client using a base_uri and an array of
+	 * default request options to apply to each request:
+	 *
+	 *     $client = new Client([
+	 *         'base_uri'        => 'http://www.foo.com/1.0/',
+	 *         'timeout'         => 0,
+	 *         'allow_redirects' => false,
+	 *         'proxy'           => '192.168.16.1:10'
+	 *     ]);
+	 *
+	 * Client configuration settings include the following options:
+	 *
+	 * - handler: (callable) Function that transfers HTTP requests over the
+	 *   wire. The function is called with a Psr7\Http\Message\RequestInterface
+	 *   and array of transfer options, and must return a
+	 *   OCA\FullTextSearch_Elasticsearch\Vendor\GuzzleHttp\Promise\PromiseInterface that is fulfilled with a
+	 *   Psr7\Http\Message\ResponseInterface on success.
+	 *   If no handler is provided, a default handler will be created
+	 *   that enables all of the request options below by attaching all of the
+	 *   default middleware to the handler.
+	 * - base_uri: (string|UriInterface) Base URI of the client that is merged
+	 *   into relative URIs. Can be a string or instance of UriInterface.
+	 * - **: any request option
+	 *
+	 * @param array $config Client configuration settings.
+	 *
+	 * @see \OCA\FullTextSearch_Elasticsearch\Vendor\GuzzleHttp\RequestOptions for a list of available request options.
+	 */
+	public function __construct(array $config = [])
+	{
+		if (!isset($config['handler'])) {
+			$config['handler'] = HandlerStack::create();
+		} elseif (!\is_callable($config['handler'])) {
+			throw new InvalidArgumentException('handler must be a callable');
+		}
+
+		// Convert the base_uri to a UriInterface
+		if (isset($config['base_uri'])) {
+			$config['base_uri'] = Psr7\Utils::uriFor($config['base_uri']);
+		}
+
+		$this->configureDefaults($config);
+	}
+
+	/**
+	 * @param string $method
+	 * @param array  $args
+	 *
+	 * @return PromiseInterface|ResponseInterface
+	 *
+	 * @deprecated Client::__call will be removed in guzzlehttp/guzzle:8.0.
+	 */
+	public function __call($method, $args)
+	{
+		if (\count($args) < 1) {
+			throw new InvalidArgumentException('Magic request methods require a URI and optional options array');
+		}
+
+		$uri = $args[0];
+		$opts = $args[1] ?? [];
+
+		return \substr($method, -5) === 'Async'
+			? $this->requestAsync(\substr($method, 0, -5), $uri, $opts)
+			: $this->request($method, $uri, $opts);
+	}
+
+	/**
+	 * Asynchronously send an HTTP request.
+	 *
+	 * @param array $options Request options to apply to the given
+	 *                       request and to the transfer. See \OCA\FullTextSearch_Elasticsearch\Vendor\GuzzleHttp\RequestOptions.
+	 */
+	public function sendAsync(RequestInterface $request, array $options = []): PromiseInterface
+	{
+		// Merge the base URI into the request URI if needed.
+		$options = $this->prepareDefaults($options);
+
+		return $this->transfer(
+			$request->withUri($this->buildUri($request->getUri(), $options), $request->hasHeader('Host')),
+			$options
+		);
+	}
+
+	/**
+	 * Send an HTTP request.
+	 *
+	 * @param array $options Request options to apply to the given
+	 *                       request and to the transfer. See \OCA\FullTextSearch_Elasticsearch\Vendor\GuzzleHttp\RequestOptions.
+	 *
+	 * @throws GuzzleException
+	 */
+	public function send(RequestInterface $request, array $options = []): ResponseInterface
+	{
+		$options[RequestOptions::SYNCHRONOUS] = true;
+
+		return $this->sendAsync($request, $options)->wait();
+	}
+
+	/**
+	 * The HttpClient PSR (PSR-18) specify this method.
+	 *
+	 * {@inheritDoc}
+	 */
+	public function sendRequest(RequestInterface $request): ResponseInterface
+	{
+		$options[RequestOptions::SYNCHRONOUS] = true;
+		$options[RequestOptions::ALLOW_REDIRECTS] = false;
+		$options[RequestOptions::HTTP_ERRORS] = false;
+
+		return $this->sendAsync($request, $options)->wait();
+	}
+
+	/**
+	 * Create and send an asynchronous HTTP request.
+	 *
+	 * Use an absolute path to override the base path of the client, or a
+	 * relative path to append to the base path of the client. The URL can
+	 * contain the query string as well. Use an array to provide a URL
+	 * template and additional variables to use in the URL template expansion.
+	 *
+	 * @param string              $method  HTTP method
+	 * @param string|UriInterface $uri     URI object or string.
+	 * @param array               $options Request options to apply. See \OCA\FullTextSearch_Elasticsearch\Vendor\GuzzleHttp\RequestOptions.
+	 */
+	public function requestAsync(string $method, $uri = '', array $options = []): PromiseInterface
+	{
+		$options = $this->prepareDefaults($options);
+		// Remove request modifying parameter because it can be done up-front.
+		$headers = $options['headers'] ?? [];
+		$body = $options['body'] ?? null;
+		$version = $options['version'] ?? '1.1';
+		// Merge the URI into the base URI.
+		$uri = $this->buildUri(Psr7\Utils::uriFor($uri), $options);
+		if (\is_array($body)) {
+			throw $this->invalidBody();
+		}
+		$request = new Psr7\Request($method, $uri, $headers, $body, $version);
+		// Remove the option so that they are not doubly-applied.
+		unset($options['headers'], $options['body'], $options['version']);
+
+		return $this->transfer($request, $options);
+	}
+
+	/**
+	 * Create and send an HTTP request.
+	 *
+	 * Use an absolute path to override the base path of the client, or a
+	 * relative path to append to the base path of the client. The URL can
+	 * contain the query string as well.
+	 *
+	 * @param string              $method  HTTP method.
+	 * @param string|UriInterface $uri     URI object or string.
+	 * @param array               $options Request options to apply. See \OCA\FullTextSearch_Elasticsearch\Vendor\GuzzleHttp\RequestOptions.
+	 *
+	 * @throws GuzzleException
+	 */
+	public function request(string $method, $uri = '', array $options = []): ResponseInterface
+	{
+		$options[RequestOptions::SYNCHRONOUS] = true;
+
+		return $this->requestAsync($method, $uri, $options)->wait();
+	}
+
+	/**
+	 * Get a client configuration option.
+	 *
+	 * These options include default request options of the client, a "handler"
+	 * (if utilized by the concrete client), and a "base_uri" if utilized by
+	 * the concrete client.
+	 *
+	 * @param string|null $option The config option to retrieve.
+	 *
+	 * @return mixed
+	 *
+	 * @deprecated Client::getConfig will be removed in guzzlehttp/guzzle:8.0.
+	 */
+	public function getConfig(string $option = null)
+	{
+		return $option === null
+			? $this->config
+			: ($this->config[$option] ?? null);
+	}
+
+	private function buildUri(UriInterface $uri, array $config): UriInterface
+	{
+		if (isset($config['base_uri'])) {
+			$uri = Psr7\UriResolver::resolve(Psr7\Utils::uriFor($config['base_uri']), $uri);
+		}
+
+		if (isset($config['idn_conversion']) && ($config['idn_conversion'] !== false)) {
+			$idnOptions = ($config['idn_conversion'] === true) ? \IDNA_DEFAULT : $config['idn_conversion'];
+			$uri = Utils::idnUriConvert($uri, $idnOptions);
+		}
+
+		return $uri->getScheme() === '' && $uri->getHost() !== '' ? $uri->withScheme('http') : $uri;
+	}
+
+	/**
+	 * Configures the default options for a client.
+	 */
+	private function configureDefaults(array $config): void
+	{
+		$defaults = [
+			'allow_redirects' => RedirectMiddleware::$defaultSettings,
+			'http_errors' => true,
+			'decode_content' => true,
+			'verify' => true,
+			'cookies' => false,
+			'idn_conversion' => false,
+		];
+
+		// Use the standard Linux HTTP_PROXY and HTTPS_PROXY if set.
+
+		// We can only trust the HTTP_PROXY environment variable in a CLI
+		// process due to the fact that PHP has no reliable mechanism to
+		// get environment variables that start with "HTTP_".
+		if (\PHP_SAPI === 'cli' && ($proxy = Utils::getenv('HTTP_PROXY'))) {
+			$defaults['proxy']['http'] = $proxy;
+		}
+
+		if ($proxy = Utils::getenv('HTTPS_PROXY')) {
+			$defaults['proxy']['https'] = $proxy;
+		}
+
+		if ($noProxy = Utils::getenv('NO_PROXY')) {
+			$cleanedNoProxy = \str_replace(' ', '', $noProxy);
+			$defaults['proxy']['no'] = \explode(',', $cleanedNoProxy);
+		}
+
+		$this->config = $config + $defaults;
+
+		if (!empty($config['cookies']) && $config['cookies'] === true) {
+			$this->config['cookies'] = new CookieJar();
+		}
+
+		// Add the default user-agent header.
+		if (!isset($this->config['headers'])) {
+			$this->config['headers'] = ['User-Agent' => Utils::defaultUserAgent()];
+		} else {
+			// Add the User-Agent header if one was not already set.
+			foreach (\array_keys($this->config['headers']) as $name) {
+				if (\strtolower($name) === 'user-agent') {
+					return;
+				}
+			}
+			$this->config['headers']['User-Agent'] = Utils::defaultUserAgent();
+		}
+	}
+
+	/**
+	 * Merges default options into the array.
+	 *
+	 * @param array $options Options to modify by reference
+	 */
+	private function prepareDefaults(array $options): array
+	{
+		$defaults = $this->config;
+
+		if (!empty($defaults['headers'])) {
+			// Default headers are only added if they are not present.
+			$defaults['_conditional'] = $defaults['headers'];
+			unset($defaults['headers']);
+		}
+
+		// Special handling for headers is required as they are added as
+		// conditional headers and as headers passed to a request ctor.
+		if (\array_key_exists('headers', $options)) {
+			// Allows default headers to be unset.
+			if ($options['headers'] === null) {
+				$defaults['_conditional'] = [];
+				unset($options['headers']);
+			} elseif (!\is_array($options['headers'])) {
+				throw new InvalidArgumentException('headers must be an array');
+			}
+		}
+
+		// Shallow merge defaults underneath options.
+		$result = $options + $defaults;
+
+		// Remove null values.
+		foreach ($result as $k => $v) {
+			if ($v === null) {
+				unset($result[$k]);
+			}
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Transfers the given request and applies request options.
+	 *
+	 * The URI of the request is not modified and the request options are used
+	 * as-is without merging in default options.
+	 *
+	 * @param array $options See \OCA\FullTextSearch_Elasticsearch\Vendor\GuzzleHttp\RequestOptions.
+	 */
+	private function transfer(RequestInterface $request, array $options): PromiseInterface
+	{
+		$request = $this->applyOptions($request, $options);
+		/** @var HandlerStack $handler */
+		$handler = $options['handler'];
+
+		try {
+			return P\Create::promiseFor($handler($request, $options));
+		} catch (\Exception $e) {
+			return P\Create::rejectionFor($e);
+		}
+	}
+
+	/**
+	 * Applies the array of request options to a request.
+	 */
+	private function applyOptions(RequestInterface $request, array &$options): RequestInterface
+	{
+		$modify = [
+			'set_headers' => [],
+		];
+
+		if (isset($options['headers'])) {
+			if (array_keys($options['headers']) === range(0, count($options['headers']) - 1)) {
+				throw new InvalidArgumentException('The headers array must have header name as keys.');
+			}
+			$modify['set_headers'] = $options['headers'];
+			unset($options['headers']);
+		}
+
+		if (isset($options['form_params'])) {
+			if (isset($options['multipart'])) {
+				throw new InvalidArgumentException('You cannot use '
+					.'form_params and multipart at the same time. Use the '
+					.'form_params option if you want to send application/'
+					.'x-www-form-urlencoded requests, and the multipart '
+					.'option to send multipart/form-data requests.');
+			}
+			$options['body'] = \http_build_query($options['form_params'], '', '&');
+			unset($options['form_params']);
+			// Ensure that we don't have the header in different case and set the new value.
+			$options['_conditional'] = Psr7\Utils::caselessRemove(['Content-Type'], $options['_conditional']);
+			$options['_conditional']['Content-Type'] = 'application/x-www-form-urlencoded';
+		}
+
+		if (isset($options['multipart'])) {
+			$options['body'] = new Psr7\MultipartStream($options['multipart']);
+			unset($options['multipart']);
+		}
+
+		if (isset($options['json'])) {
+			$options['body'] = Utils::jsonEncode($options['json']);
+			unset($options['json']);
+			// Ensure that we don't have the header in different case and set the new value.
+			$options['_conditional'] = Psr7\Utils::caselessRemove(['Content-Type'], $options['_conditional']);
+			$options['_conditional']['Content-Type'] = 'application/json';
+		}
+
+		if (!empty($options['decode_content'])
+			&& $options['decode_content'] !== true
+		) {
+			// Ensure that we don't have the header in different case and set the new value.
+			$options['_conditional'] = Psr7\Utils::caselessRemove(['Accept-Encoding'], $options['_conditional']);
+			$modify['set_headers']['Accept-Encoding'] = $options['decode_content'];
+		}
+
+		if (isset($options['body'])) {
+			if (\is_array($options['body'])) {
+				throw $this->invalidBody();
+			}
+			$modify['body'] = Psr7\Utils::streamFor($options['body']);
+			unset($options['body']);
+		}
+
+		if (!empty($options['auth']) && \is_array($options['auth'])) {
+			$value = $options['auth'];
+			$type = isset($value[2]) ? \strtolower($value[2]) : 'basic';
+			switch ($type) {
+				case 'basic':
+					// Ensure that we don't have the header in different case and set the new value.
+					$modify['set_headers'] = Psr7\Utils::caselessRemove(['Authorization'], $modify['set_headers']);
+					$modify['set_headers']['Authorization'] = 'Basic '
+						.\base64_encode("$value[0]:$value[1]");
+					break;
+				case 'digest':
+					// @todo: Do not rely on curl
+					$options['curl'][\CURLOPT_HTTPAUTH] = \CURLAUTH_DIGEST;
+					$options['curl'][\CURLOPT_USERPWD] = "$value[0]:$value[1]";
+					break;
+				case 'ntlm':
+					$options['curl'][\CURLOPT_HTTPAUTH] = \CURLAUTH_NTLM;
+					$options['curl'][\CURLOPT_USERPWD] = "$value[0]:$value[1]";
+					break;
+			}
+		}
+
+		if (isset($options['query'])) {
+			$value = $options['query'];
+			if (\is_array($value)) {
+				$value = \http_build_query($value, '', '&', \PHP_QUERY_RFC3986);
+			}
+			if (!\is_string($value)) {
+				throw new InvalidArgumentException('query must be a string or array');
+			}
+			$modify['query'] = $value;
+			unset($options['query']);
+		}
+
+		// Ensure that sink is not an invalid value.
+		if (isset($options['sink'])) {
+			// TODO: Add more sink validation?
+			if (\is_bool($options['sink'])) {
+				throw new InvalidArgumentException('sink must not be a boolean');
+			}
+		}
+
+		if (isset($options['version'])) {
+			$modify['version'] = $options['version'];
+		}
+
+		$request = Psr7\Utils::modifyRequest($request, $modify);
+		if ($request->getBody() instanceof Psr7\MultipartStream) {
+			// Use a multipart/form-data POST if a Content-Type is not set.
+			// Ensure that we don't have the header in different case and set the new value.
+			$options['_conditional'] = Psr7\Utils::caselessRemove(['Content-Type'], $options['_conditional']);
+			$options['_conditional']['Content-Type'] = 'multipart/form-data; boundary='
+				.$request->getBody()->getBoundary();
+		}
+
+		// Merge in conditional headers if they are not present.
+		if (isset($options['_conditional'])) {
+			// Build up the changes so it's in a single clone of the message.
+			$modify = [];
+			foreach ($options['_conditional'] as $k => $v) {
+				if (!$request->hasHeader($k)) {
+					$modify['set_headers'][$k] = $v;
+				}
+			}
+			$request = Psr7\Utils::modifyRequest($request, $modify);
+			// Don't pass this internal value along to middleware/handlers.
+			unset($options['_conditional']);
+		}
+
+		return $request;
+	}
+
+	/**
+	 * Return an InvalidArgumentException with pre-set message.
+	 */
+	private function invalidBody(): InvalidArgumentException
+	{
+		return new InvalidArgumentException('Passing in the "body" request '
+			.'option as an array to send a request is not supported. '
+			.'Please use the "form_params" request option to send a '
+			.'application/x-www-form-urlencoded request, or the "multipart" '
+			.'request option to send a multipart/form-data request.');
+	}
 }

lib/Vendor/GuzzleHttp/Promise/Utils.php

Indentation +229 added lines, -229 removed lines

@@ -6,254 +6,254 @@
 
 final class Utils
 {
-    /**
-     * Get the global task queue used for promise resolution.
-     *
-     * This task queue MUST be run in an event loop in order for promises to be
-     * settled asynchronously. It will be automatically run when synchronously
-     * waiting on a promise.
-     *
-     * <code>
-     * while ($eventLoop->isRunning()) {
-     *     OCA\FullTextSearch_Elasticsearch\Vendor\GuzzleHttp\Promise\Utils::queue()->run();
-     * }
-     * </code>
-     *
-     * @param TaskQueueInterface|null $assign Optionally specify a new queue instance.
-     */
-    public static function queue(TaskQueueInterface $assign = null): TaskQueueInterface
-    {
-        static $queue;
+	/**
+	 * Get the global task queue used for promise resolution.
+	 *
+	 * This task queue MUST be run in an event loop in order for promises to be
+	 * settled asynchronously. It will be automatically run when synchronously
+	 * waiting on a promise.
+	 *
+	 * <code>
+	 * while ($eventLoop->isRunning()) {
+	 *     OCA\FullTextSearch_Elasticsearch\Vendor\GuzzleHttp\Promise\Utils::queue()->run();
+	 * }
+	 * </code>
+	 *
+	 * @param TaskQueueInterface|null $assign Optionally specify a new queue instance.
+	 */
+	public static function queue(TaskQueueInterface $assign = null): TaskQueueInterface
+	{
+		static $queue;
 
-        if ($assign) {
-            $queue = $assign;
-        } elseif (!$queue) {
-            $queue = new TaskQueue();
-        }
+		if ($assign) {
+			$queue = $assign;
+		} elseif (!$queue) {
+			$queue = new TaskQueue();
+		}
 
-        return $queue;
-    }
+		return $queue;
+	}
 
-    /**
-     * Adds a function to run in the task queue when it is next `run()` and
-     * returns a promise that is fulfilled or rejected with the result.
-     *
-     * @param callable $task Task function to run.
-     */
-    public static function task(callable $task): PromiseInterface
-    {
-        $queue = self::queue();
-        $promise = new Promise([$queue, 'run']);
-        $queue->add(function () use ($task, $promise): void {
-            try {
-                if (Is::pending($promise)) {
-                    $promise->resolve($task());
-                }
-            } catch (\Throwable $e) {
-                $promise->reject($e);
-            }
-        });
+	/**
+	 * Adds a function to run in the task queue when it is next `run()` and
+	 * returns a promise that is fulfilled or rejected with the result.
+	 *
+	 * @param callable $task Task function to run.
+	 */
+	public static function task(callable $task): PromiseInterface
+	{
+		$queue = self::queue();
+		$promise = new Promise([$queue, 'run']);
+		$queue->add(function () use ($task, $promise): void {
+			try {
+				if (Is::pending($promise)) {
+					$promise->resolve($task());
+				}
+			} catch (\Throwable $e) {
+				$promise->reject($e);
+			}
+		});
 
-        return $promise;
-    }
+		return $promise;
+	}
 
-    /**
-     * Synchronously waits on a promise to resolve and returns an inspection
-     * state array.
-     *
-     * Returns a state associative array containing a "state" key mapping to a
-     * valid promise state. If the state of the promise is "fulfilled", the
-     * array will contain a "value" key mapping to the fulfilled value of the
-     * promise. If the promise is rejected, the array will contain a "reason"
-     * key mapping to the rejection reason of the promise.
-     *
-     * @param PromiseInterface $promise Promise or value.
-     */
-    public static function inspect(PromiseInterface $promise): array
-    {
-        try {
-            return [
-                'state' => PromiseInterface::FULFILLED,
-                'value' => $promise->wait(),
-            ];
-        } catch (RejectionException $e) {
-            return ['state' => PromiseInterface::REJECTED, 'reason' => $e->getReason()];
-        } catch (\Throwable $e) {
-            return ['state' => PromiseInterface::REJECTED, 'reason' => $e];
-        }
-    }
+	/**
+	 * Synchronously waits on a promise to resolve and returns an inspection
+	 * state array.
+	 *
+	 * Returns a state associative array containing a "state" key mapping to a
+	 * valid promise state. If the state of the promise is "fulfilled", the
+	 * array will contain a "value" key mapping to the fulfilled value of the
+	 * promise. If the promise is rejected, the array will contain a "reason"
+	 * key mapping to the rejection reason of the promise.
+	 *
+	 * @param PromiseInterface $promise Promise or value.
+	 */
+	public static function inspect(PromiseInterface $promise): array
+	{
+		try {
+			return [
+				'state' => PromiseInterface::FULFILLED,
+				'value' => $promise->wait(),
+			];
+		} catch (RejectionException $e) {
+			return ['state' => PromiseInterface::REJECTED, 'reason' => $e->getReason()];
+		} catch (\Throwable $e) {
+			return ['state' => PromiseInterface::REJECTED, 'reason' => $e];
+		}
+	}
 
-    /**
-     * Waits on all of the provided promises, but does not unwrap rejected
-     * promises as thrown exception.
-     *
-     * Returns an array of inspection state arrays.
-     *
-     * @see inspect for the inspection state array format.
-     *
-     * @param PromiseInterface[] $promises Traversable of promises to wait upon.
-     */
-    public static function inspectAll($promises): array
-    {
-        $results = [];
-        foreach ($promises as $key => $promise) {
-            $results[$key] = self::inspect($promise);
-        }
+	/**
+	 * Waits on all of the provided promises, but does not unwrap rejected
+	 * promises as thrown exception.
+	 *
+	 * Returns an array of inspection state arrays.
+	 *
+	 * @see inspect for the inspection state array format.
+	 *
+	 * @param PromiseInterface[] $promises Traversable of promises to wait upon.
+	 */
+	public static function inspectAll($promises): array
+	{
+		$results = [];
+		foreach ($promises as $key => $promise) {
+			$results[$key] = self::inspect($promise);
+		}
 
-        return $results;
-    }
+		return $results;
+	}
 
-    /**
-     * Waits on all of the provided promises and returns the fulfilled values.
-     *
-     * Returns an array that contains the value of each promise (in the same
-     * order the promises were provided). An exception is thrown if any of the
-     * promises are rejected.
-     *
-     * @param iterable<PromiseInterface> $promises Iterable of PromiseInterface objects to wait on.
-     *
-     * @throws \Throwable on error
-     */
-    public static function unwrap($promises): array
-    {
-        $results = [];
-        foreach ($promises as $key => $promise) {
-            $results[$key] = $promise->wait();
-        }
+	/**
+	 * Waits on all of the provided promises and returns the fulfilled values.
+	 *
+	 * Returns an array that contains the value of each promise (in the same
+	 * order the promises were provided). An exception is thrown if any of the
+	 * promises are rejected.
+	 *
+	 * @param iterable<PromiseInterface> $promises Iterable of PromiseInterface objects to wait on.
+	 *
+	 * @throws \Throwable on error
+	 */
+	public static function unwrap($promises): array
+	{
+		$results = [];
+		foreach ($promises as $key => $promise) {
+			$results[$key] = $promise->wait();
+		}
 
-        return $results;
-    }
+		return $results;
+	}
 
-    /**
-     * Given an array of promises, return a promise that is fulfilled when all
-     * the items in the array are fulfilled.
-     *
-     * The promise's fulfillment value is an array with fulfillment values at
-     * respective positions to the original array. If any promise in the array
-     * rejects, the returned promise is rejected with the rejection reason.
-     *
-     * @param mixed $promises  Promises or values.
-     * @param bool  $recursive If true, resolves new promises that might have been added to the stack during its own resolution.
-     */
-    public static function all($promises, bool $recursive = false): PromiseInterface
-    {
-        $results = [];
-        $promise = Each::of(
-            $promises,
-            function ($value, $idx) use (&$results): void {
-                $results[$idx] = $value;
-            },
-            function ($reason, $idx, Promise $aggregate): void {
-                $aggregate->reject($reason);
-            }
-        )->then(function () use (&$results) {
-            ksort($results);
+	/**
+	 * Given an array of promises, return a promise that is fulfilled when all
+	 * the items in the array are fulfilled.
+	 *
+	 * The promise's fulfillment value is an array with fulfillment values at
+	 * respective positions to the original array. If any promise in the array
+	 * rejects, the returned promise is rejected with the rejection reason.
+	 *
+	 * @param mixed $promises  Promises or values.
+	 * @param bool  $recursive If true, resolves new promises that might have been added to the stack during its own resolution.
+	 */
+	public static function all($promises, bool $recursive = false): PromiseInterface
+	{
+		$results = [];
+		$promise = Each::of(
+			$promises,
+			function ($value, $idx) use (&$results): void {
+				$results[$idx] = $value;
+			},
+			function ($reason, $idx, Promise $aggregate): void {
+				$aggregate->reject($reason);
+			}
+		)->then(function () use (&$results) {
+			ksort($results);
 
-            return $results;
-        });
+			return $results;
+		});
 
-        if (true === $recursive) {
-            $promise = $promise->then(function ($results) use ($recursive, &$promises) {
-                foreach ($promises as $promise) {
-                    if (Is::pending($promise)) {
-                        return self::all($promises, $recursive);
-                    }
-                }
+		if (true === $recursive) {
+			$promise = $promise->then(function ($results) use ($recursive, &$promises) {
+				foreach ($promises as $promise) {
+					if (Is::pending($promise)) {
+						return self::all($promises, $recursive);
+					}
+				}
 
-                return $results;
-            });
-        }
+				return $results;
+			});
+		}
 
-        return $promise;
-    }
+		return $promise;
+	}
 
-    /**
-     * Initiate a competitive race between multiple promises or values (values
-     * will become immediately fulfilled promises).
-     *
-     * When count amount of promises have been fulfilled, the returned promise
-     * is fulfilled with an array that contains the fulfillment values of the
-     * winners in order of resolution.
-     *
-     * This promise is rejected with a {@see AggregateException} if the number
-     * of fulfilled promises is less than the desired $count.
-     *
-     * @param int   $count    Total number of promises.
-     * @param mixed $promises Promises or values.
-     */
-    public static function some(int $count, $promises): PromiseInterface
-    {
-        $results = [];
-        $rejections = [];
+	/**
+	 * Initiate a competitive race between multiple promises or values (values
+	 * will become immediately fulfilled promises).
+	 *
+	 * When count amount of promises have been fulfilled, the returned promise
+	 * is fulfilled with an array that contains the fulfillment values of the
+	 * winners in order of resolution.
+	 *
+	 * This promise is rejected with a {@see AggregateException} if the number
+	 * of fulfilled promises is less than the desired $count.
+	 *
+	 * @param int   $count    Total number of promises.
+	 * @param mixed $promises Promises or values.
+	 */
+	public static function some(int $count, $promises): PromiseInterface
+	{
+		$results = [];
+		$rejections = [];
 
-        return Each::of(
-            $promises,
-            function ($value, $idx, PromiseInterface $p) use (&$results, $count): void {
-                if (Is::settled($p)) {
-                    return;
-                }
-                $results[$idx] = $value;
-                if (count($results) >= $count) {
-                    $p->resolve(null);
-                }
-            },
-            function ($reason) use (&$rejections): void {
-                $rejections[] = $reason;
-            }
-        )->then(
-            function () use (&$results, &$rejections, $count) {
-                if (count($results) !== $count) {
-                    throw new AggregateException(
-                        'Not enough promises to fulfill count',
-                        $rejections
-                    );
-                }
-                ksort($results);
+		return Each::of(
+			$promises,
+			function ($value, $idx, PromiseInterface $p) use (&$results, $count): void {
+				if (Is::settled($p)) {
+					return;
+				}
+				$results[$idx] = $value;
+				if (count($results) >= $count) {
+					$p->resolve(null);
+				}
+			},
+			function ($reason) use (&$rejections): void {
+				$rejections[] = $reason;
+			}
+		)->then(
+			function () use (&$results, &$rejections, $count) {
+				if (count($results) !== $count) {
+					throw new AggregateException(
+						'Not enough promises to fulfill count',
+						$rejections
+					);
+				}
+				ksort($results);
 
-                return array_values($results);
-            }
-        );
-    }
+				return array_values($results);
+			}
+		);
+	}
 
-    /**
-     * Like some(), with 1 as count. However, if the promise fulfills, the
-     * fulfillment value is not an array of 1 but the value directly.
-     *
-     * @param mixed $promises Promises or values.
-     */
-    public static function any($promises): PromiseInterface
-    {
-        return self::some(1, $promises)->then(function ($values) {
-            return $values[0];
-        });
-    }
+	/**
+	 * Like some(), with 1 as count. However, if the promise fulfills, the
+	 * fulfillment value is not an array of 1 but the value directly.
+	 *
+	 * @param mixed $promises Promises or values.
+	 */
+	public static function any($promises): PromiseInterface
+	{
+		return self::some(1, $promises)->then(function ($values) {
+			return $values[0];
+		});
+	}
 
-    /**
-     * Returns a promise that is fulfilled when all of the provided promises have
-     * been fulfilled or rejected.
-     *
-     * The returned promise is fulfilled with an array of inspection state arrays.
-     *
-     * @see inspect for the inspection state array format.
-     *
-     * @param mixed $promises Promises or values.
-     */
-    public static function settle($promises): PromiseInterface
-    {
-        $results = [];
+	/**
+	 * Returns a promise that is fulfilled when all of the provided promises have
+	 * been fulfilled or rejected.
+	 *
+	 * The returned promise is fulfilled with an array of inspection state arrays.
+	 *
+	 * @see inspect for the inspection state array format.
+	 *
+	 * @param mixed $promises Promises or values.
+	 */
+	public static function settle($promises): PromiseInterface
+	{
+		$results = [];
 
-        return Each::of(
-            $promises,
-            function ($value, $idx) use (&$results): void {
-                $results[$idx] = ['state' => PromiseInterface::FULFILLED, 'value' => $value];
-            },
-            function ($reason, $idx) use (&$results): void {
-                $results[$idx] = ['state' => PromiseInterface::REJECTED, 'reason' => $reason];
-            }
-        )->then(function () use (&$results) {
-            ksort($results);
+		return Each::of(
+			$promises,
+			function ($value, $idx) use (&$results): void {
+				$results[$idx] = ['state' => PromiseInterface::FULFILLED, 'value' => $value];
+			},
+			function ($reason, $idx) use (&$results): void {
+				$results[$idx] = ['state' => PromiseInterface::REJECTED, 'reason' => $reason];
+			}
+		)->then(function () use (&$results) {
+			ksort($results);
 
-            return $results;
-        });
-    }
+			return $results;
+		});
+	}
 }

Spacing +12 added lines, -12 removed lines

@@ -44,7 +44,7 @@ 
     {
         $queue = self::queue();
         $promise = new Promise([$queue, 'run']);
-        $queue->add(function () use ($task, $promise): void {
+        $queue->add(function() use ($task, $promise): void {
             try {
                 if (Is::pending($promise)) {
                     $promise->resolve($task());
@@ -140,20 +140,20 @@ 
         $results = [];
         $promise = Each::of(
             $promises,
-            function ($value, $idx) use (&$results): void {
+            function($value, $idx) use (&$results): void {
                 $results[$idx] = $value;
             },
-            function ($reason, $idx, Promise $aggregate): void {
+            function($reason, $idx, Promise $aggregate): void {
                 $aggregate->reject($reason);
             }
-        )->then(function () use (&$results) {
+        )->then(function() use (&$results) {
             ksort($results);
 
             return $results;
         });
 
         if (true === $recursive) {
-            $promise = $promise->then(function ($results) use ($recursive, &$promises) {
+            $promise = $promise->then(function($results) use ($recursive, &$promises) {
                 foreach ($promises as $promise) {
                     if (Is::pending($promise)) {
                         return self::all($promises, $recursive);
@@ -188,7 +188,7 @@ 
 
         return Each::of(
             $promises,
-            function ($value, $idx, PromiseInterface $p) use (&$results, $count): void {
+            function($value, $idx, PromiseInterface $p) use (&$results, $count): void {
                 if (Is::settled($p)) {
                     return;
                 }
@@ -197,11 +197,11 @@ 
                     $p->resolve(null);
                 }
             },
-            function ($reason) use (&$rejections): void {
+            function($reason) use (&$rejections): void {
                 $rejections[] = $reason;
             }
         )->then(
-            function () use (&$results, &$rejections, $count) {
+            function() use (&$results, &$rejections, $count) {
                 if (count($results) !== $count) {
                     throw new AggregateException(
                         'Not enough promises to fulfill count',
@@ -223,7 +223,7 @@ 
      */
     public static function any($promises): PromiseInterface
     {
-        return self::some(1, $promises)->then(function ($values) {
+        return self::some(1, $promises)->then(function($values) {
             return $values[0];
         });
     }
@@ -244,13 +244,13 @@ 
 
         return Each::of(
             $promises,
-            function ($value, $idx) use (&$results): void {
+            function($value, $idx) use (&$results): void {
                 $results[$idx] = ['state' => PromiseInterface::FULFILLED, 'value' => $value];
             },
-            function ($reason, $idx) use (&$results): void {
+            function($reason, $idx) use (&$results): void {
                 $results[$idx] = ['state' => PromiseInterface::REJECTED, 'reason' => $reason];
             }
-        )->then(function () use (&$results) {
+        )->then(function() use (&$results) {
             ksort($results);
 
             return $results;

Braces +1 added lines, -2 removed lines

@@ -4,8 +4,7 @@
 
 namespace OCA\FullTextSearch_Elasticsearch\Vendor\GuzzleHttp\Promise;
 
-final class Utils
-{
+final class Utils {
     /**
      * Get the global task queue used for promise resolution.
      *

lib/Vendor/GuzzleHttp/Promise/Coroutine.php

Indentation +114 added lines, -114 removed lines

@@ -45,118 +45,118 @@
  */
 final class Coroutine implements PromiseInterface
 {
-    /**
-     * @var PromiseInterface|null
-     */
-    private $currentPromise;
-
-    /**
-     * @var Generator
-     */
-    private $generator;
-
-    /**
-     * @var Promise
-     */
-    private $result;
-
-    public function __construct(callable $generatorFn)
-    {
-        $this->generator = $generatorFn();
-        $this->result = new Promise(function (): void {
-            while (isset($this->currentPromise)) {
-                $this->currentPromise->wait();
-            }
-        });
-        try {
-            $this->nextCoroutine($this->generator->current());
-        } catch (Throwable $throwable) {
-            $this->result->reject($throwable);
-        }
-    }
-
-    /**
-     * Create a new coroutine.
-     */
-    public static function of(callable $generatorFn): self
-    {
-        return new self($generatorFn);
-    }
-
-    public function then(
-        callable $onFulfilled = null,
-        callable $onRejected = null
-    ): PromiseInterface {
-        return $this->result->then($onFulfilled, $onRejected);
-    }
-
-    public function otherwise(callable $onRejected): PromiseInterface
-    {
-        return $this->result->otherwise($onRejected);
-    }
-
-    public function wait(bool $unwrap = true)
-    {
-        return $this->result->wait($unwrap);
-    }
-
-    public function getState(): string
-    {
-        return $this->result->getState();
-    }
-
-    public function resolve($value): void
-    {
-        $this->result->resolve($value);
-    }
-
-    public function reject($reason): void
-    {
-        $this->result->reject($reason);
-    }
-
-    public function cancel(): void
-    {
-        $this->currentPromise->cancel();
-        $this->result->cancel();
-    }
-
-    private function nextCoroutine($yielded): void
-    {
-        $this->currentPromise = Create::promiseFor($yielded)
-            ->then([$this, '_handleSuccess'], [$this, '_handleFailure']);
-    }
-
-    /**
-     * @internal
-     */
-    public function _handleSuccess($value): void
-    {
-        unset($this->currentPromise);
-        try {
-            $next = $this->generator->send($value);
-            if ($this->generator->valid()) {
-                $this->nextCoroutine($next);
-            } else {
-                $this->result->resolve($value);
-            }
-        } catch (Throwable $throwable) {
-            $this->result->reject($throwable);
-        }
-    }
-
-    /**
-     * @internal
-     */
-    public function _handleFailure($reason): void
-    {
-        unset($this->currentPromise);
-        try {
-            $nextYield = $this->generator->throw(Create::exceptionFor($reason));
-            // The throw was caught, so keep iterating on the coroutine
-            $this->nextCoroutine($nextYield);
-        } catch (Throwable $throwable) {
-            $this->result->reject($throwable);
-        }
-    }
+	/**
+	 * @var PromiseInterface|null
+	 */
+	private $currentPromise;
+
+	/**
+	 * @var Generator
+	 */
+	private $generator;
+
+	/**
+	 * @var Promise
+	 */
+	private $result;
+
+	public function __construct(callable $generatorFn)
+	{
+		$this->generator = $generatorFn();
+		$this->result = new Promise(function (): void {
+			while (isset($this->currentPromise)) {
+				$this->currentPromise->wait();
+			}
+		});
+		try {
+			$this->nextCoroutine($this->generator->current());
+		} catch (Throwable $throwable) {
+			$this->result->reject($throwable);
+		}
+	}
+
+	/**
+	 * Create a new coroutine.
+	 */
+	public static function of(callable $generatorFn): self
+	{
+		return new self($generatorFn);
+	}
+
+	public function then(
+		callable $onFulfilled = null,
+		callable $onRejected = null
+	): PromiseInterface {
+		return $this->result->then($onFulfilled, $onRejected);
+	}
+
+	public function otherwise(callable $onRejected): PromiseInterface
+	{
+		return $this->result->otherwise($onRejected);
+	}
+
+	public function wait(bool $unwrap = true)
+	{
+		return $this->result->wait($unwrap);
+	}
+
+	public function getState(): string
+	{
+		return $this->result->getState();
+	}
+
+	public function resolve($value): void
+	{
+		$this->result->resolve($value);
+	}
+
+	public function reject($reason): void
+	{
+		$this->result->reject($reason);
+	}
+
+	public function cancel(): void
+	{
+		$this->currentPromise->cancel();
+		$this->result->cancel();
+	}
+
+	private function nextCoroutine($yielded): void
+	{
+		$this->currentPromise = Create::promiseFor($yielded)
+			->then([$this, '_handleSuccess'], [$this, '_handleFailure']);
+	}
+
+	/**
+	 * @internal
+	 */
+	public function _handleSuccess($value): void
+	{
+		unset($this->currentPromise);
+		try {
+			$next = $this->generator->send($value);
+			if ($this->generator->valid()) {
+				$this->nextCoroutine($next);
+			} else {
+				$this->result->resolve($value);
+			}
+		} catch (Throwable $throwable) {
+			$this->result->reject($throwable);
+		}
+	}
+
+	/**
+	 * @internal
+	 */
+	public function _handleFailure($reason): void
+	{
+		unset($this->currentPromise);
+		try {
+			$nextYield = $this->generator->throw(Create::exceptionFor($reason));
+			// The throw was caught, so keep iterating on the coroutine
+			$this->nextCoroutine($nextYield);
+		} catch (Throwable $throwable) {
+			$this->result->reject($throwable);
+		}
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
     public function __construct(callable $generatorFn)
     {
         $this->generator = $generatorFn();
-        $this->result = new Promise(function (): void {
+        $this->result = new Promise(function(): void {
             while (isset($this->currentPromise)) {
                 $this->currentPromise->wait();
             }

Braces +1 added lines, -2 removed lines

@@ -43,8 +43,7 @@
  *
  * @see https://github.com/petkaantonov/bluebird/blob/master/API.md#generators inspiration
  */
-final class Coroutine implements PromiseInterface
-{
+final class Coroutine implements PromiseInterface {
     /**
      * @var PromiseInterface|null
      */

lib/Vendor/GuzzleHttp/Promise/RejectionException.php

Indentation +35 added lines, -35 removed lines

@@ -11,39 +11,39 @@
  */
 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/Each.php

Indentation +70 added lines, -70 removed lines

@@ -6,76 +6,76 @@
 
 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();
-    }
+	/**
+	 * 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 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);
-            }
-        );
-    }
+	/**
+	 * 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 +1 added lines, -1 removed lines

@@ -73,7 +73,7 @@
             $iterable,
             $concurrency,
             $onFulfilled,
-            function ($reason, $idx, PromiseInterface $aggregate): void {
+            function($reason, $idx, PromiseInterface $aggregate): void {
                 $aggregate->reject($reason);
             }
         );

Braces +1 added lines, -2 removed lines

@@ -4,8 +4,7 @@
 
 namespace OCA\FullTextSearch_Elasticsearch\Vendor\GuzzleHttp\Promise;
 
-final class Each
-{
+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