nextcloud / fulltextsearch_elasticsearch

lib/Vendor/Elastic/Elasticsearch/Exception/ConfigException.php

Braces +1 added lines, -2 removed lines

@@ -16,7 +16,6 @@
 
 use Exception;
 
-class ConfigException extends Exception implements ElasticsearchException
-{
+class ConfigException extends Exception implements ElasticsearchException {
 
 }
\ No newline at end of file

lib/Vendor/Elastic/Elasticsearch/Exception/InvalidArgumentException.php

Braces +1 added lines, -2 removed lines

@@ -16,7 +16,6 @@
 
 use InvalidArgumentException as InvalidArgument;
 
-class InvalidArgumentException extends InvalidArgument implements ElasticsearchException
-{
+class InvalidArgumentException extends InvalidArgument implements ElasticsearchException {
 
 }
\ No newline at end of file

lib/Vendor/Elastic/Elasticsearch/Client.php

Indentation +140 added lines, -140 removed lines

@@ -27,149 +27,149 @@
 
 final class Client implements ClientInterface
 {
-    const CLIENT_NAME = 'es';
-    const VERSION = '8.13.0';
-    const API_COMPATIBILITY_HEADER = '%s/vnd.elasticsearch+%s; compatible-with=8';
+	const CLIENT_NAME = 'es';
+	const VERSION = '8.13.0';
+	const API_COMPATIBILITY_HEADER = '%s/vnd.elasticsearch+%s; compatible-with=8';
     
-    use ClientEndpointsTrait;
-    use EndpointTrait;
-    use NamespaceTrait;
+	use ClientEndpointsTrait;
+	use EndpointTrait;
+	use NamespaceTrait;
     
-    protected Transport $transport;
-    protected LoggerInterface $logger;
+	protected Transport $transport;
+	protected LoggerInterface $logger;
 
-    /**
-     * Specify is the request is asyncronous
-     */
-    protected bool $async = false;
+	/**
+	 * Specify is the request is asyncronous
+	 */
+	protected bool $async = false;
     
-    /**
-     * Enable or disable the x-elastic-meta-header
-     */
-    protected bool $elasticMetaHeader = true;
-
-    /**
-     * Enable or disable the response Exception
-     */
-    protected bool $responseException = true;
-
-    /**
-     * The endpoint namespace storage 
-     */
-    protected array $namespace;
-
-    public function __construct(
-        Transport $transport, 
-        LoggerInterface $logger
-    ) {
-        $this->transport = $transport;
-        $this->logger = $logger;       
+	/**
+	 * Enable or disable the x-elastic-meta-header
+	 */
+	protected bool $elasticMetaHeader = true;
+
+	/**
+	 * Enable or disable the response Exception
+	 */
+	protected bool $responseException = true;
+
+	/**
+	 * The endpoint namespace storage 
+	 */
+	protected array $namespace;
+
+	public function __construct(
+		Transport $transport, 
+		LoggerInterface $logger
+	) {
+		$this->transport = $transport;
+		$this->logger = $logger;       
         
-        $this->defaultTransportSettings($this->transport);
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function getTransport(): Transport
-    {
-        return $this->transport;
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function getLogger(): LoggerInterface
-    {
-        return $this->logger;
-    }
-
-    /**
-     * Set the default settings for Elasticsearch
-     */
-    protected function defaultTransportSettings(Transport $transport): void
-    {
-        $transport->setUserAgent('elasticsearch-php', self::VERSION);
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function setAsync(bool $async): self
-    {
-        $this->async = $async;
-        return $this;
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function getAsync(): bool
-    {
-        return $this->async;
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function setElasticMetaHeader(bool $active): self
-    {
-        $this->elasticMetaHeader = $active;
-        return $this;
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function getElasticMetaHeader(): bool
-    {
-        return $this->elasticMetaHeader;
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function setResponseException(bool $active): self
-    {
-        $this->responseException = $active;
-        return $this;
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function getResponseException(): bool
-    {
-        return $this->responseException;
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function sendRequest(RequestInterface $request)
-    {   
-        // If async returns a Promise
-        if ($this->getAsync()) {
-            if ($this->getElasticMetaHeader()) {
-                $this->transport->setElasticMetaHeader(Client::CLIENT_NAME, Client::VERSION, true);
-            }
-            $this->transport->setAsyncOnSuccess(
-                $request->getMethod() === 'HEAD'
-                    ? new AsyncOnSuccessNoException
-                    : ($this->getResponseException() ? new AsyncOnSuccess : new AsyncOnSuccessNoException)
-            );
-            return $this->transport->sendAsyncRequest($request);
-        }     
-
-        if ($this->getElasticMetaHeader()) {
-            $this->transport->setElasticMetaHeader(Client::CLIENT_NAME, Client::VERSION, false);
-        }
-        $start = microtime(true);
-        $response = $this->transport->sendRequest($request);
-        $this->logger->info(sprintf("Response time in %.3f sec", microtime(true) - $start));       
-
-        $result = new Elasticsearch;
-        $result->setResponse($response, $request->getMethod() === 'HEAD' ? false : $this->getResponseException());
-        return $result;
-    }
+		$this->defaultTransportSettings($this->transport);
+	}
+
+	/**
+	 * @inheritdoc
+	 */
+	public function getTransport(): Transport
+	{
+		return $this->transport;
+	}
+
+	/**
+	 * @inheritdoc
+	 */
+	public function getLogger(): LoggerInterface
+	{
+		return $this->logger;
+	}
+
+	/**
+	 * Set the default settings for Elasticsearch
+	 */
+	protected function defaultTransportSettings(Transport $transport): void
+	{
+		$transport->setUserAgent('elasticsearch-php', self::VERSION);
+	}
+
+	/**
+	 * @inheritdoc
+	 */
+	public function setAsync(bool $async): self
+	{
+		$this->async = $async;
+		return $this;
+	}
+
+	/**
+	 * @inheritdoc
+	 */
+	public function getAsync(): bool
+	{
+		return $this->async;
+	}
+
+	/**
+	 * @inheritdoc
+	 */
+	public function setElasticMetaHeader(bool $active): self
+	{
+		$this->elasticMetaHeader = $active;
+		return $this;
+	}
+
+	/**
+	 * @inheritdoc
+	 */
+	public function getElasticMetaHeader(): bool
+	{
+		return $this->elasticMetaHeader;
+	}
+
+	/**
+	 * @inheritdoc
+	 */
+	public function setResponseException(bool $active): self
+	{
+		$this->responseException = $active;
+		return $this;
+	}
+
+	/**
+	 * @inheritdoc
+	 */
+	public function getResponseException(): bool
+	{
+		return $this->responseException;
+	}
+
+	/**
+	 * @inheritdoc
+	 */
+	public function sendRequest(RequestInterface $request)
+	{   
+		// If async returns a Promise
+		if ($this->getAsync()) {
+			if ($this->getElasticMetaHeader()) {
+				$this->transport->setElasticMetaHeader(Client::CLIENT_NAME, Client::VERSION, true);
+			}
+			$this->transport->setAsyncOnSuccess(
+				$request->getMethod() === 'HEAD'
+					? new AsyncOnSuccessNoException
+					: ($this->getResponseException() ? new AsyncOnSuccess : new AsyncOnSuccessNoException)
+			);
+			return $this->transport->sendAsyncRequest($request);
+		}     
+
+		if ($this->getElasticMetaHeader()) {
+			$this->transport->setElasticMetaHeader(Client::CLIENT_NAME, Client::VERSION, false);
+		}
+		$start = microtime(true);
+		$response = $this->transport->sendRequest($request);
+		$this->logger->info(sprintf("Response time in %.3f sec", microtime(true) - $start));       
+
+		$result = new Elasticsearch;
+		$result->setResponse($response, $request->getMethod() === 'HEAD' ? false : $this->getResponseException());
+		return $result;
+	}
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
  * Elasticsearch B.V licenses this file to you under the MIT License.
  * See the LICENSE file in the project root for more information.
  */
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace OCA\FullTextSearch_Elasticsearch\Vendor\Elastic\Elasticsearch;
 

Braces +1 added lines, -2 removed lines

@@ -25,8 +25,7 @@
 use OCA\FullTextSearch_Elasticsearch\Vendor\Psr\Http\Message\RequestInterface;
 use OCA\FullTextSearch_Elasticsearch\Vendor\Psr\Log\LoggerInterface;
 
-final class Client implements ClientInterface
-{
+final class Client implements ClientInterface {
     const CLIENT_NAME = 'es';
     const VERSION = '8.13.0';
     const API_COMPATIBILITY_HEADER = '%s/vnd.elasticsearch+%s; compatible-with=8';

lib/Vendor/Elastic/Elasticsearch/Helper/Iterators/SearchHitIterator.php

Indentation +141 added lines, -141 removed lines

@@ -22,145 +22,145 @@
 class SearchHitIterator implements Iterator, Countable
 {
 
-    /**
-     * @var SearchResponseIterator
-     */
-    private SearchResponseIterator $searchResponses;
-
-    /**
-     * @var int
-     */
-    protected int $currentKey;
-
-    /**
-     * @var int
-     */
-    protected int $currentHitIndex;
-
-    /**
-     * @var array|null
-     */
-    protected ?array $currentHitData;
-
-    /**
-     * @var int
-     */
-    protected int $count = 0;
-
-    /**
-     * Constructor
-     *
-     * @param SearchResponseIterator $searchResponses
-     */
-    public function __construct(SearchResponseIterator $searchResponses)
-    {
-        $this->searchResponses = $searchResponses;
-    }
-
-    /**
-     * Rewinds the internal SearchResponseIterator and itself
-     *
-     * @return void
-     * @throws ClientResponseException
-     * @throws ServerResponseException
-     * @see    Iterator::rewind()
-     */
-    public function rewind(): void
-    {
-        $this->currentKey = 0;
-        $this->searchResponses->rewind();
-
-        // The first page may be empty. In that case, the next page is fetched.
-        $currentPage = $this->searchResponses->current();
-        if ($this->searchResponses->valid() && empty($currentPage['hits']['hits'])) {
-            $this->searchResponses->next();
-        }
-
-        $this->count = 0;
-        if (isset($currentPage['hits']['total']['value'], $currentPage['hits']['total'])) {
-            $this->count = $currentPage['hits']['total']['value'] ?? $currentPage['hits']['total'];
-        }
-
-        $this->readPageData();
-    }
-
-    /**
-     * Advances pointer of the current hit to the next one in the current page. If there
-     * isn't a next hit in the current page, then it advances the current page and moves the
-     * pointer to the first hit in the page.
-     *
-     * @return void
-     * @throws ClientResponseException
-     * @throws ServerResponseException
-     * @see    Iterator::next()
-     */
-    public function next(): void
-    {
-        $this->currentKey++;
-        $this->currentHitIndex++;
-        $currentPage = $this->searchResponses->current();
-        if (isset($currentPage['hits']['hits'][$this->currentHitIndex])) {
-            $this->currentHitData = $currentPage['hits']['hits'][$this->currentHitIndex];
-        } else {
-            $this->searchResponses->next();
-            $this->readPageData();
-        }
-    }
-
-    /**
-     * Returns a boolean indicating whether or not the current pointer has valid data
-     *
-     * @return bool
-     * @see    Iterator::valid()
-     */
-    public function valid(): bool
-    {
-        return is_array($this->currentHitData);
-    }
-
-    /**
-     * Returns the current hit
-     *
-     * @return array
-     * @see    Iterator::current()
-     */
-    public function current(): array
-    {
-        return $this->currentHitData;
-    }
-
-    /**
-     * Returns the current hit index. The hit index spans all pages.
-     *
-     * @return int
-     * @see    Iterator::key()
-     */
-    public function key(): int
-    {
-        return $this->currentKey;
-    }
-
-    /**
-     * Advances the internal SearchResponseIterator and resets the currentHitIndex to 0
-     *
-     * @internal
-     */
-    private function readPageData(): void
-    {
-        if ($this->searchResponses->valid()) {
-            $currentPage = $this->searchResponses->current();
-            $this->currentHitIndex = 0;
-            $this->currentHitData = $currentPage['hits']['hits'][$this->currentHitIndex];
-        } else {
-            $this->currentHitData = null;
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function count(): int
-    {
-        return $this->count;
-    }
+	/**
+	 * @var SearchResponseIterator
+	 */
+	private SearchResponseIterator $searchResponses;
+
+	/**
+	 * @var int
+	 */
+	protected int $currentKey;
+
+	/**
+	 * @var int
+	 */
+	protected int $currentHitIndex;
+
+	/**
+	 * @var array|null
+	 */
+	protected ?array $currentHitData;
+
+	/**
+	 * @var int
+	 */
+	protected int $count = 0;
+
+	/**
+	 * Constructor
+	 *
+	 * @param SearchResponseIterator $searchResponses
+	 */
+	public function __construct(SearchResponseIterator $searchResponses)
+	{
+		$this->searchResponses = $searchResponses;
+	}
+
+	/**
+	 * Rewinds the internal SearchResponseIterator and itself
+	 *
+	 * @return void
+	 * @throws ClientResponseException
+	 * @throws ServerResponseException
+	 * @see    Iterator::rewind()
+	 */
+	public function rewind(): void
+	{
+		$this->currentKey = 0;
+		$this->searchResponses->rewind();
+
+		// The first page may be empty. In that case, the next page is fetched.
+		$currentPage = $this->searchResponses->current();
+		if ($this->searchResponses->valid() && empty($currentPage['hits']['hits'])) {
+			$this->searchResponses->next();
+		}
+
+		$this->count = 0;
+		if (isset($currentPage['hits']['total']['value'], $currentPage['hits']['total'])) {
+			$this->count = $currentPage['hits']['total']['value'] ?? $currentPage['hits']['total'];
+		}
+
+		$this->readPageData();
+	}
+
+	/**
+	 * Advances pointer of the current hit to the next one in the current page. If there
+	 * isn't a next hit in the current page, then it advances the current page and moves the
+	 * pointer to the first hit in the page.
+	 *
+	 * @return void
+	 * @throws ClientResponseException
+	 * @throws ServerResponseException
+	 * @see    Iterator::next()
+	 */
+	public function next(): void
+	{
+		$this->currentKey++;
+		$this->currentHitIndex++;
+		$currentPage = $this->searchResponses->current();
+		if (isset($currentPage['hits']['hits'][$this->currentHitIndex])) {
+			$this->currentHitData = $currentPage['hits']['hits'][$this->currentHitIndex];
+		} else {
+			$this->searchResponses->next();
+			$this->readPageData();
+		}
+	}
+
+	/**
+	 * Returns a boolean indicating whether or not the current pointer has valid data
+	 *
+	 * @return bool
+	 * @see    Iterator::valid()
+	 */
+	public function valid(): bool
+	{
+		return is_array($this->currentHitData);
+	}
+
+	/**
+	 * Returns the current hit
+	 *
+	 * @return array
+	 * @see    Iterator::current()
+	 */
+	public function current(): array
+	{
+		return $this->currentHitData;
+	}
+
+	/**
+	 * Returns the current hit index. The hit index spans all pages.
+	 *
+	 * @return int
+	 * @see    Iterator::key()
+	 */
+	public function key(): int
+	{
+		return $this->currentKey;
+	}
+
+	/**
+	 * Advances the internal SearchResponseIterator and resets the currentHitIndex to 0
+	 *
+	 * @internal
+	 */
+	private function readPageData(): void
+	{
+		if ($this->searchResponses->valid()) {
+			$currentPage = $this->searchResponses->current();
+			$this->currentHitIndex = 0;
+			$this->currentHitData = $currentPage['hits']['hits'][$this->currentHitIndex];
+		} else {
+			$this->currentHitData = null;
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function count(): int
+	{
+		return $this->count;
+	}
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
  * Elasticsearch B.V licenses this file to you under the MIT License.
  * See the LICENSE file in the project root for more information.
  */
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace OCA\FullTextSearch_Elasticsearch\Vendor\Elastic\Elasticsearch\Helper\Iterators;
 

lib/Vendor/Elastic/Elasticsearch/Helper/Iterators/SearchResponseIterator.php

Indentation +167 added lines, -167 removed lines

@@ -22,171 +22,171 @@
 class SearchResponseIterator implements Iterator
 {
 
-    /**
-     * @var ClientInterface
-     */
-    private ClientInterface $client;
-
-    /**
-     * @var array
-     */
-    private array $params;
-
-    /**
-     * @var int
-     */
-    private int $currentKey = 0;
-
-    /**
-     * @var array
-     */
-    private array $currentScrolledResponse;
-
-    /**
-     * @var string|null
-     */
-    private ?string $scrollId;
-
-    /**
-     * @var string duration
-     */
-    private $scrollTtl;
-
-    /**
-     * Constructor
-     *
-     * @param ClientInterface $client
-     * @param array  $searchParams Associative array of parameters
-     * @see   ClientInterface::search()
-     */
-    public function __construct(ClientInterface $client, array $searchParams)
-    {
-        $this->client = $client;
-        $this->params = $searchParams;
-
-        if (isset($searchParams['scroll'])) {
-            $this->scrollTtl = $searchParams['scroll'];
-        }
-    }
-
-    /**
-     * Destructor
-     *
-     * @throws ClientResponseException
-     * @throws ServerResponseException
-     */
-    public function __destruct()
-    {
-        $this->clearScroll();
-    }
-
-    /**
-     * Sets the time to live duration of a scroll window
-     *
-     * @param  string $timeToLive
-     * @return $this
-     */
-    public function setScrollTimeout(string $timeToLive): SearchResponseIterator
-    {
-        $this->scrollTtl = $timeToLive;
-        return $this;
-    }
-
-    /**
-     * Clears the current scroll window if there is a scroll_id stored
-     *
-     * @return void
-     * @throws ClientResponseException
-     * @throws ServerResponseException
-     */
-    private function clearScroll(): void
-    {
-        if (!empty($this->scrollId)) {
-            /* @phpstan-ignore-next-line */
-            $this->client->clearScroll(
-                [
-                    'body' => [
-                        'scroll_id' => $this->scrollId
-                    ],
-                    'client' => [
-                        'ignore' => 404
-                    ]
-                ]
-            );
-            $this->scrollId = null;
-        }
-    }
-
-    /**
-     * Rewinds the iterator by performing the initial search.
-     *
-     * @return void
-     * @throws ClientResponseException
-     * @throws ServerResponseException
-     * @see    Iterator::rewind()
-     */
-    public function rewind(): void
-    {
-        $this->clearScroll();
-        $this->currentKey = 0;
-        /* @phpstan-ignore-next-line */
-        $this->currentScrolledResponse = $this->client->search($this->params)->asArray();
-        $this->scrollId = $this->currentScrolledResponse['_scroll_id'];
-    }
-
-    /**
-     * Fetches every "page" after the first one using the lastest "scroll_id"
-     *
-     * @return void
-     * @throws ClientResponseException
-     * @throws ServerResponseException
-     * @see    Iterator::next()
-     */
-    public function next(): void
-    {
-        /* @phpstan-ignore-next-line */
-        $this->currentScrolledResponse = $this->client->scroll(
-            [
-                'body' => [
-                    'scroll_id' => $this->scrollId,
-                    'scroll'    => $this->scrollTtl
-                ]
-            ]
-        )->asArray();
-        $this->scrollId = $this->currentScrolledResponse['_scroll_id'];
-        $this->currentKey++;
-    }
-
-    /**
-     * Returns a boolean value indicating if the current page is valid or not
-     *
-     * @return bool
-     * @see    Iterator::valid()
-     */
-    public function valid(): bool
-    {
-        return isset($this->currentScrolledResponse['hits']['hits'][0]);
-    }
-
-    /**
-     * Returns the current "page"
-     *
-     * @return array
-     * @see    Iterator::current()
-     */
-    public function current(): array
-    {
-        return $this->currentScrolledResponse;
-    }
-
-    /**
-     * Returns the current "page number" of the current "page"
-     *
-     * @return int
-     * @see    Iterator::key()
-     */
-    public function key(): int
-    {
-        return $this->currentKey;
-    }
+	/**
+	 * @var ClientInterface
+	 */
+	private ClientInterface $client;
+
+	/**
+	 * @var array
+	 */
+	private array $params;
+
+	/**
+	 * @var int
+	 */
+	private int $currentKey = 0;
+
+	/**
+	 * @var array
+	 */
+	private array $currentScrolledResponse;
+
+	/**
+	 * @var string|null
+	 */
+	private ?string $scrollId;
+
+	/**
+	 * @var string duration
+	 */
+	private $scrollTtl;
+
+	/**
+	 * Constructor
+	 *
+	 * @param ClientInterface $client
+	 * @param array  $searchParams Associative array of parameters
+	 * @see   ClientInterface::search()
+	 */
+	public function __construct(ClientInterface $client, array $searchParams)
+	{
+		$this->client = $client;
+		$this->params = $searchParams;
+
+		if (isset($searchParams['scroll'])) {
+			$this->scrollTtl = $searchParams['scroll'];
+		}
+	}
+
+	/**
+	 * Destructor
+	 *
+	 * @throws ClientResponseException
+	 * @throws ServerResponseException
+	 */
+	public function __destruct()
+	{
+		$this->clearScroll();
+	}
+
+	/**
+	 * Sets the time to live duration of a scroll window
+	 *
+	 * @param  string $timeToLive
+	 * @return $this
+	 */
+	public function setScrollTimeout(string $timeToLive): SearchResponseIterator
+	{
+		$this->scrollTtl = $timeToLive;
+		return $this;
+	}
+
+	/**
+	 * Clears the current scroll window if there is a scroll_id stored
+	 *
+	 * @return void
+	 * @throws ClientResponseException
+	 * @throws ServerResponseException
+	 */
+	private function clearScroll(): void
+	{
+		if (!empty($this->scrollId)) {
+			/* @phpstan-ignore-next-line */
+			$this->client->clearScroll(
+				[
+					'body' => [
+						'scroll_id' => $this->scrollId
+					],
+					'client' => [
+						'ignore' => 404
+					]
+				]
+			);
+			$this->scrollId = null;
+		}
+	}
+
+	/**
+	 * Rewinds the iterator by performing the initial search.
+	 *
+	 * @return void
+	 * @throws ClientResponseException
+	 * @throws ServerResponseException
+	 * @see    Iterator::rewind()
+	 */
+	public function rewind(): void
+	{
+		$this->clearScroll();
+		$this->currentKey = 0;
+		/* @phpstan-ignore-next-line */
+		$this->currentScrolledResponse = $this->client->search($this->params)->asArray();
+		$this->scrollId = $this->currentScrolledResponse['_scroll_id'];
+	}
+
+	/**
+	 * Fetches every "page" after the first one using the lastest "scroll_id"
+	 *
+	 * @return void
+	 * @throws ClientResponseException
+	 * @throws ServerResponseException
+	 * @see    Iterator::next()
+	 */
+	public function next(): void
+	{
+		/* @phpstan-ignore-next-line */
+		$this->currentScrolledResponse = $this->client->scroll(
+			[
+				'body' => [
+					'scroll_id' => $this->scrollId,
+					'scroll'    => $this->scrollTtl
+				]
+			]
+		)->asArray();
+		$this->scrollId = $this->currentScrolledResponse['_scroll_id'];
+		$this->currentKey++;
+	}
+
+	/**
+	 * Returns a boolean value indicating if the current page is valid or not
+	 *
+	 * @return bool
+	 * @see    Iterator::valid()
+	 */
+	public function valid(): bool
+	{
+		return isset($this->currentScrolledResponse['hits']['hits'][0]);
+	}
+
+	/**
+	 * Returns the current "page"
+	 *
+	 * @return array
+	 * @see    Iterator::current()
+	 */
+	public function current(): array
+	{
+		return $this->currentScrolledResponse;
+	}
+
+	/**
+	 * Returns the current "page number" of the current "page"
+	 *
+	 * @return int
+	 * @see    Iterator::key()
+	 */
+	public function key(): int
+	{
+		return $this->currentKey;
+	}
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
  * Elasticsearch B.V licenses this file to you under the MIT License.
  * See the LICENSE file in the project root for more information.
  */
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace OCA\FullTextSearch_Elasticsearch\Vendor\Elastic\Elasticsearch\Helper\Iterators;
 

Braces +1 added lines, -2 removed lines

@@ -19,8 +19,7 @@
 use OCA\FullTextSearch_Elasticsearch\Vendor\Elastic\Elasticsearch\Exception\ServerResponseException;
 use Iterator;
 
-class SearchResponseIterator implements Iterator
-{
+class SearchResponseIterator implements Iterator {
 
     /**
      * @var ClientInterface

lib/Vendor/GuzzleHttp/Utils.php

Indentation +358 added lines, -358 removed lines

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

Spacing +4 added lines, -4 removed lines

@@ -312,7 +312,7 @@ 
      */
     public static function currentTime(): float
     {
-        return (float) \function_exists('hrtime') ? \hrtime(true) / 1e9 : \microtime(true);
+        return (float)\function_exists('hrtime') ? \hrtime(true) / 1e9 : \microtime(true);
     }
 
     /**
@@ -327,7 +327,7 @@ 
             if ($asciiHost === false) {
                 $errorBitSet = $info['errors'] ?? 0;
 
-                $errorConstants = array_filter(array_keys(get_defined_constants()), static function (string $name): bool {
+                $errorConstants = array_filter(array_keys(get_defined_constants()), static function(string $name): bool {
                     return substr($name, 0, 11) === 'IDNA_ERROR_';
                 });
 
@@ -360,11 +360,11 @@ 
     public static function getenv(string $name): ?string
     {
         if (isset($_SERVER[$name])) {
-            return (string) $_SERVER[$name];
+            return (string)$_SERVER[$name];
         }
 
         if (\PHP_SAPI === 'cli' && ($value = \getenv($name)) !== false && $value !== null) {
-            return (string) $value;
+            return (string)$value;
         }
 
         return null;

Braces +1 added lines, -2 removed lines

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

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.
      *