nextcloud / fulltextsearch_elasticsearch

lib/Vendor/GuzzleHttp/BodySummarizer.php

Braces +1 added lines, -2 removed lines

@@ -3,8 +3,7 @@
 namespace OCA\FullTextSearch_Elasticsearch\Vendor\GuzzleHttp;
 
 use OCA\FullTextSearch_Elasticsearch\Vendor\Psr\Http\Message\MessageInterface;
-final class BodySummarizer implements BodySummarizerInterface
-{
+final class BodySummarizer implements BodySummarizerInterface {
     /**
      * @var int|null
      */

Indentation +15 added lines, -15 removed lines

@@ -5,19 +5,19 @@
 use OCA\FullTextSearch_Elasticsearch\Vendor\Psr\Http\Message\MessageInterface;
 final class BodySummarizer implements BodySummarizerInterface
 {
-    /**
-     * @var int|null
-     */
-    private $truncateAt;
-    public function __construct(?int $truncateAt = null)
-    {
-        $this->truncateAt = $truncateAt;
-    }
-    /**
-     * Returns a summarized message body.
-     */
-    public function summarize(MessageInterface $message) : ?string
-    {
-        return $this->truncateAt === null ? Psr7\Message::bodySummary($message) : Psr7\Message::bodySummary($message, $this->truncateAt);
-    }
+	/**
+	 * @var int|null
+	 */
+	private $truncateAt;
+	public function __construct(?int $truncateAt = null)
+	{
+		$this->truncateAt = $truncateAt;
+	}
+	/**
+	 * Returns a summarized message body.
+	 */
+	public function summarize(MessageInterface $message) : ?string
+	{
+		return $this->truncateAt === null ? Psr7\Message::bodySummary($message) : Psr7\Message::bodySummary($message, $this->truncateAt);
+	}
 }

lib/Vendor/GuzzleHttp/Utils.php

Spacing +10 added lines, -10 removed lines

@@ -22,9 +22,9 @@ 
     {
         switch (\gettype($input)) {
             case 'object':
-                return 'object(' . \get_class($input) . ')';
+                return 'object('.\get_class($input).')';
             case 'array':
-                return 'array(' . \count($input) . ')';
+                return 'array('.\count($input).')';
             default:
                 \ob_start();
                 \var_dump($input);
@@ -218,7 +218,7 @@ 
             }
             // Special match if the area when prefixed with ".". Remove any
             // existing leading "." and add a new leading ".".
-            $area = '.' . \ltrim($area, '.');
+            $area = '.'.\ltrim($area, '.');
             if (\substr($host, -\strlen($area)) === $area) {
                 return \true;
             }
@@ -244,7 +244,7 @@ 
     {
         $data = \json_decode($json, $assoc, $depth, $options);
         if (\JSON_ERROR_NONE !== \json_last_error()) {
-            throw new InvalidArgumentException('json_decode error: ' . \json_last_error_msg());
+            throw new InvalidArgumentException('json_decode error: '.\json_last_error_msg());
         }
         return $data;
     }
@@ -263,7 +263,7 @@ 
     {
         $json = \json_encode($value, $options, $depth);
         if (\JSON_ERROR_NONE !== \json_last_error()) {
-            throw new InvalidArgumentException('json_encode error: ' . \json_last_error_msg());
+            throw new InvalidArgumentException('json_encode error: '.\json_last_error_msg());
         }
         /** @var string */
         return $json;
@@ -278,7 +278,7 @@ 
      */
     public static function currentTime() : float
     {
-        return (float) \function_exists('hrtime') ? \hrtime(\true) / 1000000000.0 : \microtime(\true);
+        return (float)\function_exists('hrtime') ? \hrtime(\true) / 1000000000.0 : \microtime(\true);
     }
     /**
      * @throws InvalidArgumentException
@@ -291,7 +291,7 @@ 
             $asciiHost = self::idnToAsci($uri->getHost(), $options, $info);
             if ($asciiHost === \false) {
                 $errorBitSet = $info['errors'] ?? 0;
-                $errorConstants = \array_filter(\array_keys(\get_defined_constants()), static function (string $name) : bool {
+                $errorConstants = \array_filter(\array_keys(\get_defined_constants()), static function(string $name) : bool {
                     return \substr($name, 0, 11) === 'IDNA_ERROR_';
                 });
                 $errors = [];
@@ -302,7 +302,7 @@ 
                 }
                 $errorMessage = 'IDN conversion failed';
                 if ($errors) {
-                    $errorMessage .= ' (errors: ' . \implode(', ', $errors) . ')';
+                    $errorMessage .= ' (errors: '.\implode(', ', $errors).')';
                 }
                 throw new InvalidArgumentException($errorMessage);
             }
@@ -319,10 +319,10 @@ 
     public static function getenv(string $name) : ?string
     {
         if (isset($_SERVER[$name])) {
-            return (string) $_SERVER[$name];
+            return (string)$_SERVER[$name];
         }
         if (\PHP_SAPI === 'cli' && ($value = \getenv($name)) !== \false && $value !== null) {
-            return (string) $value;
+            return (string)$value;
         }
         return null;
     }

Braces +1 added lines, -2 removed lines

@@ -8,8 +8,7 @@
 use OCA\FullTextSearch_Elasticsearch\Vendor\GuzzleHttp\Handler\Proxy;
 use OCA\FullTextSearch_Elasticsearch\Vendor\GuzzleHttp\Handler\StreamHandler;
 use OCA\FullTextSearch_Elasticsearch\Vendor\Psr\Http\Message\UriInterface;
-final class Utils
-{
+final class Utils {
     /**
      * Debug function used to describe the provided value type and class.
      *

Indentation +313 added lines, -313 removed lines

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

lib/Vendor/Http/Discovery/Psr17Factory.php

Indentation +198 added lines, -198 removed lines

@@ -40,202 +40,202 @@
  */
 class Psr17Factory implements RequestFactoryInterface, ResponseFactoryInterface, ServerRequestFactoryInterface, StreamFactoryInterface, UploadedFileFactoryInterface, UriFactoryInterface
 {
-    private $requestFactory;
-    private $responseFactory;
-    private $serverRequestFactory;
-    private $streamFactory;
-    private $uploadedFileFactory;
-    private $uriFactory;
-    public function __construct(?RequestFactoryInterface $requestFactory = null, ?ResponseFactoryInterface $responseFactory = null, ?ServerRequestFactoryInterface $serverRequestFactory = null, ?StreamFactoryInterface $streamFactory = null, ?UploadedFileFactoryInterface $uploadedFileFactory = null, ?UriFactoryInterface $uriFactory = null)
-    {
-        $this->requestFactory = $requestFactory;
-        $this->responseFactory = $responseFactory;
-        $this->serverRequestFactory = $serverRequestFactory;
-        $this->streamFactory = $streamFactory;
-        $this->uploadedFileFactory = $uploadedFileFactory;
-        $this->uriFactory = $uriFactory;
-        $this->setFactory($requestFactory);
-        $this->setFactory($responseFactory);
-        $this->setFactory($serverRequestFactory);
-        $this->setFactory($streamFactory);
-        $this->setFactory($uploadedFileFactory);
-        $this->setFactory($uriFactory);
-    }
-    /**
-     * @param UriInterface|string $uri
-     */
-    public function createRequest(string $method, $uri) : RequestInterface
-    {
-        $factory = $this->requestFactory ?? $this->setFactory(Psr17FactoryDiscovery::findRequestFactory());
-        return $factory->createRequest(...\func_get_args());
-    }
-    public function createResponse(int $code = 200, string $reasonPhrase = '') : ResponseInterface
-    {
-        $factory = $this->responseFactory ?? $this->setFactory(Psr17FactoryDiscovery::findResponseFactory());
-        return $factory->createResponse(...\func_get_args());
-    }
-    /**
-     * @param UriInterface|string $uri
-     */
-    public function createServerRequest(string $method, $uri, array $serverParams = []) : ServerRequestInterface
-    {
-        $factory = $this->serverRequestFactory ?? $this->setFactory(Psr17FactoryDiscovery::findServerRequestFactory());
-        return $factory->createServerRequest(...\func_get_args());
-    }
-    public function createServerRequestFromGlobals(?array $server = null, ?array $get = null, ?array $post = null, ?array $cookie = null, ?array $files = null, ?StreamInterface $body = null) : ServerRequestInterface
-    {
-        $server = $server ?? $_SERVER;
-        $request = $this->createServerRequest($server['REQUEST_METHOD'] ?? 'GET', $this->createUriFromGlobals($server), $server);
-        return $this->buildServerRequestFromGlobals($request, $server, $files ?? $_FILES)->withQueryParams($get ?? $_GET)->withParsedBody($post ?? $_POST)->withCookieParams($cookie ?? $_COOKIE)->withBody($body ?? $this->createStreamFromFile('php://input', 'r+'));
-    }
-    public function createStream(string $content = '') : StreamInterface
-    {
-        $factory = $this->streamFactory ?? $this->setFactory(Psr17FactoryDiscovery::findStreamFactory());
-        return $factory->createStream($content);
-    }
-    public function createStreamFromFile(string $filename, string $mode = 'r') : StreamInterface
-    {
-        $factory = $this->streamFactory ?? $this->setFactory(Psr17FactoryDiscovery::findStreamFactory());
-        return $factory->createStreamFromFile($filename, $mode);
-    }
-    /**
-     * @param resource $resource
-     */
-    public function createStreamFromResource($resource) : StreamInterface
-    {
-        $factory = $this->streamFactory ?? $this->setFactory(Psr17FactoryDiscovery::findStreamFactory());
-        return $factory->createStreamFromResource($resource);
-    }
-    public function createUploadedFile(StreamInterface $stream, ?int $size = null, int $error = \UPLOAD_ERR_OK, ?string $clientFilename = null, ?string $clientMediaType = null) : UploadedFileInterface
-    {
-        $factory = $this->uploadedFileFactory ?? $this->setFactory(Psr17FactoryDiscovery::findUploadedFileFactory());
-        return $factory->createUploadedFile(...\func_get_args());
-    }
-    public function createUri(string $uri = '') : UriInterface
-    {
-        $factory = $this->uriFactory ?? $this->setFactory(Psr17FactoryDiscovery::findUriFactory());
-        return $factory->createUri(...\func_get_args());
-    }
-    public function createUriFromGlobals(?array $server = null) : UriInterface
-    {
-        return $this->buildUriFromGlobals($this->createUri(''), $server ?? $_SERVER);
-    }
-    private function setFactory($factory)
-    {
-        if (!$this->requestFactory && $factory instanceof RequestFactoryInterface) {
-            $this->requestFactory = $factory;
-        }
-        if (!$this->responseFactory && $factory instanceof ResponseFactoryInterface) {
-            $this->responseFactory = $factory;
-        }
-        if (!$this->serverRequestFactory && $factory instanceof ServerRequestFactoryInterface) {
-            $this->serverRequestFactory = $factory;
-        }
-        if (!$this->streamFactory && $factory instanceof StreamFactoryInterface) {
-            $this->streamFactory = $factory;
-        }
-        if (!$this->uploadedFileFactory && $factory instanceof UploadedFileFactoryInterface) {
-            $this->uploadedFileFactory = $factory;
-        }
-        if (!$this->uriFactory && $factory instanceof UriFactoryInterface) {
-            $this->uriFactory = $factory;
-        }
-        return $factory;
-    }
-    private function buildServerRequestFromGlobals(ServerRequestInterface $request, array $server, array $files) : ServerRequestInterface
-    {
-        $request = $request->withProtocolVersion(isset($server['SERVER_PROTOCOL']) ? \str_replace('HTTP/', '', $server['SERVER_PROTOCOL']) : '1.1')->withUploadedFiles($this->normalizeFiles($files));
-        $headers = [];
-        foreach ($server as $k => $v) {
-            if (0 === \strpos($k, 'HTTP_')) {
-                $k = \substr($k, 5);
-            } elseif (!\in_array($k, ['CONTENT_TYPE', 'CONTENT_LENGTH', 'CONTENT_MD5'], \true)) {
-                continue;
-            }
-            $k = \str_replace(' ', '-', \ucwords(\strtolower(\str_replace('_', ' ', $k))));
-            $headers[$k] = $v;
-        }
-        if (!isset($headers['Authorization'])) {
-            if (isset($_SERVER['REDIRECT_HTTP_AUTHORIZATION'])) {
-                $headers['Authorization'] = $_SERVER['REDIRECT_HTTP_AUTHORIZATION'];
-            } elseif (isset($_SERVER['PHP_AUTH_USER'])) {
-                $headers['Authorization'] = 'Basic ' . \base64_encode($_SERVER['PHP_AUTH_USER'] . ':' . ($_SERVER['PHP_AUTH_PW'] ?? ''));
-            } elseif (isset($_SERVER['PHP_AUTH_DIGEST'])) {
-                $headers['Authorization'] = $_SERVER['PHP_AUTH_DIGEST'];
-            }
-        }
-        foreach ($headers as $k => $v) {
-            try {
-                $request = $request->withHeader($k, $v);
-            } catch (\InvalidArgumentException $e) {
-                // ignore invalid headers
-            }
-        }
-        return $request;
-    }
-    private function buildUriFromGlobals(UriInterface $uri, array $server) : UriInterface
-    {
-        $uri = $uri->withScheme(!empty($server['HTTPS']) && 'off' !== \strtolower($server['HTTPS']) ? 'https' : 'http');
-        $hasPort = \false;
-        if (isset($server['HTTP_HOST'])) {
-            $parts = \parse_url('http://' . $server['HTTP_HOST']);
-            $uri = $uri->withHost($parts['host'] ?? 'localhost');
-            if ($parts['port'] ?? \false) {
-                $hasPort = \true;
-                $uri = $uri->withPort($parts['port']);
-            }
-        } else {
-            $uri = $uri->withHost($server['SERVER_NAME'] ?? $server['SERVER_ADDR'] ?? 'localhost');
-        }
-        if (!$hasPort && isset($server['SERVER_PORT'])) {
-            $uri = $uri->withPort($server['SERVER_PORT']);
-        }
-        $hasQuery = \false;
-        if (isset($server['REQUEST_URI'])) {
-            $requestUriParts = \explode('?', $server['REQUEST_URI'], 2);
-            $uri = $uri->withPath($requestUriParts[0]);
-            if (isset($requestUriParts[1])) {
-                $hasQuery = \true;
-                $uri = $uri->withQuery($requestUriParts[1]);
-            }
-        }
-        if (!$hasQuery && isset($server['QUERY_STRING'])) {
-            $uri = $uri->withQuery($server['QUERY_STRING']);
-        }
-        return $uri;
-    }
-    private function normalizeFiles(array $files) : array
-    {
-        foreach ($files as $k => $v) {
-            if ($v instanceof UploadedFileInterface) {
-                continue;
-            }
-            if (!\is_array($v)) {
-                unset($files[$k]);
-            } elseif (!isset($v['tmp_name'])) {
-                $files[$k] = $this->normalizeFiles($v);
-            } else {
-                $files[$k] = $this->createUploadedFileFromSpec($v);
-            }
-        }
-        return $files;
-    }
-    /**
-     * Create and return an UploadedFile instance from a $_FILES specification.
-     *
-     * @param array $value $_FILES struct
-     *
-     * @return UploadedFileInterface|UploadedFileInterface[]
-     */
-    private function createUploadedFileFromSpec(array $value)
-    {
-        if (!\is_array($tmpName = $value['tmp_name'])) {
-            $file = \is_file($tmpName) ? $this->createStreamFromFile($tmpName, 'r') : $this->createStream();
-            return $this->createUploadedFile($file, $value['size'], $value['error'], $value['name'], $value['type']);
-        }
-        foreach ($tmpName as $k => $v) {
-            $tmpName[$k] = $this->createUploadedFileFromSpec(['tmp_name' => $v, 'size' => $value['size'][$k] ?? null, 'error' => $value['error'][$k] ?? null, 'name' => $value['name'][$k] ?? null, 'type' => $value['type'][$k] ?? null]);
-        }
-        return $tmpName;
-    }
+	private $requestFactory;
+	private $responseFactory;
+	private $serverRequestFactory;
+	private $streamFactory;
+	private $uploadedFileFactory;
+	private $uriFactory;
+	public function __construct(?RequestFactoryInterface $requestFactory = null, ?ResponseFactoryInterface $responseFactory = null, ?ServerRequestFactoryInterface $serverRequestFactory = null, ?StreamFactoryInterface $streamFactory = null, ?UploadedFileFactoryInterface $uploadedFileFactory = null, ?UriFactoryInterface $uriFactory = null)
+	{
+		$this->requestFactory = $requestFactory;
+		$this->responseFactory = $responseFactory;
+		$this->serverRequestFactory = $serverRequestFactory;
+		$this->streamFactory = $streamFactory;
+		$this->uploadedFileFactory = $uploadedFileFactory;
+		$this->uriFactory = $uriFactory;
+		$this->setFactory($requestFactory);
+		$this->setFactory($responseFactory);
+		$this->setFactory($serverRequestFactory);
+		$this->setFactory($streamFactory);
+		$this->setFactory($uploadedFileFactory);
+		$this->setFactory($uriFactory);
+	}
+	/**
+	 * @param UriInterface|string $uri
+	 */
+	public function createRequest(string $method, $uri) : RequestInterface
+	{
+		$factory = $this->requestFactory ?? $this->setFactory(Psr17FactoryDiscovery::findRequestFactory());
+		return $factory->createRequest(...\func_get_args());
+	}
+	public function createResponse(int $code = 200, string $reasonPhrase = '') : ResponseInterface
+	{
+		$factory = $this->responseFactory ?? $this->setFactory(Psr17FactoryDiscovery::findResponseFactory());
+		return $factory->createResponse(...\func_get_args());
+	}
+	/**
+	 * @param UriInterface|string $uri
+	 */
+	public function createServerRequest(string $method, $uri, array $serverParams = []) : ServerRequestInterface
+	{
+		$factory = $this->serverRequestFactory ?? $this->setFactory(Psr17FactoryDiscovery::findServerRequestFactory());
+		return $factory->createServerRequest(...\func_get_args());
+	}
+	public function createServerRequestFromGlobals(?array $server = null, ?array $get = null, ?array $post = null, ?array $cookie = null, ?array $files = null, ?StreamInterface $body = null) : ServerRequestInterface
+	{
+		$server = $server ?? $_SERVER;
+		$request = $this->createServerRequest($server['REQUEST_METHOD'] ?? 'GET', $this->createUriFromGlobals($server), $server);
+		return $this->buildServerRequestFromGlobals($request, $server, $files ?? $_FILES)->withQueryParams($get ?? $_GET)->withParsedBody($post ?? $_POST)->withCookieParams($cookie ?? $_COOKIE)->withBody($body ?? $this->createStreamFromFile('php://input', 'r+'));
+	}
+	public function createStream(string $content = '') : StreamInterface
+	{
+		$factory = $this->streamFactory ?? $this->setFactory(Psr17FactoryDiscovery::findStreamFactory());
+		return $factory->createStream($content);
+	}
+	public function createStreamFromFile(string $filename, string $mode = 'r') : StreamInterface
+	{
+		$factory = $this->streamFactory ?? $this->setFactory(Psr17FactoryDiscovery::findStreamFactory());
+		return $factory->createStreamFromFile($filename, $mode);
+	}
+	/**
+	 * @param resource $resource
+	 */
+	public function createStreamFromResource($resource) : StreamInterface
+	{
+		$factory = $this->streamFactory ?? $this->setFactory(Psr17FactoryDiscovery::findStreamFactory());
+		return $factory->createStreamFromResource($resource);
+	}
+	public function createUploadedFile(StreamInterface $stream, ?int $size = null, int $error = \UPLOAD_ERR_OK, ?string $clientFilename = null, ?string $clientMediaType = null) : UploadedFileInterface
+	{
+		$factory = $this->uploadedFileFactory ?? $this->setFactory(Psr17FactoryDiscovery::findUploadedFileFactory());
+		return $factory->createUploadedFile(...\func_get_args());
+	}
+	public function createUri(string $uri = '') : UriInterface
+	{
+		$factory = $this->uriFactory ?? $this->setFactory(Psr17FactoryDiscovery::findUriFactory());
+		return $factory->createUri(...\func_get_args());
+	}
+	public function createUriFromGlobals(?array $server = null) : UriInterface
+	{
+		return $this->buildUriFromGlobals($this->createUri(''), $server ?? $_SERVER);
+	}
+	private function setFactory($factory)
+	{
+		if (!$this->requestFactory && $factory instanceof RequestFactoryInterface) {
+			$this->requestFactory = $factory;
+		}
+		if (!$this->responseFactory && $factory instanceof ResponseFactoryInterface) {
+			$this->responseFactory = $factory;
+		}
+		if (!$this->serverRequestFactory && $factory instanceof ServerRequestFactoryInterface) {
+			$this->serverRequestFactory = $factory;
+		}
+		if (!$this->streamFactory && $factory instanceof StreamFactoryInterface) {
+			$this->streamFactory = $factory;
+		}
+		if (!$this->uploadedFileFactory && $factory instanceof UploadedFileFactoryInterface) {
+			$this->uploadedFileFactory = $factory;
+		}
+		if (!$this->uriFactory && $factory instanceof UriFactoryInterface) {
+			$this->uriFactory = $factory;
+		}
+		return $factory;
+	}
+	private function buildServerRequestFromGlobals(ServerRequestInterface $request, array $server, array $files) : ServerRequestInterface
+	{
+		$request = $request->withProtocolVersion(isset($server['SERVER_PROTOCOL']) ? \str_replace('HTTP/', '', $server['SERVER_PROTOCOL']) : '1.1')->withUploadedFiles($this->normalizeFiles($files));
+		$headers = [];
+		foreach ($server as $k => $v) {
+			if (0 === \strpos($k, 'HTTP_')) {
+				$k = \substr($k, 5);
+			} elseif (!\in_array($k, ['CONTENT_TYPE', 'CONTENT_LENGTH', 'CONTENT_MD5'], \true)) {
+				continue;
+			}
+			$k = \str_replace(' ', '-', \ucwords(\strtolower(\str_replace('_', ' ', $k))));
+			$headers[$k] = $v;
+		}
+		if (!isset($headers['Authorization'])) {
+			if (isset($_SERVER['REDIRECT_HTTP_AUTHORIZATION'])) {
+				$headers['Authorization'] = $_SERVER['REDIRECT_HTTP_AUTHORIZATION'];
+			} elseif (isset($_SERVER['PHP_AUTH_USER'])) {
+				$headers['Authorization'] = 'Basic ' . \base64_encode($_SERVER['PHP_AUTH_USER'] . ':' . ($_SERVER['PHP_AUTH_PW'] ?? ''));
+			} elseif (isset($_SERVER['PHP_AUTH_DIGEST'])) {
+				$headers['Authorization'] = $_SERVER['PHP_AUTH_DIGEST'];
+			}
+		}
+		foreach ($headers as $k => $v) {
+			try {
+				$request = $request->withHeader($k, $v);
+			} catch (\InvalidArgumentException $e) {
+				// ignore invalid headers
+			}
+		}
+		return $request;
+	}
+	private function buildUriFromGlobals(UriInterface $uri, array $server) : UriInterface
+	{
+		$uri = $uri->withScheme(!empty($server['HTTPS']) && 'off' !== \strtolower($server['HTTPS']) ? 'https' : 'http');
+		$hasPort = \false;
+		if (isset($server['HTTP_HOST'])) {
+			$parts = \parse_url('http://' . $server['HTTP_HOST']);
+			$uri = $uri->withHost($parts['host'] ?? 'localhost');
+			if ($parts['port'] ?? \false) {
+				$hasPort = \true;
+				$uri = $uri->withPort($parts['port']);
+			}
+		} else {
+			$uri = $uri->withHost($server['SERVER_NAME'] ?? $server['SERVER_ADDR'] ?? 'localhost');
+		}
+		if (!$hasPort && isset($server['SERVER_PORT'])) {
+			$uri = $uri->withPort($server['SERVER_PORT']);
+		}
+		$hasQuery = \false;
+		if (isset($server['REQUEST_URI'])) {
+			$requestUriParts = \explode('?', $server['REQUEST_URI'], 2);
+			$uri = $uri->withPath($requestUriParts[0]);
+			if (isset($requestUriParts[1])) {
+				$hasQuery = \true;
+				$uri = $uri->withQuery($requestUriParts[1]);
+			}
+		}
+		if (!$hasQuery && isset($server['QUERY_STRING'])) {
+			$uri = $uri->withQuery($server['QUERY_STRING']);
+		}
+		return $uri;
+	}
+	private function normalizeFiles(array $files) : array
+	{
+		foreach ($files as $k => $v) {
+			if ($v instanceof UploadedFileInterface) {
+				continue;
+			}
+			if (!\is_array($v)) {
+				unset($files[$k]);
+			} elseif (!isset($v['tmp_name'])) {
+				$files[$k] = $this->normalizeFiles($v);
+			} else {
+				$files[$k] = $this->createUploadedFileFromSpec($v);
+			}
+		}
+		return $files;
+	}
+	/**
+	 * Create and return an UploadedFile instance from a $_FILES specification.
+	 *
+	 * @param array $value $_FILES struct
+	 *
+	 * @return UploadedFileInterface|UploadedFileInterface[]
+	 */
+	private function createUploadedFileFromSpec(array $value)
+	{
+		if (!\is_array($tmpName = $value['tmp_name'])) {
+			$file = \is_file($tmpName) ? $this->createStreamFromFile($tmpName, 'r') : $this->createStream();
+			return $this->createUploadedFile($file, $value['size'], $value['error'], $value['name'], $value['type']);
+		}
+		foreach ($tmpName as $k => $v) {
+			$tmpName[$k] = $this->createUploadedFileFromSpec(['tmp_name' => $v, 'size' => $value['size'][$k] ?? null, 'error' => $value['error'][$k] ?? null, 'name' => $value['name'][$k] ?? null, 'type' => $value['type'][$k] ?? null]);
+		}
+		return $tmpName;
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -159,7 +159,7 @@ 
             if (isset($_SERVER['REDIRECT_HTTP_AUTHORIZATION'])) {
                 $headers['Authorization'] = $_SERVER['REDIRECT_HTTP_AUTHORIZATION'];
             } elseif (isset($_SERVER['PHP_AUTH_USER'])) {
-                $headers['Authorization'] = 'Basic ' . \base64_encode($_SERVER['PHP_AUTH_USER'] . ':' . ($_SERVER['PHP_AUTH_PW'] ?? ''));
+                $headers['Authorization'] = 'Basic '.\base64_encode($_SERVER['PHP_AUTH_USER'].':'.($_SERVER['PHP_AUTH_PW'] ?? ''));
             } elseif (isset($_SERVER['PHP_AUTH_DIGEST'])) {
                 $headers['Authorization'] = $_SERVER['PHP_AUTH_DIGEST'];
             }
@@ -178,7 +178,7 @@ 
         $uri = $uri->withScheme(!empty($server['HTTPS']) && 'off' !== \strtolower($server['HTTPS']) ? 'https' : 'http');
         $hasPort = \false;
         if (isset($server['HTTP_HOST'])) {
-            $parts = \parse_url('http://' . $server['HTTP_HOST']);
+            $parts = \parse_url('http://'.$server['HTTP_HOST']);
             $uri = $uri->withHost($parts['host'] ?? 'localhost');
             if ($parts['port'] ?? \false) {
                 $hasPort = \true;

lib/Vendor/Http/Discovery/Exception/DiscoveryFailedException.php

Indentation +32 added lines, -32 removed lines

@@ -10,36 +10,36 @@
  */
 final class DiscoveryFailedException extends \Exception implements Exception
 {
-    /**
-     * @var \Exception[]
-     */
-    private $exceptions;
-    /**
-     * @param string       $message
-     * @param \Exception[] $exceptions
-     */
-    public function __construct($message, array $exceptions = [])
-    {
-        $this->exceptions = $exceptions;
-        parent::__construct($message);
-    }
-    /**
-     * @param \Exception[] $exceptions
-     */
-    public static function create($exceptions)
-    {
-        $message = 'Could not find resource using any discovery strategy. Find more information at http://docs.php-http.org/en/latest/discovery.html#common-errors';
-        foreach ($exceptions as $e) {
-            $message .= "\n - " . $e->getMessage();
-        }
-        $message .= "\n\n";
-        return new self($message, $exceptions);
-    }
-    /**
-     * @return \Exception[]
-     */
-    public function getExceptions()
-    {
-        return $this->exceptions;
-    }
+	/**
+	 * @var \Exception[]
+	 */
+	private $exceptions;
+	/**
+	 * @param string       $message
+	 * @param \Exception[] $exceptions
+	 */
+	public function __construct($message, array $exceptions = [])
+	{
+		$this->exceptions = $exceptions;
+		parent::__construct($message);
+	}
+	/**
+	 * @param \Exception[] $exceptions
+	 */
+	public static function create($exceptions)
+	{
+		$message = 'Could not find resource using any discovery strategy. Find more information at http://docs.php-http.org/en/latest/discovery.html#common-errors';
+		foreach ($exceptions as $e) {
+			$message .= "\n - " . $e->getMessage();
+		}
+		$message .= "\n\n";
+		return new self($message, $exceptions);
+	}
+	/**
+	 * @return \Exception[]
+	 */
+	public function getExceptions()
+	{
+		return $this->exceptions;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
     {
         $message = 'Could not find resource using any discovery strategy. Find more information at http://docs.php-http.org/en/latest/discovery.html#common-errors';
         foreach ($exceptions as $e) {
-            $message .= "\n - " . $e->getMessage();
+            $message .= "\n - ".$e->getMessage();
         }
         $message .= "\n\n";
         return new self($message, $exceptions);

lib/Vendor/Http/Discovery/Exception/NoCandidateFoundException.php

Indentation +21 added lines, -21 removed lines

@@ -10,25 +10,25 @@
  */
 final class NoCandidateFoundException extends \Exception implements Exception
 {
-    /**
-     * @param string $strategy
-     */
-    public function __construct($strategy, array $candidates)
-    {
-        $classes = \array_map(function ($a) {
-            return $a['class'];
-        }, $candidates);
-        $message = \sprintf('No valid candidate found using strategy "%s". We tested the following candidates: %s.', $strategy, \implode(', ', \array_map([$this, 'stringify'], $classes)));
-        parent::__construct($message);
-    }
-    private function stringify($mixed)
-    {
-        if (\is_string($mixed)) {
-            return $mixed;
-        }
-        if (\is_array($mixed) && 2 === \count($mixed)) {
-            return \sprintf('%s::%s', $this->stringify($mixed[0]), $mixed[1]);
-        }
-        return \is_object($mixed) ? \get_class($mixed) : \gettype($mixed);
-    }
+	/**
+	 * @param string $strategy
+	 */
+	public function __construct($strategy, array $candidates)
+	{
+		$classes = \array_map(function ($a) {
+			return $a['class'];
+		}, $candidates);
+		$message = \sprintf('No valid candidate found using strategy "%s". We tested the following candidates: %s.', $strategy, \implode(', ', \array_map([$this, 'stringify'], $classes)));
+		parent::__construct($message);
+	}
+	private function stringify($mixed)
+	{
+		if (\is_string($mixed)) {
+			return $mixed;
+		}
+		if (\is_array($mixed) && 2 === \count($mixed)) {
+			return \sprintf('%s::%s', $this->stringify($mixed[0]), $mixed[1]);
+		}
+		return \is_object($mixed) ? \get_class($mixed) : \gettype($mixed);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
      */
     public function __construct($strategy, array $candidates)
     {
-        $classes = \array_map(function ($a) {
+        $classes = \array_map(function($a) {
             return $a['class'];
         }, $candidates);
         $message = \sprintf('No valid candidate found using strategy "%s". We tested the following candidates: %s.', $strategy, \implode(', ', \array_map([$this, 'stringify'], $classes)));

lib/Vendor/Http/Discovery/Psr17FactoryDiscovery.php

Indentation +99 added lines, -99 removed lines

@@ -17,103 +17,103 @@
  */
 final class Psr17FactoryDiscovery extends ClassDiscovery
 {
-    private static function createException($type, Exception $e)
-    {
-        return new RealNotFoundException('No PSR-17 ' . $type . ' found. Install a package from this list: https://packagist.org/providers/psr/http-factory-implementation', 0, $e);
-    }
-    /**
-     * @return RequestFactoryInterface
-     *
-     * @throws RealNotFoundException
-     */
-    public static function findRequestFactory()
-    {
-        try {
-            $messageFactory = static::findOneByType(RequestFactoryInterface::class);
-        } catch (DiscoveryFailedException $e) {
-            throw self::createException('request factory', $e);
-        }
-        return static::instantiateClass($messageFactory);
-    }
-    /**
-     * @return ResponseFactoryInterface
-     *
-     * @throws RealNotFoundException
-     */
-    public static function findResponseFactory()
-    {
-        try {
-            $messageFactory = static::findOneByType(ResponseFactoryInterface::class);
-        } catch (DiscoveryFailedException $e) {
-            throw self::createException('response factory', $e);
-        }
-        return static::instantiateClass($messageFactory);
-    }
-    /**
-     * @return ServerRequestFactoryInterface
-     *
-     * @throws RealNotFoundException
-     */
-    public static function findServerRequestFactory()
-    {
-        try {
-            $messageFactory = static::findOneByType(ServerRequestFactoryInterface::class);
-        } catch (DiscoveryFailedException $e) {
-            throw self::createException('server request factory', $e);
-        }
-        return static::instantiateClass($messageFactory);
-    }
-    /**
-     * @return StreamFactoryInterface
-     *
-     * @throws RealNotFoundException
-     */
-    public static function findStreamFactory()
-    {
-        try {
-            $messageFactory = static::findOneByType(StreamFactoryInterface::class);
-        } catch (DiscoveryFailedException $e) {
-            throw self::createException('stream factory', $e);
-        }
-        return static::instantiateClass($messageFactory);
-    }
-    /**
-     * @return UploadedFileFactoryInterface
-     *
-     * @throws RealNotFoundException
-     */
-    public static function findUploadedFileFactory()
-    {
-        try {
-            $messageFactory = static::findOneByType(UploadedFileFactoryInterface::class);
-        } catch (DiscoveryFailedException $e) {
-            throw self::createException('uploaded file factory', $e);
-        }
-        return static::instantiateClass($messageFactory);
-    }
-    /**
-     * @return UriFactoryInterface
-     *
-     * @throws RealNotFoundException
-     */
-    public static function findUriFactory()
-    {
-        try {
-            $messageFactory = static::findOneByType(UriFactoryInterface::class);
-        } catch (DiscoveryFailedException $e) {
-            throw self::createException('url factory', $e);
-        }
-        return static::instantiateClass($messageFactory);
-    }
-    /**
-     * @return UriFactoryInterface
-     *
-     * @throws RealNotFoundException
-     *
-     * @deprecated This will be removed in 2.0. Consider using the findUriFactory() method.
-     */
-    public static function findUrlFactory()
-    {
-        return static::findUriFactory();
-    }
+	private static function createException($type, Exception $e)
+	{
+		return new RealNotFoundException('No PSR-17 ' . $type . ' found. Install a package from this list: https://packagist.org/providers/psr/http-factory-implementation', 0, $e);
+	}
+	/**
+	 * @return RequestFactoryInterface
+	 *
+	 * @throws RealNotFoundException
+	 */
+	public static function findRequestFactory()
+	{
+		try {
+			$messageFactory = static::findOneByType(RequestFactoryInterface::class);
+		} catch (DiscoveryFailedException $e) {
+			throw self::createException('request factory', $e);
+		}
+		return static::instantiateClass($messageFactory);
+	}
+	/**
+	 * @return ResponseFactoryInterface
+	 *
+	 * @throws RealNotFoundException
+	 */
+	public static function findResponseFactory()
+	{
+		try {
+			$messageFactory = static::findOneByType(ResponseFactoryInterface::class);
+		} catch (DiscoveryFailedException $e) {
+			throw self::createException('response factory', $e);
+		}
+		return static::instantiateClass($messageFactory);
+	}
+	/**
+	 * @return ServerRequestFactoryInterface
+	 *
+	 * @throws RealNotFoundException
+	 */
+	public static function findServerRequestFactory()
+	{
+		try {
+			$messageFactory = static::findOneByType(ServerRequestFactoryInterface::class);
+		} catch (DiscoveryFailedException $e) {
+			throw self::createException('server request factory', $e);
+		}
+		return static::instantiateClass($messageFactory);
+	}
+	/**
+	 * @return StreamFactoryInterface
+	 *
+	 * @throws RealNotFoundException
+	 */
+	public static function findStreamFactory()
+	{
+		try {
+			$messageFactory = static::findOneByType(StreamFactoryInterface::class);
+		} catch (DiscoveryFailedException $e) {
+			throw self::createException('stream factory', $e);
+		}
+		return static::instantiateClass($messageFactory);
+	}
+	/**
+	 * @return UploadedFileFactoryInterface
+	 *
+	 * @throws RealNotFoundException
+	 */
+	public static function findUploadedFileFactory()
+	{
+		try {
+			$messageFactory = static::findOneByType(UploadedFileFactoryInterface::class);
+		} catch (DiscoveryFailedException $e) {
+			throw self::createException('uploaded file factory', $e);
+		}
+		return static::instantiateClass($messageFactory);
+	}
+	/**
+	 * @return UriFactoryInterface
+	 *
+	 * @throws RealNotFoundException
+	 */
+	public static function findUriFactory()
+	{
+		try {
+			$messageFactory = static::findOneByType(UriFactoryInterface::class);
+		} catch (DiscoveryFailedException $e) {
+			throw self::createException('url factory', $e);
+		}
+		return static::instantiateClass($messageFactory);
+	}
+	/**
+	 * @return UriFactoryInterface
+	 *
+	 * @throws RealNotFoundException
+	 *
+	 * @deprecated This will be removed in 2.0. Consider using the findUriFactory() method.
+	 */
+	public static function findUrlFactory()
+	{
+		return static::findUriFactory();
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
 {
     private static function createException($type, Exception $e)
     {
-        return new RealNotFoundException('No PSR-17 ' . $type . ' found. Install a package from this list: https://packagist.org/providers/psr/http-factory-implementation', 0, $e);
+        return new RealNotFoundException('No PSR-17 '.$type.' found. Install a package from this list: https://packagist.org/providers/psr/http-factory-implementation', 0, $e);
     }
     /**
      * @return RequestFactoryInterface

Braces +1 added lines, -2 removed lines

@@ -15,8 +15,7 @@
  *
  * @author Tobias Nyholm <tobias.nyholm@gmail.com>
  */
-final class Psr17FactoryDiscovery extends ClassDiscovery
-{
+final class Psr17FactoryDiscovery extends ClassDiscovery {
     private static function createException($type, Exception $e)
     {
         return new RealNotFoundException('No PSR-17 ' . $type . ' found. Install a package from this list: https://packagist.org/providers/psr/http-factory-implementation', 0, $e);

lib/Vendor/Http/Discovery/NotFoundException.php

Braces +1 added lines, -2 removed lines

@@ -10,6 +10,5 @@
  *
  * @deprecated since since version 1.0, and will be removed in 2.0. Use {@link \Http\Discovery\Exception\NotFoundException} instead.
  */
-final class NotFoundException extends RealNotFoundException
-{
+final class NotFoundException extends RealNotFoundException {
 }

lib/Vendor/Http/Discovery/Psr18Client.php

Braces +1 added lines, -2 removed lines

@@ -19,8 +19,7 @@
  *
  * @author Nicolas Grekas <p@tchwork.com>
  */
-class Psr18Client extends Psr17Factory implements ClientInterface
-{
+class Psr18Client extends Psr17Factory implements ClientInterface {
     private $client;
     public function __construct(?ClientInterface $client = null, ?RequestFactoryInterface $requestFactory = null, ?ResponseFactoryInterface $responseFactory = null, ?ServerRequestFactoryInterface $serverRequestFactory = null, ?StreamFactoryInterface $streamFactory = null, ?UploadedFileFactoryInterface $uploadedFileFactory = null, ?UriFactoryInterface $uriFactory = null)
     {

Indentation +16 added lines, -16 removed lines

@@ -21,20 +21,20 @@
  */
 class Psr18Client extends Psr17Factory implements ClientInterface
 {
-    private $client;
-    public function __construct(?ClientInterface $client = null, ?RequestFactoryInterface $requestFactory = null, ?ResponseFactoryInterface $responseFactory = null, ?ServerRequestFactoryInterface $serverRequestFactory = null, ?StreamFactoryInterface $streamFactory = null, ?UploadedFileFactoryInterface $uploadedFileFactory = null, ?UriFactoryInterface $uriFactory = null)
-    {
-        $requestFactory ?? ($requestFactory = $client instanceof RequestFactoryInterface ? $client : null);
-        $responseFactory ?? ($responseFactory = $client instanceof ResponseFactoryInterface ? $client : null);
-        $serverRequestFactory ?? ($serverRequestFactory = $client instanceof ServerRequestFactoryInterface ? $client : null);
-        $streamFactory ?? ($streamFactory = $client instanceof StreamFactoryInterface ? $client : null);
-        $uploadedFileFactory ?? ($uploadedFileFactory = $client instanceof UploadedFileFactoryInterface ? $client : null);
-        $uriFactory ?? ($uriFactory = $client instanceof UriFactoryInterface ? $client : null);
-        parent::__construct($requestFactory, $responseFactory, $serverRequestFactory, $streamFactory, $uploadedFileFactory, $uriFactory);
-        $this->client = $client ?? Psr18ClientDiscovery::find();
-    }
-    public function sendRequest(RequestInterface $request) : ResponseInterface
-    {
-        return $this->client->sendRequest($request);
-    }
+	private $client;
+	public function __construct(?ClientInterface $client = null, ?RequestFactoryInterface $requestFactory = null, ?ResponseFactoryInterface $responseFactory = null, ?ServerRequestFactoryInterface $serverRequestFactory = null, ?StreamFactoryInterface $streamFactory = null, ?UploadedFileFactoryInterface $uploadedFileFactory = null, ?UriFactoryInterface $uriFactory = null)
+	{
+		$requestFactory ?? ($requestFactory = $client instanceof RequestFactoryInterface ? $client : null);
+		$responseFactory ?? ($responseFactory = $client instanceof ResponseFactoryInterface ? $client : null);
+		$serverRequestFactory ?? ($serverRequestFactory = $client instanceof ServerRequestFactoryInterface ? $client : null);
+		$streamFactory ?? ($streamFactory = $client instanceof StreamFactoryInterface ? $client : null);
+		$uploadedFileFactory ?? ($uploadedFileFactory = $client instanceof UploadedFileFactoryInterface ? $client : null);
+		$uriFactory ?? ($uriFactory = $client instanceof UriFactoryInterface ? $client : null);
+		parent::__construct($requestFactory, $responseFactory, $serverRequestFactory, $streamFactory, $uploadedFileFactory, $uriFactory);
+		$this->client = $client ?? Psr18ClientDiscovery::find();
+	}
+	public function sendRequest(RequestInterface $request) : ResponseInterface
+	{
+		return $this->client->sendRequest($request);
+	}
 }

lib/Vendor/Http/Discovery/Strategy/MockClientStrategy.php

Indentation +7 added lines, -7 removed lines

@@ -12,11 +12,11 @@
  */
 final class MockClientStrategy implements DiscoveryStrategy
 {
-    public static function getCandidates($type)
-    {
-        if (\is_a(HttpClient::class, $type, \true) || \is_a(HttpAsyncClient::class, $type, \true)) {
-            return [['class' => Mock::class, 'condition' => Mock::class]];
-        }
-        return [];
-    }
+	public static function getCandidates($type)
+	{
+		if (\is_a(HttpClient::class, $type, \true) || \is_a(HttpAsyncClient::class, $type, \true)) {
+			return [['class' => Mock::class, 'condition' => Mock::class]];
+		}
+		return [];
+	}
 }

Braces +1 added lines, -2 removed lines

@@ -10,8 +10,7 @@
  *
  * @author Sam Rapaport <me@samrapdev.com>
  */
-final class MockClientStrategy implements DiscoveryStrategy
-{
+final class MockClientStrategy implements DiscoveryStrategy {
     public static function getCandidates($type)
     {
         if (\is_a(HttpClient::class, $type, \true) || \is_a(HttpAsyncClient::class, $type, \true)) {