nextcloud / fulltextsearch_elasticsearch

lib/Vendor/GuzzleHttp/Handler/Proxy.php

Indentation +34 added lines, -34 removed lines

@@ -13,39 +13,39 @@
  */
 class Proxy
 {
-    /**
-     * Sends synchronous requests to a specific handler while sending all other
-     * requests to another handler.
-     *
-     * @param callable(\OCA\FullTextSearch_Elasticsearch\Vendor\Psr\Http\Message\RequestInterface, array): \OCA\FullTextSearch_Elasticsearch\Vendor\GuzzleHttp\Promise\PromiseInterface $default Handler used for normal responses
-     * @param callable(\OCA\FullTextSearch_Elasticsearch\Vendor\Psr\Http\Message\RequestInterface, array): \OCA\FullTextSearch_Elasticsearch\Vendor\GuzzleHttp\Promise\PromiseInterface $sync    Handler used for synchronous responses.
-     *
-     * @return callable(\OCA\FullTextSearch_Elasticsearch\Vendor\Psr\Http\Message\RequestInterface, array): \OCA\FullTextSearch_Elasticsearch\Vendor\GuzzleHttp\Promise\PromiseInterface Returns the composed handler.
-     */
-    public static function wrapSync(callable $default, callable $sync): callable
-    {
-        return static function (RequestInterface $request, array $options) use ($default, $sync): PromiseInterface {
-            return empty($options[RequestOptions::SYNCHRONOUS]) ? $default($request, $options) : $sync($request, $options);
-        };
-    }
+	/**
+	 * Sends synchronous requests to a specific handler while sending all other
+	 * requests to another handler.
+	 *
+	 * @param callable(\OCA\FullTextSearch_Elasticsearch\Vendor\Psr\Http\Message\RequestInterface, array): \OCA\FullTextSearch_Elasticsearch\Vendor\GuzzleHttp\Promise\PromiseInterface $default Handler used for normal responses
+	 * @param callable(\OCA\FullTextSearch_Elasticsearch\Vendor\Psr\Http\Message\RequestInterface, array): \OCA\FullTextSearch_Elasticsearch\Vendor\GuzzleHttp\Promise\PromiseInterface $sync    Handler used for synchronous responses.
+	 *
+	 * @return callable(\OCA\FullTextSearch_Elasticsearch\Vendor\Psr\Http\Message\RequestInterface, array): \OCA\FullTextSearch_Elasticsearch\Vendor\GuzzleHttp\Promise\PromiseInterface Returns the composed handler.
+	 */
+	public static function wrapSync(callable $default, callable $sync): callable
+	{
+		return static function (RequestInterface $request, array $options) use ($default, $sync): PromiseInterface {
+			return empty($options[RequestOptions::SYNCHRONOUS]) ? $default($request, $options) : $sync($request, $options);
+		};
+	}
 
-    /**
-     * Sends streaming requests to a streaming compatible handler while sending
-     * all other requests to a default handler.
-     *
-     * This, for example, could be useful for taking advantage of the
-     * performance benefits of curl while still supporting true streaming
-     * through the StreamHandler.
-     *
-     * @param callable(\OCA\FullTextSearch_Elasticsearch\Vendor\Psr\Http\Message\RequestInterface, array): \OCA\FullTextSearch_Elasticsearch\Vendor\GuzzleHttp\Promise\PromiseInterface $default   Handler used for non-streaming responses
-     * @param callable(\OCA\FullTextSearch_Elasticsearch\Vendor\Psr\Http\Message\RequestInterface, array): \OCA\FullTextSearch_Elasticsearch\Vendor\GuzzleHttp\Promise\PromiseInterface $streaming Handler used for streaming responses
-     *
-     * @return callable(\OCA\FullTextSearch_Elasticsearch\Vendor\Psr\Http\Message\RequestInterface, array): \OCA\FullTextSearch_Elasticsearch\Vendor\GuzzleHttp\Promise\PromiseInterface Returns the composed handler.
-     */
-    public static function wrapStreaming(callable $default, callable $streaming): callable
-    {
-        return static function (RequestInterface $request, array $options) use ($default, $streaming): PromiseInterface {
-            return empty($options['stream']) ? $default($request, $options) : $streaming($request, $options);
-        };
-    }
+	/**
+	 * Sends streaming requests to a streaming compatible handler while sending
+	 * all other requests to a default handler.
+	 *
+	 * This, for example, could be useful for taking advantage of the
+	 * performance benefits of curl while still supporting true streaming
+	 * through the StreamHandler.
+	 *
+	 * @param callable(\OCA\FullTextSearch_Elasticsearch\Vendor\Psr\Http\Message\RequestInterface, array): \OCA\FullTextSearch_Elasticsearch\Vendor\GuzzleHttp\Promise\PromiseInterface $default   Handler used for non-streaming responses
+	 * @param callable(\OCA\FullTextSearch_Elasticsearch\Vendor\Psr\Http\Message\RequestInterface, array): \OCA\FullTextSearch_Elasticsearch\Vendor\GuzzleHttp\Promise\PromiseInterface $streaming Handler used for streaming responses
+	 *
+	 * @return callable(\OCA\FullTextSearch_Elasticsearch\Vendor\Psr\Http\Message\RequestInterface, array): \OCA\FullTextSearch_Elasticsearch\Vendor\GuzzleHttp\Promise\PromiseInterface Returns the composed handler.
+	 */
+	public static function wrapStreaming(callable $default, callable $streaming): callable
+	{
+		return static function (RequestInterface $request, array $options) use ($default, $streaming): PromiseInterface {
+			return empty($options['stream']) ? $default($request, $options) : $streaming($request, $options);
+		};
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -24,7 +24,7 @@ 
      */
     public static function wrapSync(callable $default, callable $sync): callable
     {
-        return static function (RequestInterface $request, array $options) use ($default, $sync): PromiseInterface {
+        return static function(RequestInterface $request, array $options) use ($default, $sync): PromiseInterface {
             return empty($options[RequestOptions::SYNCHRONOUS]) ? $default($request, $options) : $sync($request, $options);
         };
     }
@@ -44,7 +44,7 @@ 
      */
     public static function wrapStreaming(callable $default, callable $streaming): callable
     {
-        return static function (RequestInterface $request, array $options) use ($default, $streaming): PromiseInterface {
+        return static function(RequestInterface $request, array $options) use ($default, $streaming): PromiseInterface {
             return empty($options['stream']) ? $default($request, $options) : $streaming($request, $options);
         };
     }

Braces +1 added lines, -2 removed lines

@@ -11,8 +11,7 @@
  *
  * @final
  */
-class Proxy
-{
+class Proxy {
     /**
      * Sends synchronous requests to a specific handler while sending all other
      * requests to another handler.

lib/Vendor/GuzzleHttp/Handler/CurlFactoryInterface.php

Indentation +15 added lines, -15 removed lines

@@ -6,20 +6,20 @@
 
 interface CurlFactoryInterface
 {
-    /**
-     * Creates a cURL handle resource.
-     *
-     * @param RequestInterface $request Request
-     * @param array            $options Transfer options
-     *
-     * @throws \RuntimeException when an option cannot be applied
-     */
-    public function create(RequestInterface $request, array $options): EasyHandle;
+	/**
+	 * Creates a cURL handle resource.
+	 *
+	 * @param RequestInterface $request Request
+	 * @param array            $options Transfer options
+	 *
+	 * @throws \RuntimeException when an option cannot be applied
+	 */
+	public function create(RequestInterface $request, array $options): EasyHandle;
 
-    /**
-     * Release an easy handle, allowing it to be reused or closed.
-     *
-     * This function must call unset on the easy handle's "handle" property.
-     */
-    public function release(EasyHandle $easy): void;
+	/**
+	 * Release an easy handle, allowing it to be reused or closed.
+	 *
+	 * This function must call unset on the easy handle's "handle" property.
+	 */
+	public function release(EasyHandle $easy): void;
 }

Braces +1 added lines, -2 removed lines

@@ -4,8 +4,7 @@
 
 use OCA\FullTextSearch_Elasticsearch\Vendor\Psr\Http\Message\RequestInterface;
 
-interface CurlFactoryInterface
-{
+interface CurlFactoryInterface {
     /**
      * Creates a cURL handle resource.
      *

lib/Vendor/GuzzleHttp/Handler/CurlFactory.php

Indentation +616 added lines, -616 removed lines

@@ -19,620 +19,620 @@
  */
 class CurlFactory implements CurlFactoryInterface
 {
-    public const CURL_VERSION_STR = 'curl_version';
-
-    /**
-     * @deprecated
-     */
-    public const LOW_CURL_VERSION_NUMBER = '7.21.2';
-
-    /**
-     * @var resource[]|\CurlHandle[]
-     */
-    private $handles = [];
-
-    /**
-     * @var int Total number of idle handles to keep in cache
-     */
-    private $maxHandles;
-
-    /**
-     * @param int $maxHandles Maximum number of idle handles.
-     */
-    public function __construct(int $maxHandles)
-    {
-        $this->maxHandles = $maxHandles;
-    }
-
-    public function create(RequestInterface $request, array $options): EasyHandle
-    {
-        if (isset($options['curl']['body_as_string'])) {
-            $options['_body_as_string'] = $options['curl']['body_as_string'];
-            unset($options['curl']['body_as_string']);
-        }
-
-        $easy = new EasyHandle();
-        $easy->request = $request;
-        $easy->options = $options;
-        $conf = $this->getDefaultConf($easy);
-        $this->applyMethod($easy, $conf);
-        $this->applyHandlerOptions($easy, $conf);
-        $this->applyHeaders($easy, $conf);
-        unset($conf['_headers']);
-
-        // Add handler options from the request configuration options
-        if (isset($options['curl'])) {
-            $conf = \array_replace($conf, $options['curl']);
-        }
-
-        $conf[\CURLOPT_HEADERFUNCTION] = $this->createHeaderFn($easy);
-        $easy->handle = $this->handles ? \array_pop($this->handles) : \curl_init();
-        curl_setopt_array($easy->handle, $conf);
-
-        return $easy;
-    }
-
-    public function release(EasyHandle $easy): void
-    {
-        $resource = $easy->handle;
-        unset($easy->handle);
-
-        if (\count($this->handles) >= $this->maxHandles) {
-            \curl_close($resource);
-        } else {
-            // Remove all callback functions as they can hold onto references
-            // and are not cleaned up by curl_reset. Using curl_setopt_array
-            // does not work for some reason, so removing each one
-            // individually.
-            \curl_setopt($resource, \CURLOPT_HEADERFUNCTION, null);
-            \curl_setopt($resource, \CURLOPT_READFUNCTION, null);
-            \curl_setopt($resource, \CURLOPT_WRITEFUNCTION, null);
-            \curl_setopt($resource, \CURLOPT_PROGRESSFUNCTION, null);
-            \curl_reset($resource);
-            $this->handles[] = $resource;
-        }
-    }
-
-    /**
-     * Completes a cURL transaction, either returning a response promise or a
-     * rejected promise.
-     *
-     * @param callable(RequestInterface, array): PromiseInterface $handler
-     * @param CurlFactoryInterface                                $factory Dictates how the handle is released
-     */
-    public static function finish(callable $handler, EasyHandle $easy, CurlFactoryInterface $factory): PromiseInterface
-    {
-        if (isset($easy->options['on_stats'])) {
-            self::invokeStats($easy);
-        }
-
-        if (!$easy->response || $easy->errno) {
-            return self::finishError($handler, $easy, $factory);
-        }
-
-        // Return the response if it is present and there is no error.
-        $factory->release($easy);
-
-        // Rewind the body of the response if possible.
-        $body = $easy->response->getBody();
-        if ($body->isSeekable()) {
-            $body->rewind();
-        }
-
-        return new FulfilledPromise($easy->response);
-    }
-
-    private static function invokeStats(EasyHandle $easy): void
-    {
-        $curlStats = \curl_getinfo($easy->handle);
-        $curlStats['appconnect_time'] = \curl_getinfo($easy->handle, \CURLINFO_APPCONNECT_TIME);
-        $stats = new TransferStats(
-            $easy->request,
-            $easy->response,
-            $curlStats['total_time'],
-            $easy->errno,
-            $curlStats
-        );
-        ($easy->options['on_stats'])($stats);
-    }
-
-    /**
-     * @param callable(RequestInterface, array): PromiseInterface $handler
-     */
-    private static function finishError(callable $handler, EasyHandle $easy, CurlFactoryInterface $factory): PromiseInterface
-    {
-        // Get error information and release the handle to the factory.
-        $ctx = [
-            'errno' => $easy->errno,
-            'error' => \curl_error($easy->handle),
-            'appconnect_time' => \curl_getinfo($easy->handle, \CURLINFO_APPCONNECT_TIME),
-        ] + \curl_getinfo($easy->handle);
-        $ctx[self::CURL_VERSION_STR] = \curl_version()['version'];
-        $factory->release($easy);
-
-        // Retry when nothing is present or when curl failed to rewind.
-        if (empty($easy->options['_err_message']) && (!$easy->errno || $easy->errno == 65)) {
-            return self::retryFailedRewind($handler, $easy, $ctx);
-        }
-
-        return self::createRejection($easy, $ctx);
-    }
-
-    private static function createRejection(EasyHandle $easy, array $ctx): PromiseInterface
-    {
-        static $connectionErrors = [
-            \CURLE_OPERATION_TIMEOUTED => true,
-            \CURLE_COULDNT_RESOLVE_HOST => true,
-            \CURLE_COULDNT_CONNECT => true,
-            \CURLE_SSL_CONNECT_ERROR => true,
-            \CURLE_GOT_NOTHING => true,
-        ];
-
-        if ($easy->createResponseException) {
-            return P\Create::rejectionFor(
-                new RequestException(
-                    'An error was encountered while creating the response',
-                    $easy->request,
-                    $easy->response,
-                    $easy->createResponseException,
-                    $ctx
-                )
-            );
-        }
-
-        // If an exception was encountered during the onHeaders event, then
-        // return a rejected promise that wraps that exception.
-        if ($easy->onHeadersException) {
-            return P\Create::rejectionFor(
-                new RequestException(
-                    'An error was encountered during the on_headers event',
-                    $easy->request,
-                    $easy->response,
-                    $easy->onHeadersException,
-                    $ctx
-                )
-            );
-        }
-
-        $message = \sprintf(
-            'cURL error %s: %s (%s)',
-            $ctx['errno'],
-            $ctx['error'],
-            'see https://curl.haxx.se/libcurl/c/libcurl-errors.html'
-        );
-        $uriString = (string) $easy->request->getUri();
-        if ($uriString !== '' && false === \strpos($ctx['error'], $uriString)) {
-            $message .= \sprintf(' for %s', $uriString);
-        }
-
-        // Create a connection exception if it was a specific error code.
-        $error = isset($connectionErrors[$easy->errno])
-            ? new ConnectException($message, $easy->request, null, $ctx)
-            : new RequestException($message, $easy->request, $easy->response, null, $ctx);
-
-        return P\Create::rejectionFor($error);
-    }
-
-    /**
-     * @return array<int|string, mixed>
-     */
-    private function getDefaultConf(EasyHandle $easy): array
-    {
-        $conf = [
-            '_headers' => $easy->request->getHeaders(),
-            \CURLOPT_CUSTOMREQUEST => $easy->request->getMethod(),
-            \CURLOPT_URL => (string) $easy->request->getUri()->withFragment(''),
-            \CURLOPT_RETURNTRANSFER => false,
-            \CURLOPT_HEADER => false,
-            \CURLOPT_CONNECTTIMEOUT => 300,
-        ];
-
-        if (\defined('CURLOPT_PROTOCOLS')) {
-            $conf[\CURLOPT_PROTOCOLS] = \CURLPROTO_HTTP | \CURLPROTO_HTTPS;
-        }
-
-        $version = $easy->request->getProtocolVersion();
-        if ($version == 1.1) {
-            $conf[\CURLOPT_HTTP_VERSION] = \CURL_HTTP_VERSION_1_1;
-        } elseif ($version == 2.0) {
-            $conf[\CURLOPT_HTTP_VERSION] = \CURL_HTTP_VERSION_2_0;
-        } else {
-            $conf[\CURLOPT_HTTP_VERSION] = \CURL_HTTP_VERSION_1_0;
-        }
-
-        return $conf;
-    }
-
-    private function applyMethod(EasyHandle $easy, array &$conf): void
-    {
-        $body = $easy->request->getBody();
-        $size = $body->getSize();
-
-        if ($size === null || $size > 0) {
-            $this->applyBody($easy->request, $easy->options, $conf);
-
-            return;
-        }
-
-        $method = $easy->request->getMethod();
-        if ($method === 'PUT' || $method === 'POST') {
-            // See https://datatracker.ietf.org/doc/html/rfc7230#section-3.3.2
-            if (!$easy->request->hasHeader('Content-Length')) {
-                $conf[\CURLOPT_HTTPHEADER][] = 'Content-Length: 0';
-            }
-        } elseif ($method === 'HEAD') {
-            $conf[\CURLOPT_NOBODY] = true;
-            unset(
-                $conf[\CURLOPT_WRITEFUNCTION],
-                $conf[\CURLOPT_READFUNCTION],
-                $conf[\CURLOPT_FILE],
-                $conf[\CURLOPT_INFILE]
-            );
-        }
-    }
-
-    private function applyBody(RequestInterface $request, array $options, array &$conf): void
-    {
-        $size = $request->hasHeader('Content-Length')
-            ? (int) $request->getHeaderLine('Content-Length')
-            : null;
-
-        // Send the body as a string if the size is less than 1MB OR if the
-        // [curl][body_as_string] request value is set.
-        if (($size !== null && $size < 1000000) || !empty($options['_body_as_string'])) {
-            $conf[\CURLOPT_POSTFIELDS] = (string) $request->getBody();
-            // Don't duplicate the Content-Length header
-            $this->removeHeader('Content-Length', $conf);
-            $this->removeHeader('Transfer-Encoding', $conf);
-        } else {
-            $conf[\CURLOPT_UPLOAD] = true;
-            if ($size !== null) {
-                $conf[\CURLOPT_INFILESIZE] = $size;
-                $this->removeHeader('Content-Length', $conf);
-            }
-            $body = $request->getBody();
-            if ($body->isSeekable()) {
-                $body->rewind();
-            }
-            $conf[\CURLOPT_READFUNCTION] = static function ($ch, $fd, $length) use ($body) {
-                return $body->read($length);
-            };
-        }
-
-        // If the Expect header is not present, prevent curl from adding it
-        if (!$request->hasHeader('Expect')) {
-            $conf[\CURLOPT_HTTPHEADER][] = 'Expect:';
-        }
-
-        // cURL sometimes adds a content-type by default. Prevent this.
-        if (!$request->hasHeader('Content-Type')) {
-            $conf[\CURLOPT_HTTPHEADER][] = 'Content-Type:';
-        }
-    }
-
-    private function applyHeaders(EasyHandle $easy, array &$conf): void
-    {
-        foreach ($conf['_headers'] as $name => $values) {
-            foreach ($values as $value) {
-                $value = (string) $value;
-                if ($value === '') {
-                    // cURL requires a special format for empty headers.
-                    // See https://github.com/guzzle/guzzle/issues/1882 for more details.
-                    $conf[\CURLOPT_HTTPHEADER][] = "$name;";
-                } else {
-                    $conf[\CURLOPT_HTTPHEADER][] = "$name: $value";
-                }
-            }
-        }
-
-        // Remove the Accept header if one was not set
-        if (!$easy->request->hasHeader('Accept')) {
-            $conf[\CURLOPT_HTTPHEADER][] = 'Accept:';
-        }
-    }
-
-    /**
-     * Remove a header from the options array.
-     *
-     * @param string $name    Case-insensitive header to remove
-     * @param array  $options Array of options to modify
-     */
-    private function removeHeader(string $name, array &$options): void
-    {
-        foreach (\array_keys($options['_headers']) as $key) {
-            if (!\strcasecmp($key, $name)) {
-                unset($options['_headers'][$key]);
-
-                return;
-            }
-        }
-    }
-
-    private function applyHandlerOptions(EasyHandle $easy, array &$conf): void
-    {
-        $options = $easy->options;
-        if (isset($options['verify'])) {
-            if ($options['verify'] === false) {
-                unset($conf[\CURLOPT_CAINFO]);
-                $conf[\CURLOPT_SSL_VERIFYHOST] = 0;
-                $conf[\CURLOPT_SSL_VERIFYPEER] = false;
-            } else {
-                $conf[\CURLOPT_SSL_VERIFYHOST] = 2;
-                $conf[\CURLOPT_SSL_VERIFYPEER] = true;
-                if (\is_string($options['verify'])) {
-                    // Throw an error if the file/folder/link path is not valid or doesn't exist.
-                    if (!\file_exists($options['verify'])) {
-                        throw new \InvalidArgumentException("SSL CA bundle not found: {$options['verify']}");
-                    }
-                    // If it's a directory or a link to a directory use CURLOPT_CAPATH.
-                    // If not, it's probably a file, or a link to a file, so use CURLOPT_CAINFO.
-                    if (
-                        \is_dir($options['verify'])
-                        || (
-                            \is_link($options['verify']) === true
-                            && ($verifyLink = \readlink($options['verify'])) !== false
-                            && \is_dir($verifyLink)
-                        )
-                    ) {
-                        $conf[\CURLOPT_CAPATH] = $options['verify'];
-                    } else {
-                        $conf[\CURLOPT_CAINFO] = $options['verify'];
-                    }
-                }
-            }
-        }
-
-        if (!isset($options['curl'][\CURLOPT_ENCODING]) && !empty($options['decode_content'])) {
-            $accept = $easy->request->getHeaderLine('Accept-Encoding');
-            if ($accept) {
-                $conf[\CURLOPT_ENCODING] = $accept;
-            } else {
-                // The empty string enables all available decoders and implicitly
-                // sets a matching 'Accept-Encoding' header.
-                $conf[\CURLOPT_ENCODING] = '';
-                // But as the user did not specify any acceptable encodings we need
-                // to overwrite this implicit header with an empty one.
-                $conf[\CURLOPT_HTTPHEADER][] = 'Accept-Encoding:';
-            }
-        }
-
-        if (!isset($options['sink'])) {
-            // Use a default temp stream if no sink was set.
-            $options['sink'] = \OCA\FullTextSearch_Elasticsearch\Vendor\GuzzleHttp\Psr7\Utils::tryFopen('php://temp', 'w+');
-        }
-        $sink = $options['sink'];
-        if (!\is_string($sink)) {
-            $sink = \OCA\FullTextSearch_Elasticsearch\Vendor\GuzzleHttp\Psr7\Utils::streamFor($sink);
-        } elseif (!\is_dir(\dirname($sink))) {
-            // Ensure that the directory exists before failing in curl.
-            throw new \RuntimeException(\sprintf('Directory %s does not exist for sink value of %s', \dirname($sink), $sink));
-        } else {
-            $sink = new LazyOpenStream($sink, 'w+');
-        }
-        $easy->sink = $sink;
-        $conf[\CURLOPT_WRITEFUNCTION] = static function ($ch, $write) use ($sink): int {
-            return $sink->write($write);
-        };
-
-        $timeoutRequiresNoSignal = false;
-        if (isset($options['timeout'])) {
-            $timeoutRequiresNoSignal |= $options['timeout'] < 1;
-            $conf[\CURLOPT_TIMEOUT_MS] = $options['timeout'] * 1000;
-        }
-
-        // CURL default value is CURL_IPRESOLVE_WHATEVER
-        if (isset($options['force_ip_resolve'])) {
-            if ('v4' === $options['force_ip_resolve']) {
-                $conf[\CURLOPT_IPRESOLVE] = \CURL_IPRESOLVE_V4;
-            } elseif ('v6' === $options['force_ip_resolve']) {
-                $conf[\CURLOPT_IPRESOLVE] = \CURL_IPRESOLVE_V6;
-            }
-        }
-
-        if (isset($options['connect_timeout'])) {
-            $timeoutRequiresNoSignal |= $options['connect_timeout'] < 1;
-            $conf[\CURLOPT_CONNECTTIMEOUT_MS] = $options['connect_timeout'] * 1000;
-        }
-
-        if ($timeoutRequiresNoSignal && \strtoupper(\substr(\PHP_OS, 0, 3)) !== 'WIN') {
-            $conf[\CURLOPT_NOSIGNAL] = true;
-        }
-
-        if (isset($options['proxy'])) {
-            if (!\is_array($options['proxy'])) {
-                $conf[\CURLOPT_PROXY] = $options['proxy'];
-            } else {
-                $scheme = $easy->request->getUri()->getScheme();
-                if (isset($options['proxy'][$scheme])) {
-                    $host = $easy->request->getUri()->getHost();
-                    if (isset($options['proxy']['no']) && Utils::isHostInNoProxy($host, $options['proxy']['no'])) {
-                        unset($conf[\CURLOPT_PROXY]);
-                    } else {
-                        $conf[\CURLOPT_PROXY] = $options['proxy'][$scheme];
-                    }
-                }
-            }
-        }
-
-        if (isset($options['crypto_method'])) {
-            if (\STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT === $options['crypto_method']) {
-                if (!defined('CURL_SSLVERSION_TLSv1_0')) {
-                    throw new \InvalidArgumentException('Invalid crypto_method request option: TLS 1.0 not supported by your version of cURL');
-                }
-                $conf[\CURLOPT_SSLVERSION] = \CURL_SSLVERSION_TLSv1_0;
-            } elseif (\STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT === $options['crypto_method']) {
-                if (!defined('CURL_SSLVERSION_TLSv1_1')) {
-                    throw new \InvalidArgumentException('Invalid crypto_method request option: TLS 1.1 not supported by your version of cURL');
-                }
-                $conf[\CURLOPT_SSLVERSION] = \CURL_SSLVERSION_TLSv1_1;
-            } elseif (\STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT === $options['crypto_method']) {
-                if (!defined('CURL_SSLVERSION_TLSv1_2')) {
-                    throw new \InvalidArgumentException('Invalid crypto_method request option: TLS 1.2 not supported by your version of cURL');
-                }
-                $conf[\CURLOPT_SSLVERSION] = \CURL_SSLVERSION_TLSv1_2;
-            } elseif (defined('STREAM_CRYPTO_METHOD_TLSv1_3_CLIENT') && \STREAM_CRYPTO_METHOD_TLSv1_3_CLIENT === $options['crypto_method']) {
-                if (!defined('CURL_SSLVERSION_TLSv1_3')) {
-                    throw new \InvalidArgumentException('Invalid crypto_method request option: TLS 1.3 not supported by your version of cURL');
-                }
-                $conf[\CURLOPT_SSLVERSION] = \CURL_SSLVERSION_TLSv1_3;
-            } else {
-                throw new \InvalidArgumentException('Invalid crypto_method request option: unknown version provided');
-            }
-        }
-
-        if (isset($options['cert'])) {
-            $cert = $options['cert'];
-            if (\is_array($cert)) {
-                $conf[\CURLOPT_SSLCERTPASSWD] = $cert[1];
-                $cert = $cert[0];
-            }
-            if (!\file_exists($cert)) {
-                throw new \InvalidArgumentException("SSL certificate not found: {$cert}");
-            }
-            // OpenSSL (versions 0.9.3 and later) also support "P12" for PKCS#12-encoded files.
-            // see https://curl.se/libcurl/c/CURLOPT_SSLCERTTYPE.html
-            $ext = pathinfo($cert, \PATHINFO_EXTENSION);
-            if (preg_match('#^(der|p12)$#i', $ext)) {
-                $conf[\CURLOPT_SSLCERTTYPE] = strtoupper($ext);
-            }
-            $conf[\CURLOPT_SSLCERT] = $cert;
-        }
-
-        if (isset($options['ssl_key'])) {
-            if (\is_array($options['ssl_key'])) {
-                if (\count($options['ssl_key']) === 2) {
-                    [$sslKey, $conf[\CURLOPT_SSLKEYPASSWD]] = $options['ssl_key'];
-                } else {
-                    [$sslKey] = $options['ssl_key'];
-                }
-            }
-
-            $sslKey = $sslKey ?? $options['ssl_key'];
-
-            if (!\file_exists($sslKey)) {
-                throw new \InvalidArgumentException("SSL private key not found: {$sslKey}");
-            }
-            $conf[\CURLOPT_SSLKEY] = $sslKey;
-        }
-
-        if (isset($options['progress'])) {
-            $progress = $options['progress'];
-            if (!\is_callable($progress)) {
-                throw new \InvalidArgumentException('progress client option must be callable');
-            }
-            $conf[\CURLOPT_NOPROGRESS] = false;
-            $conf[\CURLOPT_PROGRESSFUNCTION] = static function ($resource, int $downloadSize, int $downloaded, int $uploadSize, int $uploaded) use ($progress) {
-                $progress($downloadSize, $downloaded, $uploadSize, $uploaded);
-            };
-        }
-
-        if (!empty($options['debug'])) {
-            $conf[\CURLOPT_STDERR] = Utils::debugResource($options['debug']);
-            $conf[\CURLOPT_VERBOSE] = true;
-        }
-    }
-
-    /**
-     * This function ensures that a response was set on a transaction. If one
-     * was not set, then the request is retried if possible. This error
-     * typically means you are sending a payload, curl encountered a
-     * "Connection died, retrying a fresh connect" error, tried to rewind the
-     * stream, and then encountered a "necessary data rewind wasn't possible"
-     * error, causing the request to be sent through curl_multi_info_read()
-     * without an error status.
-     *
-     * @param callable(RequestInterface, array): PromiseInterface $handler
-     */
-    private static function retryFailedRewind(callable $handler, EasyHandle $easy, array $ctx): PromiseInterface
-    {
-        try {
-            // Only rewind if the body has been read from.
-            $body = $easy->request->getBody();
-            if ($body->tell() > 0) {
-                $body->rewind();
-            }
-        } catch (\RuntimeException $e) {
-            $ctx['error'] = 'The connection unexpectedly failed without '
-                .'providing an error. The request would have been retried, '
-                .'but attempting to rewind the request body failed. '
-                .'Exception: '.$e;
-
-            return self::createRejection($easy, $ctx);
-        }
-
-        // Retry no more than 3 times before giving up.
-        if (!isset($easy->options['_curl_retries'])) {
-            $easy->options['_curl_retries'] = 1;
-        } elseif ($easy->options['_curl_retries'] == 2) {
-            $ctx['error'] = 'The cURL request was retried 3 times '
-                .'and did not succeed. The most likely reason for the failure '
-                .'is that cURL was unable to rewind the body of the request '
-                .'and subsequent retries resulted in the same error. Turn on '
-                .'the debug option to see what went wrong. See '
-                .'https://bugs.php.net/bug.php?id=47204 for more information.';
-
-            return self::createRejection($easy, $ctx);
-        } else {
-            ++$easy->options['_curl_retries'];
-        }
-
-        return $handler($easy->request, $easy->options);
-    }
-
-    private function createHeaderFn(EasyHandle $easy): callable
-    {
-        if (isset($easy->options['on_headers'])) {
-            $onHeaders = $easy->options['on_headers'];
-
-            if (!\is_callable($onHeaders)) {
-                throw new \InvalidArgumentException('on_headers must be callable');
-            }
-        } else {
-            $onHeaders = null;
-        }
-
-        return static function ($ch, $h) use (
-            $onHeaders,
-            $easy,
-            &$startingResponse
-        ) {
-            $value = \trim($h);
-            if ($value === '') {
-                $startingResponse = true;
-                try {
-                    $easy->createResponse();
-                } catch (\Exception $e) {
-                    $easy->createResponseException = $e;
-
-                    return -1;
-                }
-                if ($onHeaders !== null) {
-                    try {
-                        $onHeaders($easy->response);
-                    } catch (\Exception $e) {
-                        // Associate the exception with the handle and trigger
-                        // a curl header write error by returning 0.
-                        $easy->onHeadersException = $e;
-
-                        return -1;
-                    }
-                }
-            } elseif ($startingResponse) {
-                $startingResponse = false;
-                $easy->headers = [$value];
-            } else {
-                $easy->headers[] = $value;
-            }
-
-            return \strlen($h);
-        };
-    }
-
-    public function __destruct()
-    {
-        foreach ($this->handles as $id => $handle) {
-            \curl_close($handle);
-            unset($this->handles[$id]);
-        }
-    }
+	public const CURL_VERSION_STR = 'curl_version';
+
+	/**
+	 * @deprecated
+	 */
+	public const LOW_CURL_VERSION_NUMBER = '7.21.2';
+
+	/**
+	 * @var resource[]|\CurlHandle[]
+	 */
+	private $handles = [];
+
+	/**
+	 * @var int Total number of idle handles to keep in cache
+	 */
+	private $maxHandles;
+
+	/**
+	 * @param int $maxHandles Maximum number of idle handles.
+	 */
+	public function __construct(int $maxHandles)
+	{
+		$this->maxHandles = $maxHandles;
+	}
+
+	public function create(RequestInterface $request, array $options): EasyHandle
+	{
+		if (isset($options['curl']['body_as_string'])) {
+			$options['_body_as_string'] = $options['curl']['body_as_string'];
+			unset($options['curl']['body_as_string']);
+		}
+
+		$easy = new EasyHandle();
+		$easy->request = $request;
+		$easy->options = $options;
+		$conf = $this->getDefaultConf($easy);
+		$this->applyMethod($easy, $conf);
+		$this->applyHandlerOptions($easy, $conf);
+		$this->applyHeaders($easy, $conf);
+		unset($conf['_headers']);
+
+		// Add handler options from the request configuration options
+		if (isset($options['curl'])) {
+			$conf = \array_replace($conf, $options['curl']);
+		}
+
+		$conf[\CURLOPT_HEADERFUNCTION] = $this->createHeaderFn($easy);
+		$easy->handle = $this->handles ? \array_pop($this->handles) : \curl_init();
+		curl_setopt_array($easy->handle, $conf);
+
+		return $easy;
+	}
+
+	public function release(EasyHandle $easy): void
+	{
+		$resource = $easy->handle;
+		unset($easy->handle);
+
+		if (\count($this->handles) >= $this->maxHandles) {
+			\curl_close($resource);
+		} else {
+			// Remove all callback functions as they can hold onto references
+			// and are not cleaned up by curl_reset. Using curl_setopt_array
+			// does not work for some reason, so removing each one
+			// individually.
+			\curl_setopt($resource, \CURLOPT_HEADERFUNCTION, null);
+			\curl_setopt($resource, \CURLOPT_READFUNCTION, null);
+			\curl_setopt($resource, \CURLOPT_WRITEFUNCTION, null);
+			\curl_setopt($resource, \CURLOPT_PROGRESSFUNCTION, null);
+			\curl_reset($resource);
+			$this->handles[] = $resource;
+		}
+	}
+
+	/**
+	 * Completes a cURL transaction, either returning a response promise or a
+	 * rejected promise.
+	 *
+	 * @param callable(RequestInterface, array): PromiseInterface $handler
+	 * @param CurlFactoryInterface                                $factory Dictates how the handle is released
+	 */
+	public static function finish(callable $handler, EasyHandle $easy, CurlFactoryInterface $factory): PromiseInterface
+	{
+		if (isset($easy->options['on_stats'])) {
+			self::invokeStats($easy);
+		}
+
+		if (!$easy->response || $easy->errno) {
+			return self::finishError($handler, $easy, $factory);
+		}
+
+		// Return the response if it is present and there is no error.
+		$factory->release($easy);
+
+		// Rewind the body of the response if possible.
+		$body = $easy->response->getBody();
+		if ($body->isSeekable()) {
+			$body->rewind();
+		}
+
+		return new FulfilledPromise($easy->response);
+	}
+
+	private static function invokeStats(EasyHandle $easy): void
+	{
+		$curlStats = \curl_getinfo($easy->handle);
+		$curlStats['appconnect_time'] = \curl_getinfo($easy->handle, \CURLINFO_APPCONNECT_TIME);
+		$stats = new TransferStats(
+			$easy->request,
+			$easy->response,
+			$curlStats['total_time'],
+			$easy->errno,
+			$curlStats
+		);
+		($easy->options['on_stats'])($stats);
+	}
+
+	/**
+	 * @param callable(RequestInterface, array): PromiseInterface $handler
+	 */
+	private static function finishError(callable $handler, EasyHandle $easy, CurlFactoryInterface $factory): PromiseInterface
+	{
+		// Get error information and release the handle to the factory.
+		$ctx = [
+			'errno' => $easy->errno,
+			'error' => \curl_error($easy->handle),
+			'appconnect_time' => \curl_getinfo($easy->handle, \CURLINFO_APPCONNECT_TIME),
+		] + \curl_getinfo($easy->handle);
+		$ctx[self::CURL_VERSION_STR] = \curl_version()['version'];
+		$factory->release($easy);
+
+		// Retry when nothing is present or when curl failed to rewind.
+		if (empty($easy->options['_err_message']) && (!$easy->errno || $easy->errno == 65)) {
+			return self::retryFailedRewind($handler, $easy, $ctx);
+		}
+
+		return self::createRejection($easy, $ctx);
+	}
+
+	private static function createRejection(EasyHandle $easy, array $ctx): PromiseInterface
+	{
+		static $connectionErrors = [
+			\CURLE_OPERATION_TIMEOUTED => true,
+			\CURLE_COULDNT_RESOLVE_HOST => true,
+			\CURLE_COULDNT_CONNECT => true,
+			\CURLE_SSL_CONNECT_ERROR => true,
+			\CURLE_GOT_NOTHING => true,
+		];
+
+		if ($easy->createResponseException) {
+			return P\Create::rejectionFor(
+				new RequestException(
+					'An error was encountered while creating the response',
+					$easy->request,
+					$easy->response,
+					$easy->createResponseException,
+					$ctx
+				)
+			);
+		}
+
+		// If an exception was encountered during the onHeaders event, then
+		// return a rejected promise that wraps that exception.
+		if ($easy->onHeadersException) {
+			return P\Create::rejectionFor(
+				new RequestException(
+					'An error was encountered during the on_headers event',
+					$easy->request,
+					$easy->response,
+					$easy->onHeadersException,
+					$ctx
+				)
+			);
+		}
+
+		$message = \sprintf(
+			'cURL error %s: %s (%s)',
+			$ctx['errno'],
+			$ctx['error'],
+			'see https://curl.haxx.se/libcurl/c/libcurl-errors.html'
+		);
+		$uriString = (string) $easy->request->getUri();
+		if ($uriString !== '' && false === \strpos($ctx['error'], $uriString)) {
+			$message .= \sprintf(' for %s', $uriString);
+		}
+
+		// Create a connection exception if it was a specific error code.
+		$error = isset($connectionErrors[$easy->errno])
+			? new ConnectException($message, $easy->request, null, $ctx)
+			: new RequestException($message, $easy->request, $easy->response, null, $ctx);
+
+		return P\Create::rejectionFor($error);
+	}
+
+	/**
+	 * @return array<int|string, mixed>
+	 */
+	private function getDefaultConf(EasyHandle $easy): array
+	{
+		$conf = [
+			'_headers' => $easy->request->getHeaders(),
+			\CURLOPT_CUSTOMREQUEST => $easy->request->getMethod(),
+			\CURLOPT_URL => (string) $easy->request->getUri()->withFragment(''),
+			\CURLOPT_RETURNTRANSFER => false,
+			\CURLOPT_HEADER => false,
+			\CURLOPT_CONNECTTIMEOUT => 300,
+		];
+
+		if (\defined('CURLOPT_PROTOCOLS')) {
+			$conf[\CURLOPT_PROTOCOLS] = \CURLPROTO_HTTP | \CURLPROTO_HTTPS;
+		}
+
+		$version = $easy->request->getProtocolVersion();
+		if ($version == 1.1) {
+			$conf[\CURLOPT_HTTP_VERSION] = \CURL_HTTP_VERSION_1_1;
+		} elseif ($version == 2.0) {
+			$conf[\CURLOPT_HTTP_VERSION] = \CURL_HTTP_VERSION_2_0;
+		} else {
+			$conf[\CURLOPT_HTTP_VERSION] = \CURL_HTTP_VERSION_1_0;
+		}
+
+		return $conf;
+	}
+
+	private function applyMethod(EasyHandle $easy, array &$conf): void
+	{
+		$body = $easy->request->getBody();
+		$size = $body->getSize();
+
+		if ($size === null || $size > 0) {
+			$this->applyBody($easy->request, $easy->options, $conf);
+
+			return;
+		}
+
+		$method = $easy->request->getMethod();
+		if ($method === 'PUT' || $method === 'POST') {
+			// See https://datatracker.ietf.org/doc/html/rfc7230#section-3.3.2
+			if (!$easy->request->hasHeader('Content-Length')) {
+				$conf[\CURLOPT_HTTPHEADER][] = 'Content-Length: 0';
+			}
+		} elseif ($method === 'HEAD') {
+			$conf[\CURLOPT_NOBODY] = true;
+			unset(
+				$conf[\CURLOPT_WRITEFUNCTION],
+				$conf[\CURLOPT_READFUNCTION],
+				$conf[\CURLOPT_FILE],
+				$conf[\CURLOPT_INFILE]
+			);
+		}
+	}
+
+	private function applyBody(RequestInterface $request, array $options, array &$conf): void
+	{
+		$size = $request->hasHeader('Content-Length')
+			? (int) $request->getHeaderLine('Content-Length')
+			: null;
+
+		// Send the body as a string if the size is less than 1MB OR if the
+		// [curl][body_as_string] request value is set.
+		if (($size !== null && $size < 1000000) || !empty($options['_body_as_string'])) {
+			$conf[\CURLOPT_POSTFIELDS] = (string) $request->getBody();
+			// Don't duplicate the Content-Length header
+			$this->removeHeader('Content-Length', $conf);
+			$this->removeHeader('Transfer-Encoding', $conf);
+		} else {
+			$conf[\CURLOPT_UPLOAD] = true;
+			if ($size !== null) {
+				$conf[\CURLOPT_INFILESIZE] = $size;
+				$this->removeHeader('Content-Length', $conf);
+			}
+			$body = $request->getBody();
+			if ($body->isSeekable()) {
+				$body->rewind();
+			}
+			$conf[\CURLOPT_READFUNCTION] = static function ($ch, $fd, $length) use ($body) {
+				return $body->read($length);
+			};
+		}
+
+		// If the Expect header is not present, prevent curl from adding it
+		if (!$request->hasHeader('Expect')) {
+			$conf[\CURLOPT_HTTPHEADER][] = 'Expect:';
+		}
+
+		// cURL sometimes adds a content-type by default. Prevent this.
+		if (!$request->hasHeader('Content-Type')) {
+			$conf[\CURLOPT_HTTPHEADER][] = 'Content-Type:';
+		}
+	}
+
+	private function applyHeaders(EasyHandle $easy, array &$conf): void
+	{
+		foreach ($conf['_headers'] as $name => $values) {
+			foreach ($values as $value) {
+				$value = (string) $value;
+				if ($value === '') {
+					// cURL requires a special format for empty headers.
+					// See https://github.com/guzzle/guzzle/issues/1882 for more details.
+					$conf[\CURLOPT_HTTPHEADER][] = "$name;";
+				} else {
+					$conf[\CURLOPT_HTTPHEADER][] = "$name: $value";
+				}
+			}
+		}
+
+		// Remove the Accept header if one was not set
+		if (!$easy->request->hasHeader('Accept')) {
+			$conf[\CURLOPT_HTTPHEADER][] = 'Accept:';
+		}
+	}
+
+	/**
+	 * Remove a header from the options array.
+	 *
+	 * @param string $name    Case-insensitive header to remove
+	 * @param array  $options Array of options to modify
+	 */
+	private function removeHeader(string $name, array &$options): void
+	{
+		foreach (\array_keys($options['_headers']) as $key) {
+			if (!\strcasecmp($key, $name)) {
+				unset($options['_headers'][$key]);
+
+				return;
+			}
+		}
+	}
+
+	private function applyHandlerOptions(EasyHandle $easy, array &$conf): void
+	{
+		$options = $easy->options;
+		if (isset($options['verify'])) {
+			if ($options['verify'] === false) {
+				unset($conf[\CURLOPT_CAINFO]);
+				$conf[\CURLOPT_SSL_VERIFYHOST] = 0;
+				$conf[\CURLOPT_SSL_VERIFYPEER] = false;
+			} else {
+				$conf[\CURLOPT_SSL_VERIFYHOST] = 2;
+				$conf[\CURLOPT_SSL_VERIFYPEER] = true;
+				if (\is_string($options['verify'])) {
+					// Throw an error if the file/folder/link path is not valid or doesn't exist.
+					if (!\file_exists($options['verify'])) {
+						throw new \InvalidArgumentException("SSL CA bundle not found: {$options['verify']}");
+					}
+					// If it's a directory or a link to a directory use CURLOPT_CAPATH.
+					// If not, it's probably a file, or a link to a file, so use CURLOPT_CAINFO.
+					if (
+						\is_dir($options['verify'])
+						|| (
+							\is_link($options['verify']) === true
+							&& ($verifyLink = \readlink($options['verify'])) !== false
+							&& \is_dir($verifyLink)
+						)
+					) {
+						$conf[\CURLOPT_CAPATH] = $options['verify'];
+					} else {
+						$conf[\CURLOPT_CAINFO] = $options['verify'];
+					}
+				}
+			}
+		}
+
+		if (!isset($options['curl'][\CURLOPT_ENCODING]) && !empty($options['decode_content'])) {
+			$accept = $easy->request->getHeaderLine('Accept-Encoding');
+			if ($accept) {
+				$conf[\CURLOPT_ENCODING] = $accept;
+			} else {
+				// The empty string enables all available decoders and implicitly
+				// sets a matching 'Accept-Encoding' header.
+				$conf[\CURLOPT_ENCODING] = '';
+				// But as the user did not specify any acceptable encodings we need
+				// to overwrite this implicit header with an empty one.
+				$conf[\CURLOPT_HTTPHEADER][] = 'Accept-Encoding:';
+			}
+		}
+
+		if (!isset($options['sink'])) {
+			// Use a default temp stream if no sink was set.
+			$options['sink'] = \OCA\FullTextSearch_Elasticsearch\Vendor\GuzzleHttp\Psr7\Utils::tryFopen('php://temp', 'w+');
+		}
+		$sink = $options['sink'];
+		if (!\is_string($sink)) {
+			$sink = \OCA\FullTextSearch_Elasticsearch\Vendor\GuzzleHttp\Psr7\Utils::streamFor($sink);
+		} elseif (!\is_dir(\dirname($sink))) {
+			// Ensure that the directory exists before failing in curl.
+			throw new \RuntimeException(\sprintf('Directory %s does not exist for sink value of %s', \dirname($sink), $sink));
+		} else {
+			$sink = new LazyOpenStream($sink, 'w+');
+		}
+		$easy->sink = $sink;
+		$conf[\CURLOPT_WRITEFUNCTION] = static function ($ch, $write) use ($sink): int {
+			return $sink->write($write);
+		};
+
+		$timeoutRequiresNoSignal = false;
+		if (isset($options['timeout'])) {
+			$timeoutRequiresNoSignal |= $options['timeout'] < 1;
+			$conf[\CURLOPT_TIMEOUT_MS] = $options['timeout'] * 1000;
+		}
+
+		// CURL default value is CURL_IPRESOLVE_WHATEVER
+		if (isset($options['force_ip_resolve'])) {
+			if ('v4' === $options['force_ip_resolve']) {
+				$conf[\CURLOPT_IPRESOLVE] = \CURL_IPRESOLVE_V4;
+			} elseif ('v6' === $options['force_ip_resolve']) {
+				$conf[\CURLOPT_IPRESOLVE] = \CURL_IPRESOLVE_V6;
+			}
+		}
+
+		if (isset($options['connect_timeout'])) {
+			$timeoutRequiresNoSignal |= $options['connect_timeout'] < 1;
+			$conf[\CURLOPT_CONNECTTIMEOUT_MS] = $options['connect_timeout'] * 1000;
+		}
+
+		if ($timeoutRequiresNoSignal && \strtoupper(\substr(\PHP_OS, 0, 3)) !== 'WIN') {
+			$conf[\CURLOPT_NOSIGNAL] = true;
+		}
+
+		if (isset($options['proxy'])) {
+			if (!\is_array($options['proxy'])) {
+				$conf[\CURLOPT_PROXY] = $options['proxy'];
+			} else {
+				$scheme = $easy->request->getUri()->getScheme();
+				if (isset($options['proxy'][$scheme])) {
+					$host = $easy->request->getUri()->getHost();
+					if (isset($options['proxy']['no']) && Utils::isHostInNoProxy($host, $options['proxy']['no'])) {
+						unset($conf[\CURLOPT_PROXY]);
+					} else {
+						$conf[\CURLOPT_PROXY] = $options['proxy'][$scheme];
+					}
+				}
+			}
+		}
+
+		if (isset($options['crypto_method'])) {
+			if (\STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT === $options['crypto_method']) {
+				if (!defined('CURL_SSLVERSION_TLSv1_0')) {
+					throw new \InvalidArgumentException('Invalid crypto_method request option: TLS 1.0 not supported by your version of cURL');
+				}
+				$conf[\CURLOPT_SSLVERSION] = \CURL_SSLVERSION_TLSv1_0;
+			} elseif (\STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT === $options['crypto_method']) {
+				if (!defined('CURL_SSLVERSION_TLSv1_1')) {
+					throw new \InvalidArgumentException('Invalid crypto_method request option: TLS 1.1 not supported by your version of cURL');
+				}
+				$conf[\CURLOPT_SSLVERSION] = \CURL_SSLVERSION_TLSv1_1;
+			} elseif (\STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT === $options['crypto_method']) {
+				if (!defined('CURL_SSLVERSION_TLSv1_2')) {
+					throw new \InvalidArgumentException('Invalid crypto_method request option: TLS 1.2 not supported by your version of cURL');
+				}
+				$conf[\CURLOPT_SSLVERSION] = \CURL_SSLVERSION_TLSv1_2;
+			} elseif (defined('STREAM_CRYPTO_METHOD_TLSv1_3_CLIENT') && \STREAM_CRYPTO_METHOD_TLSv1_3_CLIENT === $options['crypto_method']) {
+				if (!defined('CURL_SSLVERSION_TLSv1_3')) {
+					throw new \InvalidArgumentException('Invalid crypto_method request option: TLS 1.3 not supported by your version of cURL');
+				}
+				$conf[\CURLOPT_SSLVERSION] = \CURL_SSLVERSION_TLSv1_3;
+			} else {
+				throw new \InvalidArgumentException('Invalid crypto_method request option: unknown version provided');
+			}
+		}
+
+		if (isset($options['cert'])) {
+			$cert = $options['cert'];
+			if (\is_array($cert)) {
+				$conf[\CURLOPT_SSLCERTPASSWD] = $cert[1];
+				$cert = $cert[0];
+			}
+			if (!\file_exists($cert)) {
+				throw new \InvalidArgumentException("SSL certificate not found: {$cert}");
+			}
+			// OpenSSL (versions 0.9.3 and later) also support "P12" for PKCS#12-encoded files.
+			// see https://curl.se/libcurl/c/CURLOPT_SSLCERTTYPE.html
+			$ext = pathinfo($cert, \PATHINFO_EXTENSION);
+			if (preg_match('#^(der|p12)$#i', $ext)) {
+				$conf[\CURLOPT_SSLCERTTYPE] = strtoupper($ext);
+			}
+			$conf[\CURLOPT_SSLCERT] = $cert;
+		}
+
+		if (isset($options['ssl_key'])) {
+			if (\is_array($options['ssl_key'])) {
+				if (\count($options['ssl_key']) === 2) {
+					[$sslKey, $conf[\CURLOPT_SSLKEYPASSWD]] = $options['ssl_key'];
+				} else {
+					[$sslKey] = $options['ssl_key'];
+				}
+			}
+
+			$sslKey = $sslKey ?? $options['ssl_key'];
+
+			if (!\file_exists($sslKey)) {
+				throw new \InvalidArgumentException("SSL private key not found: {$sslKey}");
+			}
+			$conf[\CURLOPT_SSLKEY] = $sslKey;
+		}
+
+		if (isset($options['progress'])) {
+			$progress = $options['progress'];
+			if (!\is_callable($progress)) {
+				throw new \InvalidArgumentException('progress client option must be callable');
+			}
+			$conf[\CURLOPT_NOPROGRESS] = false;
+			$conf[\CURLOPT_PROGRESSFUNCTION] = static function ($resource, int $downloadSize, int $downloaded, int $uploadSize, int $uploaded) use ($progress) {
+				$progress($downloadSize, $downloaded, $uploadSize, $uploaded);
+			};
+		}
+
+		if (!empty($options['debug'])) {
+			$conf[\CURLOPT_STDERR] = Utils::debugResource($options['debug']);
+			$conf[\CURLOPT_VERBOSE] = true;
+		}
+	}
+
+	/**
+	 * This function ensures that a response was set on a transaction. If one
+	 * was not set, then the request is retried if possible. This error
+	 * typically means you are sending a payload, curl encountered a
+	 * "Connection died, retrying a fresh connect" error, tried to rewind the
+	 * stream, and then encountered a "necessary data rewind wasn't possible"
+	 * error, causing the request to be sent through curl_multi_info_read()
+	 * without an error status.
+	 *
+	 * @param callable(RequestInterface, array): PromiseInterface $handler
+	 */
+	private static function retryFailedRewind(callable $handler, EasyHandle $easy, array $ctx): PromiseInterface
+	{
+		try {
+			// Only rewind if the body has been read from.
+			$body = $easy->request->getBody();
+			if ($body->tell() > 0) {
+				$body->rewind();
+			}
+		} catch (\RuntimeException $e) {
+			$ctx['error'] = 'The connection unexpectedly failed without '
+				.'providing an error. The request would have been retried, '
+				.'but attempting to rewind the request body failed. '
+				.'Exception: '.$e;
+
+			return self::createRejection($easy, $ctx);
+		}
+
+		// Retry no more than 3 times before giving up.
+		if (!isset($easy->options['_curl_retries'])) {
+			$easy->options['_curl_retries'] = 1;
+		} elseif ($easy->options['_curl_retries'] == 2) {
+			$ctx['error'] = 'The cURL request was retried 3 times '
+				.'and did not succeed. The most likely reason for the failure '
+				.'is that cURL was unable to rewind the body of the request '
+				.'and subsequent retries resulted in the same error. Turn on '
+				.'the debug option to see what went wrong. See '
+				.'https://bugs.php.net/bug.php?id=47204 for more information.';
+
+			return self::createRejection($easy, $ctx);
+		} else {
+			++$easy->options['_curl_retries'];
+		}
+
+		return $handler($easy->request, $easy->options);
+	}
+
+	private function createHeaderFn(EasyHandle $easy): callable
+	{
+		if (isset($easy->options['on_headers'])) {
+			$onHeaders = $easy->options['on_headers'];
+
+			if (!\is_callable($onHeaders)) {
+				throw new \InvalidArgumentException('on_headers must be callable');
+			}
+		} else {
+			$onHeaders = null;
+		}
+
+		return static function ($ch, $h) use (
+			$onHeaders,
+			$easy,
+			&$startingResponse
+		) {
+			$value = \trim($h);
+			if ($value === '') {
+				$startingResponse = true;
+				try {
+					$easy->createResponse();
+				} catch (\Exception $e) {
+					$easy->createResponseException = $e;
+
+					return -1;
+				}
+				if ($onHeaders !== null) {
+					try {
+						$onHeaders($easy->response);
+					} catch (\Exception $e) {
+						// Associate the exception with the handle and trigger
+						// a curl header write error by returning 0.
+						$easy->onHeadersException = $e;
+
+						return -1;
+					}
+				}
+			} elseif ($startingResponse) {
+				$startingResponse = false;
+				$easy->headers = [$value];
+			} else {
+				$easy->headers[] = $value;
+			}
+
+			return \strlen($h);
+		};
+	}
+
+	public function __destruct()
+	{
+		foreach ($this->handles as $id => $handle) {
+			\curl_close($handle);
+			unset($this->handles[$id]);
+		}
+	}
 }

Spacing +9 added lines, -9 removed lines

@@ -200,7 +200,7 @@ 
             $ctx['error'],
             'see https://curl.haxx.se/libcurl/c/libcurl-errors.html'
         );
-        $uriString = (string) $easy->request->getUri();
+        $uriString = (string)$easy->request->getUri();
         if ($uriString !== '' && false === \strpos($ctx['error'], $uriString)) {
             $message .= \sprintf(' for %s', $uriString);
         }
@@ -221,7 +221,7 @@ 
         $conf = [
             '_headers' => $easy->request->getHeaders(),
             \CURLOPT_CUSTOMREQUEST => $easy->request->getMethod(),
-            \CURLOPT_URL => (string) $easy->request->getUri()->withFragment(''),
+            \CURLOPT_URL => (string)$easy->request->getUri()->withFragment(''),
             \CURLOPT_RETURNTRANSFER => false,
             \CURLOPT_HEADER => false,
             \CURLOPT_CONNECTTIMEOUT => 300,
@@ -274,13 +274,13 @@ 
     private function applyBody(RequestInterface $request, array $options, array &$conf): void
     {
         $size = $request->hasHeader('Content-Length')
-            ? (int) $request->getHeaderLine('Content-Length')
+            ? (int)$request->getHeaderLine('Content-Length')
             : null;
 
         // Send the body as a string if the size is less than 1MB OR if the
         // [curl][body_as_string] request value is set.
         if (($size !== null && $size < 1000000) || !empty($options['_body_as_string'])) {
-            $conf[\CURLOPT_POSTFIELDS] = (string) $request->getBody();
+            $conf[\CURLOPT_POSTFIELDS] = (string)$request->getBody();
             // Don't duplicate the Content-Length header
             $this->removeHeader('Content-Length', $conf);
             $this->removeHeader('Transfer-Encoding', $conf);
@@ -294,7 +294,7 @@ 
             if ($body->isSeekable()) {
                 $body->rewind();
             }
-            $conf[\CURLOPT_READFUNCTION] = static function ($ch, $fd, $length) use ($body) {
+            $conf[\CURLOPT_READFUNCTION] = static function($ch, $fd, $length) use ($body) {
                 return $body->read($length);
             };
         }
@@ -314,7 +314,7 @@ 
     {
         foreach ($conf['_headers'] as $name => $values) {
             foreach ($values as $value) {
-                $value = (string) $value;
+                $value = (string)$value;
                 if ($value === '') {
                     // cURL requires a special format for empty headers.
                     // See https://github.com/guzzle/guzzle/issues/1882 for more details.
@@ -410,7 +410,7 @@ 
             $sink = new LazyOpenStream($sink, 'w+');
         }
         $easy->sink = $sink;
-        $conf[\CURLOPT_WRITEFUNCTION] = static function ($ch, $write) use ($sink): int {
+        $conf[\CURLOPT_WRITEFUNCTION] = static function($ch, $write) use ($sink): int {
             return $sink->write($write);
         };
 
@@ -521,7 +521,7 @@ 
                 throw new \InvalidArgumentException('progress client option must be callable');
             }
             $conf[\CURLOPT_NOPROGRESS] = false;
-            $conf[\CURLOPT_PROGRESSFUNCTION] = static function ($resource, int $downloadSize, int $downloaded, int $uploadSize, int $uploaded) use ($progress) {
+            $conf[\CURLOPT_PROGRESSFUNCTION] = static function($resource, int $downloadSize, int $downloaded, int $uploadSize, int $uploaded) use ($progress) {
                 $progress($downloadSize, $downloaded, $uploadSize, $uploaded);
             };
         }
@@ -591,7 +591,7 @@ 
             $onHeaders = null;
         }
 
-        return static function ($ch, $h) use (
+        return static function($ch, $h) use (
             $onHeaders,
             $easy,
             &$startingResponse

Braces +1 added lines, -2 removed lines

@@ -17,8 +17,7 @@
  *
  * @final
  */
-class CurlFactory implements CurlFactoryInterface
-{
+class CurlFactory implements CurlFactoryInterface {
     public const CURL_VERSION_STR = 'curl_version';
 
     /**

lib/Vendor/GuzzleHttp/Handler/CurlHandler.php

Indentation +26 added lines, -26 removed lines

@@ -16,34 +16,34 @@
  */
 class CurlHandler
 {
-    /**
-     * @var CurlFactoryInterface
-     */
-    private $factory;
+	/**
+	 * @var CurlFactoryInterface
+	 */
+	private $factory;
 
-    /**
-     * Accepts an associative array of options:
-     *
-     * - handle_factory: Optional curl factory used to create cURL handles.
-     *
-     * @param array{handle_factory?: ?CurlFactoryInterface} $options Array of options to use with the handler
-     */
-    public function __construct(array $options = [])
-    {
-        $this->factory = $options['handle_factory']
-            ?? new CurlFactory(3);
-    }
+	/**
+	 * Accepts an associative array of options:
+	 *
+	 * - handle_factory: Optional curl factory used to create cURL handles.
+	 *
+	 * @param array{handle_factory?: ?CurlFactoryInterface} $options Array of options to use with the handler
+	 */
+	public function __construct(array $options = [])
+	{
+		$this->factory = $options['handle_factory']
+			?? new CurlFactory(3);
+	}
 
-    public function __invoke(RequestInterface $request, array $options): PromiseInterface
-    {
-        if (isset($options['delay'])) {
-            \usleep($options['delay'] * 1000);
-        }
+	public function __invoke(RequestInterface $request, array $options): PromiseInterface
+	{
+		if (isset($options['delay'])) {
+			\usleep($options['delay'] * 1000);
+		}
 
-        $easy = $this->factory->create($request, $options);
-        \curl_exec($easy->handle);
-        $easy->errno = \curl_errno($easy->handle);
+		$easy = $this->factory->create($request, $options);
+		\curl_exec($easy->handle);
+		$easy->errno = \curl_errno($easy->handle);
 
-        return CurlFactory::finish($this, $easy, $this->factory);
-    }
+		return CurlFactory::finish($this, $easy, $this->factory);
+	}
 }

Braces +1 added lines, -2 removed lines

@@ -14,8 +14,7 @@
  *
  * @final
  */
-class CurlHandler
-{
+class CurlHandler {
     /**
      * @var CurlFactoryInterface
      */

lib/Vendor/GuzzleHttp/RequestOptions.php

Indentation +262 added lines, -262 removed lines

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

Braces +1 added lines, -2 removed lines

@@ -7,8 +7,7 @@
  *
  * @see https://docs.guzzlephp.org/en/latest/request-options.html
  */
-final class RequestOptions
-{
+final class RequestOptions {
     /**
      * allow_redirects: (bool|array) Controls redirect behavior. Pass false
      * to disable redirects, pass true to enable redirects, pass an

lib/Vendor/GuzzleHttp/functions.php

Indentation +10 added lines, -10 removed lines

@@ -15,7 +15,7 @@ 
  */
 function describe_type($input): string
 {
-    return Utils::describeType($input);
+	return Utils::describeType($input);
 }
 
 /**
@@ -28,7 +28,7 @@ 
  */
 function headers_from_lines(iterable $lines): array
 {
-    return Utils::headersFromLines($lines);
+	return Utils::headersFromLines($lines);
 }
 
 /**
@@ -42,7 +42,7 @@ 
  */
 function debug_resource($value = null)
 {
-    return Utils::debugResource($value);
+	return Utils::debugResource($value);
 }
 
 /**
@@ -58,7 +58,7 @@ 
  */
 function choose_handler(): callable
 {
-    return Utils::chooseHandler();
+	return Utils::chooseHandler();
 }
 
 /**
@@ -68,7 +68,7 @@ 
  */
 function default_user_agent(): string
 {
-    return Utils::defaultUserAgent();
+	return Utils::defaultUserAgent();
 }
 
 /**
@@ -88,7 +88,7 @@ 
  */
 function default_ca_bundle(): string
 {
-    return Utils::defaultCaBundle();
+	return Utils::defaultCaBundle();
 }
 
 /**
@@ -99,7 +99,7 @@ 
  */
 function normalize_header_keys(array $headers): array
 {
-    return Utils::normalizeHeaderKeys($headers);
+	return Utils::normalizeHeaderKeys($headers);
 }
 
 /**
@@ -125,7 +125,7 @@ 
  */
 function is_host_in_noproxy(string $host, array $noProxyArray): bool
 {
-    return Utils::isHostInNoProxy($host, $noProxyArray);
+	return Utils::isHostInNoProxy($host, $noProxyArray);
 }
 
 /**
@@ -146,7 +146,7 @@ 
  */
 function json_decode(string $json, bool $assoc = false, int $depth = 512, int $options = 0)
 {
-    return Utils::jsonDecode($json, $assoc, $depth, $options);
+	return Utils::jsonDecode($json, $assoc, $depth, $options);
 }
 
 /**
@@ -163,5 +163,5 @@ 
  */
 function json_encode($value, int $options = 0, int $depth = 512): string
 {
-    return Utils::jsonEncode($value, $options, $depth);
+	return Utils::jsonEncode($value, $options, $depth);
 }

lib/Vendor/GuzzleHttp/Cookie/SetCookie.php

Indentation +478 added lines, -478 removed lines

@@ -7,482 +7,482 @@
  */
 class SetCookie
 {
-    /**
-     * @var array
-     */
-    private static $defaults = [
-        'Name' => null,
-        'Value' => null,
-        'Domain' => null,
-        'Path' => '/',
-        'Max-Age' => null,
-        'Expires' => null,
-        'Secure' => false,
-        'Discard' => false,
-        'HttpOnly' => false,
-    ];
-
-    /**
-     * @var array Cookie data
-     */
-    private $data;
-
-    /**
-     * Create a new SetCookie object from a string.
-     *
-     * @param string $cookie Set-Cookie header string
-     */
-    public static function fromString(string $cookie): self
-    {
-        // Create the default return array
-        $data = self::$defaults;
-        // Explode the cookie string using a series of semicolons
-        $pieces = \array_filter(\array_map('trim', \explode(';', $cookie)));
-        // The name of the cookie (first kvp) must exist and include an equal sign.
-        if (!isset($pieces[0]) || \strpos($pieces[0], '=') === false) {
-            return new self($data);
-        }
-
-        // Add the cookie pieces into the parsed data array
-        foreach ($pieces as $part) {
-            $cookieParts = \explode('=', $part, 2);
-            $key = \trim($cookieParts[0]);
-            $value = isset($cookieParts[1])
-                ? \trim($cookieParts[1], " \n\r\t\0\x0B")
-                : true;
-
-            // Only check for non-cookies when cookies have been found
-            if (!isset($data['Name'])) {
-                $data['Name'] = $key;
-                $data['Value'] = $value;
-            } else {
-                foreach (\array_keys(self::$defaults) as $search) {
-                    if (!\strcasecmp($search, $key)) {
-                        if ($search === 'Max-Age') {
-                            if (is_numeric($value)) {
-                                $data[$search] = (int) $value;
-                            }
-                        } else {
-                            $data[$search] = $value;
-                        }
-                        continue 2;
-                    }
-                }
-                $data[$key] = $value;
-            }
-        }
-
-        return new self($data);
-    }
-
-    /**
-     * @param array $data Array of cookie data provided by a Cookie parser
-     */
-    public function __construct(array $data = [])
-    {
-        $this->data = self::$defaults;
-
-        if (isset($data['Name'])) {
-            $this->setName($data['Name']);
-        }
-
-        if (isset($data['Value'])) {
-            $this->setValue($data['Value']);
-        }
-
-        if (isset($data['Domain'])) {
-            $this->setDomain($data['Domain']);
-        }
-
-        if (isset($data['Path'])) {
-            $this->setPath($data['Path']);
-        }
-
-        if (isset($data['Max-Age'])) {
-            $this->setMaxAge($data['Max-Age']);
-        }
-
-        if (isset($data['Expires'])) {
-            $this->setExpires($data['Expires']);
-        }
-
-        if (isset($data['Secure'])) {
-            $this->setSecure($data['Secure']);
-        }
-
-        if (isset($data['Discard'])) {
-            $this->setDiscard($data['Discard']);
-        }
-
-        if (isset($data['HttpOnly'])) {
-            $this->setHttpOnly($data['HttpOnly']);
-        }
-
-        // Set the remaining values that don't have extra validation logic
-        foreach (array_diff(array_keys($data), array_keys(self::$defaults)) as $key) {
-            $this->data[$key] = $data[$key];
-        }
-
-        // Extract the Expires value and turn it into a UNIX timestamp if needed
-        if (!$this->getExpires() && $this->getMaxAge()) {
-            // Calculate the Expires date
-            $this->setExpires(\time() + $this->getMaxAge());
-        } elseif (null !== ($expires = $this->getExpires()) && !\is_numeric($expires)) {
-            $this->setExpires($expires);
-        }
-    }
-
-    public function __toString()
-    {
-        $str = $this->data['Name'].'='.($this->data['Value'] ?? '').'; ';
-        foreach ($this->data as $k => $v) {
-            if ($k !== 'Name' && $k !== 'Value' && $v !== null && $v !== false) {
-                if ($k === 'Expires') {
-                    $str .= 'Expires='.\gmdate('D, d M Y H:i:s \G\M\T', $v).'; ';
-                } else {
-                    $str .= ($v === true ? $k : "{$k}={$v}").'; ';
-                }
-            }
-        }
-
-        return \rtrim($str, '; ');
-    }
-
-    public function toArray(): array
-    {
-        return $this->data;
-    }
-
-    /**
-     * Get the cookie name.
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->data['Name'];
-    }
-
-    /**
-     * Set the cookie name.
-     *
-     * @param string $name Cookie name
-     */
-    public function setName($name): void
-    {
-        if (!is_string($name)) {
-            trigger_deprecation('guzzlehttp/guzzle', '7.4', 'Not passing a string to %s::%s() is deprecated and will cause an error in 8.0.', __CLASS__, __FUNCTION__);
-        }
-
-        $this->data['Name'] = (string) $name;
-    }
-
-    /**
-     * Get the cookie value.
-     *
-     * @return string|null
-     */
-    public function getValue()
-    {
-        return $this->data['Value'];
-    }
-
-    /**
-     * Set the cookie value.
-     *
-     * @param string $value Cookie value
-     */
-    public function setValue($value): void
-    {
-        if (!is_string($value)) {
-            trigger_deprecation('guzzlehttp/guzzle', '7.4', 'Not passing a string to %s::%s() is deprecated and will cause an error in 8.0.', __CLASS__, __FUNCTION__);
-        }
-
-        $this->data['Value'] = (string) $value;
-    }
-
-    /**
-     * Get the domain.
-     *
-     * @return string|null
-     */
-    public function getDomain()
-    {
-        return $this->data['Domain'];
-    }
-
-    /**
-     * Set the domain of the cookie.
-     *
-     * @param string|null $domain
-     */
-    public function setDomain($domain): void
-    {
-        if (!is_string($domain) && null !== $domain) {
-            trigger_deprecation('guzzlehttp/guzzle', '7.4', 'Not passing a string or null to %s::%s() is deprecated and will cause an error in 8.0.', __CLASS__, __FUNCTION__);
-        }
-
-        $this->data['Domain'] = null === $domain ? null : (string) $domain;
-    }
-
-    /**
-     * Get the path.
-     *
-     * @return string
-     */
-    public function getPath()
-    {
-        return $this->data['Path'];
-    }
-
-    /**
-     * Set the path of the cookie.
-     *
-     * @param string $path Path of the cookie
-     */
-    public function setPath($path): void
-    {
-        if (!is_string($path)) {
-            trigger_deprecation('guzzlehttp/guzzle', '7.4', 'Not passing a string to %s::%s() is deprecated and will cause an error in 8.0.', __CLASS__, __FUNCTION__);
-        }
-
-        $this->data['Path'] = (string) $path;
-    }
-
-    /**
-     * Maximum lifetime of the cookie in seconds.
-     *
-     * @return int|null
-     */
-    public function getMaxAge()
-    {
-        return null === $this->data['Max-Age'] ? null : (int) $this->data['Max-Age'];
-    }
-
-    /**
-     * Set the max-age of the cookie.
-     *
-     * @param int|null $maxAge Max age of the cookie in seconds
-     */
-    public function setMaxAge($maxAge): void
-    {
-        if (!is_int($maxAge) && null !== $maxAge) {
-            trigger_deprecation('guzzlehttp/guzzle', '7.4', 'Not passing an int or null to %s::%s() is deprecated and will cause an error in 8.0.', __CLASS__, __FUNCTION__);
-        }
-
-        $this->data['Max-Age'] = $maxAge === null ? null : (int) $maxAge;
-    }
-
-    /**
-     * The UNIX timestamp when the cookie Expires.
-     *
-     * @return string|int|null
-     */
-    public function getExpires()
-    {
-        return $this->data['Expires'];
-    }
-
-    /**
-     * Set the unix timestamp for which the cookie will expire.
-     *
-     * @param int|string|null $timestamp Unix timestamp or any English textual datetime description.
-     */
-    public function setExpires($timestamp): void
-    {
-        if (!is_int($timestamp) && !is_string($timestamp) && null !== $timestamp) {
-            trigger_deprecation('guzzlehttp/guzzle', '7.4', 'Not passing an int, string or null to %s::%s() is deprecated and will cause an error in 8.0.', __CLASS__, __FUNCTION__);
-        }
-
-        $this->data['Expires'] = null === $timestamp ? null : (\is_numeric($timestamp) ? (int) $timestamp : \strtotime((string) $timestamp));
-    }
-
-    /**
-     * Get whether or not this is a secure cookie.
-     *
-     * @return bool
-     */
-    public function getSecure()
-    {
-        return $this->data['Secure'];
-    }
-
-    /**
-     * Set whether or not the cookie is secure.
-     *
-     * @param bool $secure Set to true or false if secure
-     */
-    public function setSecure($secure): void
-    {
-        if (!is_bool($secure)) {
-            trigger_deprecation('guzzlehttp/guzzle', '7.4', 'Not passing a bool to %s::%s() is deprecated and will cause an error in 8.0.', __CLASS__, __FUNCTION__);
-        }
-
-        $this->data['Secure'] = (bool) $secure;
-    }
-
-    /**
-     * Get whether or not this is a session cookie.
-     *
-     * @return bool|null
-     */
-    public function getDiscard()
-    {
-        return $this->data['Discard'];
-    }
-
-    /**
-     * Set whether or not this is a session cookie.
-     *
-     * @param bool $discard Set to true or false if this is a session cookie
-     */
-    public function setDiscard($discard): void
-    {
-        if (!is_bool($discard)) {
-            trigger_deprecation('guzzlehttp/guzzle', '7.4', 'Not passing a bool to %s::%s() is deprecated and will cause an error in 8.0.', __CLASS__, __FUNCTION__);
-        }
-
-        $this->data['Discard'] = (bool) $discard;
-    }
-
-    /**
-     * Get whether or not this is an HTTP only cookie.
-     *
-     * @return bool
-     */
-    public function getHttpOnly()
-    {
-        return $this->data['HttpOnly'];
-    }
-
-    /**
-     * Set whether or not this is an HTTP only cookie.
-     *
-     * @param bool $httpOnly Set to true or false if this is HTTP only
-     */
-    public function setHttpOnly($httpOnly): void
-    {
-        if (!is_bool($httpOnly)) {
-            trigger_deprecation('guzzlehttp/guzzle', '7.4', 'Not passing a bool to %s::%s() is deprecated and will cause an error in 8.0.', __CLASS__, __FUNCTION__);
-        }
-
-        $this->data['HttpOnly'] = (bool) $httpOnly;
-    }
-
-    /**
-     * Check if the cookie matches a path value.
-     *
-     * A request-path path-matches a given cookie-path if at least one of
-     * the following conditions holds:
-     *
-     * - The cookie-path and the request-path are identical.
-     * - The cookie-path is a prefix of the request-path, and the last
-     *   character of the cookie-path is %x2F ("/").
-     * - The cookie-path is a prefix of the request-path, and the first
-     *   character of the request-path that is not included in the cookie-
-     *   path is a %x2F ("/") character.
-     *
-     * @param string $requestPath Path to check against
-     */
-    public function matchesPath(string $requestPath): bool
-    {
-        $cookiePath = $this->getPath();
-
-        // Match on exact matches or when path is the default empty "/"
-        if ($cookiePath === '/' || $cookiePath == $requestPath) {
-            return true;
-        }
-
-        // Ensure that the cookie-path is a prefix of the request path.
-        if (0 !== \strpos($requestPath, $cookiePath)) {
-            return false;
-        }
-
-        // Match if the last character of the cookie-path is "/"
-        if (\substr($cookiePath, -1, 1) === '/') {
-            return true;
-        }
-
-        // Match if the first character not included in cookie path is "/"
-        return \substr($requestPath, \strlen($cookiePath), 1) === '/';
-    }
-
-    /**
-     * Check if the cookie matches a domain value.
-     *
-     * @param string $domain Domain to check against
-     */
-    public function matchesDomain(string $domain): bool
-    {
-        $cookieDomain = $this->getDomain();
-        if (null === $cookieDomain) {
-            return true;
-        }
-
-        // Remove the leading '.' as per spec in RFC 6265.
-        // https://datatracker.ietf.org/doc/html/rfc6265#section-5.2.3
-        $cookieDomain = \ltrim(\strtolower($cookieDomain), '.');
-
-        $domain = \strtolower($domain);
-
-        // Domain not set or exact match.
-        if ('' === $cookieDomain || $domain === $cookieDomain) {
-            return true;
-        }
-
-        // Matching the subdomain according to RFC 6265.
-        // https://datatracker.ietf.org/doc/html/rfc6265#section-5.1.3
-        if (\filter_var($domain, \FILTER_VALIDATE_IP)) {
-            return false;
-        }
-
-        return (bool) \preg_match('/\.'.\preg_quote($cookieDomain, '/').'$/', $domain);
-    }
-
-    /**
-     * Check if the cookie is expired.
-     */
-    public function isExpired(): bool
-    {
-        return $this->getExpires() !== null && \time() > $this->getExpires();
-    }
-
-    /**
-     * Check if the cookie is valid according to RFC 6265.
-     *
-     * @return bool|string Returns true if valid or an error message if invalid
-     */
-    public function validate()
-    {
-        $name = $this->getName();
-        if ($name === '') {
-            return 'The cookie name must not be empty';
-        }
-
-        // Check if any of the invalid characters are present in the cookie name
-        if (\preg_match(
-            '/[\x00-\x20\x22\x28-\x29\x2c\x2f\x3a-\x40\x5c\x7b\x7d\x7f]/',
-            $name
-        )) {
-            return 'Cookie name must not contain invalid characters: ASCII '
-                .'Control characters (0-31;127), space, tab and the '
-                .'following characters: ()<>@,;:\"/?={}';
-        }
-
-        // Value must not be null. 0 and empty string are valid. Empty strings
-        // are technically against RFC 6265, but known to happen in the wild.
-        $value = $this->getValue();
-        if ($value === null) {
-            return 'The cookie value must not be empty';
-        }
-
-        // Domains must not be empty, but can be 0. "0" is not a valid internet
-        // domain, but may be used as server name in a private network.
-        $domain = $this->getDomain();
-        if ($domain === null || $domain === '') {
-            return 'The cookie domain must not be empty';
-        }
-
-        return true;
-    }
+	/**
+	 * @var array
+	 */
+	private static $defaults = [
+		'Name' => null,
+		'Value' => null,
+		'Domain' => null,
+		'Path' => '/',
+		'Max-Age' => null,
+		'Expires' => null,
+		'Secure' => false,
+		'Discard' => false,
+		'HttpOnly' => false,
+	];
+
+	/**
+	 * @var array Cookie data
+	 */
+	private $data;
+
+	/**
+	 * Create a new SetCookie object from a string.
+	 *
+	 * @param string $cookie Set-Cookie header string
+	 */
+	public static function fromString(string $cookie): self
+	{
+		// Create the default return array
+		$data = self::$defaults;
+		// Explode the cookie string using a series of semicolons
+		$pieces = \array_filter(\array_map('trim', \explode(';', $cookie)));
+		// The name of the cookie (first kvp) must exist and include an equal sign.
+		if (!isset($pieces[0]) || \strpos($pieces[0], '=') === false) {
+			return new self($data);
+		}
+
+		// Add the cookie pieces into the parsed data array
+		foreach ($pieces as $part) {
+			$cookieParts = \explode('=', $part, 2);
+			$key = \trim($cookieParts[0]);
+			$value = isset($cookieParts[1])
+				? \trim($cookieParts[1], " \n\r\t\0\x0B")
+				: true;
+
+			// Only check for non-cookies when cookies have been found
+			if (!isset($data['Name'])) {
+				$data['Name'] = $key;
+				$data['Value'] = $value;
+			} else {
+				foreach (\array_keys(self::$defaults) as $search) {
+					if (!\strcasecmp($search, $key)) {
+						if ($search === 'Max-Age') {
+							if (is_numeric($value)) {
+								$data[$search] = (int) $value;
+							}
+						} else {
+							$data[$search] = $value;
+						}
+						continue 2;
+					}
+				}
+				$data[$key] = $value;
+			}
+		}
+
+		return new self($data);
+	}
+
+	/**
+	 * @param array $data Array of cookie data provided by a Cookie parser
+	 */
+	public function __construct(array $data = [])
+	{
+		$this->data = self::$defaults;
+
+		if (isset($data['Name'])) {
+			$this->setName($data['Name']);
+		}
+
+		if (isset($data['Value'])) {
+			$this->setValue($data['Value']);
+		}
+
+		if (isset($data['Domain'])) {
+			$this->setDomain($data['Domain']);
+		}
+
+		if (isset($data['Path'])) {
+			$this->setPath($data['Path']);
+		}
+
+		if (isset($data['Max-Age'])) {
+			$this->setMaxAge($data['Max-Age']);
+		}
+
+		if (isset($data['Expires'])) {
+			$this->setExpires($data['Expires']);
+		}
+
+		if (isset($data['Secure'])) {
+			$this->setSecure($data['Secure']);
+		}
+
+		if (isset($data['Discard'])) {
+			$this->setDiscard($data['Discard']);
+		}
+
+		if (isset($data['HttpOnly'])) {
+			$this->setHttpOnly($data['HttpOnly']);
+		}
+
+		// Set the remaining values that don't have extra validation logic
+		foreach (array_diff(array_keys($data), array_keys(self::$defaults)) as $key) {
+			$this->data[$key] = $data[$key];
+		}
+
+		// Extract the Expires value and turn it into a UNIX timestamp if needed
+		if (!$this->getExpires() && $this->getMaxAge()) {
+			// Calculate the Expires date
+			$this->setExpires(\time() + $this->getMaxAge());
+		} elseif (null !== ($expires = $this->getExpires()) && !\is_numeric($expires)) {
+			$this->setExpires($expires);
+		}
+	}
+
+	public function __toString()
+	{
+		$str = $this->data['Name'].'='.($this->data['Value'] ?? '').'; ';
+		foreach ($this->data as $k => $v) {
+			if ($k !== 'Name' && $k !== 'Value' && $v !== null && $v !== false) {
+				if ($k === 'Expires') {
+					$str .= 'Expires='.\gmdate('D, d M Y H:i:s \G\M\T', $v).'; ';
+				} else {
+					$str .= ($v === true ? $k : "{$k}={$v}").'; ';
+				}
+			}
+		}
+
+		return \rtrim($str, '; ');
+	}
+
+	public function toArray(): array
+	{
+		return $this->data;
+	}
+
+	/**
+	 * Get the cookie name.
+	 *
+	 * @return string
+	 */
+	public function getName()
+	{
+		return $this->data['Name'];
+	}
+
+	/**
+	 * Set the cookie name.
+	 *
+	 * @param string $name Cookie name
+	 */
+	public function setName($name): void
+	{
+		if (!is_string($name)) {
+			trigger_deprecation('guzzlehttp/guzzle', '7.4', 'Not passing a string to %s::%s() is deprecated and will cause an error in 8.0.', __CLASS__, __FUNCTION__);
+		}
+
+		$this->data['Name'] = (string) $name;
+	}
+
+	/**
+	 * Get the cookie value.
+	 *
+	 * @return string|null
+	 */
+	public function getValue()
+	{
+		return $this->data['Value'];
+	}
+
+	/**
+	 * Set the cookie value.
+	 *
+	 * @param string $value Cookie value
+	 */
+	public function setValue($value): void
+	{
+		if (!is_string($value)) {
+			trigger_deprecation('guzzlehttp/guzzle', '7.4', 'Not passing a string to %s::%s() is deprecated and will cause an error in 8.0.', __CLASS__, __FUNCTION__);
+		}
+
+		$this->data['Value'] = (string) $value;
+	}
+
+	/**
+	 * Get the domain.
+	 *
+	 * @return string|null
+	 */
+	public function getDomain()
+	{
+		return $this->data['Domain'];
+	}
+
+	/**
+	 * Set the domain of the cookie.
+	 *
+	 * @param string|null $domain
+	 */
+	public function setDomain($domain): void
+	{
+		if (!is_string($domain) && null !== $domain) {
+			trigger_deprecation('guzzlehttp/guzzle', '7.4', 'Not passing a string or null to %s::%s() is deprecated and will cause an error in 8.0.', __CLASS__, __FUNCTION__);
+		}
+
+		$this->data['Domain'] = null === $domain ? null : (string) $domain;
+	}
+
+	/**
+	 * Get the path.
+	 *
+	 * @return string
+	 */
+	public function getPath()
+	{
+		return $this->data['Path'];
+	}
+
+	/**
+	 * Set the path of the cookie.
+	 *
+	 * @param string $path Path of the cookie
+	 */
+	public function setPath($path): void
+	{
+		if (!is_string($path)) {
+			trigger_deprecation('guzzlehttp/guzzle', '7.4', 'Not passing a string to %s::%s() is deprecated and will cause an error in 8.0.', __CLASS__, __FUNCTION__);
+		}
+
+		$this->data['Path'] = (string) $path;
+	}
+
+	/**
+	 * Maximum lifetime of the cookie in seconds.
+	 *
+	 * @return int|null
+	 */
+	public function getMaxAge()
+	{
+		return null === $this->data['Max-Age'] ? null : (int) $this->data['Max-Age'];
+	}
+
+	/**
+	 * Set the max-age of the cookie.
+	 *
+	 * @param int|null $maxAge Max age of the cookie in seconds
+	 */
+	public function setMaxAge($maxAge): void
+	{
+		if (!is_int($maxAge) && null !== $maxAge) {
+			trigger_deprecation('guzzlehttp/guzzle', '7.4', 'Not passing an int or null to %s::%s() is deprecated and will cause an error in 8.0.', __CLASS__, __FUNCTION__);
+		}
+
+		$this->data['Max-Age'] = $maxAge === null ? null : (int) $maxAge;
+	}
+
+	/**
+	 * The UNIX timestamp when the cookie Expires.
+	 *
+	 * @return string|int|null
+	 */
+	public function getExpires()
+	{
+		return $this->data['Expires'];
+	}
+
+	/**
+	 * Set the unix timestamp for which the cookie will expire.
+	 *
+	 * @param int|string|null $timestamp Unix timestamp or any English textual datetime description.
+	 */
+	public function setExpires($timestamp): void
+	{
+		if (!is_int($timestamp) && !is_string($timestamp) && null !== $timestamp) {
+			trigger_deprecation('guzzlehttp/guzzle', '7.4', 'Not passing an int, string or null to %s::%s() is deprecated and will cause an error in 8.0.', __CLASS__, __FUNCTION__);
+		}
+
+		$this->data['Expires'] = null === $timestamp ? null : (\is_numeric($timestamp) ? (int) $timestamp : \strtotime((string) $timestamp));
+	}
+
+	/**
+	 * Get whether or not this is a secure cookie.
+	 *
+	 * @return bool
+	 */
+	public function getSecure()
+	{
+		return $this->data['Secure'];
+	}
+
+	/**
+	 * Set whether or not the cookie is secure.
+	 *
+	 * @param bool $secure Set to true or false if secure
+	 */
+	public function setSecure($secure): void
+	{
+		if (!is_bool($secure)) {
+			trigger_deprecation('guzzlehttp/guzzle', '7.4', 'Not passing a bool to %s::%s() is deprecated and will cause an error in 8.0.', __CLASS__, __FUNCTION__);
+		}
+
+		$this->data['Secure'] = (bool) $secure;
+	}
+
+	/**
+	 * Get whether or not this is a session cookie.
+	 *
+	 * @return bool|null
+	 */
+	public function getDiscard()
+	{
+		return $this->data['Discard'];
+	}
+
+	/**
+	 * Set whether or not this is a session cookie.
+	 *
+	 * @param bool $discard Set to true or false if this is a session cookie
+	 */
+	public function setDiscard($discard): void
+	{
+		if (!is_bool($discard)) {
+			trigger_deprecation('guzzlehttp/guzzle', '7.4', 'Not passing a bool to %s::%s() is deprecated and will cause an error in 8.0.', __CLASS__, __FUNCTION__);
+		}
+
+		$this->data['Discard'] = (bool) $discard;
+	}
+
+	/**
+	 * Get whether or not this is an HTTP only cookie.
+	 *
+	 * @return bool
+	 */
+	public function getHttpOnly()
+	{
+		return $this->data['HttpOnly'];
+	}
+
+	/**
+	 * Set whether or not this is an HTTP only cookie.
+	 *
+	 * @param bool $httpOnly Set to true or false if this is HTTP only
+	 */
+	public function setHttpOnly($httpOnly): void
+	{
+		if (!is_bool($httpOnly)) {
+			trigger_deprecation('guzzlehttp/guzzle', '7.4', 'Not passing a bool to %s::%s() is deprecated and will cause an error in 8.0.', __CLASS__, __FUNCTION__);
+		}
+
+		$this->data['HttpOnly'] = (bool) $httpOnly;
+	}
+
+	/**
+	 * Check if the cookie matches a path value.
+	 *
+	 * A request-path path-matches a given cookie-path if at least one of
+	 * the following conditions holds:
+	 *
+	 * - The cookie-path and the request-path are identical.
+	 * - The cookie-path is a prefix of the request-path, and the last
+	 *   character of the cookie-path is %x2F ("/").
+	 * - The cookie-path is a prefix of the request-path, and the first
+	 *   character of the request-path that is not included in the cookie-
+	 *   path is a %x2F ("/") character.
+	 *
+	 * @param string $requestPath Path to check against
+	 */
+	public function matchesPath(string $requestPath): bool
+	{
+		$cookiePath = $this->getPath();
+
+		// Match on exact matches or when path is the default empty "/"
+		if ($cookiePath === '/' || $cookiePath == $requestPath) {
+			return true;
+		}
+
+		// Ensure that the cookie-path is a prefix of the request path.
+		if (0 !== \strpos($requestPath, $cookiePath)) {
+			return false;
+		}
+
+		// Match if the last character of the cookie-path is "/"
+		if (\substr($cookiePath, -1, 1) === '/') {
+			return true;
+		}
+
+		// Match if the first character not included in cookie path is "/"
+		return \substr($requestPath, \strlen($cookiePath), 1) === '/';
+	}
+
+	/**
+	 * Check if the cookie matches a domain value.
+	 *
+	 * @param string $domain Domain to check against
+	 */
+	public function matchesDomain(string $domain): bool
+	{
+		$cookieDomain = $this->getDomain();
+		if (null === $cookieDomain) {
+			return true;
+		}
+
+		// Remove the leading '.' as per spec in RFC 6265.
+		// https://datatracker.ietf.org/doc/html/rfc6265#section-5.2.3
+		$cookieDomain = \ltrim(\strtolower($cookieDomain), '.');
+
+		$domain = \strtolower($domain);
+
+		// Domain not set or exact match.
+		if ('' === $cookieDomain || $domain === $cookieDomain) {
+			return true;
+		}
+
+		// Matching the subdomain according to RFC 6265.
+		// https://datatracker.ietf.org/doc/html/rfc6265#section-5.1.3
+		if (\filter_var($domain, \FILTER_VALIDATE_IP)) {
+			return false;
+		}
+
+		return (bool) \preg_match('/\.'.\preg_quote($cookieDomain, '/').'$/', $domain);
+	}
+
+	/**
+	 * Check if the cookie is expired.
+	 */
+	public function isExpired(): bool
+	{
+		return $this->getExpires() !== null && \time() > $this->getExpires();
+	}
+
+	/**
+	 * Check if the cookie is valid according to RFC 6265.
+	 *
+	 * @return bool|string Returns true if valid or an error message if invalid
+	 */
+	public function validate()
+	{
+		$name = $this->getName();
+		if ($name === '') {
+			return 'The cookie name must not be empty';
+		}
+
+		// Check if any of the invalid characters are present in the cookie name
+		if (\preg_match(
+			'/[\x00-\x20\x22\x28-\x29\x2c\x2f\x3a-\x40\x5c\x7b\x7d\x7f]/',
+			$name
+		)) {
+			return 'Cookie name must not contain invalid characters: ASCII '
+				.'Control characters (0-31;127), space, tab and the '
+				.'following characters: ()<>@,;:\"/?={}';
+		}
+
+		// Value must not be null. 0 and empty string are valid. Empty strings
+		// are technically against RFC 6265, but known to happen in the wild.
+		$value = $this->getValue();
+		if ($value === null) {
+			return 'The cookie value must not be empty';
+		}
+
+		// Domains must not be empty, but can be 0. "0" is not a valid internet
+		// domain, but may be used as server name in a private network.
+		$domain = $this->getDomain();
+		if ($domain === null || $domain === '') {
+			return 'The cookie domain must not be empty';
+		}
+
+		return true;
+	}
 }

Spacing +12 added lines, -12 removed lines

@@ -60,7 +60,7 @@ 
                     if (!\strcasecmp($search, $key)) {
                         if ($search === 'Max-Age') {
                             if (is_numeric($value)) {
-                                $data[$search] = (int) $value;
+                                $data[$search] = (int)$value;
                             }
                         } else {
                             $data[$search] = $value;
@@ -174,7 +174,7 @@ 
             trigger_deprecation('guzzlehttp/guzzle', '7.4', 'Not passing a string to %s::%s() is deprecated and will cause an error in 8.0.', __CLASS__, __FUNCTION__);
         }
 
-        $this->data['Name'] = (string) $name;
+        $this->data['Name'] = (string)$name;
     }
 
     /**
@@ -198,7 +198,7 @@ 
             trigger_deprecation('guzzlehttp/guzzle', '7.4', 'Not passing a string to %s::%s() is deprecated and will cause an error in 8.0.', __CLASS__, __FUNCTION__);
         }
 
-        $this->data['Value'] = (string) $value;
+        $this->data['Value'] = (string)$value;
     }
 
     /**
@@ -222,7 +222,7 @@ 
             trigger_deprecation('guzzlehttp/guzzle', '7.4', 'Not passing a string or null to %s::%s() is deprecated and will cause an error in 8.0.', __CLASS__, __FUNCTION__);
         }
 
-        $this->data['Domain'] = null === $domain ? null : (string) $domain;
+        $this->data['Domain'] = null === $domain ? null : (string)$domain;
     }
 
     /**
@@ -246,7 +246,7 @@ 
             trigger_deprecation('guzzlehttp/guzzle', '7.4', 'Not passing a string to %s::%s() is deprecated and will cause an error in 8.0.', __CLASS__, __FUNCTION__);
         }
 
-        $this->data['Path'] = (string) $path;
+        $this->data['Path'] = (string)$path;
     }
 
     /**
@@ -256,7 +256,7 @@ 
      */
     public function getMaxAge()
     {
-        return null === $this->data['Max-Age'] ? null : (int) $this->data['Max-Age'];
+        return null === $this->data['Max-Age'] ? null : (int)$this->data['Max-Age'];
     }
 
     /**
@@ -270,7 +270,7 @@ 
             trigger_deprecation('guzzlehttp/guzzle', '7.4', 'Not passing an int or null to %s::%s() is deprecated and will cause an error in 8.0.', __CLASS__, __FUNCTION__);
         }
 
-        $this->data['Max-Age'] = $maxAge === null ? null : (int) $maxAge;
+        $this->data['Max-Age'] = $maxAge === null ? null : (int)$maxAge;
     }
 
     /**
@@ -294,7 +294,7 @@ 
             trigger_deprecation('guzzlehttp/guzzle', '7.4', 'Not passing an int, string or null to %s::%s() is deprecated and will cause an error in 8.0.', __CLASS__, __FUNCTION__);
         }
 
-        $this->data['Expires'] = null === $timestamp ? null : (\is_numeric($timestamp) ? (int) $timestamp : \strtotime((string) $timestamp));
+        $this->data['Expires'] = null === $timestamp ? null : (\is_numeric($timestamp) ? (int)$timestamp : \strtotime((string)$timestamp));
     }
 
     /**
@@ -318,7 +318,7 @@ 
             trigger_deprecation('guzzlehttp/guzzle', '7.4', 'Not passing a bool to %s::%s() is deprecated and will cause an error in 8.0.', __CLASS__, __FUNCTION__);
         }
 
-        $this->data['Secure'] = (bool) $secure;
+        $this->data['Secure'] = (bool)$secure;
     }
 
     /**
@@ -342,7 +342,7 @@ 
             trigger_deprecation('guzzlehttp/guzzle', '7.4', 'Not passing a bool to %s::%s() is deprecated and will cause an error in 8.0.', __CLASS__, __FUNCTION__);
         }
 
-        $this->data['Discard'] = (bool) $discard;
+        $this->data['Discard'] = (bool)$discard;
     }
 
     /**
@@ -366,7 +366,7 @@ 
             trigger_deprecation('guzzlehttp/guzzle', '7.4', 'Not passing a bool to %s::%s() is deprecated and will cause an error in 8.0.', __CLASS__, __FUNCTION__);
         }
 
-        $this->data['HttpOnly'] = (bool) $httpOnly;
+        $this->data['HttpOnly'] = (bool)$httpOnly;
     }
 
     /**
@@ -436,7 +436,7 @@ 
             return false;
         }
 
-        return (bool) \preg_match('/\.'.\preg_quote($cookieDomain, '/').'$/', $domain);
+        return (bool)\preg_match('/\.'.\preg_quote($cookieDomain, '/').'$/', $domain);
     }
 
     /**

Braces +1 added lines, -2 removed lines

@@ -5,8 +5,7 @@
 /**
  * Set-Cookie object
  */
-class SetCookie
-{
+class SetCookie {
     /**
      * @var array
      */

lib/Vendor/GuzzleHttp/Cookie/SessionCookieJar.php

Indentation +61 added lines, -61 removed lines

@@ -7,71 +7,71 @@
  */
 class SessionCookieJar extends CookieJar
 {
-    /**
-     * @var string session key
-     */
-    private $sessionKey;
+	/**
+	 * @var string session key
+	 */
+	private $sessionKey;
 
-    /**
-     * @var bool Control whether to persist session cookies or not.
-     */
-    private $storeSessionCookies;
+	/**
+	 * @var bool Control whether to persist session cookies or not.
+	 */
+	private $storeSessionCookies;
 
-    /**
-     * Create a new SessionCookieJar object
-     *
-     * @param string $sessionKey          Session key name to store the cookie
-     *                                    data in session
-     * @param bool   $storeSessionCookies Set to true to store session cookies
-     *                                    in the cookie jar.
-     */
-    public function __construct(string $sessionKey, bool $storeSessionCookies = false)
-    {
-        parent::__construct();
-        $this->sessionKey = $sessionKey;
-        $this->storeSessionCookies = $storeSessionCookies;
-        $this->load();
-    }
+	/**
+	 * Create a new SessionCookieJar object
+	 *
+	 * @param string $sessionKey          Session key name to store the cookie
+	 *                                    data in session
+	 * @param bool   $storeSessionCookies Set to true to store session cookies
+	 *                                    in the cookie jar.
+	 */
+	public function __construct(string $sessionKey, bool $storeSessionCookies = false)
+	{
+		parent::__construct();
+		$this->sessionKey = $sessionKey;
+		$this->storeSessionCookies = $storeSessionCookies;
+		$this->load();
+	}
 
-    /**
-     * Saves cookies to session when shutting down
-     */
-    public function __destruct()
-    {
-        $this->save();
-    }
+	/**
+	 * Saves cookies to session when shutting down
+	 */
+	public function __destruct()
+	{
+		$this->save();
+	}
 
-    /**
-     * Save cookies to the client session
-     */
-    public function save(): void
-    {
-        $json = [];
-        /** @var SetCookie $cookie */
-        foreach ($this as $cookie) {
-            if (CookieJar::shouldPersist($cookie, $this->storeSessionCookies)) {
-                $json[] = $cookie->toArray();
-            }
-        }
+	/**
+	 * Save cookies to the client session
+	 */
+	public function save(): void
+	{
+		$json = [];
+		/** @var SetCookie $cookie */
+		foreach ($this as $cookie) {
+			if (CookieJar::shouldPersist($cookie, $this->storeSessionCookies)) {
+				$json[] = $cookie->toArray();
+			}
+		}
 
-        $_SESSION[$this->sessionKey] = \json_encode($json);
-    }
+		$_SESSION[$this->sessionKey] = \json_encode($json);
+	}
 
-    /**
-     * Load the contents of the client session into the data array
-     */
-    protected function load(): void
-    {
-        if (!isset($_SESSION[$this->sessionKey])) {
-            return;
-        }
-        $data = \json_decode($_SESSION[$this->sessionKey], true);
-        if (\is_array($data)) {
-            foreach ($data as $cookie) {
-                $this->setCookie(new SetCookie($cookie));
-            }
-        } elseif (\strlen($data)) {
-            throw new \RuntimeException('Invalid cookie data');
-        }
-    }
+	/**
+	 * Load the contents of the client session into the data array
+	 */
+	protected function load(): void
+	{
+		if (!isset($_SESSION[$this->sessionKey])) {
+			return;
+		}
+		$data = \json_decode($_SESSION[$this->sessionKey], true);
+		if (\is_array($data)) {
+			foreach ($data as $cookie) {
+				$this->setCookie(new SetCookie($cookie));
+			}
+		} elseif (\strlen($data)) {
+			throw new \RuntimeException('Invalid cookie data');
+		}
+	}
 }

Braces +1 added lines, -2 removed lines

@@ -5,8 +5,7 @@
 /**
  * Persists cookies in the client session
  */
-class SessionCookieJar extends CookieJar
-{
+class SessionCookieJar extends CookieJar {
     /**
      * @var string session key
      */

lib/Vendor/GuzzleHttp/Cookie/CookieJarInterface.php

Indentation +53 added lines, -53 removed lines

@@ -19,62 +19,62 @@
  */
 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;
+	/**
+	 * 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;
+	/**
+	 * 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;
+	/**
+	 * 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;
+	/**
+	 * 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;
+	/**
+	 * 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;
+	/**
+	 * Converts the cookie jar to an array.
+	 */
+	public function toArray(): array;
 }