nextcloud / fulltextsearch_elasticsearch

lib/Vendor/GuzzleHttp/ClientInterface.php

Indentation +63 added lines, -63 removed lines

@@ -12,67 +12,67 @@
  */
 interface ClientInterface
 {
-    /**
-     * The Guzzle major version.
-     */
-    public const MAJOR_VERSION = 7;
-    /**
-     * Send an HTTP request.
-     *
-     * @param RequestInterface $request Request to send
-     * @param array            $options Request options to apply to the given
-     *                                  request and to the transfer.
-     *
-     * @throws GuzzleException
-     */
-    public function send(RequestInterface $request, array $options = []) : ResponseInterface;
-    /**
-     * Asynchronously send an HTTP request.
-     *
-     * @param RequestInterface $request Request to send
-     * @param array            $options Request options to apply to the given
-     *                                  request and to the transfer.
-     */
-    public function sendAsync(RequestInterface $request, array $options = []) : PromiseInterface;
-    /**
-     * 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.
-     *
-     * @throws GuzzleException
-     */
-    public function request(string $method, $uri, array $options = []) : ResponseInterface;
-    /**
-     * 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.
-     */
-    public function requestAsync(string $method, $uri, array $options = []) : PromiseInterface;
-    /**
-     * 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 ClientInterface::getConfig will be removed in guzzlehttp/guzzle:8.0.
-     */
-    public function getConfig(?string $option = null);
+	/**
+	 * The Guzzle major version.
+	 */
+	public const MAJOR_VERSION = 7;
+	/**
+	 * Send an HTTP request.
+	 *
+	 * @param RequestInterface $request Request to send
+	 * @param array            $options Request options to apply to the given
+	 *                                  request and to the transfer.
+	 *
+	 * @throws GuzzleException
+	 */
+	public function send(RequestInterface $request, array $options = []) : ResponseInterface;
+	/**
+	 * Asynchronously send an HTTP request.
+	 *
+	 * @param RequestInterface $request Request to send
+	 * @param array            $options Request options to apply to the given
+	 *                                  request and to the transfer.
+	 */
+	public function sendAsync(RequestInterface $request, array $options = []) : PromiseInterface;
+	/**
+	 * 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.
+	 *
+	 * @throws GuzzleException
+	 */
+	public function request(string $method, $uri, array $options = []) : ResponseInterface;
+	/**
+	 * 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.
+	 */
+	public function requestAsync(string $method, $uri, array $options = []) : PromiseInterface;
+	/**
+	 * 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 ClientInterface::getConfig will be removed in guzzlehttp/guzzle:8.0.
+	 */
+	public function getConfig(?string $option = null);
 }

lib/Vendor/GuzzleHttp/Exception/RequestException.php

Indentation +96 added lines, -96 removed lines

@@ -12,100 +12,100 @@
  */
 class RequestException extends TransferException implements RequestExceptionInterface
 {
-    /**
-     * @var RequestInterface
-     */
-    private $request;
-    /**
-     * @var ResponseInterface|null
-     */
-    private $response;
-    /**
-     * @var array
-     */
-    private $handlerContext;
-    public function __construct(string $message, RequestInterface $request, ?ResponseInterface $response = null, ?\Throwable $previous = null, array $handlerContext = [])
-    {
-        // Set the code of the exception if the response is set and not future.
-        $code = $response ? $response->getStatusCode() : 0;
-        parent::__construct($message, $code, $previous);
-        $this->request = $request;
-        $this->response = $response;
-        $this->handlerContext = $handlerContext;
-    }
-    /**
-     * Wrap non-RequestExceptions with a RequestException
-     */
-    public static function wrapException(RequestInterface $request, \Throwable $e) : RequestException
-    {
-        return $e instanceof RequestException ? $e : new RequestException($e->getMessage(), $request, null, $e);
-    }
-    /**
-     * Factory method to create a new exception with a normalized error message
-     *
-     * @param RequestInterface             $request        Request sent
-     * @param ResponseInterface            $response       Response received
-     * @param \Throwable|null              $previous       Previous exception
-     * @param array                        $handlerContext Optional handler context
-     * @param BodySummarizerInterface|null $bodySummarizer Optional body summarizer
-     */
-    public static function create(RequestInterface $request, ?ResponseInterface $response = null, ?\Throwable $previous = null, array $handlerContext = [], ?BodySummarizerInterface $bodySummarizer = null) : self
-    {
-        if (!$response) {
-            return new self('Error completing request', $request, null, $previous, $handlerContext);
-        }
-        $level = (int) \floor($response->getStatusCode() / 100);
-        if ($level === 4) {
-            $label = 'Client error';
-            $className = ClientException::class;
-        } elseif ($level === 5) {
-            $label = 'Server error';
-            $className = ServerException::class;
-        } else {
-            $label = 'Unsuccessful request';
-            $className = __CLASS__;
-        }
-        $uri = \OCA\FullTextSearch_Elasticsearch\Vendor\GuzzleHttp\Psr7\Utils::redactUserInfo($request->getUri());
-        // Client Error: `GET /` resulted in a `404 Not Found` response:
-        // <html> ... (truncated)
-        $message = \sprintf('%s: `%s %s` resulted in a `%s %s` response', $label, $request->getMethod(), $uri->__toString(), $response->getStatusCode(), $response->getReasonPhrase());
-        $summary = ($bodySummarizer ?? new BodySummarizer())->summarize($response);
-        if ($summary !== null) {
-            $message .= ":\n{$summary}\n";
-        }
-        return new $className($message, $request, $response, $previous, $handlerContext);
-    }
-    /**
-     * Get the request that caused the exception
-     */
-    public function getRequest() : RequestInterface
-    {
-        return $this->request;
-    }
-    /**
-     * Get the associated response
-     */
-    public function getResponse() : ?ResponseInterface
-    {
-        return $this->response;
-    }
-    /**
-     * Check if a response was received
-     */
-    public function hasResponse() : bool
-    {
-        return $this->response !== null;
-    }
-    /**
-     * Get contextual information about the error from the underlying handler.
-     *
-     * The contents of this array will vary depending on which handler you are
-     * using. It may also be just an empty array. Relying on this data will
-     * couple you to a specific handler, but can give more debug information
-     * when needed.
-     */
-    public function getHandlerContext() : array
-    {
-        return $this->handlerContext;
-    }
+	/**
+	 * @var RequestInterface
+	 */
+	private $request;
+	/**
+	 * @var ResponseInterface|null
+	 */
+	private $response;
+	/**
+	 * @var array
+	 */
+	private $handlerContext;
+	public function __construct(string $message, RequestInterface $request, ?ResponseInterface $response = null, ?\Throwable $previous = null, array $handlerContext = [])
+	{
+		// Set the code of the exception if the response is set and not future.
+		$code = $response ? $response->getStatusCode() : 0;
+		parent::__construct($message, $code, $previous);
+		$this->request = $request;
+		$this->response = $response;
+		$this->handlerContext = $handlerContext;
+	}
+	/**
+	 * Wrap non-RequestExceptions with a RequestException
+	 */
+	public static function wrapException(RequestInterface $request, \Throwable $e) : RequestException
+	{
+		return $e instanceof RequestException ? $e : new RequestException($e->getMessage(), $request, null, $e);
+	}
+	/**
+	 * Factory method to create a new exception with a normalized error message
+	 *
+	 * @param RequestInterface             $request        Request sent
+	 * @param ResponseInterface            $response       Response received
+	 * @param \Throwable|null              $previous       Previous exception
+	 * @param array                        $handlerContext Optional handler context
+	 * @param BodySummarizerInterface|null $bodySummarizer Optional body summarizer
+	 */
+	public static function create(RequestInterface $request, ?ResponseInterface $response = null, ?\Throwable $previous = null, array $handlerContext = [], ?BodySummarizerInterface $bodySummarizer = null) : self
+	{
+		if (!$response) {
+			return new self('Error completing request', $request, null, $previous, $handlerContext);
+		}
+		$level = (int) \floor($response->getStatusCode() / 100);
+		if ($level === 4) {
+			$label = 'Client error';
+			$className = ClientException::class;
+		} elseif ($level === 5) {
+			$label = 'Server error';
+			$className = ServerException::class;
+		} else {
+			$label = 'Unsuccessful request';
+			$className = __CLASS__;
+		}
+		$uri = \OCA\FullTextSearch_Elasticsearch\Vendor\GuzzleHttp\Psr7\Utils::redactUserInfo($request->getUri());
+		// Client Error: `GET /` resulted in a `404 Not Found` response:
+		// <html> ... (truncated)
+		$message = \sprintf('%s: `%s %s` resulted in a `%s %s` response', $label, $request->getMethod(), $uri->__toString(), $response->getStatusCode(), $response->getReasonPhrase());
+		$summary = ($bodySummarizer ?? new BodySummarizer())->summarize($response);
+		if ($summary !== null) {
+			$message .= ":\n{$summary}\n";
+		}
+		return new $className($message, $request, $response, $previous, $handlerContext);
+	}
+	/**
+	 * Get the request that caused the exception
+	 */
+	public function getRequest() : RequestInterface
+	{
+		return $this->request;
+	}
+	/**
+	 * Get the associated response
+	 */
+	public function getResponse() : ?ResponseInterface
+	{
+		return $this->response;
+	}
+	/**
+	 * Check if a response was received
+	 */
+	public function hasResponse() : bool
+	{
+		return $this->response !== null;
+	}
+	/**
+	 * Get contextual information about the error from the underlying handler.
+	 *
+	 * The contents of this array will vary depending on which handler you are
+	 * using. It may also be just an empty array. Relying on this data will
+	 * couple you to a specific handler, but can give more debug information
+	 * when needed.
+	 */
+	public function getHandlerContext() : array
+	{
+		return $this->handlerContext;
+	}
 }

lib/Vendor/GuzzleHttp/Exception/BadResponseException.php

Indentation +19 added lines, -19 removed lines

@@ -9,23 +9,23 @@
  */
 class BadResponseException extends RequestException
 {
-    public function __construct(string $message, RequestInterface $request, ResponseInterface $response, ?\Throwable $previous = null, array $handlerContext = [])
-    {
-        parent::__construct($message, $request, $response, $previous, $handlerContext);
-    }
-    /**
-     * Current exception and the ones that extend it will always have a response.
-     */
-    public function hasResponse() : bool
-    {
-        return \true;
-    }
-    /**
-     * This function narrows the return type from the parent class and does not allow it to be nullable.
-     */
-    public function getResponse() : ResponseInterface
-    {
-        /** @var ResponseInterface */
-        return parent::getResponse();
-    }
+	public function __construct(string $message, RequestInterface $request, ResponseInterface $response, ?\Throwable $previous = null, array $handlerContext = [])
+	{
+		parent::__construct($message, $request, $response, $previous, $handlerContext);
+	}
+	/**
+	 * Current exception and the ones that extend it will always have a response.
+	 */
+	public function hasResponse() : bool
+	{
+		return \true;
+	}
+	/**
+	 * This function narrows the return type from the parent class and does not allow it to be nullable.
+	 */
+	public function getResponse() : ResponseInterface
+	{
+		/** @var ResponseInterface */
+		return parent::getResponse();
+	}
 }

Braces +1 added lines, -2 removed lines

@@ -7,8 +7,7 @@
 /**
  * Exception when an HTTP error occurs (4xx or 5xx error)
  */
-class BadResponseException extends RequestException
-{
+class BadResponseException extends RequestException {
     public function __construct(string $message, RequestInterface $request, ResponseInterface $response, ?\Throwable $previous = null, array $handlerContext = [])
     {
         parent::__construct($message, $request, $response, $previous, $handlerContext);

lib/Vendor/GuzzleHttp/Exception/ConnectException.php

Indentation +33 added lines, -33 removed lines

@@ -11,37 +11,37 @@
  */
 class ConnectException extends TransferException implements NetworkExceptionInterface
 {
-    /**
-     * @var RequestInterface
-     */
-    private $request;
-    /**
-     * @var array
-     */
-    private $handlerContext;
-    public function __construct(string $message, RequestInterface $request, ?\Throwable $previous = null, array $handlerContext = [])
-    {
-        parent::__construct($message, 0, $previous);
-        $this->request = $request;
-        $this->handlerContext = $handlerContext;
-    }
-    /**
-     * Get the request that caused the exception
-     */
-    public function getRequest() : RequestInterface
-    {
-        return $this->request;
-    }
-    /**
-     * Get contextual information about the error from the underlying handler.
-     *
-     * The contents of this array will vary depending on which handler you are
-     * using. It may also be just an empty array. Relying on this data will
-     * couple you to a specific handler, but can give more debug information
-     * when needed.
-     */
-    public function getHandlerContext() : array
-    {
-        return $this->handlerContext;
-    }
+	/**
+	 * @var RequestInterface
+	 */
+	private $request;
+	/**
+	 * @var array
+	 */
+	private $handlerContext;
+	public function __construct(string $message, RequestInterface $request, ?\Throwable $previous = null, array $handlerContext = [])
+	{
+		parent::__construct($message, 0, $previous);
+		$this->request = $request;
+		$this->handlerContext = $handlerContext;
+	}
+	/**
+	 * Get the request that caused the exception
+	 */
+	public function getRequest() : RequestInterface
+	{
+		return $this->request;
+	}
+	/**
+	 * Get contextual information about the error from the underlying handler.
+	 *
+	 * The contents of this array will vary depending on which handler you are
+	 * using. It may also be just an empty array. Relying on this data will
+	 * couple you to a specific handler, but can give more debug information
+	 * when needed.
+	 */
+	public function getHandlerContext() : array
+	{
+		return $this->handlerContext;
+	}
 }

lib/Vendor/GuzzleHttp/Cookie/CookieJarInterface.php

Indentation +53 added lines, -53 removed lines

@@ -18,57 +18,57 @@
  */
 interface CookieJarInterface extends \Countable, \IteratorAggregate
 {
-    /**
-     * Create a request with added cookie headers.
-     *
-     * If no matching cookies are found in the cookie jar, then no Cookie
-     * header is added to the request and the same request is returned.
-     *
-     * @param RequestInterface $request Request object to modify.
-     *
-     * @return RequestInterface returns the modified request.
-     */
-    public function withCookieHeader(RequestInterface $request) : RequestInterface;
-    /**
-     * Extract cookies from an HTTP response and store them in the CookieJar.
-     *
-     * @param RequestInterface  $request  Request that was sent
-     * @param ResponseInterface $response Response that was received
-     */
-    public function extractCookies(RequestInterface $request, ResponseInterface $response) : void;
-    /**
-     * Sets a cookie in the cookie jar.
-     *
-     * @param SetCookie $cookie Cookie to set.
-     *
-     * @return bool Returns true on success or false on failure
-     */
-    public function setCookie(SetCookie $cookie) : bool;
-    /**
-     * Remove cookies currently held in the cookie jar.
-     *
-     * Invoking this method without arguments will empty the whole cookie jar.
-     * If given a $domain argument only cookies belonging to that domain will
-     * be removed. If given a $domain and $path argument, cookies belonging to
-     * the specified path within that domain are removed. If given all three
-     * arguments, then the cookie with the specified name, path and domain is
-     * removed.
-     *
-     * @param string|null $domain Clears cookies matching a domain
-     * @param string|null $path   Clears cookies matching a domain and path
-     * @param string|null $name   Clears cookies matching a domain, path, and name
-     */
-    public function clear(?string $domain = null, ?string $path = null, ?string $name = null) : void;
-    /**
-     * Discard all sessions cookies.
-     *
-     * Removes cookies that don't have an expire field or a have a discard
-     * field set to true. To be called when the user agent shuts down according
-     * to RFC 2965.
-     */
-    public function clearSessionCookies() : void;
-    /**
-     * Converts the cookie jar to an array.
-     */
-    public function toArray() : array;
+	/**
+	 * Create a request with added cookie headers.
+	 *
+	 * If no matching cookies are found in the cookie jar, then no Cookie
+	 * header is added to the request and the same request is returned.
+	 *
+	 * @param RequestInterface $request Request object to modify.
+	 *
+	 * @return RequestInterface returns the modified request.
+	 */
+	public function withCookieHeader(RequestInterface $request) : RequestInterface;
+	/**
+	 * Extract cookies from an HTTP response and store them in the CookieJar.
+	 *
+	 * @param RequestInterface  $request  Request that was sent
+	 * @param ResponseInterface $response Response that was received
+	 */
+	public function extractCookies(RequestInterface $request, ResponseInterface $response) : void;
+	/**
+	 * Sets a cookie in the cookie jar.
+	 *
+	 * @param SetCookie $cookie Cookie to set.
+	 *
+	 * @return bool Returns true on success or false on failure
+	 */
+	public function setCookie(SetCookie $cookie) : bool;
+	/**
+	 * Remove cookies currently held in the cookie jar.
+	 *
+	 * Invoking this method without arguments will empty the whole cookie jar.
+	 * If given a $domain argument only cookies belonging to that domain will
+	 * be removed. If given a $domain and $path argument, cookies belonging to
+	 * the specified path within that domain are removed. If given all three
+	 * arguments, then the cookie with the specified name, path and domain is
+	 * removed.
+	 *
+	 * @param string|null $domain Clears cookies matching a domain
+	 * @param string|null $path   Clears cookies matching a domain and path
+	 * @param string|null $name   Clears cookies matching a domain, path, and name
+	 */
+	public function clear(?string $domain = null, ?string $path = null, ?string $name = null) : void;
+	/**
+	 * Discard all sessions cookies.
+	 *
+	 * Removes cookies that don't have an expire field or a have a discard
+	 * field set to true. To be called when the user agent shuts down according
+	 * to RFC 2965.
+	 */
+	public function clearSessionCookies() : void;
+	/**
+	 * Converts the cookie jar to an array.
+	 */
+	public function toArray() : array;
 }

lib/Vendor/GuzzleHttp/Cookie/CookieJar.php

Indentation +228 added lines, -228 removed lines

@@ -9,232 +9,232 @@
  */
 class CookieJar implements CookieJarInterface
 {
-    /**
-     * @var SetCookie[] Loaded cookie data
-     */
-    private $cookies = [];
-    /**
-     * @var bool
-     */
-    private $strictMode;
-    /**
-     * @param bool  $strictMode  Set to true to throw exceptions when invalid
-     *                           cookies are added to the cookie jar.
-     * @param array $cookieArray Array of SetCookie objects or a hash of
-     *                           arrays that can be used with the SetCookie
-     *                           constructor
-     */
-    public function __construct(bool $strictMode = \false, array $cookieArray = [])
-    {
-        $this->strictMode = $strictMode;
-        foreach ($cookieArray as $cookie) {
-            if (!$cookie instanceof SetCookie) {
-                $cookie = new SetCookie($cookie);
-            }
-            $this->setCookie($cookie);
-        }
-    }
-    /**
-     * Create a new Cookie jar from an associative array and domain.
-     *
-     * @param array  $cookies Cookies to create the jar from
-     * @param string $domain  Domain to set the cookies to
-     */
-    public static function fromArray(array $cookies, string $domain) : self
-    {
-        $cookieJar = new self();
-        foreach ($cookies as $name => $value) {
-            $cookieJar->setCookie(new SetCookie(['Domain' => $domain, 'Name' => $name, 'Value' => $value, 'Discard' => \true]));
-        }
-        return $cookieJar;
-    }
-    /**
-     * Evaluate if this cookie should be persisted to storage
-     * that survives between requests.
-     *
-     * @param SetCookie $cookie              Being evaluated.
-     * @param bool      $allowSessionCookies If we should persist session cookies
-     */
-    public static function shouldPersist(SetCookie $cookie, bool $allowSessionCookies = \false) : bool
-    {
-        if ($cookie->getExpires() || $allowSessionCookies) {
-            if (!$cookie->getDiscard()) {
-                return \true;
-            }
-        }
-        return \false;
-    }
-    /**
-     * Finds and returns the cookie based on the name
-     *
-     * @param string $name cookie name to search for
-     *
-     * @return SetCookie|null cookie that was found or null if not found
-     */
-    public function getCookieByName(string $name) : ?SetCookie
-    {
-        foreach ($this->cookies as $cookie) {
-            if ($cookie->getName() !== null && \strcasecmp($cookie->getName(), $name) === 0) {
-                return $cookie;
-            }
-        }
-        return null;
-    }
-    public function toArray() : array
-    {
-        return \array_map(static function (SetCookie $cookie) : array {
-            return $cookie->toArray();
-        }, $this->getIterator()->getArrayCopy());
-    }
-    public function clear(?string $domain = null, ?string $path = null, ?string $name = null) : void
-    {
-        if (!$domain) {
-            $this->cookies = [];
-            return;
-        } elseif (!$path) {
-            $this->cookies = \array_filter($this->cookies, static function (SetCookie $cookie) use($domain) : bool {
-                return !$cookie->matchesDomain($domain);
-            });
-        } elseif (!$name) {
-            $this->cookies = \array_filter($this->cookies, static function (SetCookie $cookie) use($path, $domain) : bool {
-                return !($cookie->matchesPath($path) && $cookie->matchesDomain($domain));
-            });
-        } else {
-            $this->cookies = \array_filter($this->cookies, static function (SetCookie $cookie) use($path, $domain, $name) {
-                return !($cookie->getName() == $name && $cookie->matchesPath($path) && $cookie->matchesDomain($domain));
-            });
-        }
-    }
-    public function clearSessionCookies() : void
-    {
-        $this->cookies = \array_filter($this->cookies, static function (SetCookie $cookie) : bool {
-            return !$cookie->getDiscard() && $cookie->getExpires();
-        });
-    }
-    public function setCookie(SetCookie $cookie) : bool
-    {
-        // If the name string is empty (but not 0), ignore the set-cookie
-        // string entirely.
-        $name = $cookie->getName();
-        if (!$name && $name !== '0') {
-            return \false;
-        }
-        // Only allow cookies with set and valid domain, name, value
-        $result = $cookie->validate();
-        if ($result !== \true) {
-            if ($this->strictMode) {
-                throw new \RuntimeException('Invalid cookie: ' . $result);
-            }
-            $this->removeCookieIfEmpty($cookie);
-            return \false;
-        }
-        // Resolve conflicts with previously set cookies
-        foreach ($this->cookies as $i => $c) {
-            // Two cookies are identical, when their path, and domain are
-            // identical.
-            if ($c->getPath() != $cookie->getPath() || $c->getDomain() != $cookie->getDomain() || $c->getName() != $cookie->getName()) {
-                continue;
-            }
-            // The previously set cookie is a discard cookie and this one is
-            // not so allow the new cookie to be set
-            if (!$cookie->getDiscard() && $c->getDiscard()) {
-                unset($this->cookies[$i]);
-                continue;
-            }
-            // If the new cookie's expiration is further into the future, then
-            // replace the old cookie
-            if ($cookie->getExpires() > $c->getExpires()) {
-                unset($this->cookies[$i]);
-                continue;
-            }
-            // If the value has changed, we better change it
-            if ($cookie->getValue() !== $c->getValue()) {
-                unset($this->cookies[$i]);
-                continue;
-            }
-            // The cookie exists, so no need to continue
-            return \false;
-        }
-        $this->cookies[] = $cookie;
-        return \true;
-    }
-    public function count() : int
-    {
-        return \count($this->cookies);
-    }
-    /**
-     * @return \ArrayIterator<int, SetCookie>
-     */
-    public function getIterator() : \ArrayIterator
-    {
-        return new \ArrayIterator(\array_values($this->cookies));
-    }
-    public function extractCookies(RequestInterface $request, ResponseInterface $response) : void
-    {
-        if ($cookieHeader = $response->getHeader('Set-Cookie')) {
-            foreach ($cookieHeader as $cookie) {
-                $sc = SetCookie::fromString($cookie);
-                if (!$sc->getDomain()) {
-                    $sc->setDomain($request->getUri()->getHost());
-                }
-                if (0 !== \strpos($sc->getPath(), '/')) {
-                    $sc->setPath($this->getCookiePathFromRequest($request));
-                }
-                if (!$sc->matchesDomain($request->getUri()->getHost())) {
-                    continue;
-                }
-                // Note: At this point `$sc->getDomain()` being a public suffix should
-                // be rejected, but we don't want to pull in the full PSL dependency.
-                $this->setCookie($sc);
-            }
-        }
-    }
-    /**
-     * Computes cookie path following RFC 6265 section 5.1.4
-     *
-     * @see https://datatracker.ietf.org/doc/html/rfc6265#section-5.1.4
-     */
-    private function getCookiePathFromRequest(RequestInterface $request) : string
-    {
-        $uriPath = $request->getUri()->getPath();
-        if ('' === $uriPath) {
-            return '/';
-        }
-        if (0 !== \strpos($uriPath, '/')) {
-            return '/';
-        }
-        if ('/' === $uriPath) {
-            return '/';
-        }
-        $lastSlashPos = \strrpos($uriPath, '/');
-        if (0 === $lastSlashPos || \false === $lastSlashPos) {
-            return '/';
-        }
-        return \substr($uriPath, 0, $lastSlashPos);
-    }
-    public function withCookieHeader(RequestInterface $request) : RequestInterface
-    {
-        $values = [];
-        $uri = $request->getUri();
-        $scheme = $uri->getScheme();
-        $host = $uri->getHost();
-        $path = $uri->getPath() ?: '/';
-        foreach ($this->cookies as $cookie) {
-            if ($cookie->matchesPath($path) && $cookie->matchesDomain($host) && !$cookie->isExpired() && (!$cookie->getSecure() || $scheme === 'https')) {
-                $values[] = $cookie->getName() . '=' . $cookie->getValue();
-            }
-        }
-        return $values ? $request->withHeader('Cookie', \implode('; ', $values)) : $request;
-    }
-    /**
-     * If a cookie already exists and the server asks to set it again with a
-     * null value, the cookie must be deleted.
-     */
-    private function removeCookieIfEmpty(SetCookie $cookie) : void
-    {
-        $cookieValue = $cookie->getValue();
-        if ($cookieValue === null || $cookieValue === '') {
-            $this->clear($cookie->getDomain(), $cookie->getPath(), $cookie->getName());
-        }
-    }
+	/**
+	 * @var SetCookie[] Loaded cookie data
+	 */
+	private $cookies = [];
+	/**
+	 * @var bool
+	 */
+	private $strictMode;
+	/**
+	 * @param bool  $strictMode  Set to true to throw exceptions when invalid
+	 *                           cookies are added to the cookie jar.
+	 * @param array $cookieArray Array of SetCookie objects or a hash of
+	 *                           arrays that can be used with the SetCookie
+	 *                           constructor
+	 */
+	public function __construct(bool $strictMode = \false, array $cookieArray = [])
+	{
+		$this->strictMode = $strictMode;
+		foreach ($cookieArray as $cookie) {
+			if (!$cookie instanceof SetCookie) {
+				$cookie = new SetCookie($cookie);
+			}
+			$this->setCookie($cookie);
+		}
+	}
+	/**
+	 * Create a new Cookie jar from an associative array and domain.
+	 *
+	 * @param array  $cookies Cookies to create the jar from
+	 * @param string $domain  Domain to set the cookies to
+	 */
+	public static function fromArray(array $cookies, string $domain) : self
+	{
+		$cookieJar = new self();
+		foreach ($cookies as $name => $value) {
+			$cookieJar->setCookie(new SetCookie(['Domain' => $domain, 'Name' => $name, 'Value' => $value, 'Discard' => \true]));
+		}
+		return $cookieJar;
+	}
+	/**
+	 * Evaluate if this cookie should be persisted to storage
+	 * that survives between requests.
+	 *
+	 * @param SetCookie $cookie              Being evaluated.
+	 * @param bool      $allowSessionCookies If we should persist session cookies
+	 */
+	public static function shouldPersist(SetCookie $cookie, bool $allowSessionCookies = \false) : bool
+	{
+		if ($cookie->getExpires() || $allowSessionCookies) {
+			if (!$cookie->getDiscard()) {
+				return \true;
+			}
+		}
+		return \false;
+	}
+	/**
+	 * Finds and returns the cookie based on the name
+	 *
+	 * @param string $name cookie name to search for
+	 *
+	 * @return SetCookie|null cookie that was found or null if not found
+	 */
+	public function getCookieByName(string $name) : ?SetCookie
+	{
+		foreach ($this->cookies as $cookie) {
+			if ($cookie->getName() !== null && \strcasecmp($cookie->getName(), $name) === 0) {
+				return $cookie;
+			}
+		}
+		return null;
+	}
+	public function toArray() : array
+	{
+		return \array_map(static function (SetCookie $cookie) : array {
+			return $cookie->toArray();
+		}, $this->getIterator()->getArrayCopy());
+	}
+	public function clear(?string $domain = null, ?string $path = null, ?string $name = null) : void
+	{
+		if (!$domain) {
+			$this->cookies = [];
+			return;
+		} elseif (!$path) {
+			$this->cookies = \array_filter($this->cookies, static function (SetCookie $cookie) use($domain) : bool {
+				return !$cookie->matchesDomain($domain);
+			});
+		} elseif (!$name) {
+			$this->cookies = \array_filter($this->cookies, static function (SetCookie $cookie) use($path, $domain) : bool {
+				return !($cookie->matchesPath($path) && $cookie->matchesDomain($domain));
+			});
+		} else {
+			$this->cookies = \array_filter($this->cookies, static function (SetCookie $cookie) use($path, $domain, $name) {
+				return !($cookie->getName() == $name && $cookie->matchesPath($path) && $cookie->matchesDomain($domain));
+			});
+		}
+	}
+	public function clearSessionCookies() : void
+	{
+		$this->cookies = \array_filter($this->cookies, static function (SetCookie $cookie) : bool {
+			return !$cookie->getDiscard() && $cookie->getExpires();
+		});
+	}
+	public function setCookie(SetCookie $cookie) : bool
+	{
+		// If the name string is empty (but not 0), ignore the set-cookie
+		// string entirely.
+		$name = $cookie->getName();
+		if (!$name && $name !== '0') {
+			return \false;
+		}
+		// Only allow cookies with set and valid domain, name, value
+		$result = $cookie->validate();
+		if ($result !== \true) {
+			if ($this->strictMode) {
+				throw new \RuntimeException('Invalid cookie: ' . $result);
+			}
+			$this->removeCookieIfEmpty($cookie);
+			return \false;
+		}
+		// Resolve conflicts with previously set cookies
+		foreach ($this->cookies as $i => $c) {
+			// Two cookies are identical, when their path, and domain are
+			// identical.
+			if ($c->getPath() != $cookie->getPath() || $c->getDomain() != $cookie->getDomain() || $c->getName() != $cookie->getName()) {
+				continue;
+			}
+			// The previously set cookie is a discard cookie and this one is
+			// not so allow the new cookie to be set
+			if (!$cookie->getDiscard() && $c->getDiscard()) {
+				unset($this->cookies[$i]);
+				continue;
+			}
+			// If the new cookie's expiration is further into the future, then
+			// replace the old cookie
+			if ($cookie->getExpires() > $c->getExpires()) {
+				unset($this->cookies[$i]);
+				continue;
+			}
+			// If the value has changed, we better change it
+			if ($cookie->getValue() !== $c->getValue()) {
+				unset($this->cookies[$i]);
+				continue;
+			}
+			// The cookie exists, so no need to continue
+			return \false;
+		}
+		$this->cookies[] = $cookie;
+		return \true;
+	}
+	public function count() : int
+	{
+		return \count($this->cookies);
+	}
+	/**
+	 * @return \ArrayIterator<int, SetCookie>
+	 */
+	public function getIterator() : \ArrayIterator
+	{
+		return new \ArrayIterator(\array_values($this->cookies));
+	}
+	public function extractCookies(RequestInterface $request, ResponseInterface $response) : void
+	{
+		if ($cookieHeader = $response->getHeader('Set-Cookie')) {
+			foreach ($cookieHeader as $cookie) {
+				$sc = SetCookie::fromString($cookie);
+				if (!$sc->getDomain()) {
+					$sc->setDomain($request->getUri()->getHost());
+				}
+				if (0 !== \strpos($sc->getPath(), '/')) {
+					$sc->setPath($this->getCookiePathFromRequest($request));
+				}
+				if (!$sc->matchesDomain($request->getUri()->getHost())) {
+					continue;
+				}
+				// Note: At this point `$sc->getDomain()` being a public suffix should
+				// be rejected, but we don't want to pull in the full PSL dependency.
+				$this->setCookie($sc);
+			}
+		}
+	}
+	/**
+	 * Computes cookie path following RFC 6265 section 5.1.4
+	 *
+	 * @see https://datatracker.ietf.org/doc/html/rfc6265#section-5.1.4
+	 */
+	private function getCookiePathFromRequest(RequestInterface $request) : string
+	{
+		$uriPath = $request->getUri()->getPath();
+		if ('' === $uriPath) {
+			return '/';
+		}
+		if (0 !== \strpos($uriPath, '/')) {
+			return '/';
+		}
+		if ('/' === $uriPath) {
+			return '/';
+		}
+		$lastSlashPos = \strrpos($uriPath, '/');
+		if (0 === $lastSlashPos || \false === $lastSlashPos) {
+			return '/';
+		}
+		return \substr($uriPath, 0, $lastSlashPos);
+	}
+	public function withCookieHeader(RequestInterface $request) : RequestInterface
+	{
+		$values = [];
+		$uri = $request->getUri();
+		$scheme = $uri->getScheme();
+		$host = $uri->getHost();
+		$path = $uri->getPath() ?: '/';
+		foreach ($this->cookies as $cookie) {
+			if ($cookie->matchesPath($path) && $cookie->matchesDomain($host) && !$cookie->isExpired() && (!$cookie->getSecure() || $scheme === 'https')) {
+				$values[] = $cookie->getName() . '=' . $cookie->getValue();
+			}
+		}
+		return $values ? $request->withHeader('Cookie', \implode('; ', $values)) : $request;
+	}
+	/**
+	 * If a cookie already exists and the server asks to set it again with a
+	 * null value, the cookie must be deleted.
+	 */
+	private function removeCookieIfEmpty(SetCookie $cookie) : void
+	{
+		$cookieValue = $cookie->getValue();
+		if ($cookieValue === null || $cookieValue === '') {
+			$this->clear($cookie->getDomain(), $cookie->getPath(), $cookie->getName());
+		}
+	}
 }

lib/Vendor/GuzzleHttp/Utils.php

Indentation +313 added lines, -313 removed lines

@@ -10,147 +10,147 @@ 
 use OCA\FullTextSearch_Elasticsearch\Vendor\Psr\Http\Message\UriInterface;
 final class Utils
 {
-    /**
-     * Debug function used to describe the provided value type and class.
-     *
-     * @param mixed $input
-     *
-     * @return string Returns a string containing the type of the variable and
-     *                if a class is provided, the class name.
-     */
-    public static function describeType($input) : string
-    {
-        switch (\gettype($input)) {
-            case 'object':
-                return 'object(' . \get_class($input) . ')';
-            case 'array':
-                return 'array(' . \count($input) . ')';
-            default:
-                \ob_start();
-                \var_dump($input);
-                // normalize float vs double
-                /** @var string $varDumpContent */
-                $varDumpContent = \ob_get_clean();
-                return \str_replace('double(', 'float(', \rtrim($varDumpContent));
-        }
-    }
-    /**
-     * Parses an array of header lines into an associative array of headers.
-     *
-     * @param iterable $lines Header lines array of strings in the following
-     *                        format: "Name: Value"
-     */
-    public static function headersFromLines(iterable $lines) : array
-    {
-        $headers = [];
-        foreach ($lines as $line) {
-            $parts = \explode(':', $line, 2);
-            $headers[\trim($parts[0])][] = isset($parts[1]) ? \trim($parts[1]) : null;
-        }
-        return $headers;
-    }
-    /**
-     * Returns a debug stream based on the provided variable.
-     *
-     * @param mixed $value Optional value
-     *
-     * @return resource
-     */
-    public static function debugResource($value = null)
-    {
-        if (\is_resource($value)) {
-            return $value;
-        }
-        if (\defined('STDOUT')) {
-            return \STDOUT;
-        }
-        return Psr7\Utils::tryFopen('php://output', 'w');
-    }
-    /**
-     * Chooses and creates a default handler to use based on the environment.
-     *
-     * The returned handler is not wrapped by any default middlewares.
-     *
-     * @return callable(\Psr\Http\Message\RequestInterface, array): \GuzzleHttp\Promise\PromiseInterface Returns the best handler for the given system.
-     *
-     * @throws \RuntimeException if no viable Handler is available.
-     */
-    public static function chooseHandler() : callable
-    {
-        $handler = null;
-        if (\defined('CURLOPT_CUSTOMREQUEST') && \function_exists('curl_version') && \version_compare(\curl_version()['version'], '7.21.2') >= 0) {
-            if (\function_exists('curl_multi_exec') && \function_exists('curl_exec')) {
-                $handler = Proxy::wrapSync(new CurlMultiHandler(), new CurlHandler());
-            } elseif (\function_exists('curl_exec')) {
-                $handler = new CurlHandler();
-            } elseif (\function_exists('curl_multi_exec')) {
-                $handler = new CurlMultiHandler();
-            }
-        }
-        if (\ini_get('allow_url_fopen')) {
-            $handler = $handler ? Proxy::wrapStreaming($handler, new StreamHandler()) : new StreamHandler();
-        } elseif (!$handler) {
-            throw new \RuntimeException('GuzzleHttp requires cURL, the allow_url_fopen ini setting, or a custom HTTP handler.');
-        }
-        return $handler;
-    }
-    /**
-     * Get the default User-Agent string to use with Guzzle.
-     */
-    public static function defaultUserAgent() : string
-    {
-        return \sprintf('GuzzleHttp/%d', ClientInterface::MAJOR_VERSION);
-    }
-    /**
-     * Returns the default cacert bundle for the current system.
-     *
-     * First, the openssl.cafile and curl.cainfo php.ini settings are checked.
-     * If those settings are not configured, then the common locations for
-     * bundles found on Red Hat, CentOS, Fedora, Ubuntu, Debian, FreeBSD, OS X
-     * and Windows are checked. If any of these file locations are found on
-     * disk, they will be utilized.
-     *
-     * Note: the result of this function is cached for subsequent calls.
-     *
-     * @throws \RuntimeException if no bundle can be found.
-     *
-     * @deprecated Utils::defaultCaBundle will be removed in guzzlehttp/guzzle:8.0. This method is not needed in PHP 5.6+.
-     */
-    public static function defaultCaBundle() : string
-    {
-        static $cached = null;
-        static $cafiles = [
-            // Red Hat, CentOS, Fedora (provided by the ca-certificates package)
-            '/etc/pki/tls/certs/ca-bundle.crt',
-            // Ubuntu, Debian (provided by the ca-certificates package)
-            '/etc/ssl/certs/ca-certificates.crt',
-            // FreeBSD (provided by the ca_root_nss package)
-            '/usr/local/share/certs/ca-root-nss.crt',
-            // SLES 12 (provided by the ca-certificates package)
-            '/var/lib/ca-certificates/ca-bundle.pem',
-            // OS X provided by homebrew (using the default path)
-            '/usr/local/etc/openssl/cert.pem',
-            // Google app engine
-            '/etc/ca-certificates.crt',
-            // Windows?
-            'C:\\windows\\system32\\curl-ca-bundle.crt',
-            'C:\\windows\\curl-ca-bundle.crt',
-        ];
-        if ($cached) {
-            return $cached;
-        }
-        if ($ca = \ini_get('openssl.cafile')) {
-            return $cached = $ca;
-        }
-        if ($ca = \ini_get('curl.cainfo')) {
-            return $cached = $ca;
-        }
-        foreach ($cafiles as $filename) {
-            if (\file_exists($filename)) {
-                return $cached = $filename;
-            }
-        }
-        throw new \RuntimeException(<<<EOT
+	/**
+	 * Debug function used to describe the provided value type and class.
+	 *
+	 * @param mixed $input
+	 *
+	 * @return string Returns a string containing the type of the variable and
+	 *                if a class is provided, the class name.
+	 */
+	public static function describeType($input) : string
+	{
+		switch (\gettype($input)) {
+			case 'object':
+				return 'object(' . \get_class($input) . ')';
+			case 'array':
+				return 'array(' . \count($input) . ')';
+			default:
+				\ob_start();
+				\var_dump($input);
+				// normalize float vs double
+				/** @var string $varDumpContent */
+				$varDumpContent = \ob_get_clean();
+				return \str_replace('double(', 'float(', \rtrim($varDumpContent));
+		}
+	}
+	/**
+	 * Parses an array of header lines into an associative array of headers.
+	 *
+	 * @param iterable $lines Header lines array of strings in the following
+	 *                        format: "Name: Value"
+	 */
+	public static function headersFromLines(iterable $lines) : array
+	{
+		$headers = [];
+		foreach ($lines as $line) {
+			$parts = \explode(':', $line, 2);
+			$headers[\trim($parts[0])][] = isset($parts[1]) ? \trim($parts[1]) : null;
+		}
+		return $headers;
+	}
+	/**
+	 * Returns a debug stream based on the provided variable.
+	 *
+	 * @param mixed $value Optional value
+	 *
+	 * @return resource
+	 */
+	public static function debugResource($value = null)
+	{
+		if (\is_resource($value)) {
+			return $value;
+		}
+		if (\defined('STDOUT')) {
+			return \STDOUT;
+		}
+		return Psr7\Utils::tryFopen('php://output', 'w');
+	}
+	/**
+	 * Chooses and creates a default handler to use based on the environment.
+	 *
+	 * The returned handler is not wrapped by any default middlewares.
+	 *
+	 * @return callable(\Psr\Http\Message\RequestInterface, array): \GuzzleHttp\Promise\PromiseInterface Returns the best handler for the given system.
+	 *
+	 * @throws \RuntimeException if no viable Handler is available.
+	 */
+	public static function chooseHandler() : callable
+	{
+		$handler = null;
+		if (\defined('CURLOPT_CUSTOMREQUEST') && \function_exists('curl_version') && \version_compare(\curl_version()['version'], '7.21.2') >= 0) {
+			if (\function_exists('curl_multi_exec') && \function_exists('curl_exec')) {
+				$handler = Proxy::wrapSync(new CurlMultiHandler(), new CurlHandler());
+			} elseif (\function_exists('curl_exec')) {
+				$handler = new CurlHandler();
+			} elseif (\function_exists('curl_multi_exec')) {
+				$handler = new CurlMultiHandler();
+			}
+		}
+		if (\ini_get('allow_url_fopen')) {
+			$handler = $handler ? Proxy::wrapStreaming($handler, new StreamHandler()) : new StreamHandler();
+		} elseif (!$handler) {
+			throw new \RuntimeException('GuzzleHttp requires cURL, the allow_url_fopen ini setting, or a custom HTTP handler.');
+		}
+		return $handler;
+	}
+	/**
+	 * Get the default User-Agent string to use with Guzzle.
+	 */
+	public static function defaultUserAgent() : string
+	{
+		return \sprintf('GuzzleHttp/%d', ClientInterface::MAJOR_VERSION);
+	}
+	/**
+	 * Returns the default cacert bundle for the current system.
+	 *
+	 * First, the openssl.cafile and curl.cainfo php.ini settings are checked.
+	 * If those settings are not configured, then the common locations for
+	 * bundles found on Red Hat, CentOS, Fedora, Ubuntu, Debian, FreeBSD, OS X
+	 * and Windows are checked. If any of these file locations are found on
+	 * disk, they will be utilized.
+	 *
+	 * Note: the result of this function is cached for subsequent calls.
+	 *
+	 * @throws \RuntimeException if no bundle can be found.
+	 *
+	 * @deprecated Utils::defaultCaBundle will be removed in guzzlehttp/guzzle:8.0. This method is not needed in PHP 5.6+.
+	 */
+	public static function defaultCaBundle() : string
+	{
+		static $cached = null;
+		static $cafiles = [
+			// Red Hat, CentOS, Fedora (provided by the ca-certificates package)
+			'/etc/pki/tls/certs/ca-bundle.crt',
+			// Ubuntu, Debian (provided by the ca-certificates package)
+			'/etc/ssl/certs/ca-certificates.crt',
+			// FreeBSD (provided by the ca_root_nss package)
+			'/usr/local/share/certs/ca-root-nss.crt',
+			// SLES 12 (provided by the ca-certificates package)
+			'/var/lib/ca-certificates/ca-bundle.pem',
+			// OS X provided by homebrew (using the default path)
+			'/usr/local/etc/openssl/cert.pem',
+			// Google app engine
+			'/etc/ca-certificates.crt',
+			// Windows?
+			'C:\\windows\\system32\\curl-ca-bundle.crt',
+			'C:\\windows\\curl-ca-bundle.crt',
+		];
+		if ($cached) {
+			return $cached;
+		}
+		if ($ca = \ini_get('openssl.cafile')) {
+			return $cached = $ca;
+		}
+		if ($ca = \ini_get('curl.cainfo')) {
+			return $cached = $ca;
+		}
+		foreach ($cafiles as $filename) {
+			if (\file_exists($filename)) {
+				return $cached = $filename;
+			}
+		}
+		throw new \RuntimeException(<<<EOT
 No system CA bundle could be found in any of the the common system locations.
 PHP versions earlier than 5.6 are not properly configured to use the system's
 CA bundle by default. In order to verify peer certificates, you will need to
@@ -164,176 +164,176 @@ 
 https://curl.haxx.se/docs/sslcerts.html for more information.
 EOT
 );
-    }
-    /**
-     * Creates an associative array of lowercase header names to the actual
-     * header casing.
-     */
-    public static function normalizeHeaderKeys(array $headers) : array
-    {
-        $result = [];
-        foreach (\array_keys($headers) as $key) {
-            $result[\strtolower($key)] = $key;
-        }
-        return $result;
-    }
-    /**
-     * Returns true if the provided host matches any of the no proxy areas.
-     *
-     * This method will strip a port from the host if it is present. Each pattern
-     * can be matched with an exact match (e.g., "foo.com" == "foo.com") or a
-     * partial match: (e.g., "foo.com" == "baz.foo.com" and ".foo.com" ==
-     * "baz.foo.com", but ".foo.com" != "foo.com").
-     *
-     * Areas are matched in the following cases:
-     * 1. "*" (without quotes) always matches any hosts.
-     * 2. An exact match.
-     * 3. The area starts with "." and the area is the last part of the host. e.g.
-     *    '.mit.edu' will match any host that ends with '.mit.edu'.
-     *
-     * @param string   $host         Host to check against the patterns.
-     * @param string[] $noProxyArray An array of host patterns.
-     *
-     * @throws InvalidArgumentException
-     */
-    public static function isHostInNoProxy(string $host, array $noProxyArray) : bool
-    {
-        if (\strlen($host) === 0) {
-            throw new InvalidArgumentException('Empty host provided');
-        }
-        // Strip port if present.
-        [$host] = \explode(':', $host, 2);
-        foreach ($noProxyArray as $area) {
-            // Always match on wildcards.
-            if ($area === '*') {
-                return \true;
-            }
-            if (empty($area)) {
-                // Don't match on empty values.
-                continue;
-            }
-            if ($area === $host) {
-                // Exact matches.
-                return \true;
-            }
-            // Special match if the area when prefixed with ".". Remove any
-            // existing leading "." and add a new leading ".".
-            $area = '.' . \ltrim($area, '.');
-            if (\substr($host, -\strlen($area)) === $area) {
-                return \true;
-            }
-        }
-        return \false;
-    }
-    /**
-     * Wrapper for json_decode that throws when an error occurs.
-     *
-     * @param string $json    JSON data to parse
-     * @param bool   $assoc   When true, returned objects will be converted
-     *                        into associative arrays.
-     * @param int    $depth   User specified recursion depth.
-     * @param int    $options Bitmask of JSON decode options.
-     *
-     * @return object|array|string|int|float|bool|null
-     *
-     * @throws InvalidArgumentException if the JSON cannot be decoded.
-     *
-     * @see https://www.php.net/manual/en/function.json-decode.php
-     */
-    public static function jsonDecode(string $json, bool $assoc = \false, int $depth = 512, int $options = 0)
-    {
-        $data = \json_decode($json, $assoc, $depth, $options);
-        if (\JSON_ERROR_NONE !== \json_last_error()) {
-            throw new InvalidArgumentException('json_decode error: ' . \json_last_error_msg());
-        }
-        return $data;
-    }
-    /**
-     * Wrapper for JSON encoding that throws when an error occurs.
-     *
-     * @param mixed $value   The value being encoded
-     * @param int   $options JSON encode option bitmask
-     * @param int   $depth   Set the maximum depth. Must be greater than zero.
-     *
-     * @throws InvalidArgumentException if the JSON cannot be encoded.
-     *
-     * @see https://www.php.net/manual/en/function.json-encode.php
-     */
-    public static function jsonEncode($value, int $options = 0, int $depth = 512) : string
-    {
-        $json = \json_encode($value, $options, $depth);
-        if (\JSON_ERROR_NONE !== \json_last_error()) {
-            throw new InvalidArgumentException('json_encode error: ' . \json_last_error_msg());
-        }
-        /** @var string */
-        return $json;
-    }
-    /**
-     * Wrapper for the hrtime() or microtime() functions
-     * (depending on the PHP version, one of the two is used)
-     *
-     * @return float UNIX timestamp
-     *
-     * @internal
-     */
-    public static function currentTime() : float
-    {
-        return (float) \function_exists('hrtime') ? \hrtime(\true) / 1000000000.0 : \microtime(\true);
-    }
-    /**
-     * @throws InvalidArgumentException
-     *
-     * @internal
-     */
-    public static function idnUriConvert(UriInterface $uri, int $options = 0) : UriInterface
-    {
-        if ($uri->getHost()) {
-            $asciiHost = self::idnToAsci($uri->getHost(), $options, $info);
-            if ($asciiHost === \false) {
-                $errorBitSet = $info['errors'] ?? 0;
-                $errorConstants = \array_filter(\array_keys(\get_defined_constants()), static function (string $name) : bool {
-                    return \substr($name, 0, 11) === 'IDNA_ERROR_';
-                });
-                $errors = [];
-                foreach ($errorConstants as $errorConstant) {
-                    if ($errorBitSet & \constant($errorConstant)) {
-                        $errors[] = $errorConstant;
-                    }
-                }
-                $errorMessage = 'IDN conversion failed';
-                if ($errors) {
-                    $errorMessage .= ' (errors: ' . \implode(', ', $errors) . ')';
-                }
-                throw new InvalidArgumentException($errorMessage);
-            }
-            if ($uri->getHost() !== $asciiHost) {
-                // Replace URI only if the ASCII version is different
-                $uri = $uri->withHost($asciiHost);
-            }
-        }
-        return $uri;
-    }
-    /**
-     * @internal
-     */
-    public static function getenv(string $name) : ?string
-    {
-        if (isset($_SERVER[$name])) {
-            return (string) $_SERVER[$name];
-        }
-        if (\PHP_SAPI === 'cli' && ($value = \getenv($name)) !== \false && $value !== null) {
-            return (string) $value;
-        }
-        return null;
-    }
-    /**
-     * @return string|false
-     */
-    private static function idnToAsci(string $domain, int $options, ?array &$info = [])
-    {
-        if (\function_exists('idn_to_ascii') && \defined('INTL_IDNA_VARIANT_UTS46')) {
-            return \idn_to_ascii($domain, $options, \INTL_IDNA_VARIANT_UTS46, $info);
-        }
-        throw new \Error('ext-idn or symfony/polyfill-intl-idn not loaded or too old');
-    }
+	}
+	/**
+	 * Creates an associative array of lowercase header names to the actual
+	 * header casing.
+	 */
+	public static function normalizeHeaderKeys(array $headers) : array
+	{
+		$result = [];
+		foreach (\array_keys($headers) as $key) {
+			$result[\strtolower($key)] = $key;
+		}
+		return $result;
+	}
+	/**
+	 * Returns true if the provided host matches any of the no proxy areas.
+	 *
+	 * This method will strip a port from the host if it is present. Each pattern
+	 * can be matched with an exact match (e.g., "foo.com" == "foo.com") or a
+	 * partial match: (e.g., "foo.com" == "baz.foo.com" and ".foo.com" ==
+	 * "baz.foo.com", but ".foo.com" != "foo.com").
+	 *
+	 * Areas are matched in the following cases:
+	 * 1. "*" (without quotes) always matches any hosts.
+	 * 2. An exact match.
+	 * 3. The area starts with "." and the area is the last part of the host. e.g.
+	 *    '.mit.edu' will match any host that ends with '.mit.edu'.
+	 *
+	 * @param string   $host         Host to check against the patterns.
+	 * @param string[] $noProxyArray An array of host patterns.
+	 *
+	 * @throws InvalidArgumentException
+	 */
+	public static function isHostInNoProxy(string $host, array $noProxyArray) : bool
+	{
+		if (\strlen($host) === 0) {
+			throw new InvalidArgumentException('Empty host provided');
+		}
+		// Strip port if present.
+		[$host] = \explode(':', $host, 2);
+		foreach ($noProxyArray as $area) {
+			// Always match on wildcards.
+			if ($area === '*') {
+				return \true;
+			}
+			if (empty($area)) {
+				// Don't match on empty values.
+				continue;
+			}
+			if ($area === $host) {
+				// Exact matches.
+				return \true;
+			}
+			// Special match if the area when prefixed with ".". Remove any
+			// existing leading "." and add a new leading ".".
+			$area = '.' . \ltrim($area, '.');
+			if (\substr($host, -\strlen($area)) === $area) {
+				return \true;
+			}
+		}
+		return \false;
+	}
+	/**
+	 * Wrapper for json_decode that throws when an error occurs.
+	 *
+	 * @param string $json    JSON data to parse
+	 * @param bool   $assoc   When true, returned objects will be converted
+	 *                        into associative arrays.
+	 * @param int    $depth   User specified recursion depth.
+	 * @param int    $options Bitmask of JSON decode options.
+	 *
+	 * @return object|array|string|int|float|bool|null
+	 *
+	 * @throws InvalidArgumentException if the JSON cannot be decoded.
+	 *
+	 * @see https://www.php.net/manual/en/function.json-decode.php
+	 */
+	public static function jsonDecode(string $json, bool $assoc = \false, int $depth = 512, int $options = 0)
+	{
+		$data = \json_decode($json, $assoc, $depth, $options);
+		if (\JSON_ERROR_NONE !== \json_last_error()) {
+			throw new InvalidArgumentException('json_decode error: ' . \json_last_error_msg());
+		}
+		return $data;
+	}
+	/**
+	 * Wrapper for JSON encoding that throws when an error occurs.
+	 *
+	 * @param mixed $value   The value being encoded
+	 * @param int   $options JSON encode option bitmask
+	 * @param int   $depth   Set the maximum depth. Must be greater than zero.
+	 *
+	 * @throws InvalidArgumentException if the JSON cannot be encoded.
+	 *
+	 * @see https://www.php.net/manual/en/function.json-encode.php
+	 */
+	public static function jsonEncode($value, int $options = 0, int $depth = 512) : string
+	{
+		$json = \json_encode($value, $options, $depth);
+		if (\JSON_ERROR_NONE !== \json_last_error()) {
+			throw new InvalidArgumentException('json_encode error: ' . \json_last_error_msg());
+		}
+		/** @var string */
+		return $json;
+	}
+	/**
+	 * Wrapper for the hrtime() or microtime() functions
+	 * (depending on the PHP version, one of the two is used)
+	 *
+	 * @return float UNIX timestamp
+	 *
+	 * @internal
+	 */
+	public static function currentTime() : float
+	{
+		return (float) \function_exists('hrtime') ? \hrtime(\true) / 1000000000.0 : \microtime(\true);
+	}
+	/**
+	 * @throws InvalidArgumentException
+	 *
+	 * @internal
+	 */
+	public static function idnUriConvert(UriInterface $uri, int $options = 0) : UriInterface
+	{
+		if ($uri->getHost()) {
+			$asciiHost = self::idnToAsci($uri->getHost(), $options, $info);
+			if ($asciiHost === \false) {
+				$errorBitSet = $info['errors'] ?? 0;
+				$errorConstants = \array_filter(\array_keys(\get_defined_constants()), static function (string $name) : bool {
+					return \substr($name, 0, 11) === 'IDNA_ERROR_';
+				});
+				$errors = [];
+				foreach ($errorConstants as $errorConstant) {
+					if ($errorBitSet & \constant($errorConstant)) {
+						$errors[] = $errorConstant;
+					}
+				}
+				$errorMessage = 'IDN conversion failed';
+				if ($errors) {
+					$errorMessage .= ' (errors: ' . \implode(', ', $errors) . ')';
+				}
+				throw new InvalidArgumentException($errorMessage);
+			}
+			if ($uri->getHost() !== $asciiHost) {
+				// Replace URI only if the ASCII version is different
+				$uri = $uri->withHost($asciiHost);
+			}
+		}
+		return $uri;
+	}
+	/**
+	 * @internal
+	 */
+	public static function getenv(string $name) : ?string
+	{
+		if (isset($_SERVER[$name])) {
+			return (string) $_SERVER[$name];
+		}
+		if (\PHP_SAPI === 'cli' && ($value = \getenv($name)) !== \false && $value !== null) {
+			return (string) $value;
+		}
+		return null;
+	}
+	/**
+	 * @return string|false
+	 */
+	private static function idnToAsci(string $domain, int $options, ?array &$info = [])
+	{
+		if (\function_exists('idn_to_ascii') && \defined('INTL_IDNA_VARIANT_UTS46')) {
+			return \idn_to_ascii($domain, $options, \INTL_IDNA_VARIANT_UTS46, $info);
+		}
+		throw new \Error('ext-idn or symfony/polyfill-intl-idn not loaded or too old');
+	}
 }

lib/Vendor/GuzzleHttp/Client.php

Indentation +384 added lines, -384 removed lines

@@ -15,388 +15,388 @@
  */
 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
-     *   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 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 \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 \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 \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 \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 \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
+	 *   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 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 \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 \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 \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 \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 \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/PrepareBodyMiddleware.php

Indentation +71 added lines, -71 removed lines

@@ -12,75 +12,75 @@
  */
 class PrepareBodyMiddleware
 {
-    /**
-     * @var callable(RequestInterface, array): PromiseInterface
-     */
-    private $nextHandler;
-    /**
-     * @param callable(RequestInterface, array): PromiseInterface $nextHandler Next handler to invoke.
-     */
-    public function __construct(callable $nextHandler)
-    {
-        $this->nextHandler = $nextHandler;
-    }
-    public function __invoke(RequestInterface $request, array $options) : PromiseInterface
-    {
-        $fn = $this->nextHandler;
-        // Don't do anything if the request has no body.
-        if ($request->getBody()->getSize() === 0) {
-            return $fn($request, $options);
-        }
-        $modify = [];
-        // Add a default content-type if possible.
-        if (!$request->hasHeader('Content-Type')) {
-            if ($uri = $request->getBody()->getMetadata('uri')) {
-                if (\is_string($uri) && ($type = Psr7\MimeType::fromFilename($uri))) {
-                    $modify['set_headers']['Content-Type'] = $type;
-                }
-            }
-        }
-        // Add a default content-length or transfer-encoding header.
-        if (!$request->hasHeader('Content-Length') && !$request->hasHeader('Transfer-Encoding')) {
-            $size = $request->getBody()->getSize();
-            if ($size !== null) {
-                $modify['set_headers']['Content-Length'] = $size;
-            } else {
-                $modify['set_headers']['Transfer-Encoding'] = 'chunked';
-            }
-        }
-        // Add the expect header if needed.
-        $this->addExpectHeader($request, $options, $modify);
-        return $fn(Psr7\Utils::modifyRequest($request, $modify), $options);
-    }
-    /**
-     * Add expect header
-     */
-    private function addExpectHeader(RequestInterface $request, array $options, array &$modify) : void
-    {
-        // Determine if the Expect header should be used
-        if ($request->hasHeader('Expect')) {
-            return;
-        }
-        $expect = $options['expect'] ?? null;
-        // Return if disabled or using HTTP/1.0
-        if ($expect === \false || $request->getProtocolVersion() === '1.0') {
-            return;
-        }
-        // The expect header is unconditionally enabled
-        if ($expect === \true) {
-            $modify['set_headers']['Expect'] = '100-Continue';
-            return;
-        }
-        // By default, send the expect header when the payload is > 1mb
-        if ($expect === null) {
-            $expect = 1048576;
-        }
-        // Always add if the body cannot be rewound, the size cannot be
-        // determined, or the size is greater than the cutoff threshold
-        $body = $request->getBody();
-        $size = $body->getSize();
-        if ($size === null || $size >= (int) $expect || !$body->isSeekable()) {
-            $modify['set_headers']['Expect'] = '100-Continue';
-        }
-    }
+	/**
+	 * @var callable(RequestInterface, array): PromiseInterface
+	 */
+	private $nextHandler;
+	/**
+	 * @param callable(RequestInterface, array): PromiseInterface $nextHandler Next handler to invoke.
+	 */
+	public function __construct(callable $nextHandler)
+	{
+		$this->nextHandler = $nextHandler;
+	}
+	public function __invoke(RequestInterface $request, array $options) : PromiseInterface
+	{
+		$fn = $this->nextHandler;
+		// Don't do anything if the request has no body.
+		if ($request->getBody()->getSize() === 0) {
+			return $fn($request, $options);
+		}
+		$modify = [];
+		// Add a default content-type if possible.
+		if (!$request->hasHeader('Content-Type')) {
+			if ($uri = $request->getBody()->getMetadata('uri')) {
+				if (\is_string($uri) && ($type = Psr7\MimeType::fromFilename($uri))) {
+					$modify['set_headers']['Content-Type'] = $type;
+				}
+			}
+		}
+		// Add a default content-length or transfer-encoding header.
+		if (!$request->hasHeader('Content-Length') && !$request->hasHeader('Transfer-Encoding')) {
+			$size = $request->getBody()->getSize();
+			if ($size !== null) {
+				$modify['set_headers']['Content-Length'] = $size;
+			} else {
+				$modify['set_headers']['Transfer-Encoding'] = 'chunked';
+			}
+		}
+		// Add the expect header if needed.
+		$this->addExpectHeader($request, $options, $modify);
+		return $fn(Psr7\Utils::modifyRequest($request, $modify), $options);
+	}
+	/**
+	 * Add expect header
+	 */
+	private function addExpectHeader(RequestInterface $request, array $options, array &$modify) : void
+	{
+		// Determine if the Expect header should be used
+		if ($request->hasHeader('Expect')) {
+			return;
+		}
+		$expect = $options['expect'] ?? null;
+		// Return if disabled or using HTTP/1.0
+		if ($expect === \false || $request->getProtocolVersion() === '1.0') {
+			return;
+		}
+		// The expect header is unconditionally enabled
+		if ($expect === \true) {
+			$modify['set_headers']['Expect'] = '100-Continue';
+			return;
+		}
+		// By default, send the expect header when the payload is > 1mb
+		if ($expect === null) {
+			$expect = 1048576;
+		}
+		// Always add if the body cannot be rewound, the size cannot be
+		// determined, or the size is greater than the cutoff threshold
+		$body = $request->getBody();
+		$size = $body->getSize();
+		if ($size === null || $size >= (int) $expect || !$body->isSeekable()) {
+			$modify['set_headers']['Expect'] = '100-Continue';
+		}
+	}
 }