nextcloud / fulltextsearch_elasticsearch

lib/Vendor/GuzzleHttp/RedirectMiddleware.php

Indentation +206 added lines, -206 removed lines

@@ -19,210 +19,210 @@
  */
 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

@@ -69,7 +69,7 @@ 
         }
 
         return $fn($request, $options)
-            ->then(function (ResponseInterface $response) use ($request, $options) {
+            ->then(function(ResponseInterface $response) use ($request, $options) {
                 return $this->checkRedirect($request, $options, $response);
             });
     }
@@ -79,7 +79,7 @@ 
      */
     public function checkRedirect(RequestInterface $request, array $options, ResponseInterface $response)
     {
-        if (\strpos((string) $response->getStatusCode(), '3') !== 0
+        if (\strpos((string)$response->getStatusCode(), '3') !== 0
             || !$response->hasHeader('Location')
         ) {
             return $response;
@@ -110,7 +110,7 @@ 
         if (!empty($options['allow_redirects']['track_redirects'])) {
             return $this->withTracking(
                 $promise,
-                (string) $nextRequest->getUri(),
+                (string)$nextRequest->getUri(),
                 $response->getStatusCode()
             );
         }
@@ -124,14 +124,14 @@ 
     private function withTracking(PromiseInterface $promise, string $uri, int $statusCode): PromiseInterface
     {
         return $promise->then(
-            static function (ResponseInterface $response) use ($uri, $statusCode) {
+            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);
@@ -191,7 +191,7 @@ 
             && $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

@@ -17,8 +17,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/PrepareBodyMiddleware.php

Indentation +89 added lines, -89 removed lines

@@ -13,93 +13,93 @@
  */
 class PrepareBodyMiddleware
 {
-    /**
-     * @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;
-
-        // Don't do anything if the request has no body.
-        if ($request->getBody()->getSize() === 0) {
-            return $fn($request, $options);
-        }
-
-        $modify = [];
-
-        // Add a default content-type if possible.
-        if (!$request->hasHeader('Content-Type')) {
-            if ($uri = $request->getBody()->getMetadata('uri')) {
-                if (is_string($uri) && $type = Psr7\MimeType::fromFilename($uri)) {
-                    $modify['set_headers']['Content-Type'] = $type;
-                }
-            }
-        }
-
-        // Add a default content-length or transfer-encoding header.
-        if (!$request->hasHeader('Content-Length')
-            && !$request->hasHeader('Transfer-Encoding')
-        ) {
-            $size = $request->getBody()->getSize();
-            if ($size !== null) {
-                $modify['set_headers']['Content-Length'] = $size;
-            } else {
-                $modify['set_headers']['Transfer-Encoding'] = 'chunked';
-            }
-        }
-
-        // Add the expect header if needed.
-        $this->addExpectHeader($request, $options, $modify);
-
-        return $fn(Psr7\Utils::modifyRequest($request, $modify), $options);
-    }
-
-    /**
-     * Add expect header
-     */
-    private function addExpectHeader(RequestInterface $request, array $options, array &$modify): void
-    {
-        // Determine if the Expect header should be used
-        if ($request->hasHeader('Expect')) {
-            return;
-        }
-
-        $expect = $options['expect'] ?? null;
-
-        // Return if disabled or if you're not using HTTP/1.1 or HTTP/2.0
-        if ($expect === false || $request->getProtocolVersion() < 1.1) {
-            return;
-        }
-
-        // The expect header is unconditionally enabled
-        if ($expect === true) {
-            $modify['set_headers']['Expect'] = '100-Continue';
-
-            return;
-        }
-
-        // By default, send the expect header when the payload is > 1mb
-        if ($expect === null) {
-            $expect = 1048576;
-        }
-
-        // Always add if the body cannot be rewound, the size cannot be
-        // determined, or the size is greater than the cutoff threshold
-        $body = $request->getBody();
-        $size = $body->getSize();
-
-        if ($size === null || $size >= (int) $expect || !$body->isSeekable()) {
-            $modify['set_headers']['Expect'] = '100-Continue';
-        }
-    }
+	/**
+	 * @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;
+
+		// Don't do anything if the request has no body.
+		if ($request->getBody()->getSize() === 0) {
+			return $fn($request, $options);
+		}
+
+		$modify = [];
+
+		// Add a default content-type if possible.
+		if (!$request->hasHeader('Content-Type')) {
+			if ($uri = $request->getBody()->getMetadata('uri')) {
+				if (is_string($uri) && $type = Psr7\MimeType::fromFilename($uri)) {
+					$modify['set_headers']['Content-Type'] = $type;
+				}
+			}
+		}
+
+		// Add a default content-length or transfer-encoding header.
+		if (!$request->hasHeader('Content-Length')
+			&& !$request->hasHeader('Transfer-Encoding')
+		) {
+			$size = $request->getBody()->getSize();
+			if ($size !== null) {
+				$modify['set_headers']['Content-Length'] = $size;
+			} else {
+				$modify['set_headers']['Transfer-Encoding'] = 'chunked';
+			}
+		}
+
+		// Add the expect header if needed.
+		$this->addExpectHeader($request, $options, $modify);
+
+		return $fn(Psr7\Utils::modifyRequest($request, $modify), $options);
+	}
+
+	/**
+	 * Add expect header
+	 */
+	private function addExpectHeader(RequestInterface $request, array $options, array &$modify): void
+	{
+		// Determine if the Expect header should be used
+		if ($request->hasHeader('Expect')) {
+			return;
+		}
+
+		$expect = $options['expect'] ?? null;
+
+		// Return if disabled or if you're not using HTTP/1.1 or HTTP/2.0
+		if ($expect === false || $request->getProtocolVersion() < 1.1) {
+			return;
+		}
+
+		// The expect header is unconditionally enabled
+		if ($expect === true) {
+			$modify['set_headers']['Expect'] = '100-Continue';
+
+			return;
+		}
+
+		// By default, send the expect header when the payload is > 1mb
+		if ($expect === null) {
+			$expect = 1048576;
+		}
+
+		// Always add if the body cannot be rewound, the size cannot be
+		// determined, or the size is greater than the cutoff threshold
+		$body = $request->getBody();
+		$size = $body->getSize();
+
+		if ($size === null || $size >= (int) $expect || !$body->isSeekable()) {
+			$modify['set_headers']['Expect'] = '100-Continue';
+		}
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -98,7 +98,7 @@
         $body = $request->getBody();
         $size = $body->getSize();
 
-        if ($size === null || $size >= (int) $expect || !$body->isSeekable()) {
+        if ($size === null || $size >= (int)$expect || !$body->isSeekable()) {
             $modify['set_headers']['Expect'] = '100-Continue';
         }
     }

Braces +1 added lines, -2 removed lines

@@ -11,8 +11,7 @@
  *
  * @final
  */
-class PrepareBodyMiddleware
-{
+class PrepareBodyMiddleware {
     /**
      * @var callable(RequestInterface, array): PromiseInterface
      */

lib/Vendor/GuzzleHttp/ClientTrait.php

Indentation +226 added lines, -226 removed lines

@@ -12,230 +12,230 @@
  */
 trait ClientTrait
 {
-    /**
-     * Create and send an HTTP request.
-     *
-     * Use an absolute path to override the base path of the client, or a
-     * relative path to append to the base path of the client. The URL can
-     * contain the query string as well.
-     *
-     * @param string              $method  HTTP method.
-     * @param string|UriInterface $uri     URI object or string.
-     * @param array               $options Request options to apply.
-     *
-     * @throws GuzzleException
-     */
-    abstract public function request(string $method, $uri, array $options = []): ResponseInterface;
-
-    /**
-     * Create and send an HTTP GET 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|UriInterface $uri     URI object or string.
-     * @param array               $options Request options to apply.
-     *
-     * @throws GuzzleException
-     */
-    public function get($uri, array $options = []): ResponseInterface
-    {
-        return $this->request('GET', $uri, $options);
-    }
-
-    /**
-     * Create and send an HTTP HEAD 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|UriInterface $uri     URI object or string.
-     * @param array               $options Request options to apply.
-     *
-     * @throws GuzzleException
-     */
-    public function head($uri, array $options = []): ResponseInterface
-    {
-        return $this->request('HEAD', $uri, $options);
-    }
-
-    /**
-     * Create and send an HTTP PUT 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|UriInterface $uri     URI object or string.
-     * @param array               $options Request options to apply.
-     *
-     * @throws GuzzleException
-     */
-    public function put($uri, array $options = []): ResponseInterface
-    {
-        return $this->request('PUT', $uri, $options);
-    }
-
-    /**
-     * Create and send an HTTP POST 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|UriInterface $uri     URI object or string.
-     * @param array               $options Request options to apply.
-     *
-     * @throws GuzzleException
-     */
-    public function post($uri, array $options = []): ResponseInterface
-    {
-        return $this->request('POST', $uri, $options);
-    }
-
-    /**
-     * Create and send an HTTP PATCH 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|UriInterface $uri     URI object or string.
-     * @param array               $options Request options to apply.
-     *
-     * @throws GuzzleException
-     */
-    public function patch($uri, array $options = []): ResponseInterface
-    {
-        return $this->request('PATCH', $uri, $options);
-    }
-
-    /**
-     * Create and send an HTTP DELETE 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|UriInterface $uri     URI object or string.
-     * @param array               $options Request options to apply.
-     *
-     * @throws GuzzleException
-     */
-    public function delete($uri, array $options = []): ResponseInterface
-    {
-        return $this->request('DELETE', $uri, $options);
-    }
-
-    /**
-     * 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.
-     */
-    abstract public function requestAsync(string $method, $uri, array $options = []): PromiseInterface;
-
-    /**
-     * Create and send an asynchronous HTTP GET 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|UriInterface $uri     URI object or string.
-     * @param array               $options Request options to apply.
-     */
-    public function getAsync($uri, array $options = []): PromiseInterface
-    {
-        return $this->requestAsync('GET', $uri, $options);
-    }
-
-    /**
-     * Create and send an asynchronous HTTP HEAD 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|UriInterface $uri     URI object or string.
-     * @param array               $options Request options to apply.
-     */
-    public function headAsync($uri, array $options = []): PromiseInterface
-    {
-        return $this->requestAsync('HEAD', $uri, $options);
-    }
-
-    /**
-     * Create and send an asynchronous HTTP PUT 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|UriInterface $uri     URI object or string.
-     * @param array               $options Request options to apply.
-     */
-    public function putAsync($uri, array $options = []): PromiseInterface
-    {
-        return $this->requestAsync('PUT', $uri, $options);
-    }
-
-    /**
-     * Create and send an asynchronous HTTP POST 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|UriInterface $uri     URI object or string.
-     * @param array               $options Request options to apply.
-     */
-    public function postAsync($uri, array $options = []): PromiseInterface
-    {
-        return $this->requestAsync('POST', $uri, $options);
-    }
-
-    /**
-     * Create and send an asynchronous HTTP PATCH 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|UriInterface $uri     URI object or string.
-     * @param array               $options Request options to apply.
-     */
-    public function patchAsync($uri, array $options = []): PromiseInterface
-    {
-        return $this->requestAsync('PATCH', $uri, $options);
-    }
-
-    /**
-     * Create and send an asynchronous HTTP DELETE 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|UriInterface $uri     URI object or string.
-     * @param array               $options Request options to apply.
-     */
-    public function deleteAsync($uri, array $options = []): PromiseInterface
-    {
-        return $this->requestAsync('DELETE', $uri, $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.
+	 *
+	 * @throws GuzzleException
+	 */
+	abstract public function request(string $method, $uri, array $options = []): ResponseInterface;
+
+	/**
+	 * Create and send an HTTP GET 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|UriInterface $uri     URI object or string.
+	 * @param array               $options Request options to apply.
+	 *
+	 * @throws GuzzleException
+	 */
+	public function get($uri, array $options = []): ResponseInterface
+	{
+		return $this->request('GET', $uri, $options);
+	}
+
+	/**
+	 * Create and send an HTTP HEAD 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|UriInterface $uri     URI object or string.
+	 * @param array               $options Request options to apply.
+	 *
+	 * @throws GuzzleException
+	 */
+	public function head($uri, array $options = []): ResponseInterface
+	{
+		return $this->request('HEAD', $uri, $options);
+	}
+
+	/**
+	 * Create and send an HTTP PUT 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|UriInterface $uri     URI object or string.
+	 * @param array               $options Request options to apply.
+	 *
+	 * @throws GuzzleException
+	 */
+	public function put($uri, array $options = []): ResponseInterface
+	{
+		return $this->request('PUT', $uri, $options);
+	}
+
+	/**
+	 * Create and send an HTTP POST 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|UriInterface $uri     URI object or string.
+	 * @param array               $options Request options to apply.
+	 *
+	 * @throws GuzzleException
+	 */
+	public function post($uri, array $options = []): ResponseInterface
+	{
+		return $this->request('POST', $uri, $options);
+	}
+
+	/**
+	 * Create and send an HTTP PATCH 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|UriInterface $uri     URI object or string.
+	 * @param array               $options Request options to apply.
+	 *
+	 * @throws GuzzleException
+	 */
+	public function patch($uri, array $options = []): ResponseInterface
+	{
+		return $this->request('PATCH', $uri, $options);
+	}
+
+	/**
+	 * Create and send an HTTP DELETE 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|UriInterface $uri     URI object or string.
+	 * @param array               $options Request options to apply.
+	 *
+	 * @throws GuzzleException
+	 */
+	public function delete($uri, array $options = []): ResponseInterface
+	{
+		return $this->request('DELETE', $uri, $options);
+	}
+
+	/**
+	 * 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.
+	 */
+	abstract public function requestAsync(string $method, $uri, array $options = []): PromiseInterface;
+
+	/**
+	 * Create and send an asynchronous HTTP GET 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|UriInterface $uri     URI object or string.
+	 * @param array               $options Request options to apply.
+	 */
+	public function getAsync($uri, array $options = []): PromiseInterface
+	{
+		return $this->requestAsync('GET', $uri, $options);
+	}
+
+	/**
+	 * Create and send an asynchronous HTTP HEAD 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|UriInterface $uri     URI object or string.
+	 * @param array               $options Request options to apply.
+	 */
+	public function headAsync($uri, array $options = []): PromiseInterface
+	{
+		return $this->requestAsync('HEAD', $uri, $options);
+	}
+
+	/**
+	 * Create and send an asynchronous HTTP PUT 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|UriInterface $uri     URI object or string.
+	 * @param array               $options Request options to apply.
+	 */
+	public function putAsync($uri, array $options = []): PromiseInterface
+	{
+		return $this->requestAsync('PUT', $uri, $options);
+	}
+
+	/**
+	 * Create and send an asynchronous HTTP POST 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|UriInterface $uri     URI object or string.
+	 * @param array               $options Request options to apply.
+	 */
+	public function postAsync($uri, array $options = []): PromiseInterface
+	{
+		return $this->requestAsync('POST', $uri, $options);
+	}
+
+	/**
+	 * Create and send an asynchronous HTTP PATCH 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|UriInterface $uri     URI object or string.
+	 * @param array               $options Request options to apply.
+	 */
+	public function patchAsync($uri, array $options = []): PromiseInterface
+	{
+		return $this->requestAsync('PATCH', $uri, $options);
+	}
+
+	/**
+	 * Create and send an asynchronous HTTP DELETE 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|UriInterface $uri     URI object or string.
+	 * @param array               $options Request options to apply.
+	 */
+	public function deleteAsync($uri, array $options = []): PromiseInterface
+	{
+		return $this->requestAsync('DELETE', $uri, $options);
+	}
 }

Braces +1 added lines, -2 removed lines

@@ -10,8 +10,7 @@
 /**
  * Client interface for sending HTTP requests.
  */
-trait ClientTrait
-{
+trait ClientTrait {
     /**
      * Create and send an HTTP request.
      *

lib/Vendor/GuzzleHttp/BodySummarizer.php

Indentation +17 added lines, -17 removed lines

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

Braces +1 added lines, -2 removed lines

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

lib/Vendor/GuzzleHttp/ClientInterface.php

Indentation +63 added lines, -63 removed lines

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

Braces +1 added lines, -2 removed lines

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

lib/Vendor/GuzzleHttp/Handler/StreamHandler.php

Indentation +590 added lines, -590 removed lines

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

Spacing +11 added lines, -11 removed lines

@@ -176,7 +176,7 @@ 
                     // Fix content-length header
                     if (isset($normalizedKeys['content-length'])) {
                         $headers['x-encoded-content-length'] = $headers[$normalizedKeys['content-length']];
-                        $length = (int) $stream->getSize();
+                        $length = (int)$stream->getSize();
                         if ($length === 0) {
                             unset($headers[$normalizedKeys['content-length']]);
                         } else {
@@ -207,7 +207,7 @@ 
         Psr7\Utils::copyToStream(
             $source,
             $sink,
-            (\strlen($contentLength) > 0 && (int) $contentLength > 0) ? (int) $contentLength : -1
+            (\strlen($contentLength) > 0 && (int)$contentLength > 0) ? (int)$contentLength : -1
         );
 
         $sink->seek(0);
@@ -228,7 +228,7 @@ 
     private function createResource(callable $callback)
     {
         $errors = [];
-        \set_error_handler(static function ($_, $msg, $file, $line) use (&$errors): bool {
+        \set_error_handler(static function($_, $msg, $file, $line) use (&$errors): bool {
             $errors[] = [
                 'message' => $msg,
                 'file' => $file,
@@ -315,14 +315,14 @@ 
         $uri = $this->resolveHost($request, $options);
 
         $contextResource = $this->createResource(
-            static function () use ($context, $params) {
+            static function() use ($context, $params) {
                 return \stream_context_create($context, $params);
             }
         );
 
         return $this->createResource(
-            function () use ($uri, &$http_response_header, $contextResource, $context, $options, $request) {
-                $resource = @\fopen((string) $uri, 'r', false, $contextResource);
+            function() use ($uri, &$http_response_header, $contextResource, $context, $options, $request) {
+                $resource = @\fopen((string)$uri, 'r', false, $contextResource);
                 $this->lastHeaders = $http_response_header ?? [];
 
                 if (false === $resource) {
@@ -331,7 +331,7 @@ 
 
                 if (isset($options['read_timeout'])) {
                     $readTimeout = $options['read_timeout'];
-                    $sec = (int) $readTimeout;
+                    $sec = (int)$readTimeout;
                     $usec = ($readTimeout - $sec) * 100000;
                     \stream_set_timeout($resource, $sec, $usec);
                 }
@@ -389,7 +389,7 @@ 
             ],
         ];
 
-        $body = (string) $request->getBody();
+        $body = (string)$request->getBody();
 
         if ('' !== $body) {
             $context['http']['content'] = $body;
@@ -544,7 +544,7 @@ 
     {
         self::addNotification(
             $params,
-            static function ($code, $a, $b, $c, $transferred, $total) use ($value) {
+            static function($code, $a, $b, $c, $transferred, $total) use ($value) {
                 if ($code == \STREAM_NOTIFY_PROGRESS) {
                     // The upload progress cannot be determined. Use 0 for cURL compatibility:
                     // https://curl.se/libcurl/c/CURLOPT_PROGRESSFUNCTION.html
@@ -581,7 +581,7 @@ 
         $ident = $request->getMethod().' '.$request->getUri()->withFragment('');
         self::addNotification(
             $params,
-            static function (int $code, ...$passed) use ($ident, $value, $map, $args): void {
+            static function(int $code, ...$passed) use ($ident, $value, $map, $args): void {
                 \fprintf($value, '<%s> [%s] ', $ident, $map[$code]);
                 foreach (\array_filter($passed) as $i => $v) {
                     \fwrite($value, $args[$i].': "'.$v.'" ');
@@ -606,7 +606,7 @@ 
 
     private static function callArray(array $functions): callable
     {
-        return static function (...$args) use ($functions) {
+        return static function(...$args) use ($functions) {
             foreach ($functions as $fn) {
                 $fn(...$args);
             }

Braces +1 added lines, -2 removed lines

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

lib/Vendor/GuzzleHttp/Handler/CurlMultiHandler.php

Indentation +245 added lines, -245 removed lines

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

Spacing +6 added lines, -6 removed lines

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

Braces +1 added lines, -2 removed lines

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

lib/Vendor/GuzzleHttp/Handler/HeaderProcessor.php

Indentation +30 added lines, -30 removed lines

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

Spacing +1 added lines, -1 removed lines

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

Braces +1 added lines, -2 removed lines

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

lib/Vendor/GuzzleHttp/Handler/MockHandler.php

Indentation +190 added lines, -190 removed lines

@@ -19,194 +19,194 @@
  */
 class MockHandler implements \Countable
 {
-    /**
-     * @var array
-     */
-    private $queue = [];
-
-    /**
-     * @var RequestInterface|null
-     */
-    private $lastRequest;
-
-    /**
-     * @var array
-     */
-    private $lastOptions = [];
-
-    /**
-     * @var callable|null
-     */
-    private $onFulfilled;
-
-    /**
-     * @var callable|null
-     */
-    private $onRejected;
-
-    /**
-     * Creates a new MockHandler that uses the default handler stack list of
-     * middlewares.
-     *
-     * @param array|null    $queue       Array of responses, callables, or exceptions.
-     * @param callable|null $onFulfilled Callback to invoke when the return value is fulfilled.
-     * @param callable|null $onRejected  Callback to invoke when the return value is rejected.
-     */
-    public static function createWithMiddleware(array $queue = null, callable $onFulfilled = null, callable $onRejected = null): HandlerStack
-    {
-        return HandlerStack::create(new self($queue, $onFulfilled, $onRejected));
-    }
-
-    /**
-     * The passed in value must be an array of
-     * {@see \OCA\FullTextSearch_Elasticsearch\Vendor\Psr\Http\Message\ResponseInterface} objects, Exceptions,
-     * callables, or Promises.
-     *
-     * @param array<int, mixed>|null $queue       The parameters to be passed to the append function, as an indexed array.
-     * @param callable|null          $onFulfilled Callback to invoke when the return value is fulfilled.
-     * @param callable|null          $onRejected  Callback to invoke when the return value is rejected.
-     */
-    public function __construct(array $queue = null, callable $onFulfilled = null, callable $onRejected = null)
-    {
-        $this->onFulfilled = $onFulfilled;
-        $this->onRejected = $onRejected;
-
-        if ($queue) {
-            // array_values included for BC
-            $this->append(...array_values($queue));
-        }
-    }
-
-    public function __invoke(RequestInterface $request, array $options): PromiseInterface
-    {
-        if (!$this->queue) {
-            throw new \OutOfBoundsException('Mock queue is empty');
-        }
-
-        if (isset($options['delay']) && \is_numeric($options['delay'])) {
-            \usleep((int) $options['delay'] * 1000);
-        }
-
-        $this->lastRequest = $request;
-        $this->lastOptions = $options;
-        $response = \array_shift($this->queue);
-
-        if (isset($options['on_headers'])) {
-            if (!\is_callable($options['on_headers'])) {
-                throw new \InvalidArgumentException('on_headers must be callable');
-            }
-            try {
-                $options['on_headers']($response);
-            } catch (\Exception $e) {
-                $msg = 'An error was encountered during the on_headers event';
-                $response = new RequestException($msg, $request, $response, $e);
-            }
-        }
-
-        if (\is_callable($response)) {
-            $response = $response($request, $options);
-        }
-
-        $response = $response instanceof \Throwable
-            ? P\Create::rejectionFor($response)
-            : P\Create::promiseFor($response);
-
-        return $response->then(
-            function (?ResponseInterface $value) use ($request, $options) {
-                $this->invokeStats($request, $options, $value);
-                if ($this->onFulfilled) {
-                    ($this->onFulfilled)($value);
-                }
-
-                if ($value !== null && isset($options['sink'])) {
-                    $contents = (string) $value->getBody();
-                    $sink = $options['sink'];
-
-                    if (\is_resource($sink)) {
-                        \fwrite($sink, $contents);
-                    } elseif (\is_string($sink)) {
-                        \file_put_contents($sink, $contents);
-                    } elseif ($sink instanceof StreamInterface) {
-                        $sink->write($contents);
-                    }
-                }
-
-                return $value;
-            },
-            function ($reason) use ($request, $options) {
-                $this->invokeStats($request, $options, null, $reason);
-                if ($this->onRejected) {
-                    ($this->onRejected)($reason);
-                }
-
-                return P\Create::rejectionFor($reason);
-            }
-        );
-    }
-
-    /**
-     * Adds one or more variadic requests, exceptions, callables, or promises
-     * to the queue.
-     *
-     * @param mixed ...$values
-     */
-    public function append(...$values): void
-    {
-        foreach ($values as $value) {
-            if ($value instanceof ResponseInterface
-                || $value instanceof \Throwable
-                || $value instanceof PromiseInterface
-                || \is_callable($value)
-            ) {
-                $this->queue[] = $value;
-            } else {
-                throw new \TypeError('Expected a Response, Promise, Throwable or callable. Found '.Utils::describeType($value));
-            }
-        }
-    }
-
-    /**
-     * Get the last received request.
-     */
-    public function getLastRequest(): ?RequestInterface
-    {
-        return $this->lastRequest;
-    }
-
-    /**
-     * Get the last received request options.
-     */
-    public function getLastOptions(): array
-    {
-        return $this->lastOptions;
-    }
-
-    /**
-     * Returns the number of remaining items in the queue.
-     */
-    public function count(): int
-    {
-        return \count($this->queue);
-    }
-
-    public function reset(): void
-    {
-        $this->queue = [];
-    }
-
-    /**
-     * @param mixed $reason Promise or reason.
-     */
-    private function invokeStats(
-        RequestInterface $request,
-        array $options,
-        ResponseInterface $response = null,
-        $reason = null
-    ): void {
-        if (isset($options['on_stats'])) {
-            $transferTime = $options['transfer_time'] ?? 0;
-            $stats = new TransferStats($request, $response, $transferTime, $reason);
-            ($options['on_stats'])($stats);
-        }
-    }
+	/**
+	 * @var array
+	 */
+	private $queue = [];
+
+	/**
+	 * @var RequestInterface|null
+	 */
+	private $lastRequest;
+
+	/**
+	 * @var array
+	 */
+	private $lastOptions = [];
+
+	/**
+	 * @var callable|null
+	 */
+	private $onFulfilled;
+
+	/**
+	 * @var callable|null
+	 */
+	private $onRejected;
+
+	/**
+	 * Creates a new MockHandler that uses the default handler stack list of
+	 * middlewares.
+	 *
+	 * @param array|null    $queue       Array of responses, callables, or exceptions.
+	 * @param callable|null $onFulfilled Callback to invoke when the return value is fulfilled.
+	 * @param callable|null $onRejected  Callback to invoke when the return value is rejected.
+	 */
+	public static function createWithMiddleware(array $queue = null, callable $onFulfilled = null, callable $onRejected = null): HandlerStack
+	{
+		return HandlerStack::create(new self($queue, $onFulfilled, $onRejected));
+	}
+
+	/**
+	 * The passed in value must be an array of
+	 * {@see \OCA\FullTextSearch_Elasticsearch\Vendor\Psr\Http\Message\ResponseInterface} objects, Exceptions,
+	 * callables, or Promises.
+	 *
+	 * @param array<int, mixed>|null $queue       The parameters to be passed to the append function, as an indexed array.
+	 * @param callable|null          $onFulfilled Callback to invoke when the return value is fulfilled.
+	 * @param callable|null          $onRejected  Callback to invoke when the return value is rejected.
+	 */
+	public function __construct(array $queue = null, callable $onFulfilled = null, callable $onRejected = null)
+	{
+		$this->onFulfilled = $onFulfilled;
+		$this->onRejected = $onRejected;
+
+		if ($queue) {
+			// array_values included for BC
+			$this->append(...array_values($queue));
+		}
+	}
+
+	public function __invoke(RequestInterface $request, array $options): PromiseInterface
+	{
+		if (!$this->queue) {
+			throw new \OutOfBoundsException('Mock queue is empty');
+		}
+
+		if (isset($options['delay']) && \is_numeric($options['delay'])) {
+			\usleep((int) $options['delay'] * 1000);
+		}
+
+		$this->lastRequest = $request;
+		$this->lastOptions = $options;
+		$response = \array_shift($this->queue);
+
+		if (isset($options['on_headers'])) {
+			if (!\is_callable($options['on_headers'])) {
+				throw new \InvalidArgumentException('on_headers must be callable');
+			}
+			try {
+				$options['on_headers']($response);
+			} catch (\Exception $e) {
+				$msg = 'An error was encountered during the on_headers event';
+				$response = new RequestException($msg, $request, $response, $e);
+			}
+		}
+
+		if (\is_callable($response)) {
+			$response = $response($request, $options);
+		}
+
+		$response = $response instanceof \Throwable
+			? P\Create::rejectionFor($response)
+			: P\Create::promiseFor($response);
+
+		return $response->then(
+			function (?ResponseInterface $value) use ($request, $options) {
+				$this->invokeStats($request, $options, $value);
+				if ($this->onFulfilled) {
+					($this->onFulfilled)($value);
+				}
+
+				if ($value !== null && isset($options['sink'])) {
+					$contents = (string) $value->getBody();
+					$sink = $options['sink'];
+
+					if (\is_resource($sink)) {
+						\fwrite($sink, $contents);
+					} elseif (\is_string($sink)) {
+						\file_put_contents($sink, $contents);
+					} elseif ($sink instanceof StreamInterface) {
+						$sink->write($contents);
+					}
+				}
+
+				return $value;
+			},
+			function ($reason) use ($request, $options) {
+				$this->invokeStats($request, $options, null, $reason);
+				if ($this->onRejected) {
+					($this->onRejected)($reason);
+				}
+
+				return P\Create::rejectionFor($reason);
+			}
+		);
+	}
+
+	/**
+	 * Adds one or more variadic requests, exceptions, callables, or promises
+	 * to the queue.
+	 *
+	 * @param mixed ...$values
+	 */
+	public function append(...$values): void
+	{
+		foreach ($values as $value) {
+			if ($value instanceof ResponseInterface
+				|| $value instanceof \Throwable
+				|| $value instanceof PromiseInterface
+				|| \is_callable($value)
+			) {
+				$this->queue[] = $value;
+			} else {
+				throw new \TypeError('Expected a Response, Promise, Throwable or callable. Found '.Utils::describeType($value));
+			}
+		}
+	}
+
+	/**
+	 * Get the last received request.
+	 */
+	public function getLastRequest(): ?RequestInterface
+	{
+		return $this->lastRequest;
+	}
+
+	/**
+	 * Get the last received request options.
+	 */
+	public function getLastOptions(): array
+	{
+		return $this->lastOptions;
+	}
+
+	/**
+	 * Returns the number of remaining items in the queue.
+	 */
+	public function count(): int
+	{
+		return \count($this->queue);
+	}
+
+	public function reset(): void
+	{
+		$this->queue = [];
+	}
+
+	/**
+	 * @param mixed $reason Promise or reason.
+	 */
+	private function invokeStats(
+		RequestInterface $request,
+		array $options,
+		ResponseInterface $response = null,
+		$reason = null
+	): void {
+		if (isset($options['on_stats'])) {
+			$transferTime = $options['transfer_time'] ?? 0;
+			$stats = new TransferStats($request, $response, $transferTime, $reason);
+			($options['on_stats'])($stats);
+		}
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -84,7 +84,7 @@ 
         }
 
         if (isset($options['delay']) && \is_numeric($options['delay'])) {
-            \usleep((int) $options['delay'] * 1000);
+            \usleep((int)$options['delay'] * 1000);
         }
 
         $this->lastRequest = $request;
@@ -112,14 +112,14 @@ 
             : P\Create::promiseFor($response);
 
         return $response->then(
-            function (?ResponseInterface $value) use ($request, $options) {
+            function(?ResponseInterface $value) use ($request, $options) {
                 $this->invokeStats($request, $options, $value);
                 if ($this->onFulfilled) {
                     ($this->onFulfilled)($value);
                 }
 
                 if ($value !== null && isset($options['sink'])) {
-                    $contents = (string) $value->getBody();
+                    $contents = (string)$value->getBody();
                     $sink = $options['sink'];
 
                     if (\is_resource($sink)) {
@@ -133,7 +133,7 @@ 
 
                 return $value;
             },
-            function ($reason) use ($request, $options) {
+            function($reason) use ($request, $options) {
                 $this->invokeStats($request, $options, null, $reason);
                 if ($this->onRejected) {
                     ($this->onRejected)($reason);