nextcloud / fulltextsearch_elasticsearch

lib/Vendor/GuzzleHttp/ClientInterface.php

Braces +1 added lines, -2 removed lines

@@ -11,8 +11,7 @@
 /**
  * Client interface for sending HTTP requests.
  */
-interface ClientInterface
-{
+interface ClientInterface {
     /**
      * The Guzzle major version.
      */

Indentation +63 added lines, -63 removed lines

@@ -12,67 +12,67 @@
  */
 interface ClientInterface
 {
-    /**
-     * The Guzzle major version.
-     */
-    public const MAJOR_VERSION = 7;
-    /**
-     * Send an HTTP request.
-     *
-     * @param RequestInterface $request Request to send
-     * @param array            $options Request options to apply to the given
-     *                                  request and to the transfer.
-     *
-     * @throws GuzzleException
-     */
-    public function send(RequestInterface $request, array $options = []) : ResponseInterface;
-    /**
-     * Asynchronously send an HTTP request.
-     *
-     * @param RequestInterface $request Request to send
-     * @param array            $options Request options to apply to the given
-     *                                  request and to the transfer.
-     */
-    public function sendAsync(RequestInterface $request, array $options = []) : PromiseInterface;
-    /**
-     * Create and send an HTTP request.
-     *
-     * Use an absolute path to override the base path of the client, or a
-     * relative path to append to the base path of the client. The URL can
-     * contain the query string as well.
-     *
-     * @param string              $method  HTTP method.
-     * @param string|UriInterface $uri     URI object or string.
-     * @param array               $options Request options to apply.
-     *
-     * @throws GuzzleException
-     */
-    public function request(string $method, $uri, array $options = []) : ResponseInterface;
-    /**
-     * Create and send an asynchronous HTTP request.
-     *
-     * Use an absolute path to override the base path of the client, or a
-     * relative path to append to the base path of the client. The URL can
-     * contain the query string as well. Use an array to provide a URL
-     * template and additional variables to use in the URL template expansion.
-     *
-     * @param string              $method  HTTP method
-     * @param string|UriInterface $uri     URI object or string.
-     * @param array               $options Request options to apply.
-     */
-    public function requestAsync(string $method, $uri, array $options = []) : PromiseInterface;
-    /**
-     * Get a client configuration option.
-     *
-     * These options include default request options of the client, a "handler"
-     * (if utilized by the concrete client), and a "base_uri" if utilized by
-     * the concrete client.
-     *
-     * @param string|null $option The config option to retrieve.
-     *
-     * @return mixed
-     *
-     * @deprecated ClientInterface::getConfig will be removed in guzzlehttp/guzzle:8.0.
-     */
-    public function getConfig(?string $option = null);
+	/**
+	 * The Guzzle major version.
+	 */
+	public const MAJOR_VERSION = 7;
+	/**
+	 * Send an HTTP request.
+	 *
+	 * @param RequestInterface $request Request to send
+	 * @param array            $options Request options to apply to the given
+	 *                                  request and to the transfer.
+	 *
+	 * @throws GuzzleException
+	 */
+	public function send(RequestInterface $request, array $options = []) : ResponseInterface;
+	/**
+	 * Asynchronously send an HTTP request.
+	 *
+	 * @param RequestInterface $request Request to send
+	 * @param array            $options Request options to apply to the given
+	 *                                  request and to the transfer.
+	 */
+	public function sendAsync(RequestInterface $request, array $options = []) : PromiseInterface;
+	/**
+	 * Create and send an HTTP request.
+	 *
+	 * Use an absolute path to override the base path of the client, or a
+	 * relative path to append to the base path of the client. The URL can
+	 * contain the query string as well.
+	 *
+	 * @param string              $method  HTTP method.
+	 * @param string|UriInterface $uri     URI object or string.
+	 * @param array               $options Request options to apply.
+	 *
+	 * @throws GuzzleException
+	 */
+	public function request(string $method, $uri, array $options = []) : ResponseInterface;
+	/**
+	 * Create and send an asynchronous HTTP request.
+	 *
+	 * Use an absolute path to override the base path of the client, or a
+	 * relative path to append to the base path of the client. The URL can
+	 * contain the query string as well. Use an array to provide a URL
+	 * template and additional variables to use in the URL template expansion.
+	 *
+	 * @param string              $method  HTTP method
+	 * @param string|UriInterface $uri     URI object or string.
+	 * @param array               $options Request options to apply.
+	 */
+	public function requestAsync(string $method, $uri, array $options = []) : PromiseInterface;
+	/**
+	 * Get a client configuration option.
+	 *
+	 * These options include default request options of the client, a "handler"
+	 * (if utilized by the concrete client), and a "base_uri" if utilized by
+	 * the concrete client.
+	 *
+	 * @param string|null $option The config option to retrieve.
+	 *
+	 * @return mixed
+	 *
+	 * @deprecated ClientInterface::getConfig will be removed in guzzlehttp/guzzle:8.0.
+	 */
+	public function getConfig(?string $option = null);
 }

lib/Vendor/GuzzleHttp/Handler/StreamHandler.php

Braces +1 added lines, -2 removed lines

@@ -20,8 +20,7 @@
  *
  * @final
  */
-class StreamHandler
-{
+class StreamHandler {
     /**
      * @var array
      */

Spacing +15 added lines, -15 removed lines

@@ -133,7 +133,7 @@ 
                     // Fix content-length header
                     if (isset($normalizedKeys['content-length'])) {
                         $headers['x-encoded-content-length'] = $headers[$normalizedKeys['content-length']];
-                        $length = (int) $stream->getSize();
+                        $length = (int)$stream->getSize();
                         if ($length === 0) {
                             unset($headers[$normalizedKeys['content-length']]);
                         } else {
@@ -159,7 +159,7 @@ 
         // that number of bytes has been read. This can prevent infinitely
         // reading from a stream when dealing with servers that do not honor
         // Connection: Close headers.
-        Psr7\Utils::copyToStream($source, $sink, \strlen($contentLength) > 0 && (int) $contentLength > 0 ? (int) $contentLength : -1);
+        Psr7\Utils::copyToStream($source, $sink, \strlen($contentLength) > 0 && (int)$contentLength > 0 ? (int)$contentLength : -1);
         $sink->seek(0);
         $source->close();
         return $sink;
@@ -176,7 +176,7 @@ 
     private function createResource(callable $callback)
     {
         $errors = [];
-        \set_error_handler(static function ($_, $msg, $file, $line) use(&$errors) : bool {
+        \set_error_handler(static function($_, $msg, $file, $line) use(&$errors) : bool {
             $errors[] = ['message' => $msg, 'file' => $file, 'line' => $line];
             return \true;
         });
@@ -189,7 +189,7 @@ 
             $message = 'Error creating resource: ';
             foreach ($errors as $err) {
                 foreach ($err as $key => $value) {
-                    $message .= "[{$key}] {$value}" . \PHP_EOL;
+                    $message .= "[{$key}] {$value}".\PHP_EOL;
                 }
             }
             throw new \RuntimeException(\trim($message));
@@ -241,18 +241,18 @@ 
             throw new \InvalidArgumentException('Microsoft NTLM authentication only supported with curl handler');
         }
         $uri = $this->resolveHost($request, $options);
-        $contextResource = $this->createResource(static function () use($context, $params) {
+        $contextResource = $this->createResource(static function() use($context, $params) {
             return \stream_context_create($context, $params);
         });
-        return $this->createResource(function () use($uri, &$http_response_header, $contextResource, $context, $options, $request) {
-            $resource = @\fopen((string) $uri, 'r', \false, $contextResource);
+        return $this->createResource(function() use($uri, &$http_response_header, $contextResource, $context, $options, $request) {
+            $resource = @\fopen((string)$uri, 'r', \false, $contextResource);
             $this->lastHeaders = $http_response_header ?? [];
             if (\false === $resource) {
                 throw new ConnectException(\sprintf('Connection refused for URI %s', $uri), $request, null, $context);
             }
             if (isset($options['read_timeout'])) {
                 $readTimeout = $options['read_timeout'];
-                $sec = (int) $readTimeout;
+                $sec = (int)$readTimeout;
                 $usec = ($readTimeout - $sec) * 100000;
                 \stream_set_timeout($resource, $sec, $usec);
             }
@@ -275,7 +275,7 @@ 
                 if (\false === $records || !isset($records[0]['ipv6'])) {
                     throw new ConnectException(\sprintf("Could not resolve IPv6 address for host '%s'", $uri->getHost()), $request);
                 }
-                return $uri->withHost('[' . $records[0]['ipv6'] . ']');
+                return $uri->withHost('['.$records[0]['ipv6'].']');
             }
         }
         return $uri;
@@ -289,7 +289,7 @@ 
             }
         }
         $context = ['http' => ['method' => $request->getMethod(), 'header' => $headers, 'protocol_version' => $request->getProtocolVersion(), 'ignore_errors' => \true, 'follow_location' => 0], 'ssl' => ['peer_name' => $request->getUri()->getHost()]];
-        $body = (string) $request->getBody();
+        $body = (string)$request->getBody();
         if ('' !== $body) {
             $context['http']['content'] = $body;
             // Prevent the HTTP handler from adding a Content-Type header.
@@ -407,7 +407,7 @@ 
      */
     private function add_progress(RequestInterface $request, array &$options, $value, array &$params) : void
     {
-        self::addNotification($params, static function ($code, $a, $b, $c, $transferred, $total) use($value) {
+        self::addNotification($params, static function($code, $a, $b, $c, $transferred, $total) use($value) {
             if ($code == \STREAM_NOTIFY_PROGRESS) {
                 // The upload progress cannot be determined. Use 0 for cURL compatibility:
                 // https://curl.se/libcurl/c/CURLOPT_PROGRESSFUNCTION.html
@@ -426,11 +426,11 @@ 
         static $map = [\STREAM_NOTIFY_CONNECT => 'CONNECT', \STREAM_NOTIFY_AUTH_REQUIRED => 'AUTH_REQUIRED', \STREAM_NOTIFY_AUTH_RESULT => 'AUTH_RESULT', \STREAM_NOTIFY_MIME_TYPE_IS => 'MIME_TYPE_IS', \STREAM_NOTIFY_FILE_SIZE_IS => 'FILE_SIZE_IS', \STREAM_NOTIFY_REDIRECTED => 'REDIRECTED', \STREAM_NOTIFY_PROGRESS => 'PROGRESS', \STREAM_NOTIFY_FAILURE => 'FAILURE', \STREAM_NOTIFY_COMPLETED => 'COMPLETED', \STREAM_NOTIFY_RESOLVE => 'RESOLVE'];
         static $args = ['severity', 'message', 'message_code', 'bytes_transferred', 'bytes_max'];
         $value = Utils::debugResource($value);
-        $ident = $request->getMethod() . ' ' . $request->getUri()->withFragment('');
-        self::addNotification($params, static function (int $code, ...$passed) use($ident, $value, $map, $args) : void {
+        $ident = $request->getMethod().' '.$request->getUri()->withFragment('');
+        self::addNotification($params, static function(int $code, ...$passed) use($ident, $value, $map, $args) : void {
             \fprintf($value, '<%s> [%s] ', $ident, $map[$code]);
             foreach (\array_filter($passed) as $i => $v) {
-                \fwrite($value, $args[$i] . ': "' . $v . '" ');
+                \fwrite($value, $args[$i].': "'.$v.'" ');
             }
             \fwrite($value, "\n");
         });
@@ -446,7 +446,7 @@ 
     }
     private static function callArray(array $functions) : callable
     {
-        return static function (...$args) use($functions) {
+        return static function(...$args) use($functions) {
             foreach ($functions as $fn) {
                 $fn(...$args);
             }

Indentation +435 added lines, -435 removed lines

@@ -21,439 +21,439 @@
  */
 class StreamHandler
 {
-    /**
-     * @var array
-     */
-    private $lastHeaders = [];
-    /**
-     * Sends an HTTP request.
-     *
-     * @param RequestInterface $request Request to send.
-     * @param array            $options Request transfer options.
-     */
-    public function __invoke(RequestInterface $request, array $options) : PromiseInterface
-    {
-        // Sleep if there is a delay specified.
-        if (isset($options['delay'])) {
-            \usleep($options['delay'] * 1000);
-        }
-        $protocolVersion = $request->getProtocolVersion();
-        if ('1.0' !== $protocolVersion && '1.1' !== $protocolVersion) {
-            throw new ConnectException(\sprintf('HTTP/%s is not supported by the stream handler.', $protocolVersion), $request);
-        }
-        $startTime = isset($options['on_stats']) ? Utils::currentTime() : null;
-        try {
-            // Does not support the expect header.
-            $request = $request->withoutHeader('Expect');
-            // Append a content-length header if body size is zero to match
-            // cURL's behavior.
-            if (0 === $request->getBody()->getSize()) {
-                $request = $request->withHeader('Content-Length', '0');
-            }
-            return $this->createResponse($request, $options, $this->createStream($request, $options), $startTime);
-        } catch (\InvalidArgumentException $e) {
-            throw $e;
-        } catch (\Exception $e) {
-            // Determine if the error was a networking error.
-            $message = $e->getMessage();
-            // This list can probably get more comprehensive.
-            if (\false !== \strpos($message, 'getaddrinfo') || \false !== \strpos($message, 'Connection refused') || \false !== \strpos($message, "couldn't connect to host") || \false !== \strpos($message, 'connection attempt failed')) {
-                $e = new ConnectException($e->getMessage(), $request, $e);
-            } else {
-                $e = RequestException::wrapException($request, $e);
-            }
-            $this->invokeStats($options, $request, $startTime, null, $e);
-            return P\Create::rejectionFor($e);
-        }
-    }
-    private function invokeStats(array $options, RequestInterface $request, ?float $startTime, ?ResponseInterface $response = null, ?\Throwable $error = null) : void
-    {
-        if (isset($options['on_stats'])) {
-            $stats = new TransferStats($request, $response, Utils::currentTime() - $startTime, $error, []);
-            $options['on_stats']($stats);
-        }
-    }
-    /**
-     * @param resource $stream
-     */
-    private function createResponse(RequestInterface $request, array $options, $stream, ?float $startTime) : PromiseInterface
-    {
-        $hdrs = $this->lastHeaders;
-        $this->lastHeaders = [];
-        try {
-            [$ver, $status, $reason, $headers] = HeaderProcessor::parseHeaders($hdrs);
-        } catch (\Exception $e) {
-            return P\Create::rejectionFor(new RequestException('An error was encountered while creating the response', $request, null, $e));
-        }
-        [$stream, $headers] = $this->checkDecode($options, $headers, $stream);
-        $stream = Psr7\Utils::streamFor($stream);
-        $sink = $stream;
-        if (\strcasecmp('HEAD', $request->getMethod())) {
-            $sink = $this->createSink($stream, $options);
-        }
-        try {
-            $response = new Psr7\Response($status, $headers, $sink, $ver, $reason);
-        } catch (\Exception $e) {
-            return P\Create::rejectionFor(new RequestException('An error was encountered while creating the response', $request, null, $e));
-        }
-        if (isset($options['on_headers'])) {
-            try {
-                $options['on_headers']($response);
-            } catch (\Exception $e) {
-                return P\Create::rejectionFor(new RequestException('An error was encountered during the on_headers event', $request, $response, $e));
-            }
-        }
-        // Do not drain when the request is a HEAD request because they have
-        // no body.
-        if ($sink !== $stream) {
-            $this->drain($stream, $sink, $response->getHeaderLine('Content-Length'));
-        }
-        $this->invokeStats($options, $request, $startTime, $response, null);
-        return new FulfilledPromise($response);
-    }
-    private function createSink(StreamInterface $stream, array $options) : StreamInterface
-    {
-        if (!empty($options['stream'])) {
-            return $stream;
-        }
-        $sink = $options['sink'] ?? Psr7\Utils::tryFopen('php://temp', 'r+');
-        return \is_string($sink) ? new Psr7\LazyOpenStream($sink, 'w+') : Psr7\Utils::streamFor($sink);
-    }
-    /**
-     * @param resource $stream
-     */
-    private function checkDecode(array $options, array $headers, $stream) : array
-    {
-        // Automatically decode responses when instructed.
-        if (!empty($options['decode_content'])) {
-            $normalizedKeys = Utils::normalizeHeaderKeys($headers);
-            if (isset($normalizedKeys['content-encoding'])) {
-                $encoding = $headers[$normalizedKeys['content-encoding']];
-                if ($encoding[0] === 'gzip' || $encoding[0] === 'deflate') {
-                    $stream = new Psr7\InflateStream(Psr7\Utils::streamFor($stream));
-                    $headers['x-encoded-content-encoding'] = $headers[$normalizedKeys['content-encoding']];
-                    // Remove content-encoding header
-                    unset($headers[$normalizedKeys['content-encoding']]);
-                    // Fix content-length header
-                    if (isset($normalizedKeys['content-length'])) {
-                        $headers['x-encoded-content-length'] = $headers[$normalizedKeys['content-length']];
-                        $length = (int) $stream->getSize();
-                        if ($length === 0) {
-                            unset($headers[$normalizedKeys['content-length']]);
-                        } else {
-                            $headers[$normalizedKeys['content-length']] = [$length];
-                        }
-                    }
-                }
-            }
-        }
-        return [$stream, $headers];
-    }
-    /**
-     * Drains the source stream into the "sink" client option.
-     *
-     * @param string $contentLength Header specifying the amount of
-     *                              data to read.
-     *
-     * @throws \RuntimeException when the sink option is invalid.
-     */
-    private function drain(StreamInterface $source, StreamInterface $sink, string $contentLength) : StreamInterface
-    {
-        // If a content-length header is provided, then stop reading once
-        // that number of bytes has been read. This can prevent infinitely
-        // reading from a stream when dealing with servers that do not honor
-        // Connection: Close headers.
-        Psr7\Utils::copyToStream($source, $sink, \strlen($contentLength) > 0 && (int) $contentLength > 0 ? (int) $contentLength : -1);
-        $sink->seek(0);
-        $source->close();
-        return $sink;
-    }
-    /**
-     * Create a resource and check to ensure it was created successfully
-     *
-     * @param callable $callback Callable that returns stream resource
-     *
-     * @return resource
-     *
-     * @throws \RuntimeException on error
-     */
-    private function createResource(callable $callback)
-    {
-        $errors = [];
-        \set_error_handler(static function ($_, $msg, $file, $line) use(&$errors) : bool {
-            $errors[] = ['message' => $msg, 'file' => $file, 'line' => $line];
-            return \true;
-        });
-        try {
-            $resource = $callback();
-        } finally {
-            \restore_error_handler();
-        }
-        if (!$resource) {
-            $message = 'Error creating resource: ';
-            foreach ($errors as $err) {
-                foreach ($err as $key => $value) {
-                    $message .= "[{$key}] {$value}" . \PHP_EOL;
-                }
-            }
-            throw new \RuntimeException(\trim($message));
-        }
-        return $resource;
-    }
-    /**
-     * @return resource
-     */
-    private function createStream(RequestInterface $request, array $options)
-    {
-        static $methods;
-        if (!$methods) {
-            $methods = \array_flip(\get_class_methods(__CLASS__));
-        }
-        if (!\in_array($request->getUri()->getScheme(), ['http', 'https'])) {
-            throw new RequestException(\sprintf("The scheme '%s' is not supported.", $request->getUri()->getScheme()), $request);
-        }
-        // HTTP/1.1 streams using the PHP stream wrapper require a
-        // Connection: close header
-        if ($request->getProtocolVersion() === '1.1' && !$request->hasHeader('Connection')) {
-            $request = $request->withHeader('Connection', 'close');
-        }
-        // Ensure SSL is verified by default
-        if (!isset($options['verify'])) {
-            $options['verify'] = \true;
-        }
-        $params = [];
-        $context = $this->getDefaultContext($request);
-        if (isset($options['on_headers']) && !\is_callable($options['on_headers'])) {
-            throw new \InvalidArgumentException('on_headers must be callable');
-        }
-        if (!empty($options)) {
-            foreach ($options as $key => $value) {
-                $method = "add_{$key}";
-                if (isset($methods[$method])) {
-                    $this->{$method}($request, $context, $value, $params);
-                }
-            }
-        }
-        if (isset($options['stream_context'])) {
-            if (!\is_array($options['stream_context'])) {
-                throw new \InvalidArgumentException('stream_context must be an array');
-            }
-            $context = \array_replace_recursive($context, $options['stream_context']);
-        }
-        // Microsoft NTLM authentication only supported with curl handler
-        if (isset($options['auth'][2]) && 'ntlm' === $options['auth'][2]) {
-            throw new \InvalidArgumentException('Microsoft NTLM authentication only supported with curl handler');
-        }
-        $uri = $this->resolveHost($request, $options);
-        $contextResource = $this->createResource(static function () use($context, $params) {
-            return \stream_context_create($context, $params);
-        });
-        return $this->createResource(function () use($uri, &$http_response_header, $contextResource, $context, $options, $request) {
-            $resource = @\fopen((string) $uri, 'r', \false, $contextResource);
-            $this->lastHeaders = $http_response_header ?? [];
-            if (\false === $resource) {
-                throw new ConnectException(\sprintf('Connection refused for URI %s', $uri), $request, null, $context);
-            }
-            if (isset($options['read_timeout'])) {
-                $readTimeout = $options['read_timeout'];
-                $sec = (int) $readTimeout;
-                $usec = ($readTimeout - $sec) * 100000;
-                \stream_set_timeout($resource, $sec, $usec);
-            }
-            return $resource;
-        });
-    }
-    private function resolveHost(RequestInterface $request, array $options) : UriInterface
-    {
-        $uri = $request->getUri();
-        if (isset($options['force_ip_resolve']) && !\filter_var($uri->getHost(), \FILTER_VALIDATE_IP)) {
-            if ('v4' === $options['force_ip_resolve']) {
-                $records = \dns_get_record($uri->getHost(), \DNS_A);
-                if (\false === $records || !isset($records[0]['ip'])) {
-                    throw new ConnectException(\sprintf("Could not resolve IPv4 address for host '%s'", $uri->getHost()), $request);
-                }
-                return $uri->withHost($records[0]['ip']);
-            }
-            if ('v6' === $options['force_ip_resolve']) {
-                $records = \dns_get_record($uri->getHost(), \DNS_AAAA);
-                if (\false === $records || !isset($records[0]['ipv6'])) {
-                    throw new ConnectException(\sprintf("Could not resolve IPv6 address for host '%s'", $uri->getHost()), $request);
-                }
-                return $uri->withHost('[' . $records[0]['ipv6'] . ']');
-            }
-        }
-        return $uri;
-    }
-    private function getDefaultContext(RequestInterface $request) : array
-    {
-        $headers = '';
-        foreach ($request->getHeaders() as $name => $value) {
-            foreach ($value as $val) {
-                $headers .= "{$name}: {$val}\r\n";
-            }
-        }
-        $context = ['http' => ['method' => $request->getMethod(), 'header' => $headers, 'protocol_version' => $request->getProtocolVersion(), 'ignore_errors' => \true, 'follow_location' => 0], 'ssl' => ['peer_name' => $request->getUri()->getHost()]];
-        $body = (string) $request->getBody();
-        if ('' !== $body) {
-            $context['http']['content'] = $body;
-            // Prevent the HTTP handler from adding a Content-Type header.
-            if (!$request->hasHeader('Content-Type')) {
-                $context['http']['header'] .= "Content-Type:\r\n";
-            }
-        }
-        $context['http']['header'] = \rtrim($context['http']['header']);
-        return $context;
-    }
-    /**
-     * @param mixed $value as passed via Request transfer options.
-     */
-    private function add_proxy(RequestInterface $request, array &$options, $value, array &$params) : void
-    {
-        $uri = null;
-        if (!\is_array($value)) {
-            $uri = $value;
-        } else {
-            $scheme = $request->getUri()->getScheme();
-            if (isset($value[$scheme])) {
-                if (!isset($value['no']) || !Utils::isHostInNoProxy($request->getUri()->getHost(), $value['no'])) {
-                    $uri = $value[$scheme];
-                }
-            }
-        }
-        if (!$uri) {
-            return;
-        }
-        $parsed = $this->parse_proxy($uri);
-        $options['http']['proxy'] = $parsed['proxy'];
-        if ($parsed['auth']) {
-            if (!isset($options['http']['header'])) {
-                $options['http']['header'] = [];
-            }
-            $options['http']['header'] .= "\r\nProxy-Authorization: {$parsed['auth']}";
-        }
-    }
-    /**
-     * Parses the given proxy URL to make it compatible with the format PHP's stream context expects.
-     */
-    private function parse_proxy(string $url) : array
-    {
-        $parsed = \parse_url($url);
-        if ($parsed !== \false && isset($parsed['scheme']) && $parsed['scheme'] === 'http') {
-            if (isset($parsed['host']) && isset($parsed['port'])) {
-                $auth = null;
-                if (isset($parsed['user']) && isset($parsed['pass'])) {
-                    $auth = \base64_encode("{$parsed['user']}:{$parsed['pass']}");
-                }
-                return ['proxy' => "tcp://{$parsed['host']}:{$parsed['port']}", 'auth' => $auth ? "Basic {$auth}" : null];
-            }
-        }
-        // Return proxy as-is.
-        return ['proxy' => $url, 'auth' => null];
-    }
-    /**
-     * @param mixed $value as passed via Request transfer options.
-     */
-    private function add_timeout(RequestInterface $request, array &$options, $value, array &$params) : void
-    {
-        if ($value > 0) {
-            $options['http']['timeout'] = $value;
-        }
-    }
-    /**
-     * @param mixed $value as passed via Request transfer options.
-     */
-    private function add_crypto_method(RequestInterface $request, array &$options, $value, array &$params) : void
-    {
-        if ($value === \STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT || $value === \STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT || $value === \STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT || \defined('STREAM_CRYPTO_METHOD_TLSv1_3_CLIENT') && $value === \STREAM_CRYPTO_METHOD_TLSv1_3_CLIENT) {
-            $options['http']['crypto_method'] = $value;
-            return;
-        }
-        throw new \InvalidArgumentException('Invalid crypto_method request option: unknown version provided');
-    }
-    /**
-     * @param mixed $value as passed via Request transfer options.
-     */
-    private function add_verify(RequestInterface $request, array &$options, $value, array &$params) : void
-    {
-        if ($value === \false) {
-            $options['ssl']['verify_peer'] = \false;
-            $options['ssl']['verify_peer_name'] = \false;
-            return;
-        }
-        if (\is_string($value)) {
-            $options['ssl']['cafile'] = $value;
-            if (!\file_exists($value)) {
-                throw new \RuntimeException("SSL CA bundle not found: {$value}");
-            }
-        } elseif ($value !== \true) {
-            throw new \InvalidArgumentException('Invalid verify request option');
-        }
-        $options['ssl']['verify_peer'] = \true;
-        $options['ssl']['verify_peer_name'] = \true;
-        $options['ssl']['allow_self_signed'] = \false;
-    }
-    /**
-     * @param mixed $value as passed via Request transfer options.
-     */
-    private function add_cert(RequestInterface $request, array &$options, $value, array &$params) : void
-    {
-        if (\is_array($value)) {
-            $options['ssl']['passphrase'] = $value[1];
-            $value = $value[0];
-        }
-        if (!\file_exists($value)) {
-            throw new \RuntimeException("SSL certificate not found: {$value}");
-        }
-        $options['ssl']['local_cert'] = $value;
-    }
-    /**
-     * @param mixed $value as passed via Request transfer options.
-     */
-    private function add_progress(RequestInterface $request, array &$options, $value, array &$params) : void
-    {
-        self::addNotification($params, static function ($code, $a, $b, $c, $transferred, $total) use($value) {
-            if ($code == \STREAM_NOTIFY_PROGRESS) {
-                // The upload progress cannot be determined. Use 0 for cURL compatibility:
-                // https://curl.se/libcurl/c/CURLOPT_PROGRESSFUNCTION.html
-                $value($total, $transferred, 0, 0);
-            }
-        });
-    }
-    /**
-     * @param mixed $value as passed via Request transfer options.
-     */
-    private function add_debug(RequestInterface $request, array &$options, $value, array &$params) : void
-    {
-        if ($value === \false) {
-            return;
-        }
-        static $map = [\STREAM_NOTIFY_CONNECT => 'CONNECT', \STREAM_NOTIFY_AUTH_REQUIRED => 'AUTH_REQUIRED', \STREAM_NOTIFY_AUTH_RESULT => 'AUTH_RESULT', \STREAM_NOTIFY_MIME_TYPE_IS => 'MIME_TYPE_IS', \STREAM_NOTIFY_FILE_SIZE_IS => 'FILE_SIZE_IS', \STREAM_NOTIFY_REDIRECTED => 'REDIRECTED', \STREAM_NOTIFY_PROGRESS => 'PROGRESS', \STREAM_NOTIFY_FAILURE => 'FAILURE', \STREAM_NOTIFY_COMPLETED => 'COMPLETED', \STREAM_NOTIFY_RESOLVE => 'RESOLVE'];
-        static $args = ['severity', 'message', 'message_code', 'bytes_transferred', 'bytes_max'];
-        $value = Utils::debugResource($value);
-        $ident = $request->getMethod() . ' ' . $request->getUri()->withFragment('');
-        self::addNotification($params, static function (int $code, ...$passed) use($ident, $value, $map, $args) : void {
-            \fprintf($value, '<%s> [%s] ', $ident, $map[$code]);
-            foreach (\array_filter($passed) as $i => $v) {
-                \fwrite($value, $args[$i] . ': "' . $v . '" ');
-            }
-            \fwrite($value, "\n");
-        });
-    }
-    private static function addNotification(array &$params, callable $notify) : void
-    {
-        // Wrap the existing function if needed.
-        if (!isset($params['notification'])) {
-            $params['notification'] = $notify;
-        } else {
-            $params['notification'] = self::callArray([$params['notification'], $notify]);
-        }
-    }
-    private static function callArray(array $functions) : callable
-    {
-        return static function (...$args) use($functions) {
-            foreach ($functions as $fn) {
-                $fn(...$args);
-            }
-        };
-    }
+	/**
+	 * @var array
+	 */
+	private $lastHeaders = [];
+	/**
+	 * Sends an HTTP request.
+	 *
+	 * @param RequestInterface $request Request to send.
+	 * @param array            $options Request transfer options.
+	 */
+	public function __invoke(RequestInterface $request, array $options) : PromiseInterface
+	{
+		// Sleep if there is a delay specified.
+		if (isset($options['delay'])) {
+			\usleep($options['delay'] * 1000);
+		}
+		$protocolVersion = $request->getProtocolVersion();
+		if ('1.0' !== $protocolVersion && '1.1' !== $protocolVersion) {
+			throw new ConnectException(\sprintf('HTTP/%s is not supported by the stream handler.', $protocolVersion), $request);
+		}
+		$startTime = isset($options['on_stats']) ? Utils::currentTime() : null;
+		try {
+			// Does not support the expect header.
+			$request = $request->withoutHeader('Expect');
+			// Append a content-length header if body size is zero to match
+			// cURL's behavior.
+			if (0 === $request->getBody()->getSize()) {
+				$request = $request->withHeader('Content-Length', '0');
+			}
+			return $this->createResponse($request, $options, $this->createStream($request, $options), $startTime);
+		} catch (\InvalidArgumentException $e) {
+			throw $e;
+		} catch (\Exception $e) {
+			// Determine if the error was a networking error.
+			$message = $e->getMessage();
+			// This list can probably get more comprehensive.
+			if (\false !== \strpos($message, 'getaddrinfo') || \false !== \strpos($message, 'Connection refused') || \false !== \strpos($message, "couldn't connect to host") || \false !== \strpos($message, 'connection attempt failed')) {
+				$e = new ConnectException($e->getMessage(), $request, $e);
+			} else {
+				$e = RequestException::wrapException($request, $e);
+			}
+			$this->invokeStats($options, $request, $startTime, null, $e);
+			return P\Create::rejectionFor($e);
+		}
+	}
+	private function invokeStats(array $options, RequestInterface $request, ?float $startTime, ?ResponseInterface $response = null, ?\Throwable $error = null) : void
+	{
+		if (isset($options['on_stats'])) {
+			$stats = new TransferStats($request, $response, Utils::currentTime() - $startTime, $error, []);
+			$options['on_stats']($stats);
+		}
+	}
+	/**
+	 * @param resource $stream
+	 */
+	private function createResponse(RequestInterface $request, array $options, $stream, ?float $startTime) : PromiseInterface
+	{
+		$hdrs = $this->lastHeaders;
+		$this->lastHeaders = [];
+		try {
+			[$ver, $status, $reason, $headers] = HeaderProcessor::parseHeaders($hdrs);
+		} catch (\Exception $e) {
+			return P\Create::rejectionFor(new RequestException('An error was encountered while creating the response', $request, null, $e));
+		}
+		[$stream, $headers] = $this->checkDecode($options, $headers, $stream);
+		$stream = Psr7\Utils::streamFor($stream);
+		$sink = $stream;
+		if (\strcasecmp('HEAD', $request->getMethod())) {
+			$sink = $this->createSink($stream, $options);
+		}
+		try {
+			$response = new Psr7\Response($status, $headers, $sink, $ver, $reason);
+		} catch (\Exception $e) {
+			return P\Create::rejectionFor(new RequestException('An error was encountered while creating the response', $request, null, $e));
+		}
+		if (isset($options['on_headers'])) {
+			try {
+				$options['on_headers']($response);
+			} catch (\Exception $e) {
+				return P\Create::rejectionFor(new RequestException('An error was encountered during the on_headers event', $request, $response, $e));
+			}
+		}
+		// Do not drain when the request is a HEAD request because they have
+		// no body.
+		if ($sink !== $stream) {
+			$this->drain($stream, $sink, $response->getHeaderLine('Content-Length'));
+		}
+		$this->invokeStats($options, $request, $startTime, $response, null);
+		return new FulfilledPromise($response);
+	}
+	private function createSink(StreamInterface $stream, array $options) : StreamInterface
+	{
+		if (!empty($options['stream'])) {
+			return $stream;
+		}
+		$sink = $options['sink'] ?? Psr7\Utils::tryFopen('php://temp', 'r+');
+		return \is_string($sink) ? new Psr7\LazyOpenStream($sink, 'w+') : Psr7\Utils::streamFor($sink);
+	}
+	/**
+	 * @param resource $stream
+	 */
+	private function checkDecode(array $options, array $headers, $stream) : array
+	{
+		// Automatically decode responses when instructed.
+		if (!empty($options['decode_content'])) {
+			$normalizedKeys = Utils::normalizeHeaderKeys($headers);
+			if (isset($normalizedKeys['content-encoding'])) {
+				$encoding = $headers[$normalizedKeys['content-encoding']];
+				if ($encoding[0] === 'gzip' || $encoding[0] === 'deflate') {
+					$stream = new Psr7\InflateStream(Psr7\Utils::streamFor($stream));
+					$headers['x-encoded-content-encoding'] = $headers[$normalizedKeys['content-encoding']];
+					// Remove content-encoding header
+					unset($headers[$normalizedKeys['content-encoding']]);
+					// Fix content-length header
+					if (isset($normalizedKeys['content-length'])) {
+						$headers['x-encoded-content-length'] = $headers[$normalizedKeys['content-length']];
+						$length = (int) $stream->getSize();
+						if ($length === 0) {
+							unset($headers[$normalizedKeys['content-length']]);
+						} else {
+							$headers[$normalizedKeys['content-length']] = [$length];
+						}
+					}
+				}
+			}
+		}
+		return [$stream, $headers];
+	}
+	/**
+	 * Drains the source stream into the "sink" client option.
+	 *
+	 * @param string $contentLength Header specifying the amount of
+	 *                              data to read.
+	 *
+	 * @throws \RuntimeException when the sink option is invalid.
+	 */
+	private function drain(StreamInterface $source, StreamInterface $sink, string $contentLength) : StreamInterface
+	{
+		// If a content-length header is provided, then stop reading once
+		// that number of bytes has been read. This can prevent infinitely
+		// reading from a stream when dealing with servers that do not honor
+		// Connection: Close headers.
+		Psr7\Utils::copyToStream($source, $sink, \strlen($contentLength) > 0 && (int) $contentLength > 0 ? (int) $contentLength : -1);
+		$sink->seek(0);
+		$source->close();
+		return $sink;
+	}
+	/**
+	 * Create a resource and check to ensure it was created successfully
+	 *
+	 * @param callable $callback Callable that returns stream resource
+	 *
+	 * @return resource
+	 *
+	 * @throws \RuntimeException on error
+	 */
+	private function createResource(callable $callback)
+	{
+		$errors = [];
+		\set_error_handler(static function ($_, $msg, $file, $line) use(&$errors) : bool {
+			$errors[] = ['message' => $msg, 'file' => $file, 'line' => $line];
+			return \true;
+		});
+		try {
+			$resource = $callback();
+		} finally {
+			\restore_error_handler();
+		}
+		if (!$resource) {
+			$message = 'Error creating resource: ';
+			foreach ($errors as $err) {
+				foreach ($err as $key => $value) {
+					$message .= "[{$key}] {$value}" . \PHP_EOL;
+				}
+			}
+			throw new \RuntimeException(\trim($message));
+		}
+		return $resource;
+	}
+	/**
+	 * @return resource
+	 */
+	private function createStream(RequestInterface $request, array $options)
+	{
+		static $methods;
+		if (!$methods) {
+			$methods = \array_flip(\get_class_methods(__CLASS__));
+		}
+		if (!\in_array($request->getUri()->getScheme(), ['http', 'https'])) {
+			throw new RequestException(\sprintf("The scheme '%s' is not supported.", $request->getUri()->getScheme()), $request);
+		}
+		// HTTP/1.1 streams using the PHP stream wrapper require a
+		// Connection: close header
+		if ($request->getProtocolVersion() === '1.1' && !$request->hasHeader('Connection')) {
+			$request = $request->withHeader('Connection', 'close');
+		}
+		// Ensure SSL is verified by default
+		if (!isset($options['verify'])) {
+			$options['verify'] = \true;
+		}
+		$params = [];
+		$context = $this->getDefaultContext($request);
+		if (isset($options['on_headers']) && !\is_callable($options['on_headers'])) {
+			throw new \InvalidArgumentException('on_headers must be callable');
+		}
+		if (!empty($options)) {
+			foreach ($options as $key => $value) {
+				$method = "add_{$key}";
+				if (isset($methods[$method])) {
+					$this->{$method}($request, $context, $value, $params);
+				}
+			}
+		}
+		if (isset($options['stream_context'])) {
+			if (!\is_array($options['stream_context'])) {
+				throw new \InvalidArgumentException('stream_context must be an array');
+			}
+			$context = \array_replace_recursive($context, $options['stream_context']);
+		}
+		// Microsoft NTLM authentication only supported with curl handler
+		if (isset($options['auth'][2]) && 'ntlm' === $options['auth'][2]) {
+			throw new \InvalidArgumentException('Microsoft NTLM authentication only supported with curl handler');
+		}
+		$uri = $this->resolveHost($request, $options);
+		$contextResource = $this->createResource(static function () use($context, $params) {
+			return \stream_context_create($context, $params);
+		});
+		return $this->createResource(function () use($uri, &$http_response_header, $contextResource, $context, $options, $request) {
+			$resource = @\fopen((string) $uri, 'r', \false, $contextResource);
+			$this->lastHeaders = $http_response_header ?? [];
+			if (\false === $resource) {
+				throw new ConnectException(\sprintf('Connection refused for URI %s', $uri), $request, null, $context);
+			}
+			if (isset($options['read_timeout'])) {
+				$readTimeout = $options['read_timeout'];
+				$sec = (int) $readTimeout;
+				$usec = ($readTimeout - $sec) * 100000;
+				\stream_set_timeout($resource, $sec, $usec);
+			}
+			return $resource;
+		});
+	}
+	private function resolveHost(RequestInterface $request, array $options) : UriInterface
+	{
+		$uri = $request->getUri();
+		if (isset($options['force_ip_resolve']) && !\filter_var($uri->getHost(), \FILTER_VALIDATE_IP)) {
+			if ('v4' === $options['force_ip_resolve']) {
+				$records = \dns_get_record($uri->getHost(), \DNS_A);
+				if (\false === $records || !isset($records[0]['ip'])) {
+					throw new ConnectException(\sprintf("Could not resolve IPv4 address for host '%s'", $uri->getHost()), $request);
+				}
+				return $uri->withHost($records[0]['ip']);
+			}
+			if ('v6' === $options['force_ip_resolve']) {
+				$records = \dns_get_record($uri->getHost(), \DNS_AAAA);
+				if (\false === $records || !isset($records[0]['ipv6'])) {
+					throw new ConnectException(\sprintf("Could not resolve IPv6 address for host '%s'", $uri->getHost()), $request);
+				}
+				return $uri->withHost('[' . $records[0]['ipv6'] . ']');
+			}
+		}
+		return $uri;
+	}
+	private function getDefaultContext(RequestInterface $request) : array
+	{
+		$headers = '';
+		foreach ($request->getHeaders() as $name => $value) {
+			foreach ($value as $val) {
+				$headers .= "{$name}: {$val}\r\n";
+			}
+		}
+		$context = ['http' => ['method' => $request->getMethod(), 'header' => $headers, 'protocol_version' => $request->getProtocolVersion(), 'ignore_errors' => \true, 'follow_location' => 0], 'ssl' => ['peer_name' => $request->getUri()->getHost()]];
+		$body = (string) $request->getBody();
+		if ('' !== $body) {
+			$context['http']['content'] = $body;
+			// Prevent the HTTP handler from adding a Content-Type header.
+			if (!$request->hasHeader('Content-Type')) {
+				$context['http']['header'] .= "Content-Type:\r\n";
+			}
+		}
+		$context['http']['header'] = \rtrim($context['http']['header']);
+		return $context;
+	}
+	/**
+	 * @param mixed $value as passed via Request transfer options.
+	 */
+	private function add_proxy(RequestInterface $request, array &$options, $value, array &$params) : void
+	{
+		$uri = null;
+		if (!\is_array($value)) {
+			$uri = $value;
+		} else {
+			$scheme = $request->getUri()->getScheme();
+			if (isset($value[$scheme])) {
+				if (!isset($value['no']) || !Utils::isHostInNoProxy($request->getUri()->getHost(), $value['no'])) {
+					$uri = $value[$scheme];
+				}
+			}
+		}
+		if (!$uri) {
+			return;
+		}
+		$parsed = $this->parse_proxy($uri);
+		$options['http']['proxy'] = $parsed['proxy'];
+		if ($parsed['auth']) {
+			if (!isset($options['http']['header'])) {
+				$options['http']['header'] = [];
+			}
+			$options['http']['header'] .= "\r\nProxy-Authorization: {$parsed['auth']}";
+		}
+	}
+	/**
+	 * Parses the given proxy URL to make it compatible with the format PHP's stream context expects.
+	 */
+	private function parse_proxy(string $url) : array
+	{
+		$parsed = \parse_url($url);
+		if ($parsed !== \false && isset($parsed['scheme']) && $parsed['scheme'] === 'http') {
+			if (isset($parsed['host']) && isset($parsed['port'])) {
+				$auth = null;
+				if (isset($parsed['user']) && isset($parsed['pass'])) {
+					$auth = \base64_encode("{$parsed['user']}:{$parsed['pass']}");
+				}
+				return ['proxy' => "tcp://{$parsed['host']}:{$parsed['port']}", 'auth' => $auth ? "Basic {$auth}" : null];
+			}
+		}
+		// Return proxy as-is.
+		return ['proxy' => $url, 'auth' => null];
+	}
+	/**
+	 * @param mixed $value as passed via Request transfer options.
+	 */
+	private function add_timeout(RequestInterface $request, array &$options, $value, array &$params) : void
+	{
+		if ($value > 0) {
+			$options['http']['timeout'] = $value;
+		}
+	}
+	/**
+	 * @param mixed $value as passed via Request transfer options.
+	 */
+	private function add_crypto_method(RequestInterface $request, array &$options, $value, array &$params) : void
+	{
+		if ($value === \STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT || $value === \STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT || $value === \STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT || \defined('STREAM_CRYPTO_METHOD_TLSv1_3_CLIENT') && $value === \STREAM_CRYPTO_METHOD_TLSv1_3_CLIENT) {
+			$options['http']['crypto_method'] = $value;
+			return;
+		}
+		throw new \InvalidArgumentException('Invalid crypto_method request option: unknown version provided');
+	}
+	/**
+	 * @param mixed $value as passed via Request transfer options.
+	 */
+	private function add_verify(RequestInterface $request, array &$options, $value, array &$params) : void
+	{
+		if ($value === \false) {
+			$options['ssl']['verify_peer'] = \false;
+			$options['ssl']['verify_peer_name'] = \false;
+			return;
+		}
+		if (\is_string($value)) {
+			$options['ssl']['cafile'] = $value;
+			if (!\file_exists($value)) {
+				throw new \RuntimeException("SSL CA bundle not found: {$value}");
+			}
+		} elseif ($value !== \true) {
+			throw new \InvalidArgumentException('Invalid verify request option');
+		}
+		$options['ssl']['verify_peer'] = \true;
+		$options['ssl']['verify_peer_name'] = \true;
+		$options['ssl']['allow_self_signed'] = \false;
+	}
+	/**
+	 * @param mixed $value as passed via Request transfer options.
+	 */
+	private function add_cert(RequestInterface $request, array &$options, $value, array &$params) : void
+	{
+		if (\is_array($value)) {
+			$options['ssl']['passphrase'] = $value[1];
+			$value = $value[0];
+		}
+		if (!\file_exists($value)) {
+			throw new \RuntimeException("SSL certificate not found: {$value}");
+		}
+		$options['ssl']['local_cert'] = $value;
+	}
+	/**
+	 * @param mixed $value as passed via Request transfer options.
+	 */
+	private function add_progress(RequestInterface $request, array &$options, $value, array &$params) : void
+	{
+		self::addNotification($params, static function ($code, $a, $b, $c, $transferred, $total) use($value) {
+			if ($code == \STREAM_NOTIFY_PROGRESS) {
+				// The upload progress cannot be determined. Use 0 for cURL compatibility:
+				// https://curl.se/libcurl/c/CURLOPT_PROGRESSFUNCTION.html
+				$value($total, $transferred, 0, 0);
+			}
+		});
+	}
+	/**
+	 * @param mixed $value as passed via Request transfer options.
+	 */
+	private function add_debug(RequestInterface $request, array &$options, $value, array &$params) : void
+	{
+		if ($value === \false) {
+			return;
+		}
+		static $map = [\STREAM_NOTIFY_CONNECT => 'CONNECT', \STREAM_NOTIFY_AUTH_REQUIRED => 'AUTH_REQUIRED', \STREAM_NOTIFY_AUTH_RESULT => 'AUTH_RESULT', \STREAM_NOTIFY_MIME_TYPE_IS => 'MIME_TYPE_IS', \STREAM_NOTIFY_FILE_SIZE_IS => 'FILE_SIZE_IS', \STREAM_NOTIFY_REDIRECTED => 'REDIRECTED', \STREAM_NOTIFY_PROGRESS => 'PROGRESS', \STREAM_NOTIFY_FAILURE => 'FAILURE', \STREAM_NOTIFY_COMPLETED => 'COMPLETED', \STREAM_NOTIFY_RESOLVE => 'RESOLVE'];
+		static $args = ['severity', 'message', 'message_code', 'bytes_transferred', 'bytes_max'];
+		$value = Utils::debugResource($value);
+		$ident = $request->getMethod() . ' ' . $request->getUri()->withFragment('');
+		self::addNotification($params, static function (int $code, ...$passed) use($ident, $value, $map, $args) : void {
+			\fprintf($value, '<%s> [%s] ', $ident, $map[$code]);
+			foreach (\array_filter($passed) as $i => $v) {
+				\fwrite($value, $args[$i] . ': "' . $v . '" ');
+			}
+			\fwrite($value, "\n");
+		});
+	}
+	private static function addNotification(array &$params, callable $notify) : void
+	{
+		// Wrap the existing function if needed.
+		if (!isset($params['notification'])) {
+			$params['notification'] = $notify;
+		} else {
+			$params['notification'] = self::callArray([$params['notification'], $notify]);
+		}
+	}
+	private static function callArray(array $functions) : callable
+	{
+		return static function (...$args) use($functions) {
+			foreach ($functions as $fn) {
+				$fn(...$args);
+			}
+		};
+	}
 }

lib/Vendor/GuzzleHttp/Handler/CurlMultiHandler.php

Braces +1 added lines, -2 removed lines

@@ -17,8 +17,7 @@
  *
  * @final
  */
-class CurlMultiHandler
-{
+class CurlMultiHandler {
     /**
      * @var CurlFactoryInterface
      */

Spacing +6 added lines, -6 removed lines

@@ -64,7 +64,7 @@ 
             $this->selectTimeout = $options['select_timeout'];
         } elseif ($selectTimeout = Utils::getenv('GUZZLE_CURL_SELECT_TIMEOUT')) {
             @\trigger_error('Since guzzlehttp/guzzle 7.2.0: Using environment variable GUZZLE_CURL_SELECT_TIMEOUT is deprecated. Use option "select_timeout" instead.', \E_USER_DEPRECATED);
-            $this->selectTimeout = (int) $selectTimeout;
+            $this->selectTimeout = (int)$selectTimeout;
         } else {
             $this->selectTimeout = 1;
         }
@@ -107,8 +107,8 @@ 
     public function __invoke(RequestInterface $request, array $options) : PromiseInterface
     {
         $easy = $this->factory->create($request, $options);
-        $id = (int) $easy->handle;
-        $promise = new Promise([$this, 'execute'], function () use($id) {
+        $id = (int)$easy->handle;
+        $promise = new Promise([$this, 'execute'], function() use($id) {
             return $this->cancel($id);
         });
         $this->addRequest(['easy' => $easy, 'deferred' => $promise]);
@@ -157,7 +157,7 @@ 
     private function addRequest(array $entry) : void
     {
         $easy = $entry['easy'];
-        $id = (int) $easy->handle;
+        $id = (int)$easy->handle;
         $this->handles[$id] = $entry;
         if (empty($easy->options['delay'])) {
             \curl_multi_add_handle($this->_mh, $easy->handle);
@@ -194,7 +194,7 @@ 
                 // if it's not done, then it would be premature to remove the handle. ref https://github.com/guzzle/guzzle/pull/2892#issuecomment-945150216
                 continue;
             }
-            $id = (int) $done['handle'];
+            $id = (int)$done['handle'];
             \curl_multi_remove_handle($this->_mh, $done['handle']);
             if (!isset($this->handles[$id])) {
                 // Probably was cancelled.
@@ -215,6 +215,6 @@ 
                 $nextTime = $time;
             }
         }
-        return (int) \max(0, $nextTime - $currentTime) * 1000000;
+        return (int)\max(0, $nextTime - $currentTime) * 1000000;
     }
 }

Indentation +213 added lines, -213 removed lines

@@ -19,217 +19,217 @@
  */
 class CurlMultiHandler
 {
-    /**
-     * @var CurlFactoryInterface
-     */
-    private $factory;
-    /**
-     * @var int
-     */
-    private $selectTimeout;
-    /**
-     * @var int Will be higher than 0 when `curl_multi_exec` is still running.
-     */
-    private $active = 0;
-    /**
-     * @var array Request entry handles, indexed by handle id in `addRequest`.
-     *
-     * @see CurlMultiHandler::addRequest
-     */
-    private $handles = [];
-    /**
-     * @var array<int, float> An array of delay times, indexed by handle id in `addRequest`.
-     *
-     * @see CurlMultiHandler::addRequest
-     */
-    private $delays = [];
-    /**
-     * @var array<mixed> An associative array of CURLMOPT_* options and corresponding values for curl_multi_setopt()
-     */
-    private $options = [];
-    /** @var resource|\CurlMultiHandle */
-    private $_mh;
-    /**
-     * This handler accepts the following options:
-     *
-     * - handle_factory: An optional factory  used to create curl handles
-     * - select_timeout: Optional timeout (in seconds) to block before timing
-     *   out while selecting curl handles. Defaults to 1 second.
-     * - options: An associative array of CURLMOPT_* options and
-     *   corresponding values for curl_multi_setopt()
-     */
-    public function __construct(array $options = [])
-    {
-        $this->factory = $options['handle_factory'] ?? new CurlFactory(50);
-        if (isset($options['select_timeout'])) {
-            $this->selectTimeout = $options['select_timeout'];
-        } elseif ($selectTimeout = Utils::getenv('GUZZLE_CURL_SELECT_TIMEOUT')) {
-            @\trigger_error('Since guzzlehttp/guzzle 7.2.0: Using environment variable GUZZLE_CURL_SELECT_TIMEOUT is deprecated. Use option "select_timeout" instead.', \E_USER_DEPRECATED);
-            $this->selectTimeout = (int) $selectTimeout;
-        } else {
-            $this->selectTimeout = 1;
-        }
-        $this->options = $options['options'] ?? [];
-        // unsetting the property forces the first access to go through
-        // __get().
-        unset($this->_mh);
-    }
-    /**
-     * @param string $name
-     *
-     * @return resource|\CurlMultiHandle
-     *
-     * @throws \BadMethodCallException when another field as `_mh` will be gotten
-     * @throws \RuntimeException       when curl can not initialize a multi handle
-     */
-    public function __get($name)
-    {
-        if ($name !== '_mh') {
-            throw new \BadMethodCallException("Can not get other property as '_mh'.");
-        }
-        $multiHandle = \curl_multi_init();
-        if (\false === $multiHandle) {
-            throw new \RuntimeException('Can not initialize curl multi handle.');
-        }
-        $this->_mh = $multiHandle;
-        foreach ($this->options as $option => $value) {
-            // A warning is raised in case of a wrong option.
-            \curl_multi_setopt($this->_mh, $option, $value);
-        }
-        return $this->_mh;
-    }
-    public function __destruct()
-    {
-        if (isset($this->_mh)) {
-            \curl_multi_close($this->_mh);
-            unset($this->_mh);
-        }
-    }
-    public function __invoke(RequestInterface $request, array $options) : PromiseInterface
-    {
-        $easy = $this->factory->create($request, $options);
-        $id = (int) $easy->handle;
-        $promise = new Promise([$this, 'execute'], function () use($id) {
-            return $this->cancel($id);
-        });
-        $this->addRequest(['easy' => $easy, 'deferred' => $promise]);
-        return $promise;
-    }
-    /**
-     * Ticks the curl event loop.
-     */
-    public function tick() : void
-    {
-        // Add any delayed handles if needed.
-        if ($this->delays) {
-            $currentTime = Utils::currentTime();
-            foreach ($this->delays as $id => $delay) {
-                if ($currentTime >= $delay) {
-                    unset($this->delays[$id]);
-                    \curl_multi_add_handle($this->_mh, $this->handles[$id]['easy']->handle);
-                }
-            }
-        }
-        // Run curl_multi_exec in the queue to enable other async tasks to run
-        P\Utils::queue()->add(Closure::fromCallable([$this, 'tickInQueue']));
-        // Step through the task queue which may add additional requests.
-        P\Utils::queue()->run();
-        if ($this->active && \curl_multi_select($this->_mh, $this->selectTimeout) === -1) {
-            // Perform a usleep if a select returns -1.
-            // See: https://bugs.php.net/bug.php?id=61141
-            \usleep(250);
-        }
-        while (\curl_multi_exec($this->_mh, $this->active) === \CURLM_CALL_MULTI_PERFORM) {
-            // Prevent busy looping for slow HTTP requests.
-            \curl_multi_select($this->_mh, $this->selectTimeout);
-        }
-        $this->processMessages();
-    }
-    /**
-     * Runs \curl_multi_exec() inside the event loop, to prevent busy looping
-     */
-    private function tickInQueue() : void
-    {
-        if (\curl_multi_exec($this->_mh, $this->active) === \CURLM_CALL_MULTI_PERFORM) {
-            \curl_multi_select($this->_mh, 0);
-            P\Utils::queue()->add(Closure::fromCallable([$this, 'tickInQueue']));
-        }
-    }
-    /**
-     * Runs until all outstanding connections have completed.
-     */
-    public function execute() : void
-    {
-        $queue = P\Utils::queue();
-        while ($this->handles || !$queue->isEmpty()) {
-            // If there are no transfers, then sleep for the next delay
-            if (!$this->active && $this->delays) {
-                \usleep($this->timeToNext());
-            }
-            $this->tick();
-        }
-    }
-    private function addRequest(array $entry) : void
-    {
-        $easy = $entry['easy'];
-        $id = (int) $easy->handle;
-        $this->handles[$id] = $entry;
-        if (empty($easy->options['delay'])) {
-            \curl_multi_add_handle($this->_mh, $easy->handle);
-        } else {
-            $this->delays[$id] = Utils::currentTime() + $easy->options['delay'] / 1000;
-        }
-    }
-    /**
-     * Cancels a handle from sending and removes references to it.
-     *
-     * @param int $id Handle ID to cancel and remove.
-     *
-     * @return bool True on success, false on failure.
-     */
-    private function cancel($id) : bool
-    {
-        if (!\is_int($id)) {
-            trigger_deprecation('guzzlehttp/guzzle', '7.4', 'Not passing an integer to %s::%s() is deprecated and will cause an error in 8.0.', __CLASS__, __FUNCTION__);
-        }
-        // Cannot cancel if it has been processed.
-        if (!isset($this->handles[$id])) {
-            return \false;
-        }
-        $handle = $this->handles[$id]['easy']->handle;
-        unset($this->delays[$id], $this->handles[$id]);
-        \curl_multi_remove_handle($this->_mh, $handle);
-        \curl_close($handle);
-        return \true;
-    }
-    private function processMessages() : void
-    {
-        while ($done = \curl_multi_info_read($this->_mh)) {
-            if ($done['msg'] !== \CURLMSG_DONE) {
-                // if it's not done, then it would be premature to remove the handle. ref https://github.com/guzzle/guzzle/pull/2892#issuecomment-945150216
-                continue;
-            }
-            $id = (int) $done['handle'];
-            \curl_multi_remove_handle($this->_mh, $done['handle']);
-            if (!isset($this->handles[$id])) {
-                // Probably was cancelled.
-                continue;
-            }
-            $entry = $this->handles[$id];
-            unset($this->handles[$id], $this->delays[$id]);
-            $entry['easy']->errno = $done['result'];
-            $entry['deferred']->resolve(CurlFactory::finish($this, $entry['easy'], $this->factory));
-        }
-    }
-    private function timeToNext() : int
-    {
-        $currentTime = Utils::currentTime();
-        $nextTime = \PHP_INT_MAX;
-        foreach ($this->delays as $time) {
-            if ($time < $nextTime) {
-                $nextTime = $time;
-            }
-        }
-        return (int) \max(0, $nextTime - $currentTime) * 1000000;
-    }
+	/**
+	 * @var CurlFactoryInterface
+	 */
+	private $factory;
+	/**
+	 * @var int
+	 */
+	private $selectTimeout;
+	/**
+	 * @var int Will be higher than 0 when `curl_multi_exec` is still running.
+	 */
+	private $active = 0;
+	/**
+	 * @var array Request entry handles, indexed by handle id in `addRequest`.
+	 *
+	 * @see CurlMultiHandler::addRequest
+	 */
+	private $handles = [];
+	/**
+	 * @var array<int, float> An array of delay times, indexed by handle id in `addRequest`.
+	 *
+	 * @see CurlMultiHandler::addRequest
+	 */
+	private $delays = [];
+	/**
+	 * @var array<mixed> An associative array of CURLMOPT_* options and corresponding values for curl_multi_setopt()
+	 */
+	private $options = [];
+	/** @var resource|\CurlMultiHandle */
+	private $_mh;
+	/**
+	 * This handler accepts the following options:
+	 *
+	 * - handle_factory: An optional factory  used to create curl handles
+	 * - select_timeout: Optional timeout (in seconds) to block before timing
+	 *   out while selecting curl handles. Defaults to 1 second.
+	 * - options: An associative array of CURLMOPT_* options and
+	 *   corresponding values for curl_multi_setopt()
+	 */
+	public function __construct(array $options = [])
+	{
+		$this->factory = $options['handle_factory'] ?? new CurlFactory(50);
+		if (isset($options['select_timeout'])) {
+			$this->selectTimeout = $options['select_timeout'];
+		} elseif ($selectTimeout = Utils::getenv('GUZZLE_CURL_SELECT_TIMEOUT')) {
+			@\trigger_error('Since guzzlehttp/guzzle 7.2.0: Using environment variable GUZZLE_CURL_SELECT_TIMEOUT is deprecated. Use option "select_timeout" instead.', \E_USER_DEPRECATED);
+			$this->selectTimeout = (int) $selectTimeout;
+		} else {
+			$this->selectTimeout = 1;
+		}
+		$this->options = $options['options'] ?? [];
+		// unsetting the property forces the first access to go through
+		// __get().
+		unset($this->_mh);
+	}
+	/**
+	 * @param string $name
+	 *
+	 * @return resource|\CurlMultiHandle
+	 *
+	 * @throws \BadMethodCallException when another field as `_mh` will be gotten
+	 * @throws \RuntimeException       when curl can not initialize a multi handle
+	 */
+	public function __get($name)
+	{
+		if ($name !== '_mh') {
+			throw new \BadMethodCallException("Can not get other property as '_mh'.");
+		}
+		$multiHandle = \curl_multi_init();
+		if (\false === $multiHandle) {
+			throw new \RuntimeException('Can not initialize curl multi handle.');
+		}
+		$this->_mh = $multiHandle;
+		foreach ($this->options as $option => $value) {
+			// A warning is raised in case of a wrong option.
+			\curl_multi_setopt($this->_mh, $option, $value);
+		}
+		return $this->_mh;
+	}
+	public function __destruct()
+	{
+		if (isset($this->_mh)) {
+			\curl_multi_close($this->_mh);
+			unset($this->_mh);
+		}
+	}
+	public function __invoke(RequestInterface $request, array $options) : PromiseInterface
+	{
+		$easy = $this->factory->create($request, $options);
+		$id = (int) $easy->handle;
+		$promise = new Promise([$this, 'execute'], function () use($id) {
+			return $this->cancel($id);
+		});
+		$this->addRequest(['easy' => $easy, 'deferred' => $promise]);
+		return $promise;
+	}
+	/**
+	 * Ticks the curl event loop.
+	 */
+	public function tick() : void
+	{
+		// Add any delayed handles if needed.
+		if ($this->delays) {
+			$currentTime = Utils::currentTime();
+			foreach ($this->delays as $id => $delay) {
+				if ($currentTime >= $delay) {
+					unset($this->delays[$id]);
+					\curl_multi_add_handle($this->_mh, $this->handles[$id]['easy']->handle);
+				}
+			}
+		}
+		// Run curl_multi_exec in the queue to enable other async tasks to run
+		P\Utils::queue()->add(Closure::fromCallable([$this, 'tickInQueue']));
+		// Step through the task queue which may add additional requests.
+		P\Utils::queue()->run();
+		if ($this->active && \curl_multi_select($this->_mh, $this->selectTimeout) === -1) {
+			// Perform a usleep if a select returns -1.
+			// See: https://bugs.php.net/bug.php?id=61141
+			\usleep(250);
+		}
+		while (\curl_multi_exec($this->_mh, $this->active) === \CURLM_CALL_MULTI_PERFORM) {
+			// Prevent busy looping for slow HTTP requests.
+			\curl_multi_select($this->_mh, $this->selectTimeout);
+		}
+		$this->processMessages();
+	}
+	/**
+	 * Runs \curl_multi_exec() inside the event loop, to prevent busy looping
+	 */
+	private function tickInQueue() : void
+	{
+		if (\curl_multi_exec($this->_mh, $this->active) === \CURLM_CALL_MULTI_PERFORM) {
+			\curl_multi_select($this->_mh, 0);
+			P\Utils::queue()->add(Closure::fromCallable([$this, 'tickInQueue']));
+		}
+	}
+	/**
+	 * Runs until all outstanding connections have completed.
+	 */
+	public function execute() : void
+	{
+		$queue = P\Utils::queue();
+		while ($this->handles || !$queue->isEmpty()) {
+			// If there are no transfers, then sleep for the next delay
+			if (!$this->active && $this->delays) {
+				\usleep($this->timeToNext());
+			}
+			$this->tick();
+		}
+	}
+	private function addRequest(array $entry) : void
+	{
+		$easy = $entry['easy'];
+		$id = (int) $easy->handle;
+		$this->handles[$id] = $entry;
+		if (empty($easy->options['delay'])) {
+			\curl_multi_add_handle($this->_mh, $easy->handle);
+		} else {
+			$this->delays[$id] = Utils::currentTime() + $easy->options['delay'] / 1000;
+		}
+	}
+	/**
+	 * Cancels a handle from sending and removes references to it.
+	 *
+	 * @param int $id Handle ID to cancel and remove.
+	 *
+	 * @return bool True on success, false on failure.
+	 */
+	private function cancel($id) : bool
+	{
+		if (!\is_int($id)) {
+			trigger_deprecation('guzzlehttp/guzzle', '7.4', 'Not passing an integer to %s::%s() is deprecated and will cause an error in 8.0.', __CLASS__, __FUNCTION__);
+		}
+		// Cannot cancel if it has been processed.
+		if (!isset($this->handles[$id])) {
+			return \false;
+		}
+		$handle = $this->handles[$id]['easy']->handle;
+		unset($this->delays[$id], $this->handles[$id]);
+		\curl_multi_remove_handle($this->_mh, $handle);
+		\curl_close($handle);
+		return \true;
+	}
+	private function processMessages() : void
+	{
+		while ($done = \curl_multi_info_read($this->_mh)) {
+			if ($done['msg'] !== \CURLMSG_DONE) {
+				// if it's not done, then it would be premature to remove the handle. ref https://github.com/guzzle/guzzle/pull/2892#issuecomment-945150216
+				continue;
+			}
+			$id = (int) $done['handle'];
+			\curl_multi_remove_handle($this->_mh, $done['handle']);
+			if (!isset($this->handles[$id])) {
+				// Probably was cancelled.
+				continue;
+			}
+			$entry = $this->handles[$id];
+			unset($this->handles[$id], $this->delays[$id]);
+			$entry['easy']->errno = $done['result'];
+			$entry['deferred']->resolve(CurlFactory::finish($this, $entry['easy'], $this->factory));
+		}
+	}
+	private function timeToNext() : int
+	{
+		$currentTime = Utils::currentTime();
+		$nextTime = \PHP_INT_MAX;
+		foreach ($this->delays as $time) {
+			if ($time < $nextTime) {
+				$nextTime = $time;
+			}
+		}
+		return (int) \max(0, $nextTime - $currentTime) * 1000000;
+	}
 }

lib/Vendor/GuzzleHttp/Handler/HeaderProcessor.php

Braces +1 added lines, -2 removed lines

@@ -7,8 +7,7 @@
 /**
  * @internal
  */
-final class HeaderProcessor
-{
+final class HeaderProcessor {
     /**
      * Returns the HTTP version, status code, reason phrase, and headers.
      *

Indentation +25 added lines, -25 removed lines

@@ -8,29 +8,29 @@
  */
 final class HeaderProcessor
 {
-    /**
-     * Returns the HTTP version, status code, reason phrase, and headers.
-     *
-     * @param string[] $headers
-     *
-     * @return array{0:string, 1:int, 2:?string, 3:array}
-     *
-     * @throws \RuntimeException
-     */
-    public static function parseHeaders(array $headers) : array
-    {
-        if ($headers === []) {
-            throw new \RuntimeException('Expected a non-empty array of header data');
-        }
-        $parts = \explode(' ', \array_shift($headers), 3);
-        $version = \explode('/', $parts[0])[1] ?? null;
-        if ($version === null) {
-            throw new \RuntimeException('HTTP version missing from header data');
-        }
-        $status = $parts[1] ?? null;
-        if ($status === null) {
-            throw new \RuntimeException('HTTP status code missing from header data');
-        }
-        return [$version, (int) $status, $parts[2] ?? null, Utils::headersFromLines($headers)];
-    }
+	/**
+	 * Returns the HTTP version, status code, reason phrase, and headers.
+	 *
+	 * @param string[] $headers
+	 *
+	 * @return array{0:string, 1:int, 2:?string, 3:array}
+	 *
+	 * @throws \RuntimeException
+	 */
+	public static function parseHeaders(array $headers) : array
+	{
+		if ($headers === []) {
+			throw new \RuntimeException('Expected a non-empty array of header data');
+		}
+		$parts = \explode(' ', \array_shift($headers), 3);
+		$version = \explode('/', $parts[0])[1] ?? null;
+		if ($version === null) {
+			throw new \RuntimeException('HTTP version missing from header data');
+		}
+		$status = $parts[1] ?? null;
+		if ($status === null) {
+			throw new \RuntimeException('HTTP status code missing from header data');
+		}
+		return [$version, (int) $status, $parts[2] ?? null, Utils::headersFromLines($headers)];
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -31,6 +31,6 @@
         if ($status === null) {
             throw new \RuntimeException('HTTP status code missing from header data');
         }
-        return [$version, (int) $status, $parts[2] ?? null, Utils::headersFromLines($headers)];
+        return [$version, (int)$status, $parts[2] ?? null, Utils::headersFromLines($headers)];
     }
 }

lib/Vendor/GuzzleHttp/Handler/EasyHandle.php

Braces +1 added lines, -2 removed lines

@@ -13,8 +13,7 @@
  *
  * @internal
  */
-final class EasyHandle
-{
+final class EasyHandle {
     /**
      * @var resource|\CurlHandle cURL resource
      */

Indentation +74 added lines, -74 removed lines

@@ -14,78 +14,78 @@
  */
 final class EasyHandle
 {
-    /**
-     * @var resource|\CurlHandle cURL resource
-     */
-    public $handle;
-    /**
-     * @var StreamInterface Where data is being written
-     */
-    public $sink;
-    /**
-     * @var array Received HTTP headers so far
-     */
-    public $headers = [];
-    /**
-     * @var ResponseInterface|null Received response (if any)
-     */
-    public $response;
-    /**
-     * @var RequestInterface Request being sent
-     */
-    public $request;
-    /**
-     * @var array Request options
-     */
-    public $options = [];
-    /**
-     * @var int cURL error number (if any)
-     */
-    public $errno = 0;
-    /**
-     * @var \Throwable|null Exception during on_headers (if any)
-     */
-    public $onHeadersException;
-    /**
-     * @var \Exception|null Exception during createResponse (if any)
-     */
-    public $createResponseException;
-    /**
-     * Attach a response to the easy handle based on the received headers.
-     *
-     * @throws \RuntimeException if no headers have been received or the first
-     *                           header line is invalid.
-     */
-    public function createResponse() : void
-    {
-        [$ver, $status, $reason, $headers] = HeaderProcessor::parseHeaders($this->headers);
-        $normalizedKeys = Utils::normalizeHeaderKeys($headers);
-        if (!empty($this->options['decode_content']) && isset($normalizedKeys['content-encoding'])) {
-            $headers['x-encoded-content-encoding'] = $headers[$normalizedKeys['content-encoding']];
-            unset($headers[$normalizedKeys['content-encoding']]);
-            if (isset($normalizedKeys['content-length'])) {
-                $headers['x-encoded-content-length'] = $headers[$normalizedKeys['content-length']];
-                $bodyLength = (int) $this->sink->getSize();
-                if ($bodyLength) {
-                    $headers[$normalizedKeys['content-length']] = $bodyLength;
-                } else {
-                    unset($headers[$normalizedKeys['content-length']]);
-                }
-            }
-        }
-        // Attach a response to the easy handle with the parsed headers.
-        $this->response = new Response($status, $headers, $this->sink, $ver, $reason);
-    }
-    /**
-     * @param string $name
-     *
-     * @return void
-     *
-     * @throws \BadMethodCallException
-     */
-    public function __get($name)
-    {
-        $msg = $name === 'handle' ? 'The EasyHandle has been released' : 'Invalid property: ' . $name;
-        throw new \BadMethodCallException($msg);
-    }
+	/**
+	 * @var resource|\CurlHandle cURL resource
+	 */
+	public $handle;
+	/**
+	 * @var StreamInterface Where data is being written
+	 */
+	public $sink;
+	/**
+	 * @var array Received HTTP headers so far
+	 */
+	public $headers = [];
+	/**
+	 * @var ResponseInterface|null Received response (if any)
+	 */
+	public $response;
+	/**
+	 * @var RequestInterface Request being sent
+	 */
+	public $request;
+	/**
+	 * @var array Request options
+	 */
+	public $options = [];
+	/**
+	 * @var int cURL error number (if any)
+	 */
+	public $errno = 0;
+	/**
+	 * @var \Throwable|null Exception during on_headers (if any)
+	 */
+	public $onHeadersException;
+	/**
+	 * @var \Exception|null Exception during createResponse (if any)
+	 */
+	public $createResponseException;
+	/**
+	 * Attach a response to the easy handle based on the received headers.
+	 *
+	 * @throws \RuntimeException if no headers have been received or the first
+	 *                           header line is invalid.
+	 */
+	public function createResponse() : void
+	{
+		[$ver, $status, $reason, $headers] = HeaderProcessor::parseHeaders($this->headers);
+		$normalizedKeys = Utils::normalizeHeaderKeys($headers);
+		if (!empty($this->options['decode_content']) && isset($normalizedKeys['content-encoding'])) {
+			$headers['x-encoded-content-encoding'] = $headers[$normalizedKeys['content-encoding']];
+			unset($headers[$normalizedKeys['content-encoding']]);
+			if (isset($normalizedKeys['content-length'])) {
+				$headers['x-encoded-content-length'] = $headers[$normalizedKeys['content-length']];
+				$bodyLength = (int) $this->sink->getSize();
+				if ($bodyLength) {
+					$headers[$normalizedKeys['content-length']] = $bodyLength;
+				} else {
+					unset($headers[$normalizedKeys['content-length']]);
+				}
+			}
+		}
+		// Attach a response to the easy handle with the parsed headers.
+		$this->response = new Response($status, $headers, $this->sink, $ver, $reason);
+	}
+	/**
+	 * @param string $name
+	 *
+	 * @return void
+	 *
+	 * @throws \BadMethodCallException
+	 */
+	public function __get($name)
+	{
+		$msg = $name === 'handle' ? 'The EasyHandle has been released' : 'Invalid property: ' . $name;
+		throw new \BadMethodCallException($msg);
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -65,7 +65,7 @@ 
             unset($headers[$normalizedKeys['content-encoding']]);
             if (isset($normalizedKeys['content-length'])) {
                 $headers['x-encoded-content-length'] = $headers[$normalizedKeys['content-length']];
-                $bodyLength = (int) $this->sink->getSize();
+                $bodyLength = (int)$this->sink->getSize();
                 if ($bodyLength) {
                     $headers[$normalizedKeys['content-length']] = $bodyLength;
                 } else {
@@ -85,7 +85,7 @@ 
      */
     public function __get($name)
     {
-        $msg = $name === 'handle' ? 'The EasyHandle has been released' : 'Invalid property: ' . $name;
+        $msg = $name === 'handle' ? 'The EasyHandle has been released' : 'Invalid property: '.$name;
         throw new \BadMethodCallException($msg);
     }
 }

lib/Vendor/GuzzleHttp/Handler/Proxy.php

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.

Indentation +34 added lines, -34 removed lines

@@ -12,38 +12,38 @@
  */
 class Proxy
 {
-    /**
-     * Sends synchronous requests to a specific handler while sending all other
-     * requests to another handler.
-     *
-     * @param callable(\Psr\Http\Message\RequestInterface, array): \GuzzleHttp\Promise\PromiseInterface $default Handler used for normal responses
-     * @param callable(\Psr\Http\Message\RequestInterface, array): \GuzzleHttp\Promise\PromiseInterface $sync    Handler used for synchronous responses.
-     *
-     * @return callable(\Psr\Http\Message\RequestInterface, array): \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(\Psr\Http\Message\RequestInterface, array): \GuzzleHttp\Promise\PromiseInterface $default   Handler used for non-streaming responses
-     * @param callable(\Psr\Http\Message\RequestInterface, array): \GuzzleHttp\Promise\PromiseInterface $streaming Handler used for streaming responses
-     *
-     * @return callable(\Psr\Http\Message\RequestInterface, array): \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 synchronous requests to a specific handler while sending all other
+	 * requests to another handler.
+	 *
+	 * @param callable(\Psr\Http\Message\RequestInterface, array): \GuzzleHttp\Promise\PromiseInterface $default Handler used for normal responses
+	 * @param callable(\Psr\Http\Message\RequestInterface, array): \GuzzleHttp\Promise\PromiseInterface $sync    Handler used for synchronous responses.
+	 *
+	 * @return callable(\Psr\Http\Message\RequestInterface, array): \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(\Psr\Http\Message\RequestInterface, array): \GuzzleHttp\Promise\PromiseInterface $default   Handler used for non-streaming responses
+	 * @param callable(\Psr\Http\Message\RequestInterface, array): \GuzzleHttp\Promise\PromiseInterface $streaming Handler used for streaming responses
+	 *
+	 * @return callable(\Psr\Http\Message\RequestInterface, array): \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

@@ -23,7 +23,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);
         };
     }
@@ -42,7 +42,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);
         };
     }

lib/Vendor/GuzzleHttp/Handler/CurlHandler.php

Braces +1 added lines, -2 removed lines

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

Indentation +25 added lines, -25 removed lines

@@ -15,29 +15,29 @@
  */
 class CurlHandler
 {
-    /**
-     * @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);
-    }
-    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);
-        return CurlFactory::finish($this, $easy, $this->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);
+	}
+	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);
+		return CurlFactory::finish($this, $easy, $this->factory);
+	}
 }

lib/Vendor/GuzzleHttp/RequestOptions.php

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

Indentation +232 added lines, -232 removed lines

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

lib/Vendor/GuzzleHttp/Cookie/SetCookie.php

Braces +1 added lines, -2 removed lines

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

Indentation +397 added lines, -397 removed lines

@@ -7,401 +7,401 @@
  */
 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\x00\v") : \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\x00\v") : \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 +16 added lines, -16 removed lines

@@ -44,7 +44,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;
@@ -104,13 +104,13 @@ 
     }
     public function __toString()
     {
-        $str = $this->data['Name'] . '=' . ($this->data['Value'] ?? '') . '; ';
+        $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) . '; ';
+                    $str .= 'Expires='.\gmdate('D, d M Y H:i:s \\G\\M\\T', $v).'; ';
                 } else {
-                    $str .= ($v === \true ? $k : "{$k}={$v}") . '; ';
+                    $str .= ($v === \true ? $k : "{$k}={$v}").'; ';
                 }
             }
         }
@@ -139,7 +139,7 @@ 
         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;
+        $this->data['Name'] = (string)$name;
     }
     /**
      * Get the cookie value.
@@ -160,7 +160,7 @@ 
         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;
+        $this->data['Value'] = (string)$value;
     }
     /**
      * Get the domain.
@@ -181,7 +181,7 @@ 
         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;
+        $this->data['Domain'] = null === $domain ? null : (string)$domain;
     }
     /**
      * Get the path.
@@ -202,7 +202,7 @@ 
         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;
+        $this->data['Path'] = (string)$path;
     }
     /**
      * Maximum lifetime of the cookie in seconds.
@@ -211,7 +211,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'];
     }
     /**
      * Set the max-age of the cookie.
@@ -223,7 +223,7 @@ 
         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;
+        $this->data['Max-Age'] = $maxAge === null ? null : (int)$maxAge;
     }
     /**
      * The UNIX timestamp when the cookie Expires.
@@ -244,7 +244,7 @@ 
         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));
+        $this->data['Expires'] = null === $timestamp ? null : (\is_numeric($timestamp) ? (int)$timestamp : \strtotime((string)$timestamp));
     }
     /**
      * Get whether or not this is a secure cookie.
@@ -265,7 +265,7 @@ 
         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;
+        $this->data['Secure'] = (bool)$secure;
     }
     /**
      * Get whether or not this is a session cookie.
@@ -286,7 +286,7 @@ 
         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;
+        $this->data['Discard'] = (bool)$discard;
     }
     /**
      * Get whether or not this is an HTTP only cookie.
@@ -307,7 +307,7 @@ 
         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;
+        $this->data['HttpOnly'] = (bool)$httpOnly;
     }
     /**
      * Check if the cookie matches a path value.
@@ -366,7 +366,7 @@ 
         if (\filter_var($domain, \FILTER_VALIDATE_IP)) {
             return \false;
         }
-        return (bool) \preg_match('/\\.' . \preg_quote($cookieDomain, '/') . '$/', $domain);
+        return (bool)\preg_match('/\\.'.\preg_quote($cookieDomain, '/').'$/', $domain);
     }
     /**
      * Check if the cookie is expired.
@@ -388,7 +388,7 @@ 
         }
         // 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: ()<>@,;:\\"/?={}';
+            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.