nextcloud / fulltextsearch_elasticsearch

lib/Vendor/GuzzleHttp/RequestOptions.php

Indentation +262 added lines, -262 removed lines

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

Braces +1 added lines, -2 removed lines

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

lib/Vendor/GuzzleHttp/functions.php

Indentation +10 added lines, -10 removed lines

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

lib/Vendor/GuzzleHttp/Cookie/SetCookie.php

Indentation +478 added lines, -478 removed lines

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

Spacing +12 added lines, -12 removed lines

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

Braces +1 added lines, -2 removed lines

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

lib/Vendor/GuzzleHttp/Cookie/SessionCookieJar.php

Indentation +61 added lines, -61 removed lines

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

Braces +1 added lines, -2 removed lines

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

lib/Vendor/GuzzleHttp/Cookie/CookieJarInterface.php

Indentation +53 added lines, -53 removed lines

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

lib/Vendor/GuzzleHttp/Cookie/FileCookieJar.php

Indentation +81 added lines, -81 removed lines

@@ -9,93 +9,93 @@
  */
 class FileCookieJar extends CookieJar
 {
-    /**
-     * @var string filename
-     */
-    private $filename;
+	/**
+	 * @var string filename
+	 */
+	private $filename;
 
-    /**
-     * @var bool Control whether to persist session cookies or not.
-     */
-    private $storeSessionCookies;
+	/**
+	 * @var bool Control whether to persist session cookies or not.
+	 */
+	private $storeSessionCookies;
 
-    /**
-     * Create a new FileCookieJar object
-     *
-     * @param string $cookieFile          File to store the cookie data
-     * @param bool   $storeSessionCookies Set to true to store session cookies
-     *                                    in the cookie jar.
-     *
-     * @throws \RuntimeException if the file cannot be found or created
-     */
-    public function __construct(string $cookieFile, bool $storeSessionCookies = false)
-    {
-        parent::__construct();
-        $this->filename = $cookieFile;
-        $this->storeSessionCookies = $storeSessionCookies;
+	/**
+	 * Create a new FileCookieJar object
+	 *
+	 * @param string $cookieFile          File to store the cookie data
+	 * @param bool   $storeSessionCookies Set to true to store session cookies
+	 *                                    in the cookie jar.
+	 *
+	 * @throws \RuntimeException if the file cannot be found or created
+	 */
+	public function __construct(string $cookieFile, bool $storeSessionCookies = false)
+	{
+		parent::__construct();
+		$this->filename = $cookieFile;
+		$this->storeSessionCookies = $storeSessionCookies;
 
-        if (\file_exists($cookieFile)) {
-            $this->load($cookieFile);
-        }
-    }
+		if (\file_exists($cookieFile)) {
+			$this->load($cookieFile);
+		}
+	}
 
-    /**
-     * Saves the file when shutting down
-     */
-    public function __destruct()
-    {
-        $this->save($this->filename);
-    }
+	/**
+	 * Saves the file when shutting down
+	 */
+	public function __destruct()
+	{
+		$this->save($this->filename);
+	}
 
-    /**
-     * Saves the cookies to a file.
-     *
-     * @param string $filename File to save
-     *
-     * @throws \RuntimeException if the file cannot be found or created
-     */
-    public function save(string $filename): void
-    {
-        $json = [];
-        /** @var SetCookie $cookie */
-        foreach ($this as $cookie) {
-            if (CookieJar::shouldPersist($cookie, $this->storeSessionCookies)) {
-                $json[] = $cookie->toArray();
-            }
-        }
+	/**
+	 * Saves the cookies to a file.
+	 *
+	 * @param string $filename File to save
+	 *
+	 * @throws \RuntimeException if the file cannot be found or created
+	 */
+	public function save(string $filename): void
+	{
+		$json = [];
+		/** @var SetCookie $cookie */
+		foreach ($this as $cookie) {
+			if (CookieJar::shouldPersist($cookie, $this->storeSessionCookies)) {
+				$json[] = $cookie->toArray();
+			}
+		}
 
-        $jsonStr = Utils::jsonEncode($json);
-        if (false === \file_put_contents($filename, $jsonStr, \LOCK_EX)) {
-            throw new \RuntimeException("Unable to save file {$filename}");
-        }
-    }
+		$jsonStr = Utils::jsonEncode($json);
+		if (false === \file_put_contents($filename, $jsonStr, \LOCK_EX)) {
+			throw new \RuntimeException("Unable to save file {$filename}");
+		}
+	}
 
-    /**
-     * Load cookies from a JSON formatted file.
-     *
-     * Old cookies are kept unless overwritten by newly loaded ones.
-     *
-     * @param string $filename Cookie file to load.
-     *
-     * @throws \RuntimeException if the file cannot be loaded.
-     */
-    public function load(string $filename): void
-    {
-        $json = \file_get_contents($filename);
-        if (false === $json) {
-            throw new \RuntimeException("Unable to load file {$filename}");
-        }
-        if ($json === '') {
-            return;
-        }
+	/**
+	 * Load cookies from a JSON formatted file.
+	 *
+	 * Old cookies are kept unless overwritten by newly loaded ones.
+	 *
+	 * @param string $filename Cookie file to load.
+	 *
+	 * @throws \RuntimeException if the file cannot be loaded.
+	 */
+	public function load(string $filename): void
+	{
+		$json = \file_get_contents($filename);
+		if (false === $json) {
+			throw new \RuntimeException("Unable to load file {$filename}");
+		}
+		if ($json === '') {
+			return;
+		}
 
-        $data = Utils::jsonDecode($json, true);
-        if (\is_array($data)) {
-            foreach ($data as $cookie) {
-                $this->setCookie(new SetCookie($cookie));
-            }
-        } elseif (\is_scalar($data) && !empty($data)) {
-            throw new \RuntimeException("Invalid cookie file: {$filename}");
-        }
-    }
+		$data = Utils::jsonDecode($json, true);
+		if (\is_array($data)) {
+			foreach ($data as $cookie) {
+				$this->setCookie(new SetCookie($cookie));
+			}
+		} elseif (\is_scalar($data) && !empty($data)) {
+			throw new \RuntimeException("Invalid cookie file: {$filename}");
+		}
+	}
 }

Braces +1 added lines, -2 removed lines

@@ -7,8 +7,7 @@
 /**
  * Persists non-session cookies using a JSON formatted file
  */
-class FileCookieJar extends CookieJar
-{
+class FileCookieJar extends CookieJar {
     /**
      * @var string filename
      */

lib/Vendor/GuzzleHttp/Cookie/CookieJar.php

Indentation +294 added lines, -294 removed lines

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

Spacing +5 added lines, -5 removed lines

@@ -98,7 +98,7 @@ 
 
     public function toArray(): array
     {
-        return \array_map(static function (SetCookie $cookie): array {
+        return \array_map(static function(SetCookie $cookie): array {
             return $cookie->toArray();
         }, $this->getIterator()->getArrayCopy());
     }
@@ -112,14 +112,14 @@ 
         } elseif (!$path) {
             $this->cookies = \array_filter(
                 $this->cookies,
-                static function (SetCookie $cookie) use ($domain): bool {
+                static function(SetCookie $cookie) use ($domain): bool {
                     return !$cookie->matchesDomain($domain);
                 }
             );
         } elseif (!$name) {
             $this->cookies = \array_filter(
                 $this->cookies,
-                static function (SetCookie $cookie) use ($path, $domain): bool {
+                static function(SetCookie $cookie) use ($path, $domain): bool {
                     return !($cookie->matchesPath($path)
                         && $cookie->matchesDomain($domain));
                 }
@@ -127,7 +127,7 @@ 
         } else {
             $this->cookies = \array_filter(
                 $this->cookies,
-                static function (SetCookie $cookie) use ($path, $domain, $name) {
+                static function(SetCookie $cookie) use ($path, $domain, $name) {
                     return !($cookie->getName() == $name
                         && $cookie->matchesPath($path)
                         && $cookie->matchesDomain($domain));
@@ -140,7 +140,7 @@ 
     {
         $this->cookies = \array_filter(
             $this->cookies,
-            static function (SetCookie $cookie): bool {
+            static function(SetCookie $cookie): bool {
                 return !$cookie->getDiscard() && $cookie->getExpires();
             }
         );

Braces +1 added lines, -2 removed lines

@@ -8,8 +8,7 @@
 /**
  * Cookie jar that stores cookies as an array
  */
-class CookieJar implements CookieJarInterface
-{
+class CookieJar implements CookieJarInterface {
     /**
      * @var SetCookie[] Loaded cookie data
      */

lib/Vendor/GuzzleHttp/Exception/TooManyRedirectsException.php

Braces +1 added lines, -2 removed lines

@@ -2,6 +2,5 @@
 
 namespace OCA\FullTextSearch_Elasticsearch\Vendor\GuzzleHttp\Exception;
 
-class TooManyRedirectsException extends RequestException
-{
+class TooManyRedirectsException extends RequestException {
 }

lib/Vendor/GuzzleHttp/Exception/ClientException.php

Braces +1 added lines, -2 removed lines

@@ -5,6 +5,5 @@
 /**
  * Exception when a client error is encountered (4xx codes)
  */
-class ClientException extends BadResponseException
-{
+class ClientException extends BadResponseException {
 }