nextcloud / fulltextsearch_elasticsearch

lib/Vendor/GuzzleHttp/RedirectMiddleware.php

Indentation +141 added lines, -141 removed lines

@@ -18,145 +18,145 @@
  */
 class RedirectMiddleware
 {
-    public const HISTORY_HEADER = 'X-Guzzle-Redirect-History';
-    public const STATUS_HISTORY_HEADER = 'X-Guzzle-Redirect-Status-History';
-    /**
-     * @var array
-     */
-    public static $defaultSettings = ['max' => 5, 'protocols' => ['http', 'https'], 'strict' => \false, 'referer' => \false, 'track_redirects' => \false];
-    /**
-     * @var callable(RequestInterface, array): PromiseInterface
-     */
-    private $nextHandler;
-    /**
-     * @param callable(RequestInterface, array): PromiseInterface $nextHandler Next handler to invoke.
-     */
-    public function __construct(callable $nextHandler)
-    {
-        $this->nextHandler = $nextHandler;
-    }
-    public function __invoke(RequestInterface $request, array $options) : PromiseInterface
-    {
-        $fn = $this->nextHandler;
-        if (empty($options['allow_redirects'])) {
-            return $fn($request, $options);
-        }
-        if ($options['allow_redirects'] === \true) {
-            $options['allow_redirects'] = self::$defaultSettings;
-        } elseif (!\is_array($options['allow_redirects'])) {
-            throw new \InvalidArgumentException('allow_redirects must be true, false, or array');
-        } else {
-            // Merge the default settings with the provided settings
-            $options['allow_redirects'] += self::$defaultSettings;
-        }
-        if (empty($options['allow_redirects']['max'])) {
-            return $fn($request, $options);
-        }
-        return $fn($request, $options)->then(function (ResponseInterface $response) use($request, $options) {
-            return $this->checkRedirect($request, $options, $response);
-        });
-    }
-    /**
-     * @return ResponseInterface|PromiseInterface
-     */
-    public function checkRedirect(RequestInterface $request, array $options, ResponseInterface $response)
-    {
-        if (\strpos((string) $response->getStatusCode(), '3') !== 0 || !$response->hasHeader('Location')) {
-            return $response;
-        }
-        $this->guardMax($request, $response, $options);
-        $nextRequest = $this->modifyRequest($request, $options, $response);
-        // If authorization is handled by curl, unset it if URI is cross-origin.
-        if (Psr7\UriComparator::isCrossOrigin($request->getUri(), $nextRequest->getUri()) && \defined('\\CURLOPT_HTTPAUTH')) {
-            unset($options['curl'][\CURLOPT_HTTPAUTH], $options['curl'][\CURLOPT_USERPWD]);
-        }
-        if (isset($options['allow_redirects']['on_redirect'])) {
-            $options['allow_redirects']['on_redirect']($request, $response, $nextRequest->getUri());
-        }
-        $promise = $this($nextRequest, $options);
-        // Add headers to be able to track history of redirects.
-        if (!empty($options['allow_redirects']['track_redirects'])) {
-            return $this->withTracking($promise, (string) $nextRequest->getUri(), $response->getStatusCode());
-        }
-        return $promise;
-    }
-    /**
-     * Enable tracking on promise.
-     */
-    private function withTracking(PromiseInterface $promise, string $uri, int $statusCode) : PromiseInterface
-    {
-        return $promise->then(static function (ResponseInterface $response) use($uri, $statusCode) {
-            // Note that we are pushing to the front of the list as this
-            // would be an earlier response than what is currently present
-            // in the history header.
-            $historyHeader = $response->getHeader(self::HISTORY_HEADER);
-            $statusHeader = $response->getHeader(self::STATUS_HISTORY_HEADER);
-            \array_unshift($historyHeader, $uri);
-            \array_unshift($statusHeader, (string) $statusCode);
-            return $response->withHeader(self::HISTORY_HEADER, $historyHeader)->withHeader(self::STATUS_HISTORY_HEADER, $statusHeader);
-        });
-    }
-    /**
-     * Check for too many redirects.
-     *
-     * @throws TooManyRedirectsException Too many redirects.
-     */
-    private function guardMax(RequestInterface $request, ResponseInterface $response, array &$options) : void
-    {
-        $current = $options['__redirect_count'] ?? 0;
-        $options['__redirect_count'] = $current + 1;
-        $max = $options['allow_redirects']['max'];
-        if ($options['__redirect_count'] > $max) {
-            throw new TooManyRedirectsException("Will not follow more than {$max} redirects", $request, $response);
-        }
-    }
-    public function modifyRequest(RequestInterface $request, array $options, ResponseInterface $response) : RequestInterface
-    {
-        // Request modifications to apply.
-        $modify = [];
-        $protocols = $options['allow_redirects']['protocols'];
-        // Use a GET request if this is an entity enclosing request and we are
-        // not forcing RFC compliance, but rather emulating what all browsers
-        // would do.
-        $statusCode = $response->getStatusCode();
-        if ($statusCode == 303 || $statusCode <= 302 && !$options['allow_redirects']['strict']) {
-            $safeMethods = ['GET', 'HEAD', 'OPTIONS'];
-            $requestMethod = $request->getMethod();
-            $modify['method'] = \in_array($requestMethod, $safeMethods) ? $requestMethod : 'GET';
-            $modify['body'] = '';
-        }
-        $uri = self::redirectUri($request, $response, $protocols);
-        if (isset($options['idn_conversion']) && $options['idn_conversion'] !== \false) {
-            $idnOptions = $options['idn_conversion'] === \true ? \IDNA_DEFAULT : $options['idn_conversion'];
-            $uri = Utils::idnUriConvert($uri, $idnOptions);
-        }
-        $modify['uri'] = $uri;
-        Psr7\Message::rewindBody($request);
-        // Add the Referer header if it is told to do so and only
-        // add the header if we are not redirecting from https to http.
-        if ($options['allow_redirects']['referer'] && $modify['uri']->getScheme() === $request->getUri()->getScheme()) {
-            $uri = $request->getUri()->withUserInfo('');
-            $modify['set_headers']['Referer'] = (string) $uri;
-        } else {
-            $modify['remove_headers'][] = 'Referer';
-        }
-        // Remove Authorization and Cookie headers if URI is cross-origin.
-        if (Psr7\UriComparator::isCrossOrigin($request->getUri(), $modify['uri'])) {
-            $modify['remove_headers'][] = 'Authorization';
-            $modify['remove_headers'][] = 'Cookie';
-        }
-        return Psr7\Utils::modifyRequest($request, $modify);
-    }
-    /**
-     * Set the appropriate URL on the request based on the location header.
-     */
-    private static function redirectUri(RequestInterface $request, ResponseInterface $response, array $protocols) : UriInterface
-    {
-        $location = Psr7\UriResolver::resolve($request->getUri(), new Psr7\Uri($response->getHeaderLine('Location')));
-        // Ensure that the redirect URI is allowed based on the protocols.
-        if (!\in_array($location->getScheme(), $protocols)) {
-            throw new BadResponseException(\sprintf('Redirect URI, %s, does not use one of the allowed redirect protocols: %s', $location, \implode(', ', $protocols)), $request, $response);
-        }
-        return $location;
-    }
+	public const HISTORY_HEADER = 'X-Guzzle-Redirect-History';
+	public const STATUS_HISTORY_HEADER = 'X-Guzzle-Redirect-Status-History';
+	/**
+	 * @var array
+	 */
+	public static $defaultSettings = ['max' => 5, 'protocols' => ['http', 'https'], 'strict' => \false, 'referer' => \false, 'track_redirects' => \false];
+	/**
+	 * @var callable(RequestInterface, array): PromiseInterface
+	 */
+	private $nextHandler;
+	/**
+	 * @param callable(RequestInterface, array): PromiseInterface $nextHandler Next handler to invoke.
+	 */
+	public function __construct(callable $nextHandler)
+	{
+		$this->nextHandler = $nextHandler;
+	}
+	public function __invoke(RequestInterface $request, array $options) : PromiseInterface
+	{
+		$fn = $this->nextHandler;
+		if (empty($options['allow_redirects'])) {
+			return $fn($request, $options);
+		}
+		if ($options['allow_redirects'] === \true) {
+			$options['allow_redirects'] = self::$defaultSettings;
+		} elseif (!\is_array($options['allow_redirects'])) {
+			throw new \InvalidArgumentException('allow_redirects must be true, false, or array');
+		} else {
+			// Merge the default settings with the provided settings
+			$options['allow_redirects'] += self::$defaultSettings;
+		}
+		if (empty($options['allow_redirects']['max'])) {
+			return $fn($request, $options);
+		}
+		return $fn($request, $options)->then(function (ResponseInterface $response) use($request, $options) {
+			return $this->checkRedirect($request, $options, $response);
+		});
+	}
+	/**
+	 * @return ResponseInterface|PromiseInterface
+	 */
+	public function checkRedirect(RequestInterface $request, array $options, ResponseInterface $response)
+	{
+		if (\strpos((string) $response->getStatusCode(), '3') !== 0 || !$response->hasHeader('Location')) {
+			return $response;
+		}
+		$this->guardMax($request, $response, $options);
+		$nextRequest = $this->modifyRequest($request, $options, $response);
+		// If authorization is handled by curl, unset it if URI is cross-origin.
+		if (Psr7\UriComparator::isCrossOrigin($request->getUri(), $nextRequest->getUri()) && \defined('\\CURLOPT_HTTPAUTH')) {
+			unset($options['curl'][\CURLOPT_HTTPAUTH], $options['curl'][\CURLOPT_USERPWD]);
+		}
+		if (isset($options['allow_redirects']['on_redirect'])) {
+			$options['allow_redirects']['on_redirect']($request, $response, $nextRequest->getUri());
+		}
+		$promise = $this($nextRequest, $options);
+		// Add headers to be able to track history of redirects.
+		if (!empty($options['allow_redirects']['track_redirects'])) {
+			return $this->withTracking($promise, (string) $nextRequest->getUri(), $response->getStatusCode());
+		}
+		return $promise;
+	}
+	/**
+	 * Enable tracking on promise.
+	 */
+	private function withTracking(PromiseInterface $promise, string $uri, int $statusCode) : PromiseInterface
+	{
+		return $promise->then(static function (ResponseInterface $response) use($uri, $statusCode) {
+			// Note that we are pushing to the front of the list as this
+			// would be an earlier response than what is currently present
+			// in the history header.
+			$historyHeader = $response->getHeader(self::HISTORY_HEADER);
+			$statusHeader = $response->getHeader(self::STATUS_HISTORY_HEADER);
+			\array_unshift($historyHeader, $uri);
+			\array_unshift($statusHeader, (string) $statusCode);
+			return $response->withHeader(self::HISTORY_HEADER, $historyHeader)->withHeader(self::STATUS_HISTORY_HEADER, $statusHeader);
+		});
+	}
+	/**
+	 * Check for too many redirects.
+	 *
+	 * @throws TooManyRedirectsException Too many redirects.
+	 */
+	private function guardMax(RequestInterface $request, ResponseInterface $response, array &$options) : void
+	{
+		$current = $options['__redirect_count'] ?? 0;
+		$options['__redirect_count'] = $current + 1;
+		$max = $options['allow_redirects']['max'];
+		if ($options['__redirect_count'] > $max) {
+			throw new TooManyRedirectsException("Will not follow more than {$max} redirects", $request, $response);
+		}
+	}
+	public function modifyRequest(RequestInterface $request, array $options, ResponseInterface $response) : RequestInterface
+	{
+		// Request modifications to apply.
+		$modify = [];
+		$protocols = $options['allow_redirects']['protocols'];
+		// Use a GET request if this is an entity enclosing request and we are
+		// not forcing RFC compliance, but rather emulating what all browsers
+		// would do.
+		$statusCode = $response->getStatusCode();
+		if ($statusCode == 303 || $statusCode <= 302 && !$options['allow_redirects']['strict']) {
+			$safeMethods = ['GET', 'HEAD', 'OPTIONS'];
+			$requestMethod = $request->getMethod();
+			$modify['method'] = \in_array($requestMethod, $safeMethods) ? $requestMethod : 'GET';
+			$modify['body'] = '';
+		}
+		$uri = self::redirectUri($request, $response, $protocols);
+		if (isset($options['idn_conversion']) && $options['idn_conversion'] !== \false) {
+			$idnOptions = $options['idn_conversion'] === \true ? \IDNA_DEFAULT : $options['idn_conversion'];
+			$uri = Utils::idnUriConvert($uri, $idnOptions);
+		}
+		$modify['uri'] = $uri;
+		Psr7\Message::rewindBody($request);
+		// Add the Referer header if it is told to do so and only
+		// add the header if we are not redirecting from https to http.
+		if ($options['allow_redirects']['referer'] && $modify['uri']->getScheme() === $request->getUri()->getScheme()) {
+			$uri = $request->getUri()->withUserInfo('');
+			$modify['set_headers']['Referer'] = (string) $uri;
+		} else {
+			$modify['remove_headers'][] = 'Referer';
+		}
+		// Remove Authorization and Cookie headers if URI is cross-origin.
+		if (Psr7\UriComparator::isCrossOrigin($request->getUri(), $modify['uri'])) {
+			$modify['remove_headers'][] = 'Authorization';
+			$modify['remove_headers'][] = 'Cookie';
+		}
+		return Psr7\Utils::modifyRequest($request, $modify);
+	}
+	/**
+	 * Set the appropriate URL on the request based on the location header.
+	 */
+	private static function redirectUri(RequestInterface $request, ResponseInterface $response, array $protocols) : UriInterface
+	{
+		$location = Psr7\UriResolver::resolve($request->getUri(), new Psr7\Uri($response->getHeaderLine('Location')));
+		// Ensure that the redirect URI is allowed based on the protocols.
+		if (!\in_array($location->getScheme(), $protocols)) {
+			throw new BadResponseException(\sprintf('Redirect URI, %s, does not use one of the allowed redirect protocols: %s', $location, \implode(', ', $protocols)), $request, $response);
+		}
+		return $location;
+	}
 }

Spacing +6 added lines, -6 removed lines

@@ -52,7 +52,7 @@ 
         if (empty($options['allow_redirects']['max'])) {
             return $fn($request, $options);
         }
-        return $fn($request, $options)->then(function (ResponseInterface $response) use($request, $options) {
+        return $fn($request, $options)->then(function(ResponseInterface $response) use($request, $options) {
             return $this->checkRedirect($request, $options, $response);
         });
     }
@@ -61,7 +61,7 @@ 
      */
     public function checkRedirect(RequestInterface $request, array $options, ResponseInterface $response)
     {
-        if (\strpos((string) $response->getStatusCode(), '3') !== 0 || !$response->hasHeader('Location')) {
+        if (\strpos((string)$response->getStatusCode(), '3') !== 0 || !$response->hasHeader('Location')) {
             return $response;
         }
         $this->guardMax($request, $response, $options);
@@ -76,7 +76,7 @@ 
         $promise = $this($nextRequest, $options);
         // Add headers to be able to track history of redirects.
         if (!empty($options['allow_redirects']['track_redirects'])) {
-            return $this->withTracking($promise, (string) $nextRequest->getUri(), $response->getStatusCode());
+            return $this->withTracking($promise, (string)$nextRequest->getUri(), $response->getStatusCode());
         }
         return $promise;
     }
@@ -85,14 +85,14 @@ 
      */
     private function withTracking(PromiseInterface $promise, string $uri, int $statusCode) : PromiseInterface
     {
-        return $promise->then(static function (ResponseInterface $response) use($uri, $statusCode) {
+        return $promise->then(static function(ResponseInterface $response) use($uri, $statusCode) {
             // Note that we are pushing to the front of the list as this
             // would be an earlier response than what is currently present
             // in the history header.
             $historyHeader = $response->getHeader(self::HISTORY_HEADER);
             $statusHeader = $response->getHeader(self::STATUS_HISTORY_HEADER);
             \array_unshift($historyHeader, $uri);
-            \array_unshift($statusHeader, (string) $statusCode);
+            \array_unshift($statusHeader, (string)$statusCode);
             return $response->withHeader(self::HISTORY_HEADER, $historyHeader)->withHeader(self::STATUS_HISTORY_HEADER, $statusHeader);
         });
     }
@@ -136,7 +136,7 @@ 
         // add the header if we are not redirecting from https to http.
         if ($options['allow_redirects']['referer'] && $modify['uri']->getScheme() === $request->getUri()->getScheme()) {
             $uri = $request->getUri()->withUserInfo('');
-            $modify['set_headers']['Referer'] = (string) $uri;
+            $modify['set_headers']['Referer'] = (string)$uri;
         } else {
             $modify['remove_headers'][] = 'Referer';
         }

Braces +1 added lines, -2 removed lines

@@ -16,8 +16,7 @@
  *
  * @final
  */
-class RedirectMiddleware
-{
+class RedirectMiddleware {
     public const HISTORY_HEADER = 'X-Guzzle-Redirect-History';
     public const STATUS_HISTORY_HEADER = 'X-Guzzle-Redirect-Status-History';
     /**

lib/Vendor/GuzzleHttp/Client.php

Indentation +384 added lines, -384 removed lines

@@ -15,388 +15,388 @@
  */
 class Client implements ClientInterface, \OCA\FullTextSearch_Elasticsearch\Vendor\Psr\Http\Client\ClientInterface
 {
-    use ClientTrait;
-    /**
-     * @var array Default request options
-     */
-    private $config;
-    /**
-     * Clients accept an array of constructor parameters.
-     *
-     * Here's an example of creating a client using a base_uri and an array of
-     * default request options to apply to each request:
-     *
-     *     $client = new Client([
-     *         'base_uri'        => 'http://www.foo.com/1.0/',
-     *         'timeout'         => 0,
-     *         'allow_redirects' => false,
-     *         'proxy'           => '192.168.16.1:10'
-     *     ]);
-     *
-     * Client configuration settings include the following options:
-     *
-     * - handler: (callable) Function that transfers HTTP requests over the
-     *   wire. The function is called with a Psr7\Http\Message\RequestInterface
-     *   and array of transfer options, and must return a
-     *   GuzzleHttp\Promise\PromiseInterface that is fulfilled with a
-     *   Psr7\Http\Message\ResponseInterface on success.
-     *   If no handler is provided, a default handler will be created
-     *   that enables all of the request options below by attaching all of the
-     *   default middleware to the handler.
-     * - base_uri: (string|UriInterface) Base URI of the client that is merged
-     *   into relative URIs. Can be a string or instance of UriInterface.
-     * - **: any request option
-     *
-     * @param array $config Client configuration settings.
-     *
-     * @see \GuzzleHttp\RequestOptions for a list of available request options.
-     */
-    public function __construct(array $config = [])
-    {
-        if (!isset($config['handler'])) {
-            $config['handler'] = HandlerStack::create();
-        } elseif (!\is_callable($config['handler'])) {
-            throw new InvalidArgumentException('handler must be a callable');
-        }
-        // Convert the base_uri to a UriInterface
-        if (isset($config['base_uri'])) {
-            $config['base_uri'] = Psr7\Utils::uriFor($config['base_uri']);
-        }
-        $this->configureDefaults($config);
-    }
-    /**
-     * @param string $method
-     * @param array  $args
-     *
-     * @return PromiseInterface|ResponseInterface
-     *
-     * @deprecated Client::__call will be removed in guzzlehttp/guzzle:8.0.
-     */
-    public function __call($method, $args)
-    {
-        if (\count($args) < 1) {
-            throw new InvalidArgumentException('Magic request methods require a URI and optional options array');
-        }
-        $uri = $args[0];
-        $opts = $args[1] ?? [];
-        return \substr($method, -5) === 'Async' ? $this->requestAsync(\substr($method, 0, -5), $uri, $opts) : $this->request($method, $uri, $opts);
-    }
-    /**
-     * Asynchronously send an HTTP request.
-     *
-     * @param array $options Request options to apply to the given
-     *                       request and to the transfer. See \GuzzleHttp\RequestOptions.
-     */
-    public function sendAsync(RequestInterface $request, array $options = []) : PromiseInterface
-    {
-        // Merge the base URI into the request URI if needed.
-        $options = $this->prepareDefaults($options);
-        return $this->transfer($request->withUri($this->buildUri($request->getUri(), $options), $request->hasHeader('Host')), $options);
-    }
-    /**
-     * Send an HTTP request.
-     *
-     * @param array $options Request options to apply to the given
-     *                       request and to the transfer. See \GuzzleHttp\RequestOptions.
-     *
-     * @throws GuzzleException
-     */
-    public function send(RequestInterface $request, array $options = []) : ResponseInterface
-    {
-        $options[RequestOptions::SYNCHRONOUS] = \true;
-        return $this->sendAsync($request, $options)->wait();
-    }
-    /**
-     * The HttpClient PSR (PSR-18) specify this method.
-     *
-     * {@inheritDoc}
-     */
-    public function sendRequest(RequestInterface $request) : ResponseInterface
-    {
-        $options[RequestOptions::SYNCHRONOUS] = \true;
-        $options[RequestOptions::ALLOW_REDIRECTS] = \false;
-        $options[RequestOptions::HTTP_ERRORS] = \false;
-        return $this->sendAsync($request, $options)->wait();
-    }
-    /**
-     * Create and send an asynchronous HTTP request.
-     *
-     * Use an absolute path to override the base path of the client, or a
-     * relative path to append to the base path of the client. The URL can
-     * contain the query string as well. Use an array to provide a URL
-     * template and additional variables to use in the URL template expansion.
-     *
-     * @param string              $method  HTTP method
-     * @param string|UriInterface $uri     URI object or string.
-     * @param array               $options Request options to apply. See \GuzzleHttp\RequestOptions.
-     */
-    public function requestAsync(string $method, $uri = '', array $options = []) : PromiseInterface
-    {
-        $options = $this->prepareDefaults($options);
-        // Remove request modifying parameter because it can be done up-front.
-        $headers = $options['headers'] ?? [];
-        $body = $options['body'] ?? null;
-        $version = $options['version'] ?? '1.1';
-        // Merge the URI into the base URI.
-        $uri = $this->buildUri(Psr7\Utils::uriFor($uri), $options);
-        if (\is_array($body)) {
-            throw $this->invalidBody();
-        }
-        $request = new Psr7\Request($method, $uri, $headers, $body, $version);
-        // Remove the option so that they are not doubly-applied.
-        unset($options['headers'], $options['body'], $options['version']);
-        return $this->transfer($request, $options);
-    }
-    /**
-     * Create and send an HTTP request.
-     *
-     * Use an absolute path to override the base path of the client, or a
-     * relative path to append to the base path of the client. The URL can
-     * contain the query string as well.
-     *
-     * @param string              $method  HTTP method.
-     * @param string|UriInterface $uri     URI object or string.
-     * @param array               $options Request options to apply. See \GuzzleHttp\RequestOptions.
-     *
-     * @throws GuzzleException
-     */
-    public function request(string $method, $uri = '', array $options = []) : ResponseInterface
-    {
-        $options[RequestOptions::SYNCHRONOUS] = \true;
-        return $this->requestAsync($method, $uri, $options)->wait();
-    }
-    /**
-     * Get a client configuration option.
-     *
-     * These options include default request options of the client, a "handler"
-     * (if utilized by the concrete client), and a "base_uri" if utilized by
-     * the concrete client.
-     *
-     * @param string|null $option The config option to retrieve.
-     *
-     * @return mixed
-     *
-     * @deprecated Client::getConfig will be removed in guzzlehttp/guzzle:8.0.
-     */
-    public function getConfig(string $option = null)
-    {
-        return $option === null ? $this->config : $this->config[$option] ?? null;
-    }
-    private function buildUri(UriInterface $uri, array $config) : UriInterface
-    {
-        if (isset($config['base_uri'])) {
-            $uri = Psr7\UriResolver::resolve(Psr7\Utils::uriFor($config['base_uri']), $uri);
-        }
-        if (isset($config['idn_conversion']) && $config['idn_conversion'] !== \false) {
-            $idnOptions = $config['idn_conversion'] === \true ? \IDNA_DEFAULT : $config['idn_conversion'];
-            $uri = Utils::idnUriConvert($uri, $idnOptions);
-        }
-        return $uri->getScheme() === '' && $uri->getHost() !== '' ? $uri->withScheme('http') : $uri;
-    }
-    /**
-     * Configures the default options for a client.
-     */
-    private function configureDefaults(array $config) : void
-    {
-        $defaults = ['allow_redirects' => RedirectMiddleware::$defaultSettings, 'http_errors' => \true, 'decode_content' => \true, 'verify' => \true, 'cookies' => \false, 'idn_conversion' => \false];
-        // Use the standard Linux HTTP_PROXY and HTTPS_PROXY if set.
-        // We can only trust the HTTP_PROXY environment variable in a CLI
-        // process due to the fact that PHP has no reliable mechanism to
-        // get environment variables that start with "HTTP_".
-        if (\PHP_SAPI === 'cli' && ($proxy = Utils::getenv('HTTP_PROXY'))) {
-            $defaults['proxy']['http'] = $proxy;
-        }
-        if ($proxy = Utils::getenv('HTTPS_PROXY')) {
-            $defaults['proxy']['https'] = $proxy;
-        }
-        if ($noProxy = Utils::getenv('NO_PROXY')) {
-            $cleanedNoProxy = \str_replace(' ', '', $noProxy);
-            $defaults['proxy']['no'] = \explode(',', $cleanedNoProxy);
-        }
-        $this->config = $config + $defaults;
-        if (!empty($config['cookies']) && $config['cookies'] === \true) {
-            $this->config['cookies'] = new CookieJar();
-        }
-        // Add the default user-agent header.
-        if (!isset($this->config['headers'])) {
-            $this->config['headers'] = ['User-Agent' => Utils::defaultUserAgent()];
-        } else {
-            // Add the User-Agent header if one was not already set.
-            foreach (\array_keys($this->config['headers']) as $name) {
-                if (\strtolower($name) === 'user-agent') {
-                    return;
-                }
-            }
-            $this->config['headers']['User-Agent'] = Utils::defaultUserAgent();
-        }
-    }
-    /**
-     * Merges default options into the array.
-     *
-     * @param array $options Options to modify by reference
-     */
-    private function prepareDefaults(array $options) : array
-    {
-        $defaults = $this->config;
-        if (!empty($defaults['headers'])) {
-            // Default headers are only added if they are not present.
-            $defaults['_conditional'] = $defaults['headers'];
-            unset($defaults['headers']);
-        }
-        // Special handling for headers is required as they are added as
-        // conditional headers and as headers passed to a request ctor.
-        if (\array_key_exists('headers', $options)) {
-            // Allows default headers to be unset.
-            if ($options['headers'] === null) {
-                $defaults['_conditional'] = [];
-                unset($options['headers']);
-            } elseif (!\is_array($options['headers'])) {
-                throw new InvalidArgumentException('headers must be an array');
-            }
-        }
-        // Shallow merge defaults underneath options.
-        $result = $options + $defaults;
-        // Remove null values.
-        foreach ($result as $k => $v) {
-            if ($v === null) {
-                unset($result[$k]);
-            }
-        }
-        return $result;
-    }
-    /**
-     * Transfers the given request and applies request options.
-     *
-     * The URI of the request is not modified and the request options are used
-     * as-is without merging in default options.
-     *
-     * @param array $options See \GuzzleHttp\RequestOptions.
-     */
-    private function transfer(RequestInterface $request, array $options) : PromiseInterface
-    {
-        $request = $this->applyOptions($request, $options);
-        /** @var HandlerStack $handler */
-        $handler = $options['handler'];
-        try {
-            return P\Create::promiseFor($handler($request, $options));
-        } catch (\Exception $e) {
-            return P\Create::rejectionFor($e);
-        }
-    }
-    /**
-     * Applies the array of request options to a request.
-     */
-    private function applyOptions(RequestInterface $request, array &$options) : RequestInterface
-    {
-        $modify = ['set_headers' => []];
-        if (isset($options['headers'])) {
-            if (\array_keys($options['headers']) === \range(0, \count($options['headers']) - 1)) {
-                throw new InvalidArgumentException('The headers array must have header name as keys.');
-            }
-            $modify['set_headers'] = $options['headers'];
-            unset($options['headers']);
-        }
-        if (isset($options['form_params'])) {
-            if (isset($options['multipart'])) {
-                throw new InvalidArgumentException('You cannot use ' . 'form_params and multipart at the same time. Use the ' . 'form_params option if you want to send application/' . 'x-www-form-urlencoded requests, and the multipart ' . 'option to send multipart/form-data requests.');
-            }
-            $options['body'] = \http_build_query($options['form_params'], '', '&');
-            unset($options['form_params']);
-            // Ensure that we don't have the header in different case and set the new value.
-            $options['_conditional'] = Psr7\Utils::caselessRemove(['Content-Type'], $options['_conditional']);
-            $options['_conditional']['Content-Type'] = 'application/x-www-form-urlencoded';
-        }
-        if (isset($options['multipart'])) {
-            $options['body'] = new Psr7\MultipartStream($options['multipart']);
-            unset($options['multipart']);
-        }
-        if (isset($options['json'])) {
-            $options['body'] = Utils::jsonEncode($options['json']);
-            unset($options['json']);
-            // Ensure that we don't have the header in different case and set the new value.
-            $options['_conditional'] = Psr7\Utils::caselessRemove(['Content-Type'], $options['_conditional']);
-            $options['_conditional']['Content-Type'] = 'application/json';
-        }
-        if (!empty($options['decode_content']) && $options['decode_content'] !== \true) {
-            // Ensure that we don't have the header in different case and set the new value.
-            $options['_conditional'] = Psr7\Utils::caselessRemove(['Accept-Encoding'], $options['_conditional']);
-            $modify['set_headers']['Accept-Encoding'] = $options['decode_content'];
-        }
-        if (isset($options['body'])) {
-            if (\is_array($options['body'])) {
-                throw $this->invalidBody();
-            }
-            $modify['body'] = Psr7\Utils::streamFor($options['body']);
-            unset($options['body']);
-        }
-        if (!empty($options['auth']) && \is_array($options['auth'])) {
-            $value = $options['auth'];
-            $type = isset($value[2]) ? \strtolower($value[2]) : 'basic';
-            switch ($type) {
-                case 'basic':
-                    // Ensure that we don't have the header in different case and set the new value.
-                    $modify['set_headers'] = Psr7\Utils::caselessRemove(['Authorization'], $modify['set_headers']);
-                    $modify['set_headers']['Authorization'] = 'Basic ' . \base64_encode("{$value[0]}:{$value[1]}");
-                    break;
-                case 'digest':
-                    // @todo: Do not rely on curl
-                    $options['curl'][\CURLOPT_HTTPAUTH] = \CURLAUTH_DIGEST;
-                    $options['curl'][\CURLOPT_USERPWD] = "{$value[0]}:{$value[1]}";
-                    break;
-                case 'ntlm':
-                    $options['curl'][\CURLOPT_HTTPAUTH] = \CURLAUTH_NTLM;
-                    $options['curl'][\CURLOPT_USERPWD] = "{$value[0]}:{$value[1]}";
-                    break;
-            }
-        }
-        if (isset($options['query'])) {
-            $value = $options['query'];
-            if (\is_array($value)) {
-                $value = \http_build_query($value, '', '&', \PHP_QUERY_RFC3986);
-            }
-            if (!\is_string($value)) {
-                throw new InvalidArgumentException('query must be a string or array');
-            }
-            $modify['query'] = $value;
-            unset($options['query']);
-        }
-        // Ensure that sink is not an invalid value.
-        if (isset($options['sink'])) {
-            // TODO: Add more sink validation?
-            if (\is_bool($options['sink'])) {
-                throw new InvalidArgumentException('sink must not be a boolean');
-            }
-        }
-        if (isset($options['version'])) {
-            $modify['version'] = $options['version'];
-        }
-        $request = Psr7\Utils::modifyRequest($request, $modify);
-        if ($request->getBody() instanceof Psr7\MultipartStream) {
-            // Use a multipart/form-data POST if a Content-Type is not set.
-            // Ensure that we don't have the header in different case and set the new value.
-            $options['_conditional'] = Psr7\Utils::caselessRemove(['Content-Type'], $options['_conditional']);
-            $options['_conditional']['Content-Type'] = 'multipart/form-data; boundary=' . $request->getBody()->getBoundary();
-        }
-        // Merge in conditional headers if they are not present.
-        if (isset($options['_conditional'])) {
-            // Build up the changes so it's in a single clone of the message.
-            $modify = [];
-            foreach ($options['_conditional'] as $k => $v) {
-                if (!$request->hasHeader($k)) {
-                    $modify['set_headers'][$k] = $v;
-                }
-            }
-            $request = Psr7\Utils::modifyRequest($request, $modify);
-            // Don't pass this internal value along to middleware/handlers.
-            unset($options['_conditional']);
-        }
-        return $request;
-    }
-    /**
-     * Return an InvalidArgumentException with pre-set message.
-     */
-    private function invalidBody() : InvalidArgumentException
-    {
-        return new InvalidArgumentException('Passing in the "body" request ' . 'option as an array to send a request is not supported. ' . 'Please use the "form_params" request option to send a ' . 'application/x-www-form-urlencoded request, or the "multipart" ' . 'request option to send a multipart/form-data request.');
-    }
+	use ClientTrait;
+	/**
+	 * @var array Default request options
+	 */
+	private $config;
+	/**
+	 * Clients accept an array of constructor parameters.
+	 *
+	 * Here's an example of creating a client using a base_uri and an array of
+	 * default request options to apply to each request:
+	 *
+	 *     $client = new Client([
+	 *         'base_uri'        => 'http://www.foo.com/1.0/',
+	 *         'timeout'         => 0,
+	 *         'allow_redirects' => false,
+	 *         'proxy'           => '192.168.16.1:10'
+	 *     ]);
+	 *
+	 * Client configuration settings include the following options:
+	 *
+	 * - handler: (callable) Function that transfers HTTP requests over the
+	 *   wire. The function is called with a Psr7\Http\Message\RequestInterface
+	 *   and array of transfer options, and must return a
+	 *   GuzzleHttp\Promise\PromiseInterface that is fulfilled with a
+	 *   Psr7\Http\Message\ResponseInterface on success.
+	 *   If no handler is provided, a default handler will be created
+	 *   that enables all of the request options below by attaching all of the
+	 *   default middleware to the handler.
+	 * - base_uri: (string|UriInterface) Base URI of the client that is merged
+	 *   into relative URIs. Can be a string or instance of UriInterface.
+	 * - **: any request option
+	 *
+	 * @param array $config Client configuration settings.
+	 *
+	 * @see \GuzzleHttp\RequestOptions for a list of available request options.
+	 */
+	public function __construct(array $config = [])
+	{
+		if (!isset($config['handler'])) {
+			$config['handler'] = HandlerStack::create();
+		} elseif (!\is_callable($config['handler'])) {
+			throw new InvalidArgumentException('handler must be a callable');
+		}
+		// Convert the base_uri to a UriInterface
+		if (isset($config['base_uri'])) {
+			$config['base_uri'] = Psr7\Utils::uriFor($config['base_uri']);
+		}
+		$this->configureDefaults($config);
+	}
+	/**
+	 * @param string $method
+	 * @param array  $args
+	 *
+	 * @return PromiseInterface|ResponseInterface
+	 *
+	 * @deprecated Client::__call will be removed in guzzlehttp/guzzle:8.0.
+	 */
+	public function __call($method, $args)
+	{
+		if (\count($args) < 1) {
+			throw new InvalidArgumentException('Magic request methods require a URI and optional options array');
+		}
+		$uri = $args[0];
+		$opts = $args[1] ?? [];
+		return \substr($method, -5) === 'Async' ? $this->requestAsync(\substr($method, 0, -5), $uri, $opts) : $this->request($method, $uri, $opts);
+	}
+	/**
+	 * Asynchronously send an HTTP request.
+	 *
+	 * @param array $options Request options to apply to the given
+	 *                       request and to the transfer. See \GuzzleHttp\RequestOptions.
+	 */
+	public function sendAsync(RequestInterface $request, array $options = []) : PromiseInterface
+	{
+		// Merge the base URI into the request URI if needed.
+		$options = $this->prepareDefaults($options);
+		return $this->transfer($request->withUri($this->buildUri($request->getUri(), $options), $request->hasHeader('Host')), $options);
+	}
+	/**
+	 * Send an HTTP request.
+	 *
+	 * @param array $options Request options to apply to the given
+	 *                       request and to the transfer. See \GuzzleHttp\RequestOptions.
+	 *
+	 * @throws GuzzleException
+	 */
+	public function send(RequestInterface $request, array $options = []) : ResponseInterface
+	{
+		$options[RequestOptions::SYNCHRONOUS] = \true;
+		return $this->sendAsync($request, $options)->wait();
+	}
+	/**
+	 * The HttpClient PSR (PSR-18) specify this method.
+	 *
+	 * {@inheritDoc}
+	 */
+	public function sendRequest(RequestInterface $request) : ResponseInterface
+	{
+		$options[RequestOptions::SYNCHRONOUS] = \true;
+		$options[RequestOptions::ALLOW_REDIRECTS] = \false;
+		$options[RequestOptions::HTTP_ERRORS] = \false;
+		return $this->sendAsync($request, $options)->wait();
+	}
+	/**
+	 * Create and send an asynchronous HTTP request.
+	 *
+	 * Use an absolute path to override the base path of the client, or a
+	 * relative path to append to the base path of the client. The URL can
+	 * contain the query string as well. Use an array to provide a URL
+	 * template and additional variables to use in the URL template expansion.
+	 *
+	 * @param string              $method  HTTP method
+	 * @param string|UriInterface $uri     URI object or string.
+	 * @param array               $options Request options to apply. See \GuzzleHttp\RequestOptions.
+	 */
+	public function requestAsync(string $method, $uri = '', array $options = []) : PromiseInterface
+	{
+		$options = $this->prepareDefaults($options);
+		// Remove request modifying parameter because it can be done up-front.
+		$headers = $options['headers'] ?? [];
+		$body = $options['body'] ?? null;
+		$version = $options['version'] ?? '1.1';
+		// Merge the URI into the base URI.
+		$uri = $this->buildUri(Psr7\Utils::uriFor($uri), $options);
+		if (\is_array($body)) {
+			throw $this->invalidBody();
+		}
+		$request = new Psr7\Request($method, $uri, $headers, $body, $version);
+		// Remove the option so that they are not doubly-applied.
+		unset($options['headers'], $options['body'], $options['version']);
+		return $this->transfer($request, $options);
+	}
+	/**
+	 * Create and send an HTTP request.
+	 *
+	 * Use an absolute path to override the base path of the client, or a
+	 * relative path to append to the base path of the client. The URL can
+	 * contain the query string as well.
+	 *
+	 * @param string              $method  HTTP method.
+	 * @param string|UriInterface $uri     URI object or string.
+	 * @param array               $options Request options to apply. See \GuzzleHttp\RequestOptions.
+	 *
+	 * @throws GuzzleException
+	 */
+	public function request(string $method, $uri = '', array $options = []) : ResponseInterface
+	{
+		$options[RequestOptions::SYNCHRONOUS] = \true;
+		return $this->requestAsync($method, $uri, $options)->wait();
+	}
+	/**
+	 * Get a client configuration option.
+	 *
+	 * These options include default request options of the client, a "handler"
+	 * (if utilized by the concrete client), and a "base_uri" if utilized by
+	 * the concrete client.
+	 *
+	 * @param string|null $option The config option to retrieve.
+	 *
+	 * @return mixed
+	 *
+	 * @deprecated Client::getConfig will be removed in guzzlehttp/guzzle:8.0.
+	 */
+	public function getConfig(string $option = null)
+	{
+		return $option === null ? $this->config : $this->config[$option] ?? null;
+	}
+	private function buildUri(UriInterface $uri, array $config) : UriInterface
+	{
+		if (isset($config['base_uri'])) {
+			$uri = Psr7\UriResolver::resolve(Psr7\Utils::uriFor($config['base_uri']), $uri);
+		}
+		if (isset($config['idn_conversion']) && $config['idn_conversion'] !== \false) {
+			$idnOptions = $config['idn_conversion'] === \true ? \IDNA_DEFAULT : $config['idn_conversion'];
+			$uri = Utils::idnUriConvert($uri, $idnOptions);
+		}
+		return $uri->getScheme() === '' && $uri->getHost() !== '' ? $uri->withScheme('http') : $uri;
+	}
+	/**
+	 * Configures the default options for a client.
+	 */
+	private function configureDefaults(array $config) : void
+	{
+		$defaults = ['allow_redirects' => RedirectMiddleware::$defaultSettings, 'http_errors' => \true, 'decode_content' => \true, 'verify' => \true, 'cookies' => \false, 'idn_conversion' => \false];
+		// Use the standard Linux HTTP_PROXY and HTTPS_PROXY if set.
+		// We can only trust the HTTP_PROXY environment variable in a CLI
+		// process due to the fact that PHP has no reliable mechanism to
+		// get environment variables that start with "HTTP_".
+		if (\PHP_SAPI === 'cli' && ($proxy = Utils::getenv('HTTP_PROXY'))) {
+			$defaults['proxy']['http'] = $proxy;
+		}
+		if ($proxy = Utils::getenv('HTTPS_PROXY')) {
+			$defaults['proxy']['https'] = $proxy;
+		}
+		if ($noProxy = Utils::getenv('NO_PROXY')) {
+			$cleanedNoProxy = \str_replace(' ', '', $noProxy);
+			$defaults['proxy']['no'] = \explode(',', $cleanedNoProxy);
+		}
+		$this->config = $config + $defaults;
+		if (!empty($config['cookies']) && $config['cookies'] === \true) {
+			$this->config['cookies'] = new CookieJar();
+		}
+		// Add the default user-agent header.
+		if (!isset($this->config['headers'])) {
+			$this->config['headers'] = ['User-Agent' => Utils::defaultUserAgent()];
+		} else {
+			// Add the User-Agent header if one was not already set.
+			foreach (\array_keys($this->config['headers']) as $name) {
+				if (\strtolower($name) === 'user-agent') {
+					return;
+				}
+			}
+			$this->config['headers']['User-Agent'] = Utils::defaultUserAgent();
+		}
+	}
+	/**
+	 * Merges default options into the array.
+	 *
+	 * @param array $options Options to modify by reference
+	 */
+	private function prepareDefaults(array $options) : array
+	{
+		$defaults = $this->config;
+		if (!empty($defaults['headers'])) {
+			// Default headers are only added if they are not present.
+			$defaults['_conditional'] = $defaults['headers'];
+			unset($defaults['headers']);
+		}
+		// Special handling for headers is required as they are added as
+		// conditional headers and as headers passed to a request ctor.
+		if (\array_key_exists('headers', $options)) {
+			// Allows default headers to be unset.
+			if ($options['headers'] === null) {
+				$defaults['_conditional'] = [];
+				unset($options['headers']);
+			} elseif (!\is_array($options['headers'])) {
+				throw new InvalidArgumentException('headers must be an array');
+			}
+		}
+		// Shallow merge defaults underneath options.
+		$result = $options + $defaults;
+		// Remove null values.
+		foreach ($result as $k => $v) {
+			if ($v === null) {
+				unset($result[$k]);
+			}
+		}
+		return $result;
+	}
+	/**
+	 * Transfers the given request and applies request options.
+	 *
+	 * The URI of the request is not modified and the request options are used
+	 * as-is without merging in default options.
+	 *
+	 * @param array $options See \GuzzleHttp\RequestOptions.
+	 */
+	private function transfer(RequestInterface $request, array $options) : PromiseInterface
+	{
+		$request = $this->applyOptions($request, $options);
+		/** @var HandlerStack $handler */
+		$handler = $options['handler'];
+		try {
+			return P\Create::promiseFor($handler($request, $options));
+		} catch (\Exception $e) {
+			return P\Create::rejectionFor($e);
+		}
+	}
+	/**
+	 * Applies the array of request options to a request.
+	 */
+	private function applyOptions(RequestInterface $request, array &$options) : RequestInterface
+	{
+		$modify = ['set_headers' => []];
+		if (isset($options['headers'])) {
+			if (\array_keys($options['headers']) === \range(0, \count($options['headers']) - 1)) {
+				throw new InvalidArgumentException('The headers array must have header name as keys.');
+			}
+			$modify['set_headers'] = $options['headers'];
+			unset($options['headers']);
+		}
+		if (isset($options['form_params'])) {
+			if (isset($options['multipart'])) {
+				throw new InvalidArgumentException('You cannot use ' . 'form_params and multipart at the same time. Use the ' . 'form_params option if you want to send application/' . 'x-www-form-urlencoded requests, and the multipart ' . 'option to send multipart/form-data requests.');
+			}
+			$options['body'] = \http_build_query($options['form_params'], '', '&');
+			unset($options['form_params']);
+			// Ensure that we don't have the header in different case and set the new value.
+			$options['_conditional'] = Psr7\Utils::caselessRemove(['Content-Type'], $options['_conditional']);
+			$options['_conditional']['Content-Type'] = 'application/x-www-form-urlencoded';
+		}
+		if (isset($options['multipart'])) {
+			$options['body'] = new Psr7\MultipartStream($options['multipart']);
+			unset($options['multipart']);
+		}
+		if (isset($options['json'])) {
+			$options['body'] = Utils::jsonEncode($options['json']);
+			unset($options['json']);
+			// Ensure that we don't have the header in different case and set the new value.
+			$options['_conditional'] = Psr7\Utils::caselessRemove(['Content-Type'], $options['_conditional']);
+			$options['_conditional']['Content-Type'] = 'application/json';
+		}
+		if (!empty($options['decode_content']) && $options['decode_content'] !== \true) {
+			// Ensure that we don't have the header in different case and set the new value.
+			$options['_conditional'] = Psr7\Utils::caselessRemove(['Accept-Encoding'], $options['_conditional']);
+			$modify['set_headers']['Accept-Encoding'] = $options['decode_content'];
+		}
+		if (isset($options['body'])) {
+			if (\is_array($options['body'])) {
+				throw $this->invalidBody();
+			}
+			$modify['body'] = Psr7\Utils::streamFor($options['body']);
+			unset($options['body']);
+		}
+		if (!empty($options['auth']) && \is_array($options['auth'])) {
+			$value = $options['auth'];
+			$type = isset($value[2]) ? \strtolower($value[2]) : 'basic';
+			switch ($type) {
+				case 'basic':
+					// Ensure that we don't have the header in different case and set the new value.
+					$modify['set_headers'] = Psr7\Utils::caselessRemove(['Authorization'], $modify['set_headers']);
+					$modify['set_headers']['Authorization'] = 'Basic ' . \base64_encode("{$value[0]}:{$value[1]}");
+					break;
+				case 'digest':
+					// @todo: Do not rely on curl
+					$options['curl'][\CURLOPT_HTTPAUTH] = \CURLAUTH_DIGEST;
+					$options['curl'][\CURLOPT_USERPWD] = "{$value[0]}:{$value[1]}";
+					break;
+				case 'ntlm':
+					$options['curl'][\CURLOPT_HTTPAUTH] = \CURLAUTH_NTLM;
+					$options['curl'][\CURLOPT_USERPWD] = "{$value[0]}:{$value[1]}";
+					break;
+			}
+		}
+		if (isset($options['query'])) {
+			$value = $options['query'];
+			if (\is_array($value)) {
+				$value = \http_build_query($value, '', '&', \PHP_QUERY_RFC3986);
+			}
+			if (!\is_string($value)) {
+				throw new InvalidArgumentException('query must be a string or array');
+			}
+			$modify['query'] = $value;
+			unset($options['query']);
+		}
+		// Ensure that sink is not an invalid value.
+		if (isset($options['sink'])) {
+			// TODO: Add more sink validation?
+			if (\is_bool($options['sink'])) {
+				throw new InvalidArgumentException('sink must not be a boolean');
+			}
+		}
+		if (isset($options['version'])) {
+			$modify['version'] = $options['version'];
+		}
+		$request = Psr7\Utils::modifyRequest($request, $modify);
+		if ($request->getBody() instanceof Psr7\MultipartStream) {
+			// Use a multipart/form-data POST if a Content-Type is not set.
+			// Ensure that we don't have the header in different case and set the new value.
+			$options['_conditional'] = Psr7\Utils::caselessRemove(['Content-Type'], $options['_conditional']);
+			$options['_conditional']['Content-Type'] = 'multipart/form-data; boundary=' . $request->getBody()->getBoundary();
+		}
+		// Merge in conditional headers if they are not present.
+		if (isset($options['_conditional'])) {
+			// Build up the changes so it's in a single clone of the message.
+			$modify = [];
+			foreach ($options['_conditional'] as $k => $v) {
+				if (!$request->hasHeader($k)) {
+					$modify['set_headers'][$k] = $v;
+				}
+			}
+			$request = Psr7\Utils::modifyRequest($request, $modify);
+			// Don't pass this internal value along to middleware/handlers.
+			unset($options['_conditional']);
+		}
+		return $request;
+	}
+	/**
+	 * Return an InvalidArgumentException with pre-set message.
+	 */
+	private function invalidBody() : InvalidArgumentException
+	{
+		return new InvalidArgumentException('Passing in the "body" request ' . 'option as an array to send a request is not supported. ' . 'Please use the "form_params" request option to send a ' . 'application/x-www-form-urlencoded request, or the "multipart" ' . 'request option to send a multipart/form-data request.');
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -298,7 +298,7 @@ 
         }
         if (isset($options['form_params'])) {
             if (isset($options['multipart'])) {
-                throw new InvalidArgumentException('You cannot use ' . 'form_params and multipart at the same time. Use the ' . 'form_params option if you want to send application/' . 'x-www-form-urlencoded requests, and the multipart ' . 'option to send multipart/form-data requests.');
+                throw new InvalidArgumentException('You cannot use '.'form_params and multipart at the same time. Use the '.'form_params option if you want to send application/'.'x-www-form-urlencoded requests, and the multipart '.'option to send multipart/form-data requests.');
             }
             $options['body'] = \http_build_query($options['form_params'], '', '&');
             unset($options['form_params']);
@@ -336,7 +336,7 @@ 
                 case 'basic':
                     // Ensure that we don't have the header in different case and set the new value.
                     $modify['set_headers'] = Psr7\Utils::caselessRemove(['Authorization'], $modify['set_headers']);
-                    $modify['set_headers']['Authorization'] = 'Basic ' . \base64_encode("{$value[0]}:{$value[1]}");
+                    $modify['set_headers']['Authorization'] = 'Basic '.\base64_encode("{$value[0]}:{$value[1]}");
                     break;
                 case 'digest':
                     // @todo: Do not rely on curl
@@ -375,7 +375,7 @@ 
             // Use a multipart/form-data POST if a Content-Type is not set.
             // Ensure that we don't have the header in different case and set the new value.
             $options['_conditional'] = Psr7\Utils::caselessRemove(['Content-Type'], $options['_conditional']);
-            $options['_conditional']['Content-Type'] = 'multipart/form-data; boundary=' . $request->getBody()->getBoundary();
+            $options['_conditional']['Content-Type'] = 'multipart/form-data; boundary='.$request->getBody()->getBoundary();
         }
         // Merge in conditional headers if they are not present.
         if (isset($options['_conditional'])) {
@@ -397,6 +397,6 @@ 
      */
     private function invalidBody() : InvalidArgumentException
     {
-        return new InvalidArgumentException('Passing in the "body" request ' . 'option as an array to send a request is not supported. ' . 'Please use the "form_params" request option to send a ' . 'application/x-www-form-urlencoded request, or the "multipart" ' . 'request option to send a multipart/form-data request.');
+        return new InvalidArgumentException('Passing in the "body" request '.'option as an array to send a request is not supported. '.'Please use the "form_params" request option to send a '.'application/x-www-form-urlencoded request, or the "multipart" '.'request option to send a multipart/form-data request.');
     }
 }

lib/Vendor/GuzzleHttp/BodySummarizerInterface.php

Indentation +4 added lines, -4 removed lines

@@ -5,8 +5,8 @@
 use OCA\FullTextSearch_Elasticsearch\Vendor\Psr\Http\Message\MessageInterface;
 interface BodySummarizerInterface
 {
-    /**
-     * Returns a summarized message body.
-     */
-    public function summarize(MessageInterface $message) : ?string;
+	/**
+	 * Returns a summarized message body.
+	 */
+	public function summarize(MessageInterface $message) : ?string;
 }

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;
-interface BodySummarizerInterface
-{
+interface BodySummarizerInterface {
     /**
      * Returns a summarized message body.
      */

lib/Vendor/GuzzleHttp/Psr7/Header.php

Indentation +109 added lines, -109 removed lines

@@ -5,113 +5,113 @@
 
 final class Header
 {
-    /**
-     * Parse an array of header values containing ";" separated data into an
-     * array of associative arrays representing the header key value pair data
-     * of the header. When a parameter does not contain a value, but just
-     * contains a key, this function will inject a key with a '' string value.
-     *
-     * @param string|array $header Header to parse into components.
-     */
-    public static function parse($header) : array
-    {
-        static $trimmed = "\"'  \n\t\r";
-        $params = $matches = [];
-        foreach ((array) $header as $value) {
-            foreach (self::splitList($value) as $val) {
-                $part = [];
-                foreach (\preg_split('/;(?=([^"]*"[^"]*")*[^"]*$)/', $val) ?: [] as $kvp) {
-                    if (\preg_match_all('/<[^>]+>|[^=]+/', $kvp, $matches)) {
-                        $m = $matches[0];
-                        if (isset($m[1])) {
-                            $part[\trim($m[0], $trimmed)] = \trim($m[1], $trimmed);
-                        } else {
-                            $part[] = \trim($m[0], $trimmed);
-                        }
-                    }
-                }
-                if ($part) {
-                    $params[] = $part;
-                }
-            }
-        }
-        return $params;
-    }
-    /**
-     * Converts an array of header values that may contain comma separated
-     * headers into an array of headers with no comma separated values.
-     *
-     * @param string|array $header Header to normalize.
-     *
-     * @deprecated Use self::splitList() instead.
-     */
-    public static function normalize($header) : array
-    {
-        $result = [];
-        foreach ((array) $header as $value) {
-            foreach (self::splitList($value) as $parsed) {
-                $result[] = $parsed;
-            }
-        }
-        return $result;
-    }
-    /**
-     * Splits a HTTP header defined to contain a comma-separated list into
-     * each individual value. Empty values will be removed.
-     *
-     * Example headers include 'accept', 'cache-control' and 'if-none-match'.
-     *
-     * This method must not be used to parse headers that are not defined as
-     * a list, such as 'user-agent' or 'set-cookie'.
-     *
-     * @param string|string[] $values Header value as returned by MessageInterface::getHeader()
-     *
-     * @return string[]
-     */
-    public static function splitList($values) : array
-    {
-        if (!\is_array($values)) {
-            $values = [$values];
-        }
-        $result = [];
-        foreach ($values as $value) {
-            if (!\is_string($value)) {
-                throw new \TypeError('$header must either be a string or an array containing strings.');
-            }
-            $v = '';
-            $isQuoted = \false;
-            $isEscaped = \false;
-            for ($i = 0, $max = \strlen($value); $i < $max; ++$i) {
-                if ($isEscaped) {
-                    $v .= $value[$i];
-                    $isEscaped = \false;
-                    continue;
-                }
-                if (!$isQuoted && $value[$i] === ',') {
-                    $v = \trim($v);
-                    if ($v !== '') {
-                        $result[] = $v;
-                    }
-                    $v = '';
-                    continue;
-                }
-                if ($isQuoted && $value[$i] === '\\') {
-                    $isEscaped = \true;
-                    $v .= $value[$i];
-                    continue;
-                }
-                if ($value[$i] === '"') {
-                    $isQuoted = !$isQuoted;
-                    $v .= $value[$i];
-                    continue;
-                }
-                $v .= $value[$i];
-            }
-            $v = \trim($v);
-            if ($v !== '') {
-                $result[] = $v;
-            }
-        }
-        return $result;
-    }
+	/**
+	 * Parse an array of header values containing ";" separated data into an
+	 * array of associative arrays representing the header key value pair data
+	 * of the header. When a parameter does not contain a value, but just
+	 * contains a key, this function will inject a key with a '' string value.
+	 *
+	 * @param string|array $header Header to parse into components.
+	 */
+	public static function parse($header) : array
+	{
+		static $trimmed = "\"'  \n\t\r";
+		$params = $matches = [];
+		foreach ((array) $header as $value) {
+			foreach (self::splitList($value) as $val) {
+				$part = [];
+				foreach (\preg_split('/;(?=([^"]*"[^"]*")*[^"]*$)/', $val) ?: [] as $kvp) {
+					if (\preg_match_all('/<[^>]+>|[^=]+/', $kvp, $matches)) {
+						$m = $matches[0];
+						if (isset($m[1])) {
+							$part[\trim($m[0], $trimmed)] = \trim($m[1], $trimmed);
+						} else {
+							$part[] = \trim($m[0], $trimmed);
+						}
+					}
+				}
+				if ($part) {
+					$params[] = $part;
+				}
+			}
+		}
+		return $params;
+	}
+	/**
+	 * Converts an array of header values that may contain comma separated
+	 * headers into an array of headers with no comma separated values.
+	 *
+	 * @param string|array $header Header to normalize.
+	 *
+	 * @deprecated Use self::splitList() instead.
+	 */
+	public static function normalize($header) : array
+	{
+		$result = [];
+		foreach ((array) $header as $value) {
+			foreach (self::splitList($value) as $parsed) {
+				$result[] = $parsed;
+			}
+		}
+		return $result;
+	}
+	/**
+	 * Splits a HTTP header defined to contain a comma-separated list into
+	 * each individual value. Empty values will be removed.
+	 *
+	 * Example headers include 'accept', 'cache-control' and 'if-none-match'.
+	 *
+	 * This method must not be used to parse headers that are not defined as
+	 * a list, such as 'user-agent' or 'set-cookie'.
+	 *
+	 * @param string|string[] $values Header value as returned by MessageInterface::getHeader()
+	 *
+	 * @return string[]
+	 */
+	public static function splitList($values) : array
+	{
+		if (!\is_array($values)) {
+			$values = [$values];
+		}
+		$result = [];
+		foreach ($values as $value) {
+			if (!\is_string($value)) {
+				throw new \TypeError('$header must either be a string or an array containing strings.');
+			}
+			$v = '';
+			$isQuoted = \false;
+			$isEscaped = \false;
+			for ($i = 0, $max = \strlen($value); $i < $max; ++$i) {
+				if ($isEscaped) {
+					$v .= $value[$i];
+					$isEscaped = \false;
+					continue;
+				}
+				if (!$isQuoted && $value[$i] === ',') {
+					$v = \trim($v);
+					if ($v !== '') {
+						$result[] = $v;
+					}
+					$v = '';
+					continue;
+				}
+				if ($isQuoted && $value[$i] === '\\') {
+					$isEscaped = \true;
+					$v .= $value[$i];
+					continue;
+				}
+				if ($value[$i] === '"') {
+					$isQuoted = !$isQuoted;
+					$v .= $value[$i];
+					continue;
+				}
+				$v .= $value[$i];
+			}
+			$v = \trim($v);
+			if ($v !== '') {
+				$result[] = $v;
+			}
+		}
+		return $result;
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare (strict_types=1);
+declare(strict_types=1);
 namespace OCA\FullTextSearch_Elasticsearch\Vendor\GuzzleHttp\Psr7;
 
 final class Header
@@ -17,7 +17,7 @@ 
     {
         static $trimmed = "\"'  \n\t\r";
         $params = $matches = [];
-        foreach ((array) $header as $value) {
+        foreach ((array)$header as $value) {
             foreach (self::splitList($value) as $val) {
                 $part = [];
                 foreach (\preg_split('/;(?=([^"]*"[^"]*")*[^"]*$)/', $val) ?: [] as $kvp) {
@@ -48,7 +48,7 @@ 
     public static function normalize($header) : array
     {
         $result = [];
-        foreach ((array) $header as $value) {
+        foreach ((array)$header as $value) {
             foreach (self::splitList($value) as $parsed) {
                 $result[] = $parsed;
             }

Braces +1 added lines, -2 removed lines

@@ -3,8 +3,7 @@
 declare (strict_types=1);
 namespace OCA\FullTextSearch_Elasticsearch\Vendor\GuzzleHttp\Psr7;
 
-final class Header
-{
+final class Header {
     /**
      * Parse an array of header values containing ";" separated data into an
      * array of associative arrays representing the header key value pair data

lib/Vendor/GuzzleHttp/Psr7/HttpFactory.php

Indentation +50 added lines, -50 removed lines

@@ -23,54 +23,54 @@
  */
 final class HttpFactory implements RequestFactoryInterface, ResponseFactoryInterface, ServerRequestFactoryInterface, StreamFactoryInterface, UploadedFileFactoryInterface, UriFactoryInterface
 {
-    public function createUploadedFile(StreamInterface $stream, int $size = null, int $error = \UPLOAD_ERR_OK, string $clientFilename = null, string $clientMediaType = null) : UploadedFileInterface
-    {
-        if ($size === null) {
-            $size = $stream->getSize();
-        }
-        return new UploadedFile($stream, $size, $error, $clientFilename, $clientMediaType);
-    }
-    public function createStream(string $content = '') : StreamInterface
-    {
-        return Utils::streamFor($content);
-    }
-    public function createStreamFromFile(string $file, string $mode = 'r') : StreamInterface
-    {
-        try {
-            $resource = Utils::tryFopen($file, $mode);
-        } catch (\RuntimeException $e) {
-            if ('' === $mode || \false === \in_array($mode[0], ['r', 'w', 'a', 'x', 'c'], \true)) {
-                throw new \InvalidArgumentException(\sprintf('Invalid file opening mode "%s"', $mode), 0, $e);
-            }
-            throw $e;
-        }
-        return Utils::streamFor($resource);
-    }
-    public function createStreamFromResource($resource) : StreamInterface
-    {
-        return Utils::streamFor($resource);
-    }
-    public function createServerRequest(string $method, $uri, array $serverParams = []) : ServerRequestInterface
-    {
-        if (empty($method)) {
-            if (!empty($serverParams['REQUEST_METHOD'])) {
-                $method = $serverParams['REQUEST_METHOD'];
-            } else {
-                throw new \InvalidArgumentException('Cannot determine HTTP method');
-            }
-        }
-        return new ServerRequest($method, $uri, [], null, '1.1', $serverParams);
-    }
-    public function createResponse(int $code = 200, string $reasonPhrase = '') : ResponseInterface
-    {
-        return new Response($code, [], null, '1.1', $reasonPhrase);
-    }
-    public function createRequest(string $method, $uri) : RequestInterface
-    {
-        return new Request($method, $uri);
-    }
-    public function createUri(string $uri = '') : UriInterface
-    {
-        return new Uri($uri);
-    }
+	public function createUploadedFile(StreamInterface $stream, int $size = null, int $error = \UPLOAD_ERR_OK, string $clientFilename = null, string $clientMediaType = null) : UploadedFileInterface
+	{
+		if ($size === null) {
+			$size = $stream->getSize();
+		}
+		return new UploadedFile($stream, $size, $error, $clientFilename, $clientMediaType);
+	}
+	public function createStream(string $content = '') : StreamInterface
+	{
+		return Utils::streamFor($content);
+	}
+	public function createStreamFromFile(string $file, string $mode = 'r') : StreamInterface
+	{
+		try {
+			$resource = Utils::tryFopen($file, $mode);
+		} catch (\RuntimeException $e) {
+			if ('' === $mode || \false === \in_array($mode[0], ['r', 'w', 'a', 'x', 'c'], \true)) {
+				throw new \InvalidArgumentException(\sprintf('Invalid file opening mode "%s"', $mode), 0, $e);
+			}
+			throw $e;
+		}
+		return Utils::streamFor($resource);
+	}
+	public function createStreamFromResource($resource) : StreamInterface
+	{
+		return Utils::streamFor($resource);
+	}
+	public function createServerRequest(string $method, $uri, array $serverParams = []) : ServerRequestInterface
+	{
+		if (empty($method)) {
+			if (!empty($serverParams['REQUEST_METHOD'])) {
+				$method = $serverParams['REQUEST_METHOD'];
+			} else {
+				throw new \InvalidArgumentException('Cannot determine HTTP method');
+			}
+		}
+		return new ServerRequest($method, $uri, [], null, '1.1', $serverParams);
+	}
+	public function createResponse(int $code = 200, string $reasonPhrase = '') : ResponseInterface
+	{
+		return new Response($code, [], null, '1.1', $reasonPhrase);
+	}
+	public function createRequest(string $method, $uri) : RequestInterface
+	{
+		return new Request($method, $uri);
+	}
+	public function createUri(string $uri = '') : UriInterface
+	{
+		return new Uri($uri);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-declare (strict_types=1);
+declare(strict_types=1);
 namespace OCA\FullTextSearch_Elasticsearch\Vendor\GuzzleHttp\Psr7;
 
 use OCA\FullTextSearch_Elasticsearch\Vendor\Psr\Http\Message\RequestFactoryInterface;

lib/Vendor/GuzzleHttp/Psr7/PumpStream.php

Indentation +130 added lines, -130 removed lines

@@ -16,134 +16,134 @@
  */
 final class PumpStream implements StreamInterface
 {
-    /** @var callable(int): (string|false|null)|null */
-    private $source;
-    /** @var int|null */
-    private $size;
-    /** @var int */
-    private $tellPos = 0;
-    /** @var array */
-    private $metadata;
-    /** @var BufferStream */
-    private $buffer;
-    /**
-     * @param callable(int): (string|false|null)  $source  Source of the stream data. The callable MAY
-     *                                                     accept an integer argument used to control the
-     *                                                     amount of data to return. The callable MUST
-     *                                                     return a string when called, or false|null on error
-     *                                                     or EOF.
-     * @param array{size?: int, metadata?: array} $options Stream options:
-     *                                                     - metadata: Hash of metadata to use with stream.
-     *                                                     - size: Size of the stream, if known.
-     */
-    public function __construct(callable $source, array $options = [])
-    {
-        $this->source = $source;
-        $this->size = $options['size'] ?? null;
-        $this->metadata = $options['metadata'] ?? [];
-        $this->buffer = new BufferStream();
-    }
-    public function __toString() : string
-    {
-        try {
-            return Utils::copyToString($this);
-        } catch (\Throwable $e) {
-            if (\PHP_VERSION_ID >= 70400) {
-                throw $e;
-            }
-            \trigger_error(\sprintf('%s::__toString exception: %s', self::class, (string) $e), \E_USER_ERROR);
-            return '';
-        }
-    }
-    public function close() : void
-    {
-        $this->detach();
-    }
-    public function detach()
-    {
-        $this->tellPos = 0;
-        $this->source = null;
-        return null;
-    }
-    public function getSize() : ?int
-    {
-        return $this->size;
-    }
-    public function tell() : int
-    {
-        return $this->tellPos;
-    }
-    public function eof() : bool
-    {
-        return $this->source === null;
-    }
-    public function isSeekable() : bool
-    {
-        return \false;
-    }
-    public function rewind() : void
-    {
-        $this->seek(0);
-    }
-    public function seek($offset, $whence = \SEEK_SET) : void
-    {
-        throw new \RuntimeException('Cannot seek a PumpStream');
-    }
-    public function isWritable() : bool
-    {
-        return \false;
-    }
-    public function write($string) : int
-    {
-        throw new \RuntimeException('Cannot write to a PumpStream');
-    }
-    public function isReadable() : bool
-    {
-        return \true;
-    }
-    public function read($length) : string
-    {
-        $data = $this->buffer->read($length);
-        $readLen = \strlen($data);
-        $this->tellPos += $readLen;
-        $remaining = $length - $readLen;
-        if ($remaining) {
-            $this->pump($remaining);
-            $data .= $this->buffer->read($remaining);
-            $this->tellPos += \strlen($data) - $readLen;
-        }
-        return $data;
-    }
-    public function getContents() : string
-    {
-        $result = '';
-        while (!$this->eof()) {
-            $result .= $this->read(1000000);
-        }
-        return $result;
-    }
-    /**
-     * @return mixed
-     */
-    public function getMetadata($key = null)
-    {
-        if (!$key) {
-            return $this->metadata;
-        }
-        return $this->metadata[$key] ?? null;
-    }
-    private function pump(int $length) : void
-    {
-        if ($this->source !== null) {
-            do {
-                $data = ($this->source)($length);
-                if ($data === \false || $data === null) {
-                    $this->source = null;
-                    return;
-                }
-                $this->buffer->write($data);
-                $length -= \strlen($data);
-            } while ($length > 0);
-        }
-    }
+	/** @var callable(int): (string|false|null)|null */
+	private $source;
+	/** @var int|null */
+	private $size;
+	/** @var int */
+	private $tellPos = 0;
+	/** @var array */
+	private $metadata;
+	/** @var BufferStream */
+	private $buffer;
+	/**
+	 * @param callable(int): (string|false|null)  $source  Source of the stream data. The callable MAY
+	 *                                                     accept an integer argument used to control the
+	 *                                                     amount of data to return. The callable MUST
+	 *                                                     return a string when called, or false|null on error
+	 *                                                     or EOF.
+	 * @param array{size?: int, metadata?: array} $options Stream options:
+	 *                                                     - metadata: Hash of metadata to use with stream.
+	 *                                                     - size: Size of the stream, if known.
+	 */
+	public function __construct(callable $source, array $options = [])
+	{
+		$this->source = $source;
+		$this->size = $options['size'] ?? null;
+		$this->metadata = $options['metadata'] ?? [];
+		$this->buffer = new BufferStream();
+	}
+	public function __toString() : string
+	{
+		try {
+			return Utils::copyToString($this);
+		} catch (\Throwable $e) {
+			if (\PHP_VERSION_ID >= 70400) {
+				throw $e;
+			}
+			\trigger_error(\sprintf('%s::__toString exception: %s', self::class, (string) $e), \E_USER_ERROR);
+			return '';
+		}
+	}
+	public function close() : void
+	{
+		$this->detach();
+	}
+	public function detach()
+	{
+		$this->tellPos = 0;
+		$this->source = null;
+		return null;
+	}
+	public function getSize() : ?int
+	{
+		return $this->size;
+	}
+	public function tell() : int
+	{
+		return $this->tellPos;
+	}
+	public function eof() : bool
+	{
+		return $this->source === null;
+	}
+	public function isSeekable() : bool
+	{
+		return \false;
+	}
+	public function rewind() : void
+	{
+		$this->seek(0);
+	}
+	public function seek($offset, $whence = \SEEK_SET) : void
+	{
+		throw new \RuntimeException('Cannot seek a PumpStream');
+	}
+	public function isWritable() : bool
+	{
+		return \false;
+	}
+	public function write($string) : int
+	{
+		throw new \RuntimeException('Cannot write to a PumpStream');
+	}
+	public function isReadable() : bool
+	{
+		return \true;
+	}
+	public function read($length) : string
+	{
+		$data = $this->buffer->read($length);
+		$readLen = \strlen($data);
+		$this->tellPos += $readLen;
+		$remaining = $length - $readLen;
+		if ($remaining) {
+			$this->pump($remaining);
+			$data .= $this->buffer->read($remaining);
+			$this->tellPos += \strlen($data) - $readLen;
+		}
+		return $data;
+	}
+	public function getContents() : string
+	{
+		$result = '';
+		while (!$this->eof()) {
+			$result .= $this->read(1000000);
+		}
+		return $result;
+	}
+	/**
+	 * @return mixed
+	 */
+	public function getMetadata($key = null)
+	{
+		if (!$key) {
+			return $this->metadata;
+		}
+		return $this->metadata[$key] ?? null;
+	}
+	private function pump(int $length) : void
+	{
+		if ($this->source !== null) {
+			do {
+				$data = ($this->source)($length);
+				if ($data === \false || $data === null) {
+					$this->source = null;
+					return;
+				}
+				$this->buffer->write($data);
+				$length -= \strlen($data);
+			} while ($length > 0);
+		}
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare (strict_types=1);
+declare(strict_types=1);
 namespace OCA\FullTextSearch_Elasticsearch\Vendor\GuzzleHttp\Psr7;
 
 use OCA\FullTextSearch_Elasticsearch\Vendor\Psr\Http\Message\StreamInterface;
@@ -51,7 +51,7 @@ 
             if (\PHP_VERSION_ID >= 70400) {
                 throw $e;
             }
-            \trigger_error(\sprintf('%s::__toString exception: %s', self::class, (string) $e), \E_USER_ERROR);
+            \trigger_error(\sprintf('%s::__toString exception: %s', self::class, (string)$e), \E_USER_ERROR);
             return '';
         }
     }

Braces +1 added lines, -2 removed lines

@@ -14,8 +14,7 @@
  * the read() function of the PumpStream. The provided callable MUST return
  * false when there is no more data to read.
  */
-final class PumpStream implements StreamInterface
-{
+final class PumpStream implements StreamInterface {
     /** @var callable(int): (string|false|null)|null */
     private $source;
     /** @var int|null */

lib/Vendor/GuzzleHttp/Psr7/MultipartStream.php

Indentation +117 added lines, -117 removed lines

@@ -10,121 +10,121 @@
  */
 final class MultipartStream implements StreamInterface
 {
-    use StreamDecoratorTrait;
-    /** @var string */
-    private $boundary;
-    /** @var StreamInterface */
-    private $stream;
-    /**
-     * @param array  $elements 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.
-     * @param string $boundary You can optionally provide a specific boundary
-     *
-     * @throws \InvalidArgumentException
-     */
-    public function __construct(array $elements = [], string $boundary = null)
-    {
-        $this->boundary = $boundary ?: \bin2hex(\random_bytes(20));
-        $this->stream = $this->createStream($elements);
-    }
-    public function getBoundary() : string
-    {
-        return $this->boundary;
-    }
-    public function isWritable() : bool
-    {
-        return \false;
-    }
-    /**
-     * Get the headers needed before transferring the content of a POST file
-     *
-     * @param string[] $headers
-     */
-    private function getHeaders(array $headers) : string
-    {
-        $str = '';
-        foreach ($headers as $key => $value) {
-            $str .= "{$key}: {$value}\r\n";
-        }
-        return "--{$this->boundary}\r\n" . \trim($str) . "\r\n\r\n";
-    }
-    /**
-     * Create the aggregate stream that will be used to upload the POST data
-     */
-    protected function createStream(array $elements = []) : StreamInterface
-    {
-        $stream = new AppendStream();
-        foreach ($elements as $element) {
-            if (!\is_array($element)) {
-                throw new \UnexpectedValueException('An array is expected');
-            }
-            $this->addElement($stream, $element);
-        }
-        // Add the trailing boundary with CRLF
-        $stream->addStream(Utils::streamFor("--{$this->boundary}--\r\n"));
-        return $stream;
-    }
-    private function addElement(AppendStream $stream, array $element) : void
-    {
-        foreach (['contents', 'name'] as $key) {
-            if (!\array_key_exists($key, $element)) {
-                throw new \InvalidArgumentException("A '{$key}' key is required");
-            }
-        }
-        $element['contents'] = Utils::streamFor($element['contents']);
-        if (empty($element['filename'])) {
-            $uri = $element['contents']->getMetadata('uri');
-            if ($uri && \is_string($uri) && \substr($uri, 0, 6) !== 'php://' && \substr($uri, 0, 7) !== 'data://') {
-                $element['filename'] = $uri;
-            }
-        }
-        [$body, $headers] = $this->createElement($element['name'], $element['contents'], $element['filename'] ?? null, $element['headers'] ?? []);
-        $stream->addStream(Utils::streamFor($this->getHeaders($headers)));
-        $stream->addStream($body);
-        $stream->addStream(Utils::streamFor("\r\n"));
-    }
-    /**
-     * @param string[] $headers
-     *
-     * @return array{0: StreamInterface, 1: string[]}
-     */
-    private function createElement(string $name, StreamInterface $stream, ?string $filename, array $headers) : array
-    {
-        // Set a default content-disposition header if one was no provided
-        $disposition = self::getHeader($headers, 'content-disposition');
-        if (!$disposition) {
-            $headers['Content-Disposition'] = $filename === '0' || $filename ? \sprintf('form-data; name="%s"; filename="%s"', $name, \basename($filename)) : "form-data; name=\"{$name}\"";
-        }
-        // Set a default content-length header if one was no provided
-        $length = self::getHeader($headers, 'content-length');
-        if (!$length) {
-            if ($length = $stream->getSize()) {
-                $headers['Content-Length'] = (string) $length;
-            }
-        }
-        // Set a default Content-Type if one was not supplied
-        $type = self::getHeader($headers, 'content-type');
-        if (!$type && ($filename === '0' || $filename)) {
-            $headers['Content-Type'] = MimeType::fromFilename($filename) ?? 'application/octet-stream';
-        }
-        return [$stream, $headers];
-    }
-    /**
-     * @param string[] $headers
-     */
-    private static function getHeader(array $headers, string $key) : ?string
-    {
-        $lowercaseHeader = \strtolower($key);
-        foreach ($headers as $k => $v) {
-            if (\strtolower((string) $k) === $lowercaseHeader) {
-                return $v;
-            }
-        }
-        return null;
-    }
+	use StreamDecoratorTrait;
+	/** @var string */
+	private $boundary;
+	/** @var StreamInterface */
+	private $stream;
+	/**
+	 * @param array  $elements 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.
+	 * @param string $boundary You can optionally provide a specific boundary
+	 *
+	 * @throws \InvalidArgumentException
+	 */
+	public function __construct(array $elements = [], string $boundary = null)
+	{
+		$this->boundary = $boundary ?: \bin2hex(\random_bytes(20));
+		$this->stream = $this->createStream($elements);
+	}
+	public function getBoundary() : string
+	{
+		return $this->boundary;
+	}
+	public function isWritable() : bool
+	{
+		return \false;
+	}
+	/**
+	 * Get the headers needed before transferring the content of a POST file
+	 *
+	 * @param string[] $headers
+	 */
+	private function getHeaders(array $headers) : string
+	{
+		$str = '';
+		foreach ($headers as $key => $value) {
+			$str .= "{$key}: {$value}\r\n";
+		}
+		return "--{$this->boundary}\r\n" . \trim($str) . "\r\n\r\n";
+	}
+	/**
+	 * Create the aggregate stream that will be used to upload the POST data
+	 */
+	protected function createStream(array $elements = []) : StreamInterface
+	{
+		$stream = new AppendStream();
+		foreach ($elements as $element) {
+			if (!\is_array($element)) {
+				throw new \UnexpectedValueException('An array is expected');
+			}
+			$this->addElement($stream, $element);
+		}
+		// Add the trailing boundary with CRLF
+		$stream->addStream(Utils::streamFor("--{$this->boundary}--\r\n"));
+		return $stream;
+	}
+	private function addElement(AppendStream $stream, array $element) : void
+	{
+		foreach (['contents', 'name'] as $key) {
+			if (!\array_key_exists($key, $element)) {
+				throw new \InvalidArgumentException("A '{$key}' key is required");
+			}
+		}
+		$element['contents'] = Utils::streamFor($element['contents']);
+		if (empty($element['filename'])) {
+			$uri = $element['contents']->getMetadata('uri');
+			if ($uri && \is_string($uri) && \substr($uri, 0, 6) !== 'php://' && \substr($uri, 0, 7) !== 'data://') {
+				$element['filename'] = $uri;
+			}
+		}
+		[$body, $headers] = $this->createElement($element['name'], $element['contents'], $element['filename'] ?? null, $element['headers'] ?? []);
+		$stream->addStream(Utils::streamFor($this->getHeaders($headers)));
+		$stream->addStream($body);
+		$stream->addStream(Utils::streamFor("\r\n"));
+	}
+	/**
+	 * @param string[] $headers
+	 *
+	 * @return array{0: StreamInterface, 1: string[]}
+	 */
+	private function createElement(string $name, StreamInterface $stream, ?string $filename, array $headers) : array
+	{
+		// Set a default content-disposition header if one was no provided
+		$disposition = self::getHeader($headers, 'content-disposition');
+		if (!$disposition) {
+			$headers['Content-Disposition'] = $filename === '0' || $filename ? \sprintf('form-data; name="%s"; filename="%s"', $name, \basename($filename)) : "form-data; name=\"{$name}\"";
+		}
+		// Set a default content-length header if one was no provided
+		$length = self::getHeader($headers, 'content-length');
+		if (!$length) {
+			if ($length = $stream->getSize()) {
+				$headers['Content-Length'] = (string) $length;
+			}
+		}
+		// Set a default Content-Type if one was not supplied
+		$type = self::getHeader($headers, 'content-type');
+		if (!$type && ($filename === '0' || $filename)) {
+			$headers['Content-Type'] = MimeType::fromFilename($filename) ?? 'application/octet-stream';
+		}
+		return [$stream, $headers];
+	}
+	/**
+	 * @param string[] $headers
+	 */
+	private static function getHeader(array $headers, string $key) : ?string
+	{
+		$lowercaseHeader = \strtolower($key);
+		foreach ($headers as $k => $v) {
+			if (\strtolower((string) $k) === $lowercaseHeader) {
+				return $v;
+			}
+		}
+		return null;
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare (strict_types=1);
+declare(strict_types=1);
 namespace OCA\FullTextSearch_Elasticsearch\Vendor\GuzzleHttp\Psr7;
 
 use OCA\FullTextSearch_Elasticsearch\Vendor\Psr\Http\Message\StreamInterface;
@@ -51,7 +51,7 @@ 
         foreach ($headers as $key => $value) {
             $str .= "{$key}: {$value}\r\n";
         }
-        return "--{$this->boundary}\r\n" . \trim($str) . "\r\n\r\n";
+        return "--{$this->boundary}\r\n".\trim($str)."\r\n\r\n";
     }
     /**
      * Create the aggregate stream that will be used to upload the POST data
@@ -104,7 +104,7 @@ 
         $length = self::getHeader($headers, 'content-length');
         if (!$length) {
             if ($length = $stream->getSize()) {
-                $headers['Content-Length'] = (string) $length;
+                $headers['Content-Length'] = (string)$length;
             }
         }
         // Set a default Content-Type if one was not supplied
@@ -121,7 +121,7 @@ 
     {
         $lowercaseHeader = \strtolower($key);
         foreach ($headers as $k => $v) {
-            if (\strtolower((string) $k) === $lowercaseHeader) {
+            if (\strtolower((string)$k) === $lowercaseHeader) {
                 return $v;
             }
         }

Braces +1 added lines, -2 removed lines

@@ -8,8 +8,7 @@
  * Stream that when read returns bytes for a streaming multipart or
  * multipart/form-data stream.
  */
-final class MultipartStream implements StreamInterface
-{
+final class MultipartStream implements StreamInterface {
     use StreamDecoratorTrait;
     /** @var string */
     private $boundary;

lib/Vendor/GuzzleHttp/Psr7/FnStream.php

Indentation +133 added lines, -133 removed lines

@@ -13,137 +13,137 @@
 #[\AllowDynamicProperties]
 final class FnStream implements StreamInterface
 {
-    private const SLOTS = ['__toString', 'close', 'detach', 'rewind', 'getSize', 'tell', 'eof', 'isSeekable', 'seek', 'isWritable', 'write', 'isReadable', 'read', 'getContents', 'getMetadata'];
-    /** @var array<string, callable> */
-    private $methods;
-    /**
-     * @param array<string, callable> $methods Hash of method name to a callable.
-     */
-    public function __construct(array $methods)
-    {
-        $this->methods = $methods;
-        // Create the functions on the class
-        foreach ($methods as $name => $fn) {
-            $this->{'_fn_' . $name} = $fn;
-        }
-    }
-    /**
-     * Lazily determine which methods are not implemented.
-     *
-     * @throws \BadMethodCallException
-     */
-    public function __get(string $name) : void
-    {
-        throw new \BadMethodCallException(\str_replace('_fn_', '', $name) . '() is not implemented in the FnStream');
-    }
-    /**
-     * The close method is called on the underlying stream only if possible.
-     */
-    public function __destruct()
-    {
-        if (isset($this->_fn_close)) {
-            ($this->_fn_close)();
-        }
-    }
-    /**
-     * An unserialize would allow the __destruct to run when the unserialized value goes out of scope.
-     *
-     * @throws \LogicException
-     */
-    public function __wakeup() : void
-    {
-        throw new \LogicException('FnStream should never be unserialized');
-    }
-    /**
-     * Adds custom functionality to an underlying stream by intercepting
-     * specific method calls.
-     *
-     * @param StreamInterface         $stream  Stream to decorate
-     * @param array<string, callable> $methods Hash of method name to a closure
-     *
-     * @return FnStream
-     */
-    public static function decorate(StreamInterface $stream, array $methods)
-    {
-        // If any of the required methods were not provided, then simply
-        // proxy to the decorated stream.
-        foreach (\array_diff(self::SLOTS, \array_keys($methods)) as $diff) {
-            /** @var callable $callable */
-            $callable = [$stream, $diff];
-            $methods[$diff] = $callable;
-        }
-        return new self($methods);
-    }
-    public function __toString() : string
-    {
-        try {
-            /** @var string */
-            return ($this->_fn___toString)();
-        } catch (\Throwable $e) {
-            if (\PHP_VERSION_ID >= 70400) {
-                throw $e;
-            }
-            \trigger_error(\sprintf('%s::__toString exception: %s', self::class, (string) $e), \E_USER_ERROR);
-            return '';
-        }
-    }
-    public function close() : void
-    {
-        ($this->_fn_close)();
-    }
-    public function detach()
-    {
-        return ($this->_fn_detach)();
-    }
-    public function getSize() : ?int
-    {
-        return ($this->_fn_getSize)();
-    }
-    public function tell() : int
-    {
-        return ($this->_fn_tell)();
-    }
-    public function eof() : bool
-    {
-        return ($this->_fn_eof)();
-    }
-    public function isSeekable() : bool
-    {
-        return ($this->_fn_isSeekable)();
-    }
-    public function rewind() : void
-    {
-        ($this->_fn_rewind)();
-    }
-    public function seek($offset, $whence = \SEEK_SET) : void
-    {
-        ($this->_fn_seek)($offset, $whence);
-    }
-    public function isWritable() : bool
-    {
-        return ($this->_fn_isWritable)();
-    }
-    public function write($string) : int
-    {
-        return ($this->_fn_write)($string);
-    }
-    public function isReadable() : bool
-    {
-        return ($this->_fn_isReadable)();
-    }
-    public function read($length) : string
-    {
-        return ($this->_fn_read)($length);
-    }
-    public function getContents() : string
-    {
-        return ($this->_fn_getContents)();
-    }
-    /**
-     * @return mixed
-     */
-    public function getMetadata($key = null)
-    {
-        return ($this->_fn_getMetadata)($key);
-    }
+	private const SLOTS = ['__toString', 'close', 'detach', 'rewind', 'getSize', 'tell', 'eof', 'isSeekable', 'seek', 'isWritable', 'write', 'isReadable', 'read', 'getContents', 'getMetadata'];
+	/** @var array<string, callable> */
+	private $methods;
+	/**
+	 * @param array<string, callable> $methods Hash of method name to a callable.
+	 */
+	public function __construct(array $methods)
+	{
+		$this->methods = $methods;
+		// Create the functions on the class
+		foreach ($methods as $name => $fn) {
+			$this->{'_fn_' . $name} = $fn;
+		}
+	}
+	/**
+	 * Lazily determine which methods are not implemented.
+	 *
+	 * @throws \BadMethodCallException
+	 */
+	public function __get(string $name) : void
+	{
+		throw new \BadMethodCallException(\str_replace('_fn_', '', $name) . '() is not implemented in the FnStream');
+	}
+	/**
+	 * The close method is called on the underlying stream only if possible.
+	 */
+	public function __destruct()
+	{
+		if (isset($this->_fn_close)) {
+			($this->_fn_close)();
+		}
+	}
+	/**
+	 * An unserialize would allow the __destruct to run when the unserialized value goes out of scope.
+	 *
+	 * @throws \LogicException
+	 */
+	public function __wakeup() : void
+	{
+		throw new \LogicException('FnStream should never be unserialized');
+	}
+	/**
+	 * Adds custom functionality to an underlying stream by intercepting
+	 * specific method calls.
+	 *
+	 * @param StreamInterface         $stream  Stream to decorate
+	 * @param array<string, callable> $methods Hash of method name to a closure
+	 *
+	 * @return FnStream
+	 */
+	public static function decorate(StreamInterface $stream, array $methods)
+	{
+		// If any of the required methods were not provided, then simply
+		// proxy to the decorated stream.
+		foreach (\array_diff(self::SLOTS, \array_keys($methods)) as $diff) {
+			/** @var callable $callable */
+			$callable = [$stream, $diff];
+			$methods[$diff] = $callable;
+		}
+		return new self($methods);
+	}
+	public function __toString() : string
+	{
+		try {
+			/** @var string */
+			return ($this->_fn___toString)();
+		} catch (\Throwable $e) {
+			if (\PHP_VERSION_ID >= 70400) {
+				throw $e;
+			}
+			\trigger_error(\sprintf('%s::__toString exception: %s', self::class, (string) $e), \E_USER_ERROR);
+			return '';
+		}
+	}
+	public function close() : void
+	{
+		($this->_fn_close)();
+	}
+	public function detach()
+	{
+		return ($this->_fn_detach)();
+	}
+	public function getSize() : ?int
+	{
+		return ($this->_fn_getSize)();
+	}
+	public function tell() : int
+	{
+		return ($this->_fn_tell)();
+	}
+	public function eof() : bool
+	{
+		return ($this->_fn_eof)();
+	}
+	public function isSeekable() : bool
+	{
+		return ($this->_fn_isSeekable)();
+	}
+	public function rewind() : void
+	{
+		($this->_fn_rewind)();
+	}
+	public function seek($offset, $whence = \SEEK_SET) : void
+	{
+		($this->_fn_seek)($offset, $whence);
+	}
+	public function isWritable() : bool
+	{
+		return ($this->_fn_isWritable)();
+	}
+	public function write($string) : int
+	{
+		return ($this->_fn_write)($string);
+	}
+	public function isReadable() : bool
+	{
+		return ($this->_fn_isReadable)();
+	}
+	public function read($length) : string
+	{
+		return ($this->_fn_read)($length);
+	}
+	public function getContents() : string
+	{
+		return ($this->_fn_getContents)();
+	}
+	/**
+	 * @return mixed
+	 */
+	public function getMetadata($key = null)
+	{
+		return ($this->_fn_getMetadata)($key);
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare (strict_types=1);
+declare(strict_types=1);
 namespace OCA\FullTextSearch_Elasticsearch\Vendor\GuzzleHttp\Psr7;
 
 use OCA\FullTextSearch_Elasticsearch\Vendor\Psr\Http\Message\StreamInterface;
@@ -24,7 +24,7 @@ 
         $this->methods = $methods;
         // Create the functions on the class
         foreach ($methods as $name => $fn) {
-            $this->{'_fn_' . $name} = $fn;
+            $this->{'_fn_'.$name} = $fn;
         }
     }
     /**
@@ -34,7 +34,7 @@ 
      */
     public function __get(string $name) : void
     {
-        throw new \BadMethodCallException(\str_replace('_fn_', '', $name) . '() is not implemented in the FnStream');
+        throw new \BadMethodCallException(\str_replace('_fn_', '', $name).'() is not implemented in the FnStream');
     }
     /**
      * The close method is called on the underlying stream only if possible.
@@ -83,7 +83,7 @@ 
             if (\PHP_VERSION_ID >= 70400) {
                 throw $e;
             }
-            \trigger_error(\sprintf('%s::__toString exception: %s', self::class, (string) $e), \E_USER_ERROR);
+            \trigger_error(\sprintf('%s::__toString exception: %s', self::class, (string)$e), \E_USER_ERROR);
             return '';
         }
     }

Braces +1 added lines, -2 removed lines

@@ -11,8 +11,7 @@
  * to create a concrete class for a simple extension point.
  */
 #[\AllowDynamicProperties]
-final class FnStream implements StreamInterface
-{
+final class FnStream implements StreamInterface {
     private const SLOTS = ['__toString', 'close', 'detach', 'rewind', 'getSize', 'tell', 'eof', 'isSeekable', 'seek', 'isWritable', 'write', 'isReadable', 'read', 'getContents', 'getMetadata'];
     /** @var array<string, callable> */
     private $methods;

lib/Vendor/GuzzleHttp/Psr7/NoSeekStream.php

Indentation +11 added lines, -11 removed lines

@@ -9,15 +9,15 @@
  */
 final class NoSeekStream implements StreamInterface
 {
-    use StreamDecoratorTrait;
-    /** @var StreamInterface */
-    private $stream;
-    public function seek($offset, $whence = \SEEK_SET) : void
-    {
-        throw new \RuntimeException('Cannot seek a NoSeekStream');
-    }
-    public function isSeekable() : bool
-    {
-        return \false;
-    }
+	use StreamDecoratorTrait;
+	/** @var StreamInterface */
+	private $stream;
+	public function seek($offset, $whence = \SEEK_SET) : void
+	{
+		throw new \RuntimeException('Cannot seek a NoSeekStream');
+	}
+	public function isSeekable() : bool
+	{
+		return \false;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-declare (strict_types=1);
+declare(strict_types=1);
 namespace OCA\FullTextSearch_Elasticsearch\Vendor\GuzzleHttp\Psr7;
 
 use OCA\FullTextSearch_Elasticsearch\Vendor\Psr\Http\Message\StreamInterface;

Braces +1 added lines, -2 removed lines

@@ -7,8 +7,7 @@
 /**
  * Stream decorator that prevents a stream from being seeked.
  */
-final class NoSeekStream implements StreamInterface
-{
+final class NoSeekStream implements StreamInterface {
     use StreamDecoratorTrait;
     /** @var StreamInterface */
     private $stream;