nextcloud / fulltextsearch_elasticsearch

lib/Vendor/GuzzleHttp/Psr7/InflateStream.php

Indentation +13 added lines, -13 removed lines

@@ -19,19 +19,19 @@
  */
 final class InflateStream implements StreamInterface
 {
-    use StreamDecoratorTrait;
+	use StreamDecoratorTrait;
 
-    /** @var StreamInterface */
-    private $stream;
+	/** @var StreamInterface */
+	private $stream;
 
-    public function __construct(StreamInterface $stream)
-    {
-        $resource = StreamWrapper::getResource($stream);
-        // Specify window=15+32, so zlib will use header detection to both gzip (with header) and zlib data
-        // See https://www.zlib.net/manual.html#Advanced definition of inflateInit2
-        // "Add 32 to windowBits to enable zlib and gzip decoding with automatic header detection"
-        // Default window size is 15.
-        stream_filter_append($resource, 'zlib.inflate', STREAM_FILTER_READ, ['window' => 15 + 32]);
-        $this->stream = $stream->isSeekable() ? new Stream($resource) : new NoSeekStream(new Stream($resource));
-    }
+	public function __construct(StreamInterface $stream)
+	{
+		$resource = StreamWrapper::getResource($stream);
+		// Specify window=15+32, so zlib will use header detection to both gzip (with header) and zlib data
+		// See https://www.zlib.net/manual.html#Advanced definition of inflateInit2
+		// "Add 32 to windowBits to enable zlib and gzip decoding with automatic header detection"
+		// Default window size is 15.
+		stream_filter_append($resource, 'zlib.inflate', STREAM_FILTER_READ, ['window' => 15 + 32]);
+		$this->stream = $stream->isSeekable() ? new Stream($resource) : new NoSeekStream(new Stream($resource));
+	}
 }

Braces +1 added lines, -2 removed lines

@@ -17,8 +17,7 @@
  * @see https://datatracker.ietf.org/doc/html/rfc1952
  * @see https://www.php.net/manual/en/filters.compression.php
  */
-final class InflateStream implements StreamInterface
-{
+final class InflateStream implements StreamInterface {
     use StreamDecoratorTrait;
 
     /** @var StreamInterface */

lib/Vendor/GuzzleHttp/Psr7/Stream.php

Indentation +269 added lines, -269 removed lines

@@ -11,273 +11,273 @@
  */
 class Stream implements StreamInterface
 {
-    /**
-     * @see https://www.php.net/manual/en/function.fopen.php
-     * @see https://www.php.net/manual/en/function.gzopen.php
-     */
-    private const READABLE_MODES = '/r|a\+|ab\+|w\+|wb\+|x\+|xb\+|c\+|cb\+/';
-    private const WRITABLE_MODES = '/a|w|r\+|rb\+|rw|x|c/';
-
-    /** @var resource */
-    private $stream;
-    /** @var int|null */
-    private $size;
-    /** @var bool */
-    private $seekable;
-    /** @var bool */
-    private $readable;
-    /** @var bool */
-    private $writable;
-    /** @var string|null */
-    private $uri;
-    /** @var mixed[] */
-    private $customMetadata;
-
-    /**
-     * This constructor accepts an associative array of options.
-     *
-     * - size: (int) If a read stream would otherwise have an indeterminate
-     *   size, but the size is known due to foreknowledge, then you can
-     *   provide that size, in bytes.
-     * - metadata: (array) Any additional metadata to return when the metadata
-     *   of the stream is accessed.
-     *
-     * @param resource                            $stream  Stream resource to wrap.
-     * @param array{size?: int, metadata?: array} $options Associative array of options.
-     *
-     * @throws \InvalidArgumentException if the stream is not a stream resource
-     */
-    public function __construct($stream, array $options = [])
-    {
-        if (!is_resource($stream)) {
-            throw new \InvalidArgumentException('Stream must be a resource');
-        }
-
-        if (isset($options['size'])) {
-            $this->size = $options['size'];
-        }
-
-        $this->customMetadata = $options['metadata'] ?? [];
-        $this->stream = $stream;
-        $meta = stream_get_meta_data($this->stream);
-        $this->seekable = $meta['seekable'];
-        $this->readable = (bool) preg_match(self::READABLE_MODES, $meta['mode']);
-        $this->writable = (bool) preg_match(self::WRITABLE_MODES, $meta['mode']);
-        $this->uri = $this->getMetadata('uri');
-    }
-
-    /**
-     * Closes the stream when the destructed
-     */
-    public function __destruct()
-    {
-        $this->close();
-    }
-
-    public function __toString(): string
-    {
-        try {
-            if ($this->isSeekable()) {
-                $this->seek(0);
-            }
-
-            return $this->getContents();
-        } catch (\Throwable $e) {
-            if (\PHP_VERSION_ID >= 70400) {
-                throw $e;
-            }
-            trigger_error(sprintf('%s::__toString exception: %s', self::class, (string) $e), E_USER_ERROR);
-
-            return '';
-        }
-    }
-
-    public function getContents(): string
-    {
-        if (!isset($this->stream)) {
-            throw new \RuntimeException('Stream is detached');
-        }
-
-        if (!$this->readable) {
-            throw new \RuntimeException('Cannot read from non-readable stream');
-        }
-
-        return Utils::tryGetContents($this->stream);
-    }
-
-    public function close(): void
-    {
-        if (isset($this->stream)) {
-            if (is_resource($this->stream)) {
-                fclose($this->stream);
-            }
-            $this->detach();
-        }
-    }
-
-    public function detach()
-    {
-        if (!isset($this->stream)) {
-            return null;
-        }
-
-        $result = $this->stream;
-        unset($this->stream);
-        $this->size = $this->uri = null;
-        $this->readable = $this->writable = $this->seekable = false;
-
-        return $result;
-    }
-
-    public function getSize(): ?int
-    {
-        if ($this->size !== null) {
-            return $this->size;
-        }
-
-        if (!isset($this->stream)) {
-            return null;
-        }
-
-        // Clear the stat cache if the stream has a URI
-        if ($this->uri) {
-            clearstatcache(true, $this->uri);
-        }
-
-        $stats = fstat($this->stream);
-        if (is_array($stats) && isset($stats['size'])) {
-            $this->size = $stats['size'];
-
-            return $this->size;
-        }
-
-        return null;
-    }
-
-    public function isReadable(): bool
-    {
-        return $this->readable;
-    }
-
-    public function isWritable(): bool
-    {
-        return $this->writable;
-    }
-
-    public function isSeekable(): bool
-    {
-        return $this->seekable;
-    }
-
-    public function eof(): bool
-    {
-        if (!isset($this->stream)) {
-            throw new \RuntimeException('Stream is detached');
-        }
-
-        return feof($this->stream);
-    }
-
-    public function tell(): int
-    {
-        if (!isset($this->stream)) {
-            throw new \RuntimeException('Stream is detached');
-        }
-
-        $result = ftell($this->stream);
-
-        if ($result === false) {
-            throw new \RuntimeException('Unable to determine stream position');
-        }
-
-        return $result;
-    }
-
-    public function rewind(): void
-    {
-        $this->seek(0);
-    }
-
-    public function seek($offset, $whence = SEEK_SET): void
-    {
-        $whence = (int) $whence;
-
-        if (!isset($this->stream)) {
-            throw new \RuntimeException('Stream is detached');
-        }
-        if (!$this->seekable) {
-            throw new \RuntimeException('Stream is not seekable');
-        }
-        if (fseek($this->stream, $offset, $whence) === -1) {
-            throw new \RuntimeException('Unable to seek to stream position '
-                .$offset.' with whence '.var_export($whence, true));
-        }
-    }
-
-    public function read($length): string
-    {
-        if (!isset($this->stream)) {
-            throw new \RuntimeException('Stream is detached');
-        }
-        if (!$this->readable) {
-            throw new \RuntimeException('Cannot read from non-readable stream');
-        }
-        if ($length < 0) {
-            throw new \RuntimeException('Length parameter cannot be negative');
-        }
-
-        if (0 === $length) {
-            return '';
-        }
-
-        try {
-            $string = fread($this->stream, $length);
-        } catch (\Exception $e) {
-            throw new \RuntimeException('Unable to read from stream', 0, $e);
-        }
-
-        if (false === $string) {
-            throw new \RuntimeException('Unable to read from stream');
-        }
-
-        return $string;
-    }
-
-    public function write($string): int
-    {
-        if (!isset($this->stream)) {
-            throw new \RuntimeException('Stream is detached');
-        }
-        if (!$this->writable) {
-            throw new \RuntimeException('Cannot write to a non-writable stream');
-        }
-
-        // We can't know the size after writing anything
-        $this->size = null;
-        $result = fwrite($this->stream, $string);
-
-        if ($result === false) {
-            throw new \RuntimeException('Unable to write to stream');
-        }
-
-        return $result;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getMetadata($key = null)
-    {
-        if (!isset($this->stream)) {
-            return $key ? null : [];
-        } elseif (!$key) {
-            return $this->customMetadata + stream_get_meta_data($this->stream);
-        } elseif (isset($this->customMetadata[$key])) {
-            return $this->customMetadata[$key];
-        }
-
-        $meta = stream_get_meta_data($this->stream);
-
-        return $meta[$key] ?? null;
-    }
+	/**
+	 * @see https://www.php.net/manual/en/function.fopen.php
+	 * @see https://www.php.net/manual/en/function.gzopen.php
+	 */
+	private const READABLE_MODES = '/r|a\+|ab\+|w\+|wb\+|x\+|xb\+|c\+|cb\+/';
+	private const WRITABLE_MODES = '/a|w|r\+|rb\+|rw|x|c/';
+
+	/** @var resource */
+	private $stream;
+	/** @var int|null */
+	private $size;
+	/** @var bool */
+	private $seekable;
+	/** @var bool */
+	private $readable;
+	/** @var bool */
+	private $writable;
+	/** @var string|null */
+	private $uri;
+	/** @var mixed[] */
+	private $customMetadata;
+
+	/**
+	 * This constructor accepts an associative array of options.
+	 *
+	 * - size: (int) If a read stream would otherwise have an indeterminate
+	 *   size, but the size is known due to foreknowledge, then you can
+	 *   provide that size, in bytes.
+	 * - metadata: (array) Any additional metadata to return when the metadata
+	 *   of the stream is accessed.
+	 *
+	 * @param resource                            $stream  Stream resource to wrap.
+	 * @param array{size?: int, metadata?: array} $options Associative array of options.
+	 *
+	 * @throws \InvalidArgumentException if the stream is not a stream resource
+	 */
+	public function __construct($stream, array $options = [])
+	{
+		if (!is_resource($stream)) {
+			throw new \InvalidArgumentException('Stream must be a resource');
+		}
+
+		if (isset($options['size'])) {
+			$this->size = $options['size'];
+		}
+
+		$this->customMetadata = $options['metadata'] ?? [];
+		$this->stream = $stream;
+		$meta = stream_get_meta_data($this->stream);
+		$this->seekable = $meta['seekable'];
+		$this->readable = (bool) preg_match(self::READABLE_MODES, $meta['mode']);
+		$this->writable = (bool) preg_match(self::WRITABLE_MODES, $meta['mode']);
+		$this->uri = $this->getMetadata('uri');
+	}
+
+	/**
+	 * Closes the stream when the destructed
+	 */
+	public function __destruct()
+	{
+		$this->close();
+	}
+
+	public function __toString(): string
+	{
+		try {
+			if ($this->isSeekable()) {
+				$this->seek(0);
+			}
+
+			return $this->getContents();
+		} catch (\Throwable $e) {
+			if (\PHP_VERSION_ID >= 70400) {
+				throw $e;
+			}
+			trigger_error(sprintf('%s::__toString exception: %s', self::class, (string) $e), E_USER_ERROR);
+
+			return '';
+		}
+	}
+
+	public function getContents(): string
+	{
+		if (!isset($this->stream)) {
+			throw new \RuntimeException('Stream is detached');
+		}
+
+		if (!$this->readable) {
+			throw new \RuntimeException('Cannot read from non-readable stream');
+		}
+
+		return Utils::tryGetContents($this->stream);
+	}
+
+	public function close(): void
+	{
+		if (isset($this->stream)) {
+			if (is_resource($this->stream)) {
+				fclose($this->stream);
+			}
+			$this->detach();
+		}
+	}
+
+	public function detach()
+	{
+		if (!isset($this->stream)) {
+			return null;
+		}
+
+		$result = $this->stream;
+		unset($this->stream);
+		$this->size = $this->uri = null;
+		$this->readable = $this->writable = $this->seekable = false;
+
+		return $result;
+	}
+
+	public function getSize(): ?int
+	{
+		if ($this->size !== null) {
+			return $this->size;
+		}
+
+		if (!isset($this->stream)) {
+			return null;
+		}
+
+		// Clear the stat cache if the stream has a URI
+		if ($this->uri) {
+			clearstatcache(true, $this->uri);
+		}
+
+		$stats = fstat($this->stream);
+		if (is_array($stats) && isset($stats['size'])) {
+			$this->size = $stats['size'];
+
+			return $this->size;
+		}
+
+		return null;
+	}
+
+	public function isReadable(): bool
+	{
+		return $this->readable;
+	}
+
+	public function isWritable(): bool
+	{
+		return $this->writable;
+	}
+
+	public function isSeekable(): bool
+	{
+		return $this->seekable;
+	}
+
+	public function eof(): bool
+	{
+		if (!isset($this->stream)) {
+			throw new \RuntimeException('Stream is detached');
+		}
+
+		return feof($this->stream);
+	}
+
+	public function tell(): int
+	{
+		if (!isset($this->stream)) {
+			throw new \RuntimeException('Stream is detached');
+		}
+
+		$result = ftell($this->stream);
+
+		if ($result === false) {
+			throw new \RuntimeException('Unable to determine stream position');
+		}
+
+		return $result;
+	}
+
+	public function rewind(): void
+	{
+		$this->seek(0);
+	}
+
+	public function seek($offset, $whence = SEEK_SET): void
+	{
+		$whence = (int) $whence;
+
+		if (!isset($this->stream)) {
+			throw new \RuntimeException('Stream is detached');
+		}
+		if (!$this->seekable) {
+			throw new \RuntimeException('Stream is not seekable');
+		}
+		if (fseek($this->stream, $offset, $whence) === -1) {
+			throw new \RuntimeException('Unable to seek to stream position '
+				.$offset.' with whence '.var_export($whence, true));
+		}
+	}
+
+	public function read($length): string
+	{
+		if (!isset($this->stream)) {
+			throw new \RuntimeException('Stream is detached');
+		}
+		if (!$this->readable) {
+			throw new \RuntimeException('Cannot read from non-readable stream');
+		}
+		if ($length < 0) {
+			throw new \RuntimeException('Length parameter cannot be negative');
+		}
+
+		if (0 === $length) {
+			return '';
+		}
+
+		try {
+			$string = fread($this->stream, $length);
+		} catch (\Exception $e) {
+			throw new \RuntimeException('Unable to read from stream', 0, $e);
+		}
+
+		if (false === $string) {
+			throw new \RuntimeException('Unable to read from stream');
+		}
+
+		return $string;
+	}
+
+	public function write($string): int
+	{
+		if (!isset($this->stream)) {
+			throw new \RuntimeException('Stream is detached');
+		}
+		if (!$this->writable) {
+			throw new \RuntimeException('Cannot write to a non-writable stream');
+		}
+
+		// We can't know the size after writing anything
+		$this->size = null;
+		$result = fwrite($this->stream, $string);
+
+		if ($result === false) {
+			throw new \RuntimeException('Unable to write to stream');
+		}
+
+		return $result;
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function getMetadata($key = null)
+	{
+		if (!isset($this->stream)) {
+			return $key ? null : [];
+		} elseif (!$key) {
+			return $this->customMetadata + stream_get_meta_data($this->stream);
+		} elseif (isset($this->customMetadata[$key])) {
+			return $this->customMetadata[$key];
+		}
+
+		$meta = stream_get_meta_data($this->stream);
+
+		return $meta[$key] ?? null;
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -61,8 +61,8 @@ 
         $this->stream = $stream;
         $meta = stream_get_meta_data($this->stream);
         $this->seekable = $meta['seekable'];
-        $this->readable = (bool) preg_match(self::READABLE_MODES, $meta['mode']);
-        $this->writable = (bool) preg_match(self::WRITABLE_MODES, $meta['mode']);
+        $this->readable = (bool)preg_match(self::READABLE_MODES, $meta['mode']);
+        $this->writable = (bool)preg_match(self::WRITABLE_MODES, $meta['mode']);
         $this->uri = $this->getMetadata('uri');
     }
 
@@ -86,7 +86,7 @@ 
             if (\PHP_VERSION_ID >= 70400) {
                 throw $e;
             }
-            trigger_error(sprintf('%s::__toString exception: %s', self::class, (string) $e), E_USER_ERROR);
+            trigger_error(sprintf('%s::__toString exception: %s', self::class, (string)$e), E_USER_ERROR);
 
             return '';
         }
@@ -200,7 +200,7 @@ 
 
     public function seek($offset, $whence = SEEK_SET): void
     {
-        $whence = (int) $whence;
+        $whence = (int)$whence;
 
         if (!isset($this->stream)) {
             throw new \RuntimeException('Stream is detached');

Braces +1 added lines, -2 removed lines

@@ -9,8 +9,7 @@
 /**
  * PHP stream implementation.
  */
-class Stream implements StreamInterface
-{
+class Stream implements StreamInterface {
     /**
      * @see https://www.php.net/manual/en/function.fopen.php
      * @see https://www.php.net/manual/en/function.gzopen.php

lib/Vendor/GuzzleHttp/Psr7/Message.php

Indentation +233 added lines, -233 removed lines

@@ -10,237 +10,237 @@
 
 final class Message
 {
-    /**
-     * Returns the string representation of an HTTP message.
-     *
-     * @param MessageInterface $message Message to convert to a string.
-     */
-    public static function toString(MessageInterface $message): string
-    {
-        if ($message instanceof RequestInterface) {
-            $msg = trim($message->getMethod().' '
-                    .$message->getRequestTarget())
-                .' HTTP/'.$message->getProtocolVersion();
-            if (!$message->hasHeader('host')) {
-                $msg .= "\r\nHost: ".$message->getUri()->getHost();
-            }
-        } elseif ($message instanceof ResponseInterface) {
-            $msg = 'HTTP/'.$message->getProtocolVersion().' '
-                .$message->getStatusCode().' '
-                .$message->getReasonPhrase();
-        } else {
-            throw new \InvalidArgumentException('Unknown message type');
-        }
-
-        foreach ($message->getHeaders() as $name => $values) {
-            if (is_string($name) && strtolower($name) === 'set-cookie') {
-                foreach ($values as $value) {
-                    $msg .= "\r\n{$name}: ".$value;
-                }
-            } else {
-                $msg .= "\r\n{$name}: ".implode(', ', $values);
-            }
-        }
-
-        return "{$msg}\r\n\r\n".$message->getBody();
-    }
-
-    /**
-     * Get a short summary of the message body.
-     *
-     * Will return `null` if the response is not printable.
-     *
-     * @param MessageInterface $message    The message to get the body summary
-     * @param int              $truncateAt The maximum allowed size of the summary
-     */
-    public static function bodySummary(MessageInterface $message, int $truncateAt = 120): ?string
-    {
-        $body = $message->getBody();
-
-        if (!$body->isSeekable() || !$body->isReadable()) {
-            return null;
-        }
-
-        $size = $body->getSize();
-
-        if ($size === 0) {
-            return null;
-        }
-
-        $body->rewind();
-        $summary = $body->read($truncateAt);
-        $body->rewind();
-
-        if ($size > $truncateAt) {
-            $summary .= ' (truncated...)';
-        }
-
-        // Matches any printable character, including unicode characters:
-        // letters, marks, numbers, punctuation, spacing, and separators.
-        if (preg_match('/[^\pL\pM\pN\pP\pS\pZ\n\r\t]/u', $summary) !== 0) {
-            return null;
-        }
-
-        return $summary;
-    }
-
-    /**
-     * Attempts to rewind a message body and throws an exception on failure.
-     *
-     * The body of the message will only be rewound if a call to `tell()`
-     * returns a value other than `0`.
-     *
-     * @param MessageInterface $message Message to rewind
-     *
-     * @throws \RuntimeException
-     */
-    public static function rewindBody(MessageInterface $message): void
-    {
-        $body = $message->getBody();
-
-        if ($body->tell()) {
-            $body->rewind();
-        }
-    }
-
-    /**
-     * Parses an HTTP message into an associative array.
-     *
-     * The array contains the "start-line" key containing the start line of
-     * the message, "headers" key containing an associative array of header
-     * array values, and a "body" key containing the body of the message.
-     *
-     * @param string $message HTTP request or response to parse.
-     */
-    public static function parseMessage(string $message): array
-    {
-        if (!$message) {
-            throw new \InvalidArgumentException('Invalid message');
-        }
-
-        $message = ltrim($message, "\r\n");
-
-        $messageParts = preg_split("/\r?\n\r?\n/", $message, 2);
-
-        if ($messageParts === false || count($messageParts) !== 2) {
-            throw new \InvalidArgumentException('Invalid message: Missing header delimiter');
-        }
-
-        [$rawHeaders, $body] = $messageParts;
-        $rawHeaders .= "\r\n"; // Put back the delimiter we split previously
-        $headerParts = preg_split("/\r?\n/", $rawHeaders, 2);
-
-        if ($headerParts === false || count($headerParts) !== 2) {
-            throw new \InvalidArgumentException('Invalid message: Missing status line');
-        }
-
-        [$startLine, $rawHeaders] = $headerParts;
-
-        if (preg_match("/(?:^HTTP\/|^[A-Z]+ \S+ HTTP\/)(\d+(?:\.\d+)?)/i", $startLine, $matches) && $matches[1] === '1.0') {
-            // Header folding is deprecated for HTTP/1.1, but allowed in HTTP/1.0
-            $rawHeaders = preg_replace(Rfc7230::HEADER_FOLD_REGEX, ' ', $rawHeaders);
-        }
-
-        /** @var array[] $headerLines */
-        $count = preg_match_all(Rfc7230::HEADER_REGEX, $rawHeaders, $headerLines, PREG_SET_ORDER);
-
-        // If these aren't the same, then one line didn't match and there's an invalid header.
-        if ($count !== substr_count($rawHeaders, "\n")) {
-            // Folding is deprecated, see https://datatracker.ietf.org/doc/html/rfc7230#section-3.2.4
-            if (preg_match(Rfc7230::HEADER_FOLD_REGEX, $rawHeaders)) {
-                throw new \InvalidArgumentException('Invalid header syntax: Obsolete line folding');
-            }
-
-            throw new \InvalidArgumentException('Invalid header syntax');
-        }
-
-        $headers = [];
-
-        foreach ($headerLines as $headerLine) {
-            $headers[$headerLine[1]][] = $headerLine[2];
-        }
-
-        return [
-            'start-line' => $startLine,
-            'headers' => $headers,
-            'body' => $body,
-        ];
-    }
-
-    /**
-     * Constructs a URI for an HTTP request message.
-     *
-     * @param string $path    Path from the start-line
-     * @param array  $headers Array of headers (each value an array).
-     */
-    public static function parseRequestUri(string $path, array $headers): string
-    {
-        $hostKey = array_filter(array_keys($headers), function ($k) {
-            // Numeric array keys are converted to int by PHP.
-            $k = (string) $k;
-
-            return strtolower($k) === 'host';
-        });
-
-        // If no host is found, then a full URI cannot be constructed.
-        if (!$hostKey) {
-            return $path;
-        }
-
-        $host = $headers[reset($hostKey)][0];
-        $scheme = substr($host, -4) === ':443' ? 'https' : 'http';
-
-        return $scheme.'://'.$host.'/'.ltrim($path, '/');
-    }
-
-    /**
-     * Parses a request message string into a request object.
-     *
-     * @param string $message Request message string.
-     */
-    public static function parseRequest(string $message): RequestInterface
-    {
-        $data = self::parseMessage($message);
-        $matches = [];
-        if (!preg_match('/^[\S]+\s+([a-zA-Z]+:\/\/|\/).*/', $data['start-line'], $matches)) {
-            throw new \InvalidArgumentException('Invalid request string');
-        }
-        $parts = explode(' ', $data['start-line'], 3);
-        $version = isset($parts[2]) ? explode('/', $parts[2])[1] : '1.1';
-
-        $request = new Request(
-            $parts[0],
-            $matches[1] === '/' ? self::parseRequestUri($parts[1], $data['headers']) : $parts[1],
-            $data['headers'],
-            $data['body'],
-            $version
-        );
-
-        return $matches[1] === '/' ? $request : $request->withRequestTarget($parts[1]);
-    }
-
-    /**
-     * Parses a response message string into a response object.
-     *
-     * @param string $message Response message string.
-     */
-    public static function parseResponse(string $message): ResponseInterface
-    {
-        $data = self::parseMessage($message);
-        // According to https://datatracker.ietf.org/doc/html/rfc7230#section-3.1.2
-        // the space between status-code and reason-phrase is required. But
-        // browsers accept responses without space and reason as well.
-        if (!preg_match('/^HTTP\/.* [0-9]{3}( .*|$)/', $data['start-line'])) {
-            throw new \InvalidArgumentException('Invalid response string: '.$data['start-line']);
-        }
-        $parts = explode(' ', $data['start-line'], 3);
-
-        return new Response(
-            (int) $parts[1],
-            $data['headers'],
-            $data['body'],
-            explode('/', $parts[0])[1],
-            $parts[2] ?? null
-        );
-    }
+	/**
+	 * Returns the string representation of an HTTP message.
+	 *
+	 * @param MessageInterface $message Message to convert to a string.
+	 */
+	public static function toString(MessageInterface $message): string
+	{
+		if ($message instanceof RequestInterface) {
+			$msg = trim($message->getMethod().' '
+					.$message->getRequestTarget())
+				.' HTTP/'.$message->getProtocolVersion();
+			if (!$message->hasHeader('host')) {
+				$msg .= "\r\nHost: ".$message->getUri()->getHost();
+			}
+		} elseif ($message instanceof ResponseInterface) {
+			$msg = 'HTTP/'.$message->getProtocolVersion().' '
+				.$message->getStatusCode().' '
+				.$message->getReasonPhrase();
+		} else {
+			throw new \InvalidArgumentException('Unknown message type');
+		}
+
+		foreach ($message->getHeaders() as $name => $values) {
+			if (is_string($name) && strtolower($name) === 'set-cookie') {
+				foreach ($values as $value) {
+					$msg .= "\r\n{$name}: ".$value;
+				}
+			} else {
+				$msg .= "\r\n{$name}: ".implode(', ', $values);
+			}
+		}
+
+		return "{$msg}\r\n\r\n".$message->getBody();
+	}
+
+	/**
+	 * Get a short summary of the message body.
+	 *
+	 * Will return `null` if the response is not printable.
+	 *
+	 * @param MessageInterface $message    The message to get the body summary
+	 * @param int              $truncateAt The maximum allowed size of the summary
+	 */
+	public static function bodySummary(MessageInterface $message, int $truncateAt = 120): ?string
+	{
+		$body = $message->getBody();
+
+		if (!$body->isSeekable() || !$body->isReadable()) {
+			return null;
+		}
+
+		$size = $body->getSize();
+
+		if ($size === 0) {
+			return null;
+		}
+
+		$body->rewind();
+		$summary = $body->read($truncateAt);
+		$body->rewind();
+
+		if ($size > $truncateAt) {
+			$summary .= ' (truncated...)';
+		}
+
+		// Matches any printable character, including unicode characters:
+		// letters, marks, numbers, punctuation, spacing, and separators.
+		if (preg_match('/[^\pL\pM\pN\pP\pS\pZ\n\r\t]/u', $summary) !== 0) {
+			return null;
+		}
+
+		return $summary;
+	}
+
+	/**
+	 * Attempts to rewind a message body and throws an exception on failure.
+	 *
+	 * The body of the message will only be rewound if a call to `tell()`
+	 * returns a value other than `0`.
+	 *
+	 * @param MessageInterface $message Message to rewind
+	 *
+	 * @throws \RuntimeException
+	 */
+	public static function rewindBody(MessageInterface $message): void
+	{
+		$body = $message->getBody();
+
+		if ($body->tell()) {
+			$body->rewind();
+		}
+	}
+
+	/**
+	 * Parses an HTTP message into an associative array.
+	 *
+	 * The array contains the "start-line" key containing the start line of
+	 * the message, "headers" key containing an associative array of header
+	 * array values, and a "body" key containing the body of the message.
+	 *
+	 * @param string $message HTTP request or response to parse.
+	 */
+	public static function parseMessage(string $message): array
+	{
+		if (!$message) {
+			throw new \InvalidArgumentException('Invalid message');
+		}
+
+		$message = ltrim($message, "\r\n");
+
+		$messageParts = preg_split("/\r?\n\r?\n/", $message, 2);
+
+		if ($messageParts === false || count($messageParts) !== 2) {
+			throw new \InvalidArgumentException('Invalid message: Missing header delimiter');
+		}
+
+		[$rawHeaders, $body] = $messageParts;
+		$rawHeaders .= "\r\n"; // Put back the delimiter we split previously
+		$headerParts = preg_split("/\r?\n/", $rawHeaders, 2);
+
+		if ($headerParts === false || count($headerParts) !== 2) {
+			throw new \InvalidArgumentException('Invalid message: Missing status line');
+		}
+
+		[$startLine, $rawHeaders] = $headerParts;
+
+		if (preg_match("/(?:^HTTP\/|^[A-Z]+ \S+ HTTP\/)(\d+(?:\.\d+)?)/i", $startLine, $matches) && $matches[1] === '1.0') {
+			// Header folding is deprecated for HTTP/1.1, but allowed in HTTP/1.0
+			$rawHeaders = preg_replace(Rfc7230::HEADER_FOLD_REGEX, ' ', $rawHeaders);
+		}
+
+		/** @var array[] $headerLines */
+		$count = preg_match_all(Rfc7230::HEADER_REGEX, $rawHeaders, $headerLines, PREG_SET_ORDER);
+
+		// If these aren't the same, then one line didn't match and there's an invalid header.
+		if ($count !== substr_count($rawHeaders, "\n")) {
+			// Folding is deprecated, see https://datatracker.ietf.org/doc/html/rfc7230#section-3.2.4
+			if (preg_match(Rfc7230::HEADER_FOLD_REGEX, $rawHeaders)) {
+				throw new \InvalidArgumentException('Invalid header syntax: Obsolete line folding');
+			}
+
+			throw new \InvalidArgumentException('Invalid header syntax');
+		}
+
+		$headers = [];
+
+		foreach ($headerLines as $headerLine) {
+			$headers[$headerLine[1]][] = $headerLine[2];
+		}
+
+		return [
+			'start-line' => $startLine,
+			'headers' => $headers,
+			'body' => $body,
+		];
+	}
+
+	/**
+	 * Constructs a URI for an HTTP request message.
+	 *
+	 * @param string $path    Path from the start-line
+	 * @param array  $headers Array of headers (each value an array).
+	 */
+	public static function parseRequestUri(string $path, array $headers): string
+	{
+		$hostKey = array_filter(array_keys($headers), function ($k) {
+			// Numeric array keys are converted to int by PHP.
+			$k = (string) $k;
+
+			return strtolower($k) === 'host';
+		});
+
+		// If no host is found, then a full URI cannot be constructed.
+		if (!$hostKey) {
+			return $path;
+		}
+
+		$host = $headers[reset($hostKey)][0];
+		$scheme = substr($host, -4) === ':443' ? 'https' : 'http';
+
+		return $scheme.'://'.$host.'/'.ltrim($path, '/');
+	}
+
+	/**
+	 * Parses a request message string into a request object.
+	 *
+	 * @param string $message Request message string.
+	 */
+	public static function parseRequest(string $message): RequestInterface
+	{
+		$data = self::parseMessage($message);
+		$matches = [];
+		if (!preg_match('/^[\S]+\s+([a-zA-Z]+:\/\/|\/).*/', $data['start-line'], $matches)) {
+			throw new \InvalidArgumentException('Invalid request string');
+		}
+		$parts = explode(' ', $data['start-line'], 3);
+		$version = isset($parts[2]) ? explode('/', $parts[2])[1] : '1.1';
+
+		$request = new Request(
+			$parts[0],
+			$matches[1] === '/' ? self::parseRequestUri($parts[1], $data['headers']) : $parts[1],
+			$data['headers'],
+			$data['body'],
+			$version
+		);
+
+		return $matches[1] === '/' ? $request : $request->withRequestTarget($parts[1]);
+	}
+
+	/**
+	 * Parses a response message string into a response object.
+	 *
+	 * @param string $message Response message string.
+	 */
+	public static function parseResponse(string $message): ResponseInterface
+	{
+		$data = self::parseMessage($message);
+		// According to https://datatracker.ietf.org/doc/html/rfc7230#section-3.1.2
+		// the space between status-code and reason-phrase is required. But
+		// browsers accept responses without space and reason as well.
+		if (!preg_match('/^HTTP\/.* [0-9]{3}( .*|$)/', $data['start-line'])) {
+			throw new \InvalidArgumentException('Invalid response string: '.$data['start-line']);
+		}
+		$parts = explode(' ', $data['start-line'], 3);
+
+		return new Response(
+			(int) $parts[1],
+			$data['headers'],
+			$data['body'],
+			explode('/', $parts[0])[1],
+			$parts[2] ?? null
+		);
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -175,9 +175,9 @@ 
      */
     public static function parseRequestUri(string $path, array $headers): string
     {
-        $hostKey = array_filter(array_keys($headers), function ($k) {
+        $hostKey = array_filter(array_keys($headers), function($k) {
             // Numeric array keys are converted to int by PHP.
-            $k = (string) $k;
+            $k = (string)$k;
 
             return strtolower($k) === 'host';
         });
@@ -236,7 +236,7 @@ 
         $parts = explode(' ', $data['start-line'], 3);
 
         return new Response(
-            (int) $parts[1],
+            (int)$parts[1],
             $data['headers'],
             $data['body'],
             explode('/', $parts[0])[1],

Braces +1 added lines, -2 removed lines

@@ -8,8 +8,7 @@
 use OCA\FullTextSearch_Elasticsearch\Vendor\Psr\Http\Message\RequestInterface;
 use OCA\FullTextSearch_Elasticsearch\Vendor\Psr\Http\Message\ResponseInterface;
 
-final class Message
-{
+final class Message {
     /**
      * Returns the string representation of an HTTP message.
      *

lib/Vendor/GuzzleHttp/Psr7/HttpFactory.php

Indentation +55 added lines, -55 removed lines

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

lib/Vendor/GuzzleHttp/Psr7/UriNormalizer.php

Indentation +202 added lines, -202 removed lines

@@ -15,206 +15,206 @@
  */
 final class UriNormalizer
 {
-    /**
-     * Default normalizations which only include the ones that preserve semantics.
-     */
-    public const PRESERVING_NORMALIZATIONS =
-        self::CAPITALIZE_PERCENT_ENCODING |
-        self::DECODE_UNRESERVED_CHARACTERS |
-        self::CONVERT_EMPTY_PATH |
-        self::REMOVE_DEFAULT_HOST |
-        self::REMOVE_DEFAULT_PORT |
-        self::REMOVE_DOT_SEGMENTS;
-
-    /**
-     * All letters within a percent-encoding triplet (e.g., "%3A") are case-insensitive, and should be capitalized.
-     *
-     * Example: http://example.org/a%c2%b1b → http://example.org/a%C2%B1b
-     */
-    public const CAPITALIZE_PERCENT_ENCODING = 1;
-
-    /**
-     * Decodes percent-encoded octets of unreserved characters.
-     *
-     * For consistency, percent-encoded octets in the ranges of ALPHA (%41–%5A and %61–%7A), DIGIT (%30–%39),
-     * hyphen (%2D), period (%2E), underscore (%5F), or tilde (%7E) should not be created by URI producers and,
-     * when found in a URI, should be decoded to their corresponding unreserved characters by URI normalizers.
-     *
-     * Example: http://example.org/%7Eusern%61me/ → http://example.org/~username/
-     */
-    public const DECODE_UNRESERVED_CHARACTERS = 2;
-
-    /**
-     * Converts the empty path to "/" for http and https URIs.
-     *
-     * Example: http://example.org → http://example.org/
-     */
-    public const CONVERT_EMPTY_PATH = 4;
-
-    /**
-     * Removes the default host of the given URI scheme from the URI.
-     *
-     * Only the "file" scheme defines the default host "localhost".
-     * All of `file:/myfile`, `file:///myfile`, and `file://localhost/myfile`
-     * are equivalent according to RFC 3986. The first format is not accepted
-     * by PHPs stream functions and thus already normalized implicitly to the
-     * second format in the Uri class. See `OCA\FullTextSearch_Elasticsearch\Vendor\GuzzleHttp\Psr7\Uri::composeComponents`.
-     *
-     * Example: file://localhost/myfile → file:///myfile
-     */
-    public const REMOVE_DEFAULT_HOST = 8;
-
-    /**
-     * Removes the default port of the given URI scheme from the URI.
-     *
-     * Example: http://example.org:80/ → http://example.org/
-     */
-    public const REMOVE_DEFAULT_PORT = 16;
-
-    /**
-     * Removes unnecessary dot-segments.
-     *
-     * Dot-segments in relative-path references are not removed as it would
-     * change the semantics of the URI reference.
-     *
-     * Example: http://example.org/../a/b/../c/./d.html → http://example.org/a/c/d.html
-     */
-    public const REMOVE_DOT_SEGMENTS = 32;
-
-    /**
-     * Paths which include two or more adjacent slashes are converted to one.
-     *
-     * Webservers usually ignore duplicate slashes and treat those URIs equivalent.
-     * But in theory those URIs do not need to be equivalent. So this normalization
-     * may change the semantics. Encoded slashes (%2F) are not removed.
-     *
-     * Example: http://example.org//foo///bar.html → http://example.org/foo/bar.html
-     */
-    public const REMOVE_DUPLICATE_SLASHES = 64;
-
-    /**
-     * Sort query parameters with their values in alphabetical order.
-     *
-     * However, the order of parameters in a URI may be significant (this is not defined by the standard).
-     * So this normalization is not safe and may change the semantics of the URI.
-     *
-     * Example: ?lang=en&article=fred → ?article=fred&lang=en
-     *
-     * Note: The sorting is neither locale nor Unicode aware (the URI query does not get decoded at all) as the
-     * purpose is to be able to compare URIs in a reproducible way, not to have the params sorted perfectly.
-     */
-    public const SORT_QUERY_PARAMETERS = 128;
-
-    /**
-     * Returns a normalized URI.
-     *
-     * The scheme and host component are already normalized to lowercase per PSR-7 UriInterface.
-     * This methods adds additional normalizations that can be configured with the $flags parameter.
-     *
-     * PSR-7 UriInterface cannot distinguish between an empty component and a missing component as
-     * getQuery(), getFragment() etc. always return a string. This means the URIs "/?#" and "/" are
-     * treated equivalent which is not necessarily true according to RFC 3986. But that difference
-     * is highly uncommon in reality. So this potential normalization is implied in PSR-7 as well.
-     *
-     * @param UriInterface $uri   The URI to normalize
-     * @param int          $flags A bitmask of normalizations to apply, see constants
-     *
-     * @see https://datatracker.ietf.org/doc/html/rfc3986#section-6.2
-     */
-    public static function normalize(UriInterface $uri, int $flags = self::PRESERVING_NORMALIZATIONS): UriInterface
-    {
-        if ($flags & self::CAPITALIZE_PERCENT_ENCODING) {
-            $uri = self::capitalizePercentEncoding($uri);
-        }
-
-        if ($flags & self::DECODE_UNRESERVED_CHARACTERS) {
-            $uri = self::decodeUnreservedCharacters($uri);
-        }
-
-        if ($flags & self::CONVERT_EMPTY_PATH && $uri->getPath() === ''
-            && ($uri->getScheme() === 'http' || $uri->getScheme() === 'https')
-        ) {
-            $uri = $uri->withPath('/');
-        }
-
-        if ($flags & self::REMOVE_DEFAULT_HOST && $uri->getScheme() === 'file' && $uri->getHost() === 'localhost') {
-            $uri = $uri->withHost('');
-        }
-
-        if ($flags & self::REMOVE_DEFAULT_PORT && $uri->getPort() !== null && Uri::isDefaultPort($uri)) {
-            $uri = $uri->withPort(null);
-        }
-
-        if ($flags & self::REMOVE_DOT_SEGMENTS && !Uri::isRelativePathReference($uri)) {
-            $uri = $uri->withPath(UriResolver::removeDotSegments($uri->getPath()));
-        }
-
-        if ($flags & self::REMOVE_DUPLICATE_SLASHES) {
-            $uri = $uri->withPath(preg_replace('#//++#', '/', $uri->getPath()));
-        }
-
-        if ($flags & self::SORT_QUERY_PARAMETERS && $uri->getQuery() !== '') {
-            $queryKeyValues = explode('&', $uri->getQuery());
-            sort($queryKeyValues);
-            $uri = $uri->withQuery(implode('&', $queryKeyValues));
-        }
-
-        return $uri;
-    }
-
-    /**
-     * Whether two URIs can be considered equivalent.
-     *
-     * Both URIs are normalized automatically before comparison with the given $normalizations bitmask. The method also
-     * accepts relative URI references and returns true when they are equivalent. This of course assumes they will be
-     * resolved against the same base URI. If this is not the case, determination of equivalence or difference of
-     * relative references does not mean anything.
-     *
-     * @param UriInterface $uri1           An URI to compare
-     * @param UriInterface $uri2           An URI to compare
-     * @param int          $normalizations A bitmask of normalizations to apply, see constants
-     *
-     * @see https://datatracker.ietf.org/doc/html/rfc3986#section-6.1
-     */
-    public static function isEquivalent(UriInterface $uri1, UriInterface $uri2, int $normalizations = self::PRESERVING_NORMALIZATIONS): bool
-    {
-        return (string) self::normalize($uri1, $normalizations) === (string) self::normalize($uri2, $normalizations);
-    }
-
-    private static function capitalizePercentEncoding(UriInterface $uri): UriInterface
-    {
-        $regex = '/(?:%[A-Fa-f0-9]{2})++/';
-
-        $callback = function (array $match): string {
-            return strtoupper($match[0]);
-        };
-
-        return
-            $uri->withPath(
-                preg_replace_callback($regex, $callback, $uri->getPath())
-            )->withQuery(
-                preg_replace_callback($regex, $callback, $uri->getQuery())
-            );
-    }
-
-    private static function decodeUnreservedCharacters(UriInterface $uri): UriInterface
-    {
-        $regex = '/%(?:2D|2E|5F|7E|3[0-9]|[46][1-9A-F]|[57][0-9A])/i';
-
-        $callback = function (array $match): string {
-            return rawurldecode($match[0]);
-        };
-
-        return
-            $uri->withPath(
-                preg_replace_callback($regex, $callback, $uri->getPath())
-            )->withQuery(
-                preg_replace_callback($regex, $callback, $uri->getQuery())
-            );
-    }
-
-    private function __construct()
-    {
-        // cannot be instantiated
-    }
+	/**
+	 * Default normalizations which only include the ones that preserve semantics.
+	 */
+	public const PRESERVING_NORMALIZATIONS =
+		self::CAPITALIZE_PERCENT_ENCODING |
+		self::DECODE_UNRESERVED_CHARACTERS |
+		self::CONVERT_EMPTY_PATH |
+		self::REMOVE_DEFAULT_HOST |
+		self::REMOVE_DEFAULT_PORT |
+		self::REMOVE_DOT_SEGMENTS;
+
+	/**
+	 * All letters within a percent-encoding triplet (e.g., "%3A") are case-insensitive, and should be capitalized.
+	 *
+	 * Example: http://example.org/a%c2%b1b → http://example.org/a%C2%B1b
+	 */
+	public const CAPITALIZE_PERCENT_ENCODING = 1;
+
+	/**
+	 * Decodes percent-encoded octets of unreserved characters.
+	 *
+	 * For consistency, percent-encoded octets in the ranges of ALPHA (%41–%5A and %61–%7A), DIGIT (%30–%39),
+	 * hyphen (%2D), period (%2E), underscore (%5F), or tilde (%7E) should not be created by URI producers and,
+	 * when found in a URI, should be decoded to their corresponding unreserved characters by URI normalizers.
+	 *
+	 * Example: http://example.org/%7Eusern%61me/ → http://example.org/~username/
+	 */
+	public const DECODE_UNRESERVED_CHARACTERS = 2;
+
+	/**
+	 * Converts the empty path to "/" for http and https URIs.
+	 *
+	 * Example: http://example.org → http://example.org/
+	 */
+	public const CONVERT_EMPTY_PATH = 4;
+
+	/**
+	 * Removes the default host of the given URI scheme from the URI.
+	 *
+	 * Only the "file" scheme defines the default host "localhost".
+	 * All of `file:/myfile`, `file:///myfile`, and `file://localhost/myfile`
+	 * are equivalent according to RFC 3986. The first format is not accepted
+	 * by PHPs stream functions and thus already normalized implicitly to the
+	 * second format in the Uri class. See `OCA\FullTextSearch_Elasticsearch\Vendor\GuzzleHttp\Psr7\Uri::composeComponents`.
+	 *
+	 * Example: file://localhost/myfile → file:///myfile
+	 */
+	public const REMOVE_DEFAULT_HOST = 8;
+
+	/**
+	 * Removes the default port of the given URI scheme from the URI.
+	 *
+	 * Example: http://example.org:80/ → http://example.org/
+	 */
+	public const REMOVE_DEFAULT_PORT = 16;
+
+	/**
+	 * Removes unnecessary dot-segments.
+	 *
+	 * Dot-segments in relative-path references are not removed as it would
+	 * change the semantics of the URI reference.
+	 *
+	 * Example: http://example.org/../a/b/../c/./d.html → http://example.org/a/c/d.html
+	 */
+	public const REMOVE_DOT_SEGMENTS = 32;
+
+	/**
+	 * Paths which include two or more adjacent slashes are converted to one.
+	 *
+	 * Webservers usually ignore duplicate slashes and treat those URIs equivalent.
+	 * But in theory those URIs do not need to be equivalent. So this normalization
+	 * may change the semantics. Encoded slashes (%2F) are not removed.
+	 *
+	 * Example: http://example.org//foo///bar.html → http://example.org/foo/bar.html
+	 */
+	public const REMOVE_DUPLICATE_SLASHES = 64;
+
+	/**
+	 * Sort query parameters with their values in alphabetical order.
+	 *
+	 * However, the order of parameters in a URI may be significant (this is not defined by the standard).
+	 * So this normalization is not safe and may change the semantics of the URI.
+	 *
+	 * Example: ?lang=en&article=fred → ?article=fred&lang=en
+	 *
+	 * Note: The sorting is neither locale nor Unicode aware (the URI query does not get decoded at all) as the
+	 * purpose is to be able to compare URIs in a reproducible way, not to have the params sorted perfectly.
+	 */
+	public const SORT_QUERY_PARAMETERS = 128;
+
+	/**
+	 * Returns a normalized URI.
+	 *
+	 * The scheme and host component are already normalized to lowercase per PSR-7 UriInterface.
+	 * This methods adds additional normalizations that can be configured with the $flags parameter.
+	 *
+	 * PSR-7 UriInterface cannot distinguish between an empty component and a missing component as
+	 * getQuery(), getFragment() etc. always return a string. This means the URIs "/?#" and "/" are
+	 * treated equivalent which is not necessarily true according to RFC 3986. But that difference
+	 * is highly uncommon in reality. So this potential normalization is implied in PSR-7 as well.
+	 *
+	 * @param UriInterface $uri   The URI to normalize
+	 * @param int          $flags A bitmask of normalizations to apply, see constants
+	 *
+	 * @see https://datatracker.ietf.org/doc/html/rfc3986#section-6.2
+	 */
+	public static function normalize(UriInterface $uri, int $flags = self::PRESERVING_NORMALIZATIONS): UriInterface
+	{
+		if ($flags & self::CAPITALIZE_PERCENT_ENCODING) {
+			$uri = self::capitalizePercentEncoding($uri);
+		}
+
+		if ($flags & self::DECODE_UNRESERVED_CHARACTERS) {
+			$uri = self::decodeUnreservedCharacters($uri);
+		}
+
+		if ($flags & self::CONVERT_EMPTY_PATH && $uri->getPath() === ''
+			&& ($uri->getScheme() === 'http' || $uri->getScheme() === 'https')
+		) {
+			$uri = $uri->withPath('/');
+		}
+
+		if ($flags & self::REMOVE_DEFAULT_HOST && $uri->getScheme() === 'file' && $uri->getHost() === 'localhost') {
+			$uri = $uri->withHost('');
+		}
+
+		if ($flags & self::REMOVE_DEFAULT_PORT && $uri->getPort() !== null && Uri::isDefaultPort($uri)) {
+			$uri = $uri->withPort(null);
+		}
+
+		if ($flags & self::REMOVE_DOT_SEGMENTS && !Uri::isRelativePathReference($uri)) {
+			$uri = $uri->withPath(UriResolver::removeDotSegments($uri->getPath()));
+		}
+
+		if ($flags & self::REMOVE_DUPLICATE_SLASHES) {
+			$uri = $uri->withPath(preg_replace('#//++#', '/', $uri->getPath()));
+		}
+
+		if ($flags & self::SORT_QUERY_PARAMETERS && $uri->getQuery() !== '') {
+			$queryKeyValues = explode('&', $uri->getQuery());
+			sort($queryKeyValues);
+			$uri = $uri->withQuery(implode('&', $queryKeyValues));
+		}
+
+		return $uri;
+	}
+
+	/**
+	 * Whether two URIs can be considered equivalent.
+	 *
+	 * Both URIs are normalized automatically before comparison with the given $normalizations bitmask. The method also
+	 * accepts relative URI references and returns true when they are equivalent. This of course assumes they will be
+	 * resolved against the same base URI. If this is not the case, determination of equivalence or difference of
+	 * relative references does not mean anything.
+	 *
+	 * @param UriInterface $uri1           An URI to compare
+	 * @param UriInterface $uri2           An URI to compare
+	 * @param int          $normalizations A bitmask of normalizations to apply, see constants
+	 *
+	 * @see https://datatracker.ietf.org/doc/html/rfc3986#section-6.1
+	 */
+	public static function isEquivalent(UriInterface $uri1, UriInterface $uri2, int $normalizations = self::PRESERVING_NORMALIZATIONS): bool
+	{
+		return (string) self::normalize($uri1, $normalizations) === (string) self::normalize($uri2, $normalizations);
+	}
+
+	private static function capitalizePercentEncoding(UriInterface $uri): UriInterface
+	{
+		$regex = '/(?:%[A-Fa-f0-9]{2})++/';
+
+		$callback = function (array $match): string {
+			return strtoupper($match[0]);
+		};
+
+		return
+			$uri->withPath(
+				preg_replace_callback($regex, $callback, $uri->getPath())
+			)->withQuery(
+				preg_replace_callback($regex, $callback, $uri->getQuery())
+			);
+	}
+
+	private static function decodeUnreservedCharacters(UriInterface $uri): UriInterface
+	{
+		$regex = '/%(?:2D|2E|5F|7E|3[0-9]|[46][1-9A-F]|[57][0-9A])/i';
+
+		$callback = function (array $match): string {
+			return rawurldecode($match[0]);
+		};
+
+		return
+			$uri->withPath(
+				preg_replace_callback($regex, $callback, $uri->getPath())
+			)->withQuery(
+				preg_replace_callback($regex, $callback, $uri->getQuery())
+			);
+	}
+
+	private function __construct()
+	{
+		// cannot be instantiated
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -178,14 +178,14 @@ 
      */
     public static function isEquivalent(UriInterface $uri1, UriInterface $uri2, int $normalizations = self::PRESERVING_NORMALIZATIONS): bool
     {
-        return (string) self::normalize($uri1, $normalizations) === (string) self::normalize($uri2, $normalizations);
+        return (string)self::normalize($uri1, $normalizations) === (string)self::normalize($uri2, $normalizations);
     }
 
     private static function capitalizePercentEncoding(UriInterface $uri): UriInterface
     {
         $regex = '/(?:%[A-Fa-f0-9]{2})++/';
 
-        $callback = function (array $match): string {
+        $callback = function(array $match): string {
             return strtoupper($match[0]);
         };
 
@@ -201,7 +201,7 @@ 
     {
         $regex = '/%(?:2D|2E|5F|7E|3[0-9]|[46][1-9A-F]|[57][0-9A])/i';
 
-        $callback = function (array $match): string {
+        $callback = function(array $match): string {
             return rawurldecode($match[0]);
         };
 

Braces +1 added lines, -2 removed lines

@@ -13,8 +13,7 @@
  *
  * @see https://datatracker.ietf.org/doc/html/rfc3986#section-6
  */
-final class UriNormalizer
-{
+final class UriNormalizer {
     /**
      * Default normalizations which only include the ones that preserve semantics.
      */

lib/Vendor/GuzzleHttp/Psr7/NoSeekStream.php

Indentation +11 added lines, -11 removed lines

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

Braces +1 added lines, -2 removed lines

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

lib/Vendor/GuzzleHttp/Psr7/UriComparator.php

Indentation +36 added lines, -36 removed lines

@@ -13,40 +13,40 @@
  */
 final class UriComparator
 {
-    /**
-     * Determines if a modified URL should be considered cross-origin with
-     * respect to an original URL.
-     */
-    public static function isCrossOrigin(UriInterface $original, UriInterface $modified): bool
-    {
-        if (\strcasecmp($original->getHost(), $modified->getHost()) !== 0) {
-            return true;
-        }
-
-        if ($original->getScheme() !== $modified->getScheme()) {
-            return true;
-        }
-
-        if (self::computePort($original) !== self::computePort($modified)) {
-            return true;
-        }
-
-        return false;
-    }
-
-    private static function computePort(UriInterface $uri): int
-    {
-        $port = $uri->getPort();
-
-        if (null !== $port) {
-            return $port;
-        }
-
-        return 'https' === $uri->getScheme() ? 443 : 80;
-    }
-
-    private function __construct()
-    {
-        // cannot be instantiated
-    }
+	/**
+	 * Determines if a modified URL should be considered cross-origin with
+	 * respect to an original URL.
+	 */
+	public static function isCrossOrigin(UriInterface $original, UriInterface $modified): bool
+	{
+		if (\strcasecmp($original->getHost(), $modified->getHost()) !== 0) {
+			return true;
+		}
+
+		if ($original->getScheme() !== $modified->getScheme()) {
+			return true;
+		}
+
+		if (self::computePort($original) !== self::computePort($modified)) {
+			return true;
+		}
+
+		return false;
+	}
+
+	private static function computePort(UriInterface $uri): int
+	{
+		$port = $uri->getPort();
+
+		if (null !== $port) {
+			return $port;
+		}
+
+		return 'https' === $uri->getScheme() ? 443 : 80;
+	}
+
+	private function __construct()
+	{
+		// cannot be instantiated
+	}
 }

Braces +1 added lines, -2 removed lines

@@ -11,8 +11,7 @@
  *
  * @author Graham Campbell
  */
-final class UriComparator
-{
+final class UriComparator {
     /**
      * Determines if a modified URL should be considered cross-origin with
      * respect to an original URL.

lib/Vendor/GuzzleHttp/Psr7/FnStream.php

Indentation +162 added lines, -162 removed lines

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

Spacing +1 added lines, -1 removed lines

@@ -99,7 +99,7 @@
             if (\PHP_VERSION_ID >= 70400) {
                 throw $e;
             }
-            trigger_error(sprintf('%s::__toString exception: %s', self::class, (string) $e), E_USER_ERROR);
+            trigger_error(sprintf('%s::__toString exception: %s', self::class, (string)$e), E_USER_ERROR);
 
             return '';
         }

Braces +1 added lines, -2 removed lines

@@ -13,8 +13,7 @@
  * to create a concrete class for a simple extension point.
  */
 #[\AllowDynamicProperties]
-final class FnStream implements StreamInterface
-{
+final class FnStream implements StreamInterface {
     private const SLOTS = [
         '__toString', 'close', 'detach', 'rewind',
         'getSize', 'tell', 'eof', 'isSeekable', 'seek', 'isWritable', 'write',

lib/Vendor/GuzzleHttp/Psr7/BufferStream.php

Indentation +128 added lines, -128 removed lines

@@ -16,132 +16,132 @@
  */
 final class BufferStream implements StreamInterface
 {
-    /** @var int */
-    private $hwm;
-
-    /** @var string */
-    private $buffer = '';
-
-    /**
-     * @param int $hwm High water mark, representing the preferred maximum
-     *                 buffer size. If the size of the buffer exceeds the high
-     *                 water mark, then calls to write will continue to succeed
-     *                 but will return 0 to inform writers to slow down
-     *                 until the buffer has been drained by reading from it.
-     */
-    public function __construct(int $hwm = 16384)
-    {
-        $this->hwm = $hwm;
-    }
-
-    public function __toString(): string
-    {
-        return $this->getContents();
-    }
-
-    public function getContents(): string
-    {
-        $buffer = $this->buffer;
-        $this->buffer = '';
-
-        return $buffer;
-    }
-
-    public function close(): void
-    {
-        $this->buffer = '';
-    }
-
-    public function detach()
-    {
-        $this->close();
-
-        return null;
-    }
-
-    public function getSize(): ?int
-    {
-        return strlen($this->buffer);
-    }
-
-    public function isReadable(): bool
-    {
-        return true;
-    }
-
-    public function isWritable(): bool
-    {
-        return true;
-    }
-
-    public function isSeekable(): bool
-    {
-        return false;
-    }
-
-    public function rewind(): void
-    {
-        $this->seek(0);
-    }
-
-    public function seek($offset, $whence = SEEK_SET): void
-    {
-        throw new \RuntimeException('Cannot seek a BufferStream');
-    }
-
-    public function eof(): bool
-    {
-        return strlen($this->buffer) === 0;
-    }
-
-    public function tell(): int
-    {
-        throw new \RuntimeException('Cannot determine the position of a BufferStream');
-    }
-
-    /**
-     * Reads data from the buffer.
-     */
-    public function read($length): string
-    {
-        $currentLength = strlen($this->buffer);
-
-        if ($length >= $currentLength) {
-            // No need to slice the buffer because we don't have enough data.
-            $result = $this->buffer;
-            $this->buffer = '';
-        } else {
-            // Slice up the result to provide a subset of the buffer.
-            $result = substr($this->buffer, 0, $length);
-            $this->buffer = substr($this->buffer, $length);
-        }
-
-        return $result;
-    }
-
-    /**
-     * Writes data to the buffer.
-     */
-    public function write($string): int
-    {
-        $this->buffer .= $string;
-
-        if (strlen($this->buffer) >= $this->hwm) {
-            return 0;
-        }
-
-        return strlen($string);
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getMetadata($key = null)
-    {
-        if ($key === 'hwm') {
-            return $this->hwm;
-        }
-
-        return $key ? null : [];
-    }
+	/** @var int */
+	private $hwm;
+
+	/** @var string */
+	private $buffer = '';
+
+	/**
+	 * @param int $hwm High water mark, representing the preferred maximum
+	 *                 buffer size. If the size of the buffer exceeds the high
+	 *                 water mark, then calls to write will continue to succeed
+	 *                 but will return 0 to inform writers to slow down
+	 *                 until the buffer has been drained by reading from it.
+	 */
+	public function __construct(int $hwm = 16384)
+	{
+		$this->hwm = $hwm;
+	}
+
+	public function __toString(): string
+	{
+		return $this->getContents();
+	}
+
+	public function getContents(): string
+	{
+		$buffer = $this->buffer;
+		$this->buffer = '';
+
+		return $buffer;
+	}
+
+	public function close(): void
+	{
+		$this->buffer = '';
+	}
+
+	public function detach()
+	{
+		$this->close();
+
+		return null;
+	}
+
+	public function getSize(): ?int
+	{
+		return strlen($this->buffer);
+	}
+
+	public function isReadable(): bool
+	{
+		return true;
+	}
+
+	public function isWritable(): bool
+	{
+		return true;
+	}
+
+	public function isSeekable(): bool
+	{
+		return false;
+	}
+
+	public function rewind(): void
+	{
+		$this->seek(0);
+	}
+
+	public function seek($offset, $whence = SEEK_SET): void
+	{
+		throw new \RuntimeException('Cannot seek a BufferStream');
+	}
+
+	public function eof(): bool
+	{
+		return strlen($this->buffer) === 0;
+	}
+
+	public function tell(): int
+	{
+		throw new \RuntimeException('Cannot determine the position of a BufferStream');
+	}
+
+	/**
+	 * Reads data from the buffer.
+	 */
+	public function read($length): string
+	{
+		$currentLength = strlen($this->buffer);
+
+		if ($length >= $currentLength) {
+			// No need to slice the buffer because we don't have enough data.
+			$result = $this->buffer;
+			$this->buffer = '';
+		} else {
+			// Slice up the result to provide a subset of the buffer.
+			$result = substr($this->buffer, 0, $length);
+			$this->buffer = substr($this->buffer, $length);
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Writes data to the buffer.
+	 */
+	public function write($string): int
+	{
+		$this->buffer .= $string;
+
+		if (strlen($this->buffer) >= $this->hwm) {
+			return 0;
+		}
+
+		return strlen($string);
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function getMetadata($key = null)
+	{
+		if ($key === 'hwm') {
+			return $this->hwm;
+		}
+
+		return $key ? null : [];
+	}
 }

Braces +1 added lines, -2 removed lines

@@ -14,8 +14,7 @@
  * what the configured high water mark of the stream is, or the maximum
  * preferred size of the buffer.
  */
-final class BufferStream implements StreamInterface
-{
+final class BufferStream implements StreamInterface {
     /** @var int */
     private $hwm;