nextcloud / fulltextsearch_elasticsearch

lib/Vendor/GuzzleHttp/Psr7/AppendStream.php

Indentation +232 added lines, -232 removed lines

@@ -13,236 +13,236 @@
  */
 final class AppendStream implements StreamInterface
 {
-    /** @var StreamInterface[] Streams being decorated */
-    private $streams = [];
-
-    /** @var bool */
-    private $seekable = true;
-
-    /** @var int */
-    private $current = 0;
-
-    /** @var int */
-    private $pos = 0;
-
-    /**
-     * @param StreamInterface[] $streams Streams to decorate. Each stream must
-     *                                   be readable.
-     */
-    public function __construct(array $streams = [])
-    {
-        foreach ($streams as $stream) {
-            $this->addStream($stream);
-        }
-    }
-
-    public function __toString(): string
-    {
-        try {
-            $this->rewind();
-
-            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 '';
-        }
-    }
-
-    /**
-     * Add a stream to the AppendStream
-     *
-     * @param StreamInterface $stream Stream to append. Must be readable.
-     *
-     * @throws \InvalidArgumentException if the stream is not readable
-     */
-    public function addStream(StreamInterface $stream): void
-    {
-        if (!$stream->isReadable()) {
-            throw new \InvalidArgumentException('Each stream must be readable');
-        }
-
-        // The stream is only seekable if all streams are seekable
-        if (!$stream->isSeekable()) {
-            $this->seekable = false;
-        }
-
-        $this->streams[] = $stream;
-    }
-
-    public function getContents(): string
-    {
-        return Utils::copyToString($this);
-    }
-
-    /**
-     * Closes each attached stream.
-     */
-    public function close(): void
-    {
-        $this->pos = $this->current = 0;
-        $this->seekable = true;
-
-        foreach ($this->streams as $stream) {
-            $stream->close();
-        }
-
-        $this->streams = [];
-    }
-
-    /**
-     * Detaches each attached stream.
-     *
-     * Returns null as it's not clear which underlying stream resource to return.
-     */
-    public function detach()
-    {
-        $this->pos = $this->current = 0;
-        $this->seekable = true;
-
-        foreach ($this->streams as $stream) {
-            $stream->detach();
-        }
-
-        $this->streams = [];
-
-        return null;
-    }
-
-    public function tell(): int
-    {
-        return $this->pos;
-    }
-
-    /**
-     * Tries to calculate the size by adding the size of each stream.
-     *
-     * If any of the streams do not return a valid number, then the size of the
-     * append stream cannot be determined and null is returned.
-     */
-    public function getSize(): ?int
-    {
-        $size = 0;
-
-        foreach ($this->streams as $stream) {
-            $s = $stream->getSize();
-            if ($s === null) {
-                return null;
-            }
-            $size += $s;
-        }
-
-        return $size;
-    }
-
-    public function eof(): bool
-    {
-        return !$this->streams
-            || ($this->current >= count($this->streams) - 1
-             && $this->streams[$this->current]->eof());
-    }
-
-    public function rewind(): void
-    {
-        $this->seek(0);
-    }
-
-    /**
-     * Attempts to seek to the given position. Only supports SEEK_SET.
-     */
-    public function seek($offset, $whence = SEEK_SET): void
-    {
-        if (!$this->seekable) {
-            throw new \RuntimeException('This AppendStream is not seekable');
-        } elseif ($whence !== SEEK_SET) {
-            throw new \RuntimeException('The AppendStream can only seek with SEEK_SET');
-        }
-
-        $this->pos = $this->current = 0;
-
-        // Rewind each stream
-        foreach ($this->streams as $i => $stream) {
-            try {
-                $stream->rewind();
-            } catch (\Exception $e) {
-                throw new \RuntimeException('Unable to seek stream '
-                    .$i.' of the AppendStream', 0, $e);
-            }
-        }
-
-        // Seek to the actual position by reading from each stream
-        while ($this->pos < $offset && !$this->eof()) {
-            $result = $this->read(min(8096, $offset - $this->pos));
-            if ($result === '') {
-                break;
-            }
-        }
-    }
-
-    /**
-     * Reads from all of the appended streams until the length is met or EOF.
-     */
-    public function read($length): string
-    {
-        $buffer = '';
-        $total = count($this->streams) - 1;
-        $remaining = $length;
-        $progressToNext = false;
-
-        while ($remaining > 0) {
-            // Progress to the next stream if needed.
-            if ($progressToNext || $this->streams[$this->current]->eof()) {
-                $progressToNext = false;
-                if ($this->current === $total) {
-                    break;
-                }
-                ++$this->current;
-            }
-
-            $result = $this->streams[$this->current]->read($remaining);
-
-            if ($result === '') {
-                $progressToNext = true;
-                continue;
-            }
-
-            $buffer .= $result;
-            $remaining = $length - strlen($buffer);
-        }
-
-        $this->pos += strlen($buffer);
-
-        return $buffer;
-    }
-
-    public function isReadable(): bool
-    {
-        return true;
-    }
-
-    public function isWritable(): bool
-    {
-        return false;
-    }
-
-    public function isSeekable(): bool
-    {
-        return $this->seekable;
-    }
-
-    public function write($string): int
-    {
-        throw new \RuntimeException('Cannot write to an AppendStream');
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getMetadata($key = null)
-    {
-        return $key ? null : [];
-    }
+	/** @var StreamInterface[] Streams being decorated */
+	private $streams = [];
+
+	/** @var bool */
+	private $seekable = true;
+
+	/** @var int */
+	private $current = 0;
+
+	/** @var int */
+	private $pos = 0;
+
+	/**
+	 * @param StreamInterface[] $streams Streams to decorate. Each stream must
+	 *                                   be readable.
+	 */
+	public function __construct(array $streams = [])
+	{
+		foreach ($streams as $stream) {
+			$this->addStream($stream);
+		}
+	}
+
+	public function __toString(): string
+	{
+		try {
+			$this->rewind();
+
+			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 '';
+		}
+	}
+
+	/**
+	 * Add a stream to the AppendStream
+	 *
+	 * @param StreamInterface $stream Stream to append. Must be readable.
+	 *
+	 * @throws \InvalidArgumentException if the stream is not readable
+	 */
+	public function addStream(StreamInterface $stream): void
+	{
+		if (!$stream->isReadable()) {
+			throw new \InvalidArgumentException('Each stream must be readable');
+		}
+
+		// The stream is only seekable if all streams are seekable
+		if (!$stream->isSeekable()) {
+			$this->seekable = false;
+		}
+
+		$this->streams[] = $stream;
+	}
+
+	public function getContents(): string
+	{
+		return Utils::copyToString($this);
+	}
+
+	/**
+	 * Closes each attached stream.
+	 */
+	public function close(): void
+	{
+		$this->pos = $this->current = 0;
+		$this->seekable = true;
+
+		foreach ($this->streams as $stream) {
+			$stream->close();
+		}
+
+		$this->streams = [];
+	}
+
+	/**
+	 * Detaches each attached stream.
+	 *
+	 * Returns null as it's not clear which underlying stream resource to return.
+	 */
+	public function detach()
+	{
+		$this->pos = $this->current = 0;
+		$this->seekable = true;
+
+		foreach ($this->streams as $stream) {
+			$stream->detach();
+		}
+
+		$this->streams = [];
+
+		return null;
+	}
+
+	public function tell(): int
+	{
+		return $this->pos;
+	}
+
+	/**
+	 * Tries to calculate the size by adding the size of each stream.
+	 *
+	 * If any of the streams do not return a valid number, then the size of the
+	 * append stream cannot be determined and null is returned.
+	 */
+	public function getSize(): ?int
+	{
+		$size = 0;
+
+		foreach ($this->streams as $stream) {
+			$s = $stream->getSize();
+			if ($s === null) {
+				return null;
+			}
+			$size += $s;
+		}
+
+		return $size;
+	}
+
+	public function eof(): bool
+	{
+		return !$this->streams
+			|| ($this->current >= count($this->streams) - 1
+			 && $this->streams[$this->current]->eof());
+	}
+
+	public function rewind(): void
+	{
+		$this->seek(0);
+	}
+
+	/**
+	 * Attempts to seek to the given position. Only supports SEEK_SET.
+	 */
+	public function seek($offset, $whence = SEEK_SET): void
+	{
+		if (!$this->seekable) {
+			throw new \RuntimeException('This AppendStream is not seekable');
+		} elseif ($whence !== SEEK_SET) {
+			throw new \RuntimeException('The AppendStream can only seek with SEEK_SET');
+		}
+
+		$this->pos = $this->current = 0;
+
+		// Rewind each stream
+		foreach ($this->streams as $i => $stream) {
+			try {
+				$stream->rewind();
+			} catch (\Exception $e) {
+				throw new \RuntimeException('Unable to seek stream '
+					.$i.' of the AppendStream', 0, $e);
+			}
+		}
+
+		// Seek to the actual position by reading from each stream
+		while ($this->pos < $offset && !$this->eof()) {
+			$result = $this->read(min(8096, $offset - $this->pos));
+			if ($result === '') {
+				break;
+			}
+		}
+	}
+
+	/**
+	 * Reads from all of the appended streams until the length is met or EOF.
+	 */
+	public function read($length): string
+	{
+		$buffer = '';
+		$total = count($this->streams) - 1;
+		$remaining = $length;
+		$progressToNext = false;
+
+		while ($remaining > 0) {
+			// Progress to the next stream if needed.
+			if ($progressToNext || $this->streams[$this->current]->eof()) {
+				$progressToNext = false;
+				if ($this->current === $total) {
+					break;
+				}
+				++$this->current;
+			}
+
+			$result = $this->streams[$this->current]->read($remaining);
+
+			if ($result === '') {
+				$progressToNext = true;
+				continue;
+			}
+
+			$buffer .= $result;
+			$remaining = $length - strlen($buffer);
+		}
+
+		$this->pos += strlen($buffer);
+
+		return $buffer;
+	}
+
+	public function isReadable(): bool
+	{
+		return true;
+	}
+
+	public function isWritable(): bool
+	{
+		return false;
+	}
+
+	public function isSeekable(): bool
+	{
+		return $this->seekable;
+	}
+
+	public function write($string): int
+	{
+		throw new \RuntimeException('Cannot write to an AppendStream');
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function getMetadata($key = null)
+	{
+		return $key ? null : [];
+	}
 }

Spacing +1 added lines, -1 removed lines

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

Braces +1 added lines, -2 removed lines

@@ -11,8 +11,7 @@
  *
  * This is a read-only stream decorator.
  */
-final class AppendStream implements StreamInterface
-{
+final class AppendStream implements StreamInterface {
     /** @var StreamInterface[] Streams being decorated */
     private $streams = [];
 

lib/Vendor/GuzzleHttp/Psr7/UriResolver.php

Indentation +193 added lines, -193 removed lines

@@ -15,197 +15,197 @@
  */
 final class UriResolver
 {
-    /**
-     * Removes dot segments from a path and returns the new path.
-     *
-     * @see https://datatracker.ietf.org/doc/html/rfc3986#section-5.2.4
-     */
-    public static function removeDotSegments(string $path): string
-    {
-        if ($path === '' || $path === '/') {
-            return $path;
-        }
-
-        $results = [];
-        $segments = explode('/', $path);
-        foreach ($segments as $segment) {
-            if ($segment === '..') {
-                array_pop($results);
-            } elseif ($segment !== '.') {
-                $results[] = $segment;
-            }
-        }
-
-        $newPath = implode('/', $results);
-
-        if ($path[0] === '/' && (!isset($newPath[0]) || $newPath[0] !== '/')) {
-            // Re-add the leading slash if necessary for cases like "/.."
-            $newPath = '/'.$newPath;
-        } elseif ($newPath !== '' && ($segment === '.' || $segment === '..')) {
-            // Add the trailing slash if necessary
-            // If newPath is not empty, then $segment must be set and is the last segment from the foreach
-            $newPath .= '/';
-        }
-
-        return $newPath;
-    }
-
-    /**
-     * Converts the relative URI into a new URI that is resolved against the base URI.
-     *
-     * @see https://datatracker.ietf.org/doc/html/rfc3986#section-5.2
-     */
-    public static function resolve(UriInterface $base, UriInterface $rel): UriInterface
-    {
-        if ((string) $rel === '') {
-            // we can simply return the same base URI instance for this same-document reference
-            return $base;
-        }
-
-        if ($rel->getScheme() != '') {
-            return $rel->withPath(self::removeDotSegments($rel->getPath()));
-        }
-
-        if ($rel->getAuthority() != '') {
-            $targetAuthority = $rel->getAuthority();
-            $targetPath = self::removeDotSegments($rel->getPath());
-            $targetQuery = $rel->getQuery();
-        } else {
-            $targetAuthority = $base->getAuthority();
-            if ($rel->getPath() === '') {
-                $targetPath = $base->getPath();
-                $targetQuery = $rel->getQuery() != '' ? $rel->getQuery() : $base->getQuery();
-            } else {
-                if ($rel->getPath()[0] === '/') {
-                    $targetPath = $rel->getPath();
-                } else {
-                    if ($targetAuthority != '' && $base->getPath() === '') {
-                        $targetPath = '/'.$rel->getPath();
-                    } else {
-                        $lastSlashPos = strrpos($base->getPath(), '/');
-                        if ($lastSlashPos === false) {
-                            $targetPath = $rel->getPath();
-                        } else {
-                            $targetPath = substr($base->getPath(), 0, $lastSlashPos + 1).$rel->getPath();
-                        }
-                    }
-                }
-                $targetPath = self::removeDotSegments($targetPath);
-                $targetQuery = $rel->getQuery();
-            }
-        }
-
-        return new Uri(Uri::composeComponents(
-            $base->getScheme(),
-            $targetAuthority,
-            $targetPath,
-            $targetQuery,
-            $rel->getFragment()
-        ));
-    }
-
-    /**
-     * Returns the target URI as a relative reference from the base URI.
-     *
-     * This method is the counterpart to resolve():
-     *
-     *    (string) $target === (string) UriResolver::resolve($base, UriResolver::relativize($base, $target))
-     *
-     * One use-case is to use the current request URI as base URI and then generate relative links in your documents
-     * to reduce the document size or offer self-contained downloadable document archives.
-     *
-     *    $base = new Uri('http://example.com/a/b/');
-     *    echo UriResolver::relativize($base, new Uri('http://example.com/a/b/c'));  // prints 'c'.
-     *    echo UriResolver::relativize($base, new Uri('http://example.com/a/x/y'));  // prints '../x/y'.
-     *    echo UriResolver::relativize($base, new Uri('http://example.com/a/b/?q')); // prints '?q'.
-     *    echo UriResolver::relativize($base, new Uri('http://example.org/a/b/'));   // prints '//example.org/a/b/'.
-     *
-     * This method also accepts a target that is already relative and will try to relativize it further. Only a
-     * relative-path reference will be returned as-is.
-     *
-     *    echo UriResolver::relativize($base, new Uri('/a/b/c'));  // prints 'c' as well
-     */
-    public static function relativize(UriInterface $base, UriInterface $target): UriInterface
-    {
-        if ($target->getScheme() !== ''
-            && ($base->getScheme() !== $target->getScheme() || $target->getAuthority() === '' && $base->getAuthority() !== '')
-        ) {
-            return $target;
-        }
-
-        if (Uri::isRelativePathReference($target)) {
-            // As the target is already highly relative we return it as-is. It would be possible to resolve
-            // the target with `$target = self::resolve($base, $target);` and then try make it more relative
-            // by removing a duplicate query. But let's not do that automatically.
-            return $target;
-        }
-
-        if ($target->getAuthority() !== '' && $base->getAuthority() !== $target->getAuthority()) {
-            return $target->withScheme('');
-        }
-
-        // We must remove the path before removing the authority because if the path starts with two slashes, the URI
-        // would turn invalid. And we also cannot set a relative path before removing the authority, as that is also
-        // invalid.
-        $emptyPathUri = $target->withScheme('')->withPath('')->withUserInfo('')->withPort(null)->withHost('');
-
-        if ($base->getPath() !== $target->getPath()) {
-            return $emptyPathUri->withPath(self::getRelativePath($base, $target));
-        }
-
-        if ($base->getQuery() === $target->getQuery()) {
-            // Only the target fragment is left. And it must be returned even if base and target fragment are the same.
-            return $emptyPathUri->withQuery('');
-        }
-
-        // If the base URI has a query but the target has none, we cannot return an empty path reference as it would
-        // inherit the base query component when resolving.
-        if ($target->getQuery() === '') {
-            $segments = explode('/', $target->getPath());
-            /** @var string $lastSegment */
-            $lastSegment = end($segments);
-
-            return $emptyPathUri->withPath($lastSegment === '' ? './' : $lastSegment);
-        }
-
-        return $emptyPathUri;
-    }
-
-    private static function getRelativePath(UriInterface $base, UriInterface $target): string
-    {
-        $sourceSegments = explode('/', $base->getPath());
-        $targetSegments = explode('/', $target->getPath());
-        array_pop($sourceSegments);
-        $targetLastSegment = array_pop($targetSegments);
-        foreach ($sourceSegments as $i => $segment) {
-            if (isset($targetSegments[$i]) && $segment === $targetSegments[$i]) {
-                unset($sourceSegments[$i], $targetSegments[$i]);
-            } else {
-                break;
-            }
-        }
-        $targetSegments[] = $targetLastSegment;
-        $relativePath = str_repeat('../', count($sourceSegments)).implode('/', $targetSegments);
-
-        // A reference to am empty last segment or an empty first sub-segment must be prefixed with "./".
-        // This also applies to a segment with a colon character (e.g., "file:colon") that cannot be used
-        // as the first segment of a relative-path reference, as it would be mistaken for a scheme name.
-        if ('' === $relativePath || false !== strpos(explode('/', $relativePath, 2)[0], ':')) {
-            $relativePath = "./$relativePath";
-        } elseif ('/' === $relativePath[0]) {
-            if ($base->getAuthority() != '' && $base->getPath() === '') {
-                // In this case an extra slash is added by resolve() automatically. So we must not add one here.
-                $relativePath = ".$relativePath";
-            } else {
-                $relativePath = "./$relativePath";
-            }
-        }
-
-        return $relativePath;
-    }
-
-    private function __construct()
-    {
-        // cannot be instantiated
-    }
+	/**
+	 * Removes dot segments from a path and returns the new path.
+	 *
+	 * @see https://datatracker.ietf.org/doc/html/rfc3986#section-5.2.4
+	 */
+	public static function removeDotSegments(string $path): string
+	{
+		if ($path === '' || $path === '/') {
+			return $path;
+		}
+
+		$results = [];
+		$segments = explode('/', $path);
+		foreach ($segments as $segment) {
+			if ($segment === '..') {
+				array_pop($results);
+			} elseif ($segment !== '.') {
+				$results[] = $segment;
+			}
+		}
+
+		$newPath = implode('/', $results);
+
+		if ($path[0] === '/' && (!isset($newPath[0]) || $newPath[0] !== '/')) {
+			// Re-add the leading slash if necessary for cases like "/.."
+			$newPath = '/'.$newPath;
+		} elseif ($newPath !== '' && ($segment === '.' || $segment === '..')) {
+			// Add the trailing slash if necessary
+			// If newPath is not empty, then $segment must be set and is the last segment from the foreach
+			$newPath .= '/';
+		}
+
+		return $newPath;
+	}
+
+	/**
+	 * Converts the relative URI into a new URI that is resolved against the base URI.
+	 *
+	 * @see https://datatracker.ietf.org/doc/html/rfc3986#section-5.2
+	 */
+	public static function resolve(UriInterface $base, UriInterface $rel): UriInterface
+	{
+		if ((string) $rel === '') {
+			// we can simply return the same base URI instance for this same-document reference
+			return $base;
+		}
+
+		if ($rel->getScheme() != '') {
+			return $rel->withPath(self::removeDotSegments($rel->getPath()));
+		}
+
+		if ($rel->getAuthority() != '') {
+			$targetAuthority = $rel->getAuthority();
+			$targetPath = self::removeDotSegments($rel->getPath());
+			$targetQuery = $rel->getQuery();
+		} else {
+			$targetAuthority = $base->getAuthority();
+			if ($rel->getPath() === '') {
+				$targetPath = $base->getPath();
+				$targetQuery = $rel->getQuery() != '' ? $rel->getQuery() : $base->getQuery();
+			} else {
+				if ($rel->getPath()[0] === '/') {
+					$targetPath = $rel->getPath();
+				} else {
+					if ($targetAuthority != '' && $base->getPath() === '') {
+						$targetPath = '/'.$rel->getPath();
+					} else {
+						$lastSlashPos = strrpos($base->getPath(), '/');
+						if ($lastSlashPos === false) {
+							$targetPath = $rel->getPath();
+						} else {
+							$targetPath = substr($base->getPath(), 0, $lastSlashPos + 1).$rel->getPath();
+						}
+					}
+				}
+				$targetPath = self::removeDotSegments($targetPath);
+				$targetQuery = $rel->getQuery();
+			}
+		}
+
+		return new Uri(Uri::composeComponents(
+			$base->getScheme(),
+			$targetAuthority,
+			$targetPath,
+			$targetQuery,
+			$rel->getFragment()
+		));
+	}
+
+	/**
+	 * Returns the target URI as a relative reference from the base URI.
+	 *
+	 * This method is the counterpart to resolve():
+	 *
+	 *    (string) $target === (string) UriResolver::resolve($base, UriResolver::relativize($base, $target))
+	 *
+	 * One use-case is to use the current request URI as base URI and then generate relative links in your documents
+	 * to reduce the document size or offer self-contained downloadable document archives.
+	 *
+	 *    $base = new Uri('http://example.com/a/b/');
+	 *    echo UriResolver::relativize($base, new Uri('http://example.com/a/b/c'));  // prints 'c'.
+	 *    echo UriResolver::relativize($base, new Uri('http://example.com/a/x/y'));  // prints '../x/y'.
+	 *    echo UriResolver::relativize($base, new Uri('http://example.com/a/b/?q')); // prints '?q'.
+	 *    echo UriResolver::relativize($base, new Uri('http://example.org/a/b/'));   // prints '//example.org/a/b/'.
+	 *
+	 * This method also accepts a target that is already relative and will try to relativize it further. Only a
+	 * relative-path reference will be returned as-is.
+	 *
+	 *    echo UriResolver::relativize($base, new Uri('/a/b/c'));  // prints 'c' as well
+	 */
+	public static function relativize(UriInterface $base, UriInterface $target): UriInterface
+	{
+		if ($target->getScheme() !== ''
+			&& ($base->getScheme() !== $target->getScheme() || $target->getAuthority() === '' && $base->getAuthority() !== '')
+		) {
+			return $target;
+		}
+
+		if (Uri::isRelativePathReference($target)) {
+			// As the target is already highly relative we return it as-is. It would be possible to resolve
+			// the target with `$target = self::resolve($base, $target);` and then try make it more relative
+			// by removing a duplicate query. But let's not do that automatically.
+			return $target;
+		}
+
+		if ($target->getAuthority() !== '' && $base->getAuthority() !== $target->getAuthority()) {
+			return $target->withScheme('');
+		}
+
+		// We must remove the path before removing the authority because if the path starts with two slashes, the URI
+		// would turn invalid. And we also cannot set a relative path before removing the authority, as that is also
+		// invalid.
+		$emptyPathUri = $target->withScheme('')->withPath('')->withUserInfo('')->withPort(null)->withHost('');
+
+		if ($base->getPath() !== $target->getPath()) {
+			return $emptyPathUri->withPath(self::getRelativePath($base, $target));
+		}
+
+		if ($base->getQuery() === $target->getQuery()) {
+			// Only the target fragment is left. And it must be returned even if base and target fragment are the same.
+			return $emptyPathUri->withQuery('');
+		}
+
+		// If the base URI has a query but the target has none, we cannot return an empty path reference as it would
+		// inherit the base query component when resolving.
+		if ($target->getQuery() === '') {
+			$segments = explode('/', $target->getPath());
+			/** @var string $lastSegment */
+			$lastSegment = end($segments);
+
+			return $emptyPathUri->withPath($lastSegment === '' ? './' : $lastSegment);
+		}
+
+		return $emptyPathUri;
+	}
+
+	private static function getRelativePath(UriInterface $base, UriInterface $target): string
+	{
+		$sourceSegments = explode('/', $base->getPath());
+		$targetSegments = explode('/', $target->getPath());
+		array_pop($sourceSegments);
+		$targetLastSegment = array_pop($targetSegments);
+		foreach ($sourceSegments as $i => $segment) {
+			if (isset($targetSegments[$i]) && $segment === $targetSegments[$i]) {
+				unset($sourceSegments[$i], $targetSegments[$i]);
+			} else {
+				break;
+			}
+		}
+		$targetSegments[] = $targetLastSegment;
+		$relativePath = str_repeat('../', count($sourceSegments)).implode('/', $targetSegments);
+
+		// A reference to am empty last segment or an empty first sub-segment must be prefixed with "./".
+		// This also applies to a segment with a colon character (e.g., "file:colon") that cannot be used
+		// as the first segment of a relative-path reference, as it would be mistaken for a scheme name.
+		if ('' === $relativePath || false !== strpos(explode('/', $relativePath, 2)[0], ':')) {
+			$relativePath = "./$relativePath";
+		} elseif ('/' === $relativePath[0]) {
+			if ($base->getAuthority() != '' && $base->getPath() === '') {
+				// In this case an extra slash is added by resolve() automatically. So we must not add one here.
+				$relativePath = ".$relativePath";
+			} else {
+				$relativePath = "./$relativePath";
+			}
+		}
+
+		return $relativePath;
+	}
+
+	private function __construct()
+	{
+		// cannot be instantiated
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
      */
     public static function resolve(UriInterface $base, UriInterface $rel): UriInterface
     {
-        if ((string) $rel === '') {
+        if ((string)$rel === '') {
             // we can simply return the same base URI instance for this same-document reference
             return $base;
         }

Braces +1 added lines, -2 removed lines

@@ -13,8 +13,7 @@
  *
  * @see https://datatracker.ietf.org/doc/html/rfc3986#section-5
  */
-final class UriResolver
-{
+final class UriResolver {
     /**
      * Removes dot segments from a path and returns the new path.
      *

lib/Vendor/GuzzleHttp/Psr7/Query.php

Indentation +96 added lines, -96 removed lines

@@ -6,108 +6,108 @@
 
 final class Query
 {
-    /**
-     * Parse a query string into an associative array.
-     *
-     * If multiple values are found for the same key, the value of that key
-     * value pair will become an array. This function does not parse nested
-     * PHP style arrays into an associative array (e.g., `foo[a]=1&foo[b]=2`
-     * will be parsed into `['foo[a]' => '1', 'foo[b]' => '2'])`.
-     *
-     * @param string   $str         Query string to parse
-     * @param int|bool $urlEncoding How the query string is encoded
-     */
-    public static function parse(string $str, $urlEncoding = true): array
-    {
-        $result = [];
+	/**
+	 * Parse a query string into an associative array.
+	 *
+	 * If multiple values are found for the same key, the value of that key
+	 * value pair will become an array. This function does not parse nested
+	 * PHP style arrays into an associative array (e.g., `foo[a]=1&foo[b]=2`
+	 * will be parsed into `['foo[a]' => '1', 'foo[b]' => '2'])`.
+	 *
+	 * @param string   $str         Query string to parse
+	 * @param int|bool $urlEncoding How the query string is encoded
+	 */
+	public static function parse(string $str, $urlEncoding = true): array
+	{
+		$result = [];
 
-        if ($str === '') {
-            return $result;
-        }
+		if ($str === '') {
+			return $result;
+		}
 
-        if ($urlEncoding === true) {
-            $decoder = function ($value) {
-                return rawurldecode(str_replace('+', ' ', (string) $value));
-            };
-        } elseif ($urlEncoding === PHP_QUERY_RFC3986) {
-            $decoder = 'rawurldecode';
-        } elseif ($urlEncoding === PHP_QUERY_RFC1738) {
-            $decoder = 'urldecode';
-        } else {
-            $decoder = function ($str) {
-                return $str;
-            };
-        }
+		if ($urlEncoding === true) {
+			$decoder = function ($value) {
+				return rawurldecode(str_replace('+', ' ', (string) $value));
+			};
+		} elseif ($urlEncoding === PHP_QUERY_RFC3986) {
+			$decoder = 'rawurldecode';
+		} elseif ($urlEncoding === PHP_QUERY_RFC1738) {
+			$decoder = 'urldecode';
+		} else {
+			$decoder = function ($str) {
+				return $str;
+			};
+		}
 
-        foreach (explode('&', $str) as $kvp) {
-            $parts = explode('=', $kvp, 2);
-            $key = $decoder($parts[0]);
-            $value = isset($parts[1]) ? $decoder($parts[1]) : null;
-            if (!array_key_exists($key, $result)) {
-                $result[$key] = $value;
-            } else {
-                if (!is_array($result[$key])) {
-                    $result[$key] = [$result[$key]];
-                }
-                $result[$key][] = $value;
-            }
-        }
+		foreach (explode('&', $str) as $kvp) {
+			$parts = explode('=', $kvp, 2);
+			$key = $decoder($parts[0]);
+			$value = isset($parts[1]) ? $decoder($parts[1]) : null;
+			if (!array_key_exists($key, $result)) {
+				$result[$key] = $value;
+			} else {
+				if (!is_array($result[$key])) {
+					$result[$key] = [$result[$key]];
+				}
+				$result[$key][] = $value;
+			}
+		}
 
-        return $result;
-    }
+		return $result;
+	}
 
-    /**
-     * Build a query string from an array of key value pairs.
-     *
-     * This function can use the return value of `parse()` to build a query
-     * string. This function does not modify the provided keys when an array is
-     * encountered (like `http_build_query()` would).
-     *
-     * @param array     $params   Query string parameters.
-     * @param int|false $encoding Set to false to not encode, PHP_QUERY_RFC3986
-     *                            to encode using RFC3986, or PHP_QUERY_RFC1738
-     *                            to encode using RFC1738.
-     */
-    public static function build(array $params, $encoding = PHP_QUERY_RFC3986): string
-    {
-        if (!$params) {
-            return '';
-        }
+	/**
+	 * Build a query string from an array of key value pairs.
+	 *
+	 * This function can use the return value of `parse()` to build a query
+	 * string. This function does not modify the provided keys when an array is
+	 * encountered (like `http_build_query()` would).
+	 *
+	 * @param array     $params   Query string parameters.
+	 * @param int|false $encoding Set to false to not encode, PHP_QUERY_RFC3986
+	 *                            to encode using RFC3986, or PHP_QUERY_RFC1738
+	 *                            to encode using RFC1738.
+	 */
+	public static function build(array $params, $encoding = PHP_QUERY_RFC3986): string
+	{
+		if (!$params) {
+			return '';
+		}
 
-        if ($encoding === false) {
-            $encoder = function (string $str): string {
-                return $str;
-            };
-        } elseif ($encoding === PHP_QUERY_RFC3986) {
-            $encoder = 'rawurlencode';
-        } elseif ($encoding === PHP_QUERY_RFC1738) {
-            $encoder = 'urlencode';
-        } else {
-            throw new \InvalidArgumentException('Invalid type');
-        }
+		if ($encoding === false) {
+			$encoder = function (string $str): string {
+				return $str;
+			};
+		} elseif ($encoding === PHP_QUERY_RFC3986) {
+			$encoder = 'rawurlencode';
+		} elseif ($encoding === PHP_QUERY_RFC1738) {
+			$encoder = 'urlencode';
+		} else {
+			throw new \InvalidArgumentException('Invalid type');
+		}
 
-        $qs = '';
-        foreach ($params as $k => $v) {
-            $k = $encoder((string) $k);
-            if (!is_array($v)) {
-                $qs .= $k;
-                $v = is_bool($v) ? (int) $v : $v;
-                if ($v !== null) {
-                    $qs .= '='.$encoder((string) $v);
-                }
-                $qs .= '&';
-            } else {
-                foreach ($v as $vv) {
-                    $qs .= $k;
-                    $vv = is_bool($vv) ? (int) $vv : $vv;
-                    if ($vv !== null) {
-                        $qs .= '='.$encoder((string) $vv);
-                    }
-                    $qs .= '&';
-                }
-            }
-        }
+		$qs = '';
+		foreach ($params as $k => $v) {
+			$k = $encoder((string) $k);
+			if (!is_array($v)) {
+				$qs .= $k;
+				$v = is_bool($v) ? (int) $v : $v;
+				if ($v !== null) {
+					$qs .= '='.$encoder((string) $v);
+				}
+				$qs .= '&';
+			} else {
+				foreach ($v as $vv) {
+					$qs .= $k;
+					$vv = is_bool($vv) ? (int) $vv : $vv;
+					if ($vv !== null) {
+						$qs .= '='.$encoder((string) $vv);
+					}
+					$qs .= '&';
+				}
+			}
+		}
 
-        return $qs ? (string) substr($qs, 0, -1) : '';
-    }
+		return $qs ? (string) substr($qs, 0, -1) : '';
+	}
 }

Spacing +10 added lines, -10 removed lines

@@ -26,15 +26,15 @@ 
         }
 
         if ($urlEncoding === true) {
-            $decoder = function ($value) {
-                return rawurldecode(str_replace('+', ' ', (string) $value));
+            $decoder = function($value) {
+                return rawurldecode(str_replace('+', ' ', (string)$value));
             };
         } elseif ($urlEncoding === PHP_QUERY_RFC3986) {
             $decoder = 'rawurldecode';
         } elseif ($urlEncoding === PHP_QUERY_RFC1738) {
             $decoder = 'urldecode';
         } else {
-            $decoder = function ($str) {
+            $decoder = function($str) {
                 return $str;
             };
         }
@@ -75,7 +75,7 @@ 
         }
 
         if ($encoding === false) {
-            $encoder = function (string $str): string {
+            $encoder = function(string $str): string {
                 return $str;
             };
         } elseif ($encoding === PHP_QUERY_RFC3986) {
@@ -88,26 +88,26 @@ 
 
         $qs = '';
         foreach ($params as $k => $v) {
-            $k = $encoder((string) $k);
+            $k = $encoder((string)$k);
             if (!is_array($v)) {
                 $qs .= $k;
-                $v = is_bool($v) ? (int) $v : $v;
+                $v = is_bool($v) ? (int)$v : $v;
                 if ($v !== null) {
-                    $qs .= '='.$encoder((string) $v);
+                    $qs .= '='.$encoder((string)$v);
                 }
                 $qs .= '&';
             } else {
                 foreach ($v as $vv) {
                     $qs .= $k;
-                    $vv = is_bool($vv) ? (int) $vv : $vv;
+                    $vv = is_bool($vv) ? (int)$vv : $vv;
                     if ($vv !== null) {
-                        $qs .= '='.$encoder((string) $vv);
+                        $qs .= '='.$encoder((string)$vv);
                     }
                     $qs .= '&';
                 }
             }
         }
 
-        return $qs ? (string) substr($qs, 0, -1) : '';
+        return $qs ? (string)substr($qs, 0, -1) : '';
     }
 }

Braces +1 added lines, -2 removed lines

@@ -4,8 +4,7 @@
 
 namespace OCA\FullTextSearch_Elasticsearch\Vendor\GuzzleHttp\Psr7;
 
-final class Query
-{
+final class Query {
     /**
      * Parse a query string into an associative array.
      *

lib/Vendor/GuzzleHttp/Psr7/ServerRequest.php

Indentation +311 added lines, -311 removed lines

@@ -26,315 +26,315 @@
  */
 class ServerRequest extends Request implements ServerRequestInterface
 {
-    /**
-     * @var array
-     */
-    private $attributes = [];
-
-    /**
-     * @var array
-     */
-    private $cookieParams = [];
-
-    /**
-     * @var array|object|null
-     */
-    private $parsedBody;
-
-    /**
-     * @var array
-     */
-    private $queryParams = [];
-
-    /**
-     * @var array
-     */
-    private $serverParams;
-
-    /**
-     * @var array
-     */
-    private $uploadedFiles = [];
-
-    /**
-     * @param string                               $method       HTTP method
-     * @param string|UriInterface                  $uri          URI
-     * @param (string|string[])[]                  $headers      Request headers
-     * @param string|resource|StreamInterface|null $body         Request body
-     * @param string                               $version      Protocol version
-     * @param array                                $serverParams Typically the $_SERVER superglobal
-     */
-    public function __construct(
-        string $method,
-        $uri,
-        array $headers = [],
-        $body = null,
-        string $version = '1.1',
-        array $serverParams = []
-    ) {
-        $this->serverParams = $serverParams;
-
-        parent::__construct($method, $uri, $headers, $body, $version);
-    }
-
-    /**
-     * Return an UploadedFile instance array.
-     *
-     * @param array $files An array which respect $_FILES structure
-     *
-     * @throws InvalidArgumentException for unrecognized values
-     */
-    public static function normalizeFiles(array $files): array
-    {
-        $normalized = [];
-
-        foreach ($files as $key => $value) {
-            if ($value instanceof UploadedFileInterface) {
-                $normalized[$key] = $value;
-            } elseif (is_array($value) && isset($value['tmp_name'])) {
-                $normalized[$key] = self::createUploadedFileFromSpec($value);
-            } elseif (is_array($value)) {
-                $normalized[$key] = self::normalizeFiles($value);
-                continue;
-            } else {
-                throw new InvalidArgumentException('Invalid value in files specification');
-            }
-        }
-
-        return $normalized;
-    }
-
-    /**
-     * Create and return an UploadedFile instance from a $_FILES specification.
-     *
-     * If the specification represents an array of values, this method will
-     * delegate to normalizeNestedFileSpec() and return that return value.
-     *
-     * @param array $value $_FILES struct
-     *
-     * @return UploadedFileInterface|UploadedFileInterface[]
-     */
-    private static function createUploadedFileFromSpec(array $value)
-    {
-        if (is_array($value['tmp_name'])) {
-            return self::normalizeNestedFileSpec($value);
-        }
-
-        return new UploadedFile(
-            $value['tmp_name'],
-            (int) $value['size'],
-            (int) $value['error'],
-            $value['name'],
-            $value['type']
-        );
-    }
-
-    /**
-     * Normalize an array of file specifications.
-     *
-     * Loops through all nested files and returns a normalized array of
-     * UploadedFileInterface instances.
-     *
-     * @return UploadedFileInterface[]
-     */
-    private static function normalizeNestedFileSpec(array $files = []): array
-    {
-        $normalizedFiles = [];
-
-        foreach (array_keys($files['tmp_name']) as $key) {
-            $spec = [
-                'tmp_name' => $files['tmp_name'][$key],
-                'size' => $files['size'][$key] ?? null,
-                'error' => $files['error'][$key] ?? null,
-                'name' => $files['name'][$key] ?? null,
-                'type' => $files['type'][$key] ?? null,
-            ];
-            $normalizedFiles[$key] = self::createUploadedFileFromSpec($spec);
-        }
-
-        return $normalizedFiles;
-    }
-
-    /**
-     * Return a ServerRequest populated with superglobals:
-     * $_GET
-     * $_POST
-     * $_COOKIE
-     * $_FILES
-     * $_SERVER
-     */
-    public static function fromGlobals(): ServerRequestInterface
-    {
-        $method = $_SERVER['REQUEST_METHOD'] ?? 'GET';
-        $headers = getallheaders();
-        $uri = self::getUriFromGlobals();
-        $body = new CachingStream(new LazyOpenStream('php://input', 'r+'));
-        $protocol = isset($_SERVER['SERVER_PROTOCOL']) ? str_replace('HTTP/', '', $_SERVER['SERVER_PROTOCOL']) : '1.1';
-
-        $serverRequest = new ServerRequest($method, $uri, $headers, $body, $protocol, $_SERVER);
-
-        return $serverRequest
-            ->withCookieParams($_COOKIE)
-            ->withQueryParams($_GET)
-            ->withParsedBody($_POST)
-            ->withUploadedFiles(self::normalizeFiles($_FILES));
-    }
-
-    private static function extractHostAndPortFromAuthority(string $authority): array
-    {
-        $uri = 'http://'.$authority;
-        $parts = parse_url($uri);
-        if (false === $parts) {
-            return [null, null];
-        }
-
-        $host = $parts['host'] ?? null;
-        $port = $parts['port'] ?? null;
-
-        return [$host, $port];
-    }
-
-    /**
-     * Get a Uri populated with values from $_SERVER.
-     */
-    public static function getUriFromGlobals(): UriInterface
-    {
-        $uri = new Uri('');
-
-        $uri = $uri->withScheme(!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off' ? 'https' : 'http');
-
-        $hasPort = false;
-        if (isset($_SERVER['HTTP_HOST'])) {
-            [$host, $port] = self::extractHostAndPortFromAuthority($_SERVER['HTTP_HOST']);
-            if ($host !== null) {
-                $uri = $uri->withHost($host);
-            }
-
-            if ($port !== null) {
-                $hasPort = true;
-                $uri = $uri->withPort($port);
-            }
-        } elseif (isset($_SERVER['SERVER_NAME'])) {
-            $uri = $uri->withHost($_SERVER['SERVER_NAME']);
-        } elseif (isset($_SERVER['SERVER_ADDR'])) {
-            $uri = $uri->withHost($_SERVER['SERVER_ADDR']);
-        }
-
-        if (!$hasPort && isset($_SERVER['SERVER_PORT'])) {
-            $uri = $uri->withPort($_SERVER['SERVER_PORT']);
-        }
-
-        $hasQuery = false;
-        if (isset($_SERVER['REQUEST_URI'])) {
-            $requestUriParts = explode('?', $_SERVER['REQUEST_URI'], 2);
-            $uri = $uri->withPath($requestUriParts[0]);
-            if (isset($requestUriParts[1])) {
-                $hasQuery = true;
-                $uri = $uri->withQuery($requestUriParts[1]);
-            }
-        }
-
-        if (!$hasQuery && isset($_SERVER['QUERY_STRING'])) {
-            $uri = $uri->withQuery($_SERVER['QUERY_STRING']);
-        }
-
-        return $uri;
-    }
-
-    public function getServerParams(): array
-    {
-        return $this->serverParams;
-    }
-
-    public function getUploadedFiles(): array
-    {
-        return $this->uploadedFiles;
-    }
-
-    public function withUploadedFiles(array $uploadedFiles): ServerRequestInterface
-    {
-        $new = clone $this;
-        $new->uploadedFiles = $uploadedFiles;
-
-        return $new;
-    }
-
-    public function getCookieParams(): array
-    {
-        return $this->cookieParams;
-    }
-
-    public function withCookieParams(array $cookies): ServerRequestInterface
-    {
-        $new = clone $this;
-        $new->cookieParams = $cookies;
-
-        return $new;
-    }
-
-    public function getQueryParams(): array
-    {
-        return $this->queryParams;
-    }
-
-    public function withQueryParams(array $query): ServerRequestInterface
-    {
-        $new = clone $this;
-        $new->queryParams = $query;
-
-        return $new;
-    }
-
-    /**
-     * @return array|object|null
-     */
-    public function getParsedBody()
-    {
-        return $this->parsedBody;
-    }
-
-    public function withParsedBody($data): ServerRequestInterface
-    {
-        $new = clone $this;
-        $new->parsedBody = $data;
-
-        return $new;
-    }
-
-    public function getAttributes(): array
-    {
-        return $this->attributes;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getAttribute($attribute, $default = null)
-    {
-        if (false === array_key_exists($attribute, $this->attributes)) {
-            return $default;
-        }
-
-        return $this->attributes[$attribute];
-    }
-
-    public function withAttribute($attribute, $value): ServerRequestInterface
-    {
-        $new = clone $this;
-        $new->attributes[$attribute] = $value;
-
-        return $new;
-    }
-
-    public function withoutAttribute($attribute): ServerRequestInterface
-    {
-        if (false === array_key_exists($attribute, $this->attributes)) {
-            return $this;
-        }
-
-        $new = clone $this;
-        unset($new->attributes[$attribute]);
-
-        return $new;
-    }
+	/**
+	 * @var array
+	 */
+	private $attributes = [];
+
+	/**
+	 * @var array
+	 */
+	private $cookieParams = [];
+
+	/**
+	 * @var array|object|null
+	 */
+	private $parsedBody;
+
+	/**
+	 * @var array
+	 */
+	private $queryParams = [];
+
+	/**
+	 * @var array
+	 */
+	private $serverParams;
+
+	/**
+	 * @var array
+	 */
+	private $uploadedFiles = [];
+
+	/**
+	 * @param string                               $method       HTTP method
+	 * @param string|UriInterface                  $uri          URI
+	 * @param (string|string[])[]                  $headers      Request headers
+	 * @param string|resource|StreamInterface|null $body         Request body
+	 * @param string                               $version      Protocol version
+	 * @param array                                $serverParams Typically the $_SERVER superglobal
+	 */
+	public function __construct(
+		string $method,
+		$uri,
+		array $headers = [],
+		$body = null,
+		string $version = '1.1',
+		array $serverParams = []
+	) {
+		$this->serverParams = $serverParams;
+
+		parent::__construct($method, $uri, $headers, $body, $version);
+	}
+
+	/**
+	 * Return an UploadedFile instance array.
+	 *
+	 * @param array $files An array which respect $_FILES structure
+	 *
+	 * @throws InvalidArgumentException for unrecognized values
+	 */
+	public static function normalizeFiles(array $files): array
+	{
+		$normalized = [];
+
+		foreach ($files as $key => $value) {
+			if ($value instanceof UploadedFileInterface) {
+				$normalized[$key] = $value;
+			} elseif (is_array($value) && isset($value['tmp_name'])) {
+				$normalized[$key] = self::createUploadedFileFromSpec($value);
+			} elseif (is_array($value)) {
+				$normalized[$key] = self::normalizeFiles($value);
+				continue;
+			} else {
+				throw new InvalidArgumentException('Invalid value in files specification');
+			}
+		}
+
+		return $normalized;
+	}
+
+	/**
+	 * Create and return an UploadedFile instance from a $_FILES specification.
+	 *
+	 * If the specification represents an array of values, this method will
+	 * delegate to normalizeNestedFileSpec() and return that return value.
+	 *
+	 * @param array $value $_FILES struct
+	 *
+	 * @return UploadedFileInterface|UploadedFileInterface[]
+	 */
+	private static function createUploadedFileFromSpec(array $value)
+	{
+		if (is_array($value['tmp_name'])) {
+			return self::normalizeNestedFileSpec($value);
+		}
+
+		return new UploadedFile(
+			$value['tmp_name'],
+			(int) $value['size'],
+			(int) $value['error'],
+			$value['name'],
+			$value['type']
+		);
+	}
+
+	/**
+	 * Normalize an array of file specifications.
+	 *
+	 * Loops through all nested files and returns a normalized array of
+	 * UploadedFileInterface instances.
+	 *
+	 * @return UploadedFileInterface[]
+	 */
+	private static function normalizeNestedFileSpec(array $files = []): array
+	{
+		$normalizedFiles = [];
+
+		foreach (array_keys($files['tmp_name']) as $key) {
+			$spec = [
+				'tmp_name' => $files['tmp_name'][$key],
+				'size' => $files['size'][$key] ?? null,
+				'error' => $files['error'][$key] ?? null,
+				'name' => $files['name'][$key] ?? null,
+				'type' => $files['type'][$key] ?? null,
+			];
+			$normalizedFiles[$key] = self::createUploadedFileFromSpec($spec);
+		}
+
+		return $normalizedFiles;
+	}
+
+	/**
+	 * Return a ServerRequest populated with superglobals:
+	 * $_GET
+	 * $_POST
+	 * $_COOKIE
+	 * $_FILES
+	 * $_SERVER
+	 */
+	public static function fromGlobals(): ServerRequestInterface
+	{
+		$method = $_SERVER['REQUEST_METHOD'] ?? 'GET';
+		$headers = getallheaders();
+		$uri = self::getUriFromGlobals();
+		$body = new CachingStream(new LazyOpenStream('php://input', 'r+'));
+		$protocol = isset($_SERVER['SERVER_PROTOCOL']) ? str_replace('HTTP/', '', $_SERVER['SERVER_PROTOCOL']) : '1.1';
+
+		$serverRequest = new ServerRequest($method, $uri, $headers, $body, $protocol, $_SERVER);
+
+		return $serverRequest
+			->withCookieParams($_COOKIE)
+			->withQueryParams($_GET)
+			->withParsedBody($_POST)
+			->withUploadedFiles(self::normalizeFiles($_FILES));
+	}
+
+	private static function extractHostAndPortFromAuthority(string $authority): array
+	{
+		$uri = 'http://'.$authority;
+		$parts = parse_url($uri);
+		if (false === $parts) {
+			return [null, null];
+		}
+
+		$host = $parts['host'] ?? null;
+		$port = $parts['port'] ?? null;
+
+		return [$host, $port];
+	}
+
+	/**
+	 * Get a Uri populated with values from $_SERVER.
+	 */
+	public static function getUriFromGlobals(): UriInterface
+	{
+		$uri = new Uri('');
+
+		$uri = $uri->withScheme(!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off' ? 'https' : 'http');
+
+		$hasPort = false;
+		if (isset($_SERVER['HTTP_HOST'])) {
+			[$host, $port] = self::extractHostAndPortFromAuthority($_SERVER['HTTP_HOST']);
+			if ($host !== null) {
+				$uri = $uri->withHost($host);
+			}
+
+			if ($port !== null) {
+				$hasPort = true;
+				$uri = $uri->withPort($port);
+			}
+		} elseif (isset($_SERVER['SERVER_NAME'])) {
+			$uri = $uri->withHost($_SERVER['SERVER_NAME']);
+		} elseif (isset($_SERVER['SERVER_ADDR'])) {
+			$uri = $uri->withHost($_SERVER['SERVER_ADDR']);
+		}
+
+		if (!$hasPort && isset($_SERVER['SERVER_PORT'])) {
+			$uri = $uri->withPort($_SERVER['SERVER_PORT']);
+		}
+
+		$hasQuery = false;
+		if (isset($_SERVER['REQUEST_URI'])) {
+			$requestUriParts = explode('?', $_SERVER['REQUEST_URI'], 2);
+			$uri = $uri->withPath($requestUriParts[0]);
+			if (isset($requestUriParts[1])) {
+				$hasQuery = true;
+				$uri = $uri->withQuery($requestUriParts[1]);
+			}
+		}
+
+		if (!$hasQuery && isset($_SERVER['QUERY_STRING'])) {
+			$uri = $uri->withQuery($_SERVER['QUERY_STRING']);
+		}
+
+		return $uri;
+	}
+
+	public function getServerParams(): array
+	{
+		return $this->serverParams;
+	}
+
+	public function getUploadedFiles(): array
+	{
+		return $this->uploadedFiles;
+	}
+
+	public function withUploadedFiles(array $uploadedFiles): ServerRequestInterface
+	{
+		$new = clone $this;
+		$new->uploadedFiles = $uploadedFiles;
+
+		return $new;
+	}
+
+	public function getCookieParams(): array
+	{
+		return $this->cookieParams;
+	}
+
+	public function withCookieParams(array $cookies): ServerRequestInterface
+	{
+		$new = clone $this;
+		$new->cookieParams = $cookies;
+
+		return $new;
+	}
+
+	public function getQueryParams(): array
+	{
+		return $this->queryParams;
+	}
+
+	public function withQueryParams(array $query): ServerRequestInterface
+	{
+		$new = clone $this;
+		$new->queryParams = $query;
+
+		return $new;
+	}
+
+	/**
+	 * @return array|object|null
+	 */
+	public function getParsedBody()
+	{
+		return $this->parsedBody;
+	}
+
+	public function withParsedBody($data): ServerRequestInterface
+	{
+		$new = clone $this;
+		$new->parsedBody = $data;
+
+		return $new;
+	}
+
+	public function getAttributes(): array
+	{
+		return $this->attributes;
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function getAttribute($attribute, $default = null)
+	{
+		if (false === array_key_exists($attribute, $this->attributes)) {
+			return $default;
+		}
+
+		return $this->attributes[$attribute];
+	}
+
+	public function withAttribute($attribute, $value): ServerRequestInterface
+	{
+		$new = clone $this;
+		$new->attributes[$attribute] = $value;
+
+		return $new;
+	}
+
+	public function withoutAttribute($attribute): ServerRequestInterface
+	{
+		if (false === array_key_exists($attribute, $this->attributes)) {
+			return $this;
+		}
+
+		$new = clone $this;
+		unset($new->attributes[$attribute]);
+
+		return $new;
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -122,8 +122,8 @@
 
         return new UploadedFile(
             $value['tmp_name'],
-            (int) $value['size'],
-            (int) $value['error'],
+            (int)$value['size'],
+            (int)$value['error'],
             $value['name'],
             $value['type']
         );

Braces +1 added lines, -2 removed lines

@@ -24,8 +24,7 @@
  * implemented such that they retain the internal state of the current
  * message and return a new instance that contains the changed state.
  */
-class ServerRequest extends Request implements ServerRequestInterface
-{
+class ServerRequest extends Request implements ServerRequestInterface {
     /**
      * @var array
      */

lib/Vendor/GuzzleHttp/Psr7/MultipartStream.php

Indentation +150 added lines, -150 removed lines

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

Spacing +2 added lines, -2 removed lines

@@ -135,7 +135,7 @@ 
         $length = self::getHeader($headers, 'content-length');
         if (!$length) {
             if ($length = $stream->getSize()) {
-                $headers['Content-Length'] = (string) $length;
+                $headers['Content-Length'] = (string)$length;
             }
         }
 
@@ -155,7 +155,7 @@ 
     {
         $lowercaseHeader = strtolower($key);
         foreach ($headers as $k => $v) {
-            if (strtolower((string) $k) === $lowercaseHeader) {
+            if (strtolower((string)$k) === $lowercaseHeader) {
                 return $v;
             }
         }

Braces +1 added lines, -2 removed lines

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

lib/Vendor/GuzzleHttp/Psr7/LazyOpenStream.php

Indentation +34 added lines, -34 removed lines

@@ -12,38 +12,38 @@
  */
 final class LazyOpenStream implements StreamInterface
 {
-    use StreamDecoratorTrait;
-
-    /** @var string */
-    private $filename;
-
-    /** @var string */
-    private $mode;
-
-    /**
-     * @var StreamInterface
-     */
-    private $stream;
-
-    /**
-     * @param string $filename File to lazily open
-     * @param string $mode     fopen mode to use when opening the stream
-     */
-    public function __construct(string $filename, string $mode)
-    {
-        $this->filename = $filename;
-        $this->mode = $mode;
-
-        // unsetting the property forces the first access to go through
-        // __get().
-        unset($this->stream);
-    }
-
-    /**
-     * Creates the underlying stream lazily when required.
-     */
-    protected function createStream(): StreamInterface
-    {
-        return Utils::streamFor(Utils::tryFopen($this->filename, $this->mode));
-    }
+	use StreamDecoratorTrait;
+
+	/** @var string */
+	private $filename;
+
+	/** @var string */
+	private $mode;
+
+	/**
+	 * @var StreamInterface
+	 */
+	private $stream;
+
+	/**
+	 * @param string $filename File to lazily open
+	 * @param string $mode     fopen mode to use when opening the stream
+	 */
+	public function __construct(string $filename, string $mode)
+	{
+		$this->filename = $filename;
+		$this->mode = $mode;
+
+		// unsetting the property forces the first access to go through
+		// __get().
+		unset($this->stream);
+	}
+
+	/**
+	 * Creates the underlying stream lazily when required.
+	 */
+	protected function createStream(): StreamInterface
+	{
+		return Utils::streamFor(Utils::tryFopen($this->filename, $this->mode));
+	}
 }

Braces +1 added lines, -2 removed lines

@@ -10,8 +10,7 @@
  * Lazily reads or writes to a file that is opened only after an IO operation
  * take place on the stream.
  */
-final class LazyOpenStream implements StreamInterface
-{
+final class LazyOpenStream implements StreamInterface {
     use StreamDecoratorTrait;
 
     /** @var string */

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