sunrise-php / http-message

src/UploadedFile.php

Indentation +136 added lines, -136 removed lines

@@ -43,140 +43,140 @@
  */
 class UploadedFile implements UploadedFileInterface
 {
-    /**
-     * @link https://www.php.net/manual/en/features.file-upload.errors.php
-     *
-     * @var array<int, non-empty-string>
-     */
-    public const UPLOAD_ERRORS = [
-        UPLOAD_ERR_OK         => 'No error',
-        UPLOAD_ERR_INI_SIZE   => 'Uploaded file exceeds the upload_max_filesize directive in the php.ini',
-        UPLOAD_ERR_FORM_SIZE  => 'Uploaded file exceeds the MAX_FILE_SIZE directive in the HTML form',
-        UPLOAD_ERR_PARTIAL    => 'Uploaded file was only partially uploaded',
-        UPLOAD_ERR_NO_FILE    => 'No file was uploaded',
-        UPLOAD_ERR_NO_TMP_DIR => 'Missing temporary directory',
-        UPLOAD_ERR_CANT_WRITE => 'Failed to write file to disk',
-        UPLOAD_ERR_EXTENSION  => 'File upload was stopped by a PHP extension',
-    ];
-
-    private ?StreamInterface $stream;
-    private ?int $size;
-    private int $errorCode;
-    private string $errorMessage;
-    private ?string $clientFilename;
-    private ?string $clientMediaType;
-    private bool $isMoved = false;
-
-    public function __construct(
-        ?StreamInterface $stream,
-        ?int $size = null,
-        int $error = UPLOAD_ERR_OK,
-        ?string $clientFilename = null,
-        ?string $clientMediaType = null
-    ) {
-        $this->stream = $stream;
-        $this->size = $size;
-        $this->errorCode = $error;
-        $this->errorMessage = self::UPLOAD_ERRORS[$error] ?? 'Unknown file upload error';
-        $this->clientFilename = $clientFilename;
-        $this->clientMediaType = $clientMediaType;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function getStream(): StreamInterface
-    {
-        if ($this->isMoved) {
-            throw new RuntimeException('Uploaded file was moved');
-        }
-
-        if ($this->errorCode !== UPLOAD_ERR_OK) {
-            throw new RuntimeException($this->errorMessage, $this->errorCode);
-        }
-
-        if ($this->stream === null) {
-            throw new RuntimeException('Uploaded file has no stream');
-        }
-
-        return $this->stream;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function moveTo($targetPath): void
-    {
-        /** @psalm-suppress TypeDoesNotContainType */
-        // @phpstan-ignore function.alreadyNarrowedType
-        if (!is_string($targetPath)) {
-            throw new TypeError(sprintf(
-                'Argument #1 ($targetPath) must be of type string, %s given',
-                gettype($targetPath),
-            ));
-        }
-
-        $sourceStream = $this->getStream();
-
-        $sourcePath = $sourceStream->getMetadata('uri');
-        if (!is_string($sourcePath) || !is_file($sourcePath) || !is_readable($sourcePath)) {
-            throw new RuntimeException('Uploaded file does not exist or is not readable');
-        }
-
-        $sourceDirname = dirname($sourcePath);
-        if (!is_writable($sourceDirname)) {
-            throw new RuntimeException('To move the uploaded file, the source directory must be writable');
-        }
-
-        $targetDirname = dirname($targetPath);
-        if (!is_dir($targetDirname) || !is_writable($targetDirname)) {
-            throw new RuntimeException('To move the uploaded file, the target directory must exist and be writable');
-        }
-
-        try {
-            $this->isMoved = is_uploaded_file($sourcePath)
-                ? move_uploaded_file($sourcePath, $targetPath)
-                : rename($sourcePath, $targetPath);
-        } catch (Throwable $e) {
-        }
-
-        if (!$this->isMoved) {
-            throw new RuntimeException('Failed to move the uploaded file');
-        }
-
-        $sourceStream->close();
-        $this->stream = null;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function getSize(): ?int
-    {
-        return $this->size;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function getError(): int
-    {
-        return $this->errorCode;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function getClientFilename(): ?string
-    {
-        return $this->clientFilename;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function getClientMediaType(): ?string
-    {
-        return $this->clientMediaType;
-    }
+	/**
+	 * @link https://www.php.net/manual/en/features.file-upload.errors.php
+	 *
+	 * @var array<int, non-empty-string>
+	 */
+	public const UPLOAD_ERRORS = [
+		UPLOAD_ERR_OK         => 'No error',
+		UPLOAD_ERR_INI_SIZE   => 'Uploaded file exceeds the upload_max_filesize directive in the php.ini',
+		UPLOAD_ERR_FORM_SIZE  => 'Uploaded file exceeds the MAX_FILE_SIZE directive in the HTML form',
+		UPLOAD_ERR_PARTIAL    => 'Uploaded file was only partially uploaded',
+		UPLOAD_ERR_NO_FILE    => 'No file was uploaded',
+		UPLOAD_ERR_NO_TMP_DIR => 'Missing temporary directory',
+		UPLOAD_ERR_CANT_WRITE => 'Failed to write file to disk',
+		UPLOAD_ERR_EXTENSION  => 'File upload was stopped by a PHP extension',
+	];
+
+	private ?StreamInterface $stream;
+	private ?int $size;
+	private int $errorCode;
+	private string $errorMessage;
+	private ?string $clientFilename;
+	private ?string $clientMediaType;
+	private bool $isMoved = false;
+
+	public function __construct(
+		?StreamInterface $stream,
+		?int $size = null,
+		int $error = UPLOAD_ERR_OK,
+		?string $clientFilename = null,
+		?string $clientMediaType = null
+	) {
+		$this->stream = $stream;
+		$this->size = $size;
+		$this->errorCode = $error;
+		$this->errorMessage = self::UPLOAD_ERRORS[$error] ?? 'Unknown file upload error';
+		$this->clientFilename = $clientFilename;
+		$this->clientMediaType = $clientMediaType;
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function getStream(): StreamInterface
+	{
+		if ($this->isMoved) {
+			throw new RuntimeException('Uploaded file was moved');
+		}
+
+		if ($this->errorCode !== UPLOAD_ERR_OK) {
+			throw new RuntimeException($this->errorMessage, $this->errorCode);
+		}
+
+		if ($this->stream === null) {
+			throw new RuntimeException('Uploaded file has no stream');
+		}
+
+		return $this->stream;
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function moveTo($targetPath): void
+	{
+		/** @psalm-suppress TypeDoesNotContainType */
+		// @phpstan-ignore function.alreadyNarrowedType
+		if (!is_string($targetPath)) {
+			throw new TypeError(sprintf(
+				'Argument #1 ($targetPath) must be of type string, %s given',
+				gettype($targetPath),
+			));
+		}
+
+		$sourceStream = $this->getStream();
+
+		$sourcePath = $sourceStream->getMetadata('uri');
+		if (!is_string($sourcePath) || !is_file($sourcePath) || !is_readable($sourcePath)) {
+			throw new RuntimeException('Uploaded file does not exist or is not readable');
+		}
+
+		$sourceDirname = dirname($sourcePath);
+		if (!is_writable($sourceDirname)) {
+			throw new RuntimeException('To move the uploaded file, the source directory must be writable');
+		}
+
+		$targetDirname = dirname($targetPath);
+		if (!is_dir($targetDirname) || !is_writable($targetDirname)) {
+			throw new RuntimeException('To move the uploaded file, the target directory must exist and be writable');
+		}
+
+		try {
+			$this->isMoved = is_uploaded_file($sourcePath)
+				? move_uploaded_file($sourcePath, $targetPath)
+				: rename($sourcePath, $targetPath);
+		} catch (Throwable $e) {
+		}
+
+		if (!$this->isMoved) {
+			throw new RuntimeException('Failed to move the uploaded file');
+		}
+
+		$sourceStream->close();
+		$this->stream = null;
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function getSize(): ?int
+	{
+		return $this->size;
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function getError(): int
+	{
+		return $this->errorCode;
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function getClientFilename(): ?string
+	{
+		return $this->clientFilename;
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function getClientMediaType(): ?string
+	{
+		return $this->clientMediaType;
+	}
 }

src/UploadedFileFactory.php

Indentation +18 added lines, -18 removed lines

@@ -22,22 +22,22 @@
  */
 class UploadedFileFactory implements UploadedFileFactoryInterface
 {
-    /**
-     * @inheritDoc
-     */
-    public function createUploadedFile(
-        StreamInterface $stream,
-        ?int $size = null,
-        int $error = UPLOAD_ERR_OK,
-        ?string $clientFilename = null,
-        ?string $clientMediaType = null
-    ): UploadedFileInterface {
-        return new UploadedFile(
-            $stream,
-            $size,
-            $error,
-            $clientFilename,
-            $clientMediaType
-        );
-    }
+	/**
+	 * @inheritDoc
+	 */
+	public function createUploadedFile(
+		StreamInterface $stream,
+		?int $size = null,
+		int $error = UPLOAD_ERR_OK,
+		?string $clientFilename = null,
+		?string $clientMediaType = null
+	): UploadedFileInterface {
+		return new UploadedFile(
+			$stream,
+			$size,
+			$error,
+			$clientFilename,
+			$clientMediaType
+		);
+	}
 }

src/Uri.php

Indentation +370 added lines, -370 removed lines

@@ -31,374 +31,374 @@
  */
 class Uri implements UriInterface
 {
-    private string $scheme = '';
-    private string $userInfo = '';
-    private string $host = '';
-    private ?int $port = null;
-    private string $path = '';
-    private string $query = '';
-    private string $fragment = '';
-
-    /**
-     * @throws InvalidArgumentException
-     */
-    public function __construct(string $uri = '')
-    {
-        if ($uri === '') {
-            return;
-        }
-
-        $this->parseUri($uri);
-    }
-
-    /**
-     * @param mixed $uri
-     *
-     * @throws InvalidArgumentException
-     */
-    public static function create($uri): UriInterface
-    {
-        if ($uri instanceof UriInterface) {
-            return $uri;
-        }
-
-        if (!is_string($uri)) {
-            throw new InvalidArgumentException('URI should be a string');
-        }
-
-        return new self($uri);
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function withScheme($scheme): UriInterface
-    {
-        $clone = clone $this;
-        $clone->setScheme($scheme);
-
-        return $clone;
-    }
-
-    /**
-     * @inheritDoc
-     *
-     * @throws InvalidArgumentException
-     */
-    public function withUserInfo($user, $password = null): UriInterface
-    {
-        $clone = clone $this;
-        $clone->setUserInfo($user, $password);
-
-        return $clone;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function withHost($host): UriInterface
-    {
-        $clone = clone $this;
-        $clone->setHost($host);
-
-        return $clone;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function withPort($port): UriInterface
-    {
-        $clone = clone $this;
-        $clone->setPort($port);
-
-        return $clone;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function withPath($path): UriInterface
-    {
-        $clone = clone $this;
-        $clone->setPath($path);
-
-        return $clone;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function withQuery($query): UriInterface
-    {
-        $clone = clone $this;
-        $clone->setQuery($query);
-
-        return $clone;
-    }
-
-    /**
-     * @inheritDoc
-     *
-     * @throws InvalidArgumentException
-     */
-    public function withFragment($fragment): UriInterface
-    {
-        $clone = clone $this;
-        $clone->setFragment($fragment);
-
-        return $clone;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function getScheme(): string
-    {
-        return $this->scheme;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function getUserInfo(): string
-    {
-        return $this->userInfo;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function getHost(): string
-    {
-        return $this->host;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function getPort(): ?int
-    {
-        // The 80 is the default port number for the HTTP protocol.
-        if ($this->port === 80 && $this->scheme === 'http') {
-            return null;
-        }
-
-        // The 443 is the default port number for the HTTPS protocol.
-        if ($this->port === 443 && $this->scheme === 'https') {
-            return null;
-        }
-
-        return $this->port;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function getPath(): string
-    {
-        // CVE-2015-3257
-        if (strncmp($this->path, '//', 2) === 0) {
-            return '/' . ltrim($this->path, '/');
-        }
-
-        return $this->path;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function getQuery(): string
-    {
-        return $this->query;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function getFragment(): string
-    {
-        return $this->fragment;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function getAuthority(): string
-    {
-        // The host is the basic subcomponent.
-        if ($this->host === '') {
-            return '';
-        }
-
-        $authority = $this->host;
-        if ($this->userInfo !== '') {
-            $authority = $this->userInfo . '@' . $authority;
-        }
-
-        $port = $this->getPort();
-        if ($port !== null) {
-            $authority = $authority . ':' . (string) $port;
-        }
-
-        return $authority;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function __toString(): string
-    {
-        $uri = '';
-
-        $scheme = $this->scheme;
-        if ($scheme !== '') {
-            $uri .= $scheme . ':';
-        }
-
-        $authority = $this->getAuthority();
-        if ($authority !== '') {
-            $uri .= '//' . $authority;
-        }
-
-        $path = $this->path;
-        if ($path !== '') {
-            // https://github.com/sunrise-php/uri/issues/31
-            // https://datatracker.ietf.org/doc/html/rfc3986#section-3.3
-            //
-            // If a URI contains an authority component,
-            // then the path component must either be empty
-            // or begin with a slash ("/") character.
-            if ($authority !== '' && strncmp($path, '/', 1) !== 0) {
-                $path = '/' . $path;
-            }
-
-            // https://github.com/sunrise-php/uri/issues/31
-            // https://datatracker.ietf.org/doc/html/rfc3986#section-3.3
-            //
-            // If a URI does not contain an authority component,
-            // then the path cannot begin with two slash characters ("//").
-            if ($authority === '' && strncmp($path, '//', 2) === 0) {
-                $path = '/' . ltrim($path, '/');
-            }
-
-            $uri .= $path;
-        }
-
-        $query = $this->query;
-        if ($query !== '') {
-            $uri .= '?' . $query;
-        }
-
-        $fragment = $this->fragment;
-        if ($fragment !== '') {
-            $uri .= '#' . $fragment;
-        }
-
-        return $uri;
-    }
-
-    /**
-     * @param mixed $scheme
-     *
-     * @throws InvalidArgumentException
-     */
-    final protected function setScheme($scheme): void
-    {
-        $this->scheme = (new Scheme($scheme))->getValue();
-    }
-
-    /**
-     * @param mixed $user
-     * @param mixed $password
-     *
-     * @throws InvalidArgumentException
-     */
-    final protected function setUserInfo($user, $password): void
-    {
-        $this->userInfo = (new UserInfo($user, $password))->getValue();
-    }
-
-    /**
-     * @param mixed $host
-     *
-     * @throws InvalidArgumentException
-     */
-    final protected function setHost($host): void
-    {
-        $this->host = (new Host($host))->getValue();
-    }
-
-    /**
-     * @param mixed $port
-     *
-     * @throws InvalidArgumentException
-     */
-    final protected function setPort($port): void
-    {
-        $this->port = (new Port($port))->getValue();
-    }
-
-    /**
-     * @param mixed $path
-     *
-     * @throws InvalidArgumentException
-     */
-    final protected function setPath($path): void
-    {
-        $this->path = (new Path($path))->getValue();
-    }
-
-    /**
-     * @param mixed $query
-     *
-     * @throws InvalidArgumentException
-     */
-    final protected function setQuery($query): void
-    {
-        $this->query = (new Query($query))->getValue();
-    }
-
-    /**
-     * @param mixed $fragment
-     *
-     * @throws InvalidArgumentException
-     */
-    final protected function setFragment($fragment): void
-    {
-        $this->fragment = (new Fragment($fragment))->getValue();
-    }
-
-    /**
-     * @throws InvalidArgumentException
-     */
-    private function parseUri(string $uri): void
-    {
-        $components = parse_url($uri);
-        if ($components === false) {
-            throw new InvalidArgumentException('Invalid URI');
-        }
-
-        if (isset($components['scheme'])) {
-            $this->setScheme($components['scheme']);
-        }
-        if (isset($components['user'])) {
-            $this->setUserInfo($components['user'], $components['pass'] ?? null);
-        }
-        if (isset($components['host'])) {
-            $this->setHost($components['host']);
-        }
-        if (isset($components['port'])) {
-            $this->setPort($components['port']);
-        }
-        if (isset($components['path'])) {
-            $this->setPath($components['path']);
-        }
-        if (isset($components['query'])) {
-            $this->setQuery($components['query']);
-        }
-        if (isset($components['fragment'])) {
-            $this->setFragment($components['fragment']);
-        }
-    }
+	private string $scheme = '';
+	private string $userInfo = '';
+	private string $host = '';
+	private ?int $port = null;
+	private string $path = '';
+	private string $query = '';
+	private string $fragment = '';
+
+	/**
+	 * @throws InvalidArgumentException
+	 */
+	public function __construct(string $uri = '')
+	{
+		if ($uri === '') {
+			return;
+		}
+
+		$this->parseUri($uri);
+	}
+
+	/**
+	 * @param mixed $uri
+	 *
+	 * @throws InvalidArgumentException
+	 */
+	public static function create($uri): UriInterface
+	{
+		if ($uri instanceof UriInterface) {
+			return $uri;
+		}
+
+		if (!is_string($uri)) {
+			throw new InvalidArgumentException('URI should be a string');
+		}
+
+		return new self($uri);
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function withScheme($scheme): UriInterface
+	{
+		$clone = clone $this;
+		$clone->setScheme($scheme);
+
+		return $clone;
+	}
+
+	/**
+	 * @inheritDoc
+	 *
+	 * @throws InvalidArgumentException
+	 */
+	public function withUserInfo($user, $password = null): UriInterface
+	{
+		$clone = clone $this;
+		$clone->setUserInfo($user, $password);
+
+		return $clone;
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function withHost($host): UriInterface
+	{
+		$clone = clone $this;
+		$clone->setHost($host);
+
+		return $clone;
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function withPort($port): UriInterface
+	{
+		$clone = clone $this;
+		$clone->setPort($port);
+
+		return $clone;
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function withPath($path): UriInterface
+	{
+		$clone = clone $this;
+		$clone->setPath($path);
+
+		return $clone;
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function withQuery($query): UriInterface
+	{
+		$clone = clone $this;
+		$clone->setQuery($query);
+
+		return $clone;
+	}
+
+	/**
+	 * @inheritDoc
+	 *
+	 * @throws InvalidArgumentException
+	 */
+	public function withFragment($fragment): UriInterface
+	{
+		$clone = clone $this;
+		$clone->setFragment($fragment);
+
+		return $clone;
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function getScheme(): string
+	{
+		return $this->scheme;
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function getUserInfo(): string
+	{
+		return $this->userInfo;
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function getHost(): string
+	{
+		return $this->host;
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function getPort(): ?int
+	{
+		// The 80 is the default port number for the HTTP protocol.
+		if ($this->port === 80 && $this->scheme === 'http') {
+			return null;
+		}
+
+		// The 443 is the default port number for the HTTPS protocol.
+		if ($this->port === 443 && $this->scheme === 'https') {
+			return null;
+		}
+
+		return $this->port;
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function getPath(): string
+	{
+		// CVE-2015-3257
+		if (strncmp($this->path, '//', 2) === 0) {
+			return '/' . ltrim($this->path, '/');
+		}
+
+		return $this->path;
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function getQuery(): string
+	{
+		return $this->query;
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function getFragment(): string
+	{
+		return $this->fragment;
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function getAuthority(): string
+	{
+		// The host is the basic subcomponent.
+		if ($this->host === '') {
+			return '';
+		}
+
+		$authority = $this->host;
+		if ($this->userInfo !== '') {
+			$authority = $this->userInfo . '@' . $authority;
+		}
+
+		$port = $this->getPort();
+		if ($port !== null) {
+			$authority = $authority . ':' . (string) $port;
+		}
+
+		return $authority;
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function __toString(): string
+	{
+		$uri = '';
+
+		$scheme = $this->scheme;
+		if ($scheme !== '') {
+			$uri .= $scheme . ':';
+		}
+
+		$authority = $this->getAuthority();
+		if ($authority !== '') {
+			$uri .= '//' . $authority;
+		}
+
+		$path = $this->path;
+		if ($path !== '') {
+			// https://github.com/sunrise-php/uri/issues/31
+			// https://datatracker.ietf.org/doc/html/rfc3986#section-3.3
+			//
+			// If a URI contains an authority component,
+			// then the path component must either be empty
+			// or begin with a slash ("/") character.
+			if ($authority !== '' && strncmp($path, '/', 1) !== 0) {
+				$path = '/' . $path;
+			}
+
+			// https://github.com/sunrise-php/uri/issues/31
+			// https://datatracker.ietf.org/doc/html/rfc3986#section-3.3
+			//
+			// If a URI does not contain an authority component,
+			// then the path cannot begin with two slash characters ("//").
+			if ($authority === '' && strncmp($path, '//', 2) === 0) {
+				$path = '/' . ltrim($path, '/');
+			}
+
+			$uri .= $path;
+		}
+
+		$query = $this->query;
+		if ($query !== '') {
+			$uri .= '?' . $query;
+		}
+
+		$fragment = $this->fragment;
+		if ($fragment !== '') {
+			$uri .= '#' . $fragment;
+		}
+
+		return $uri;
+	}
+
+	/**
+	 * @param mixed $scheme
+	 *
+	 * @throws InvalidArgumentException
+	 */
+	final protected function setScheme($scheme): void
+	{
+		$this->scheme = (new Scheme($scheme))->getValue();
+	}
+
+	/**
+	 * @param mixed $user
+	 * @param mixed $password
+	 *
+	 * @throws InvalidArgumentException
+	 */
+	final protected function setUserInfo($user, $password): void
+	{
+		$this->userInfo = (new UserInfo($user, $password))->getValue();
+	}
+
+	/**
+	 * @param mixed $host
+	 *
+	 * @throws InvalidArgumentException
+	 */
+	final protected function setHost($host): void
+	{
+		$this->host = (new Host($host))->getValue();
+	}
+
+	/**
+	 * @param mixed $port
+	 *
+	 * @throws InvalidArgumentException
+	 */
+	final protected function setPort($port): void
+	{
+		$this->port = (new Port($port))->getValue();
+	}
+
+	/**
+	 * @param mixed $path
+	 *
+	 * @throws InvalidArgumentException
+	 */
+	final protected function setPath($path): void
+	{
+		$this->path = (new Path($path))->getValue();
+	}
+
+	/**
+	 * @param mixed $query
+	 *
+	 * @throws InvalidArgumentException
+	 */
+	final protected function setQuery($query): void
+	{
+		$this->query = (new Query($query))->getValue();
+	}
+
+	/**
+	 * @param mixed $fragment
+	 *
+	 * @throws InvalidArgumentException
+	 */
+	final protected function setFragment($fragment): void
+	{
+		$this->fragment = (new Fragment($fragment))->getValue();
+	}
+
+	/**
+	 * @throws InvalidArgumentException
+	 */
+	private function parseUri(string $uri): void
+	{
+		$components = parse_url($uri);
+		if ($components === false) {
+			throw new InvalidArgumentException('Invalid URI');
+		}
+
+		if (isset($components['scheme'])) {
+			$this->setScheme($components['scheme']);
+		}
+		if (isset($components['user'])) {
+			$this->setUserInfo($components['user'], $components['pass'] ?? null);
+		}
+		if (isset($components['host'])) {
+			$this->setHost($components['host']);
+		}
+		if (isset($components['port'])) {
+			$this->setPort($components['port']);
+		}
+		if (isset($components['path'])) {
+			$this->setPath($components['path']);
+		}
+		if (isset($components['query'])) {
+			$this->setQuery($components['query']);
+		}
+		if (isset($components['fragment'])) {
+			$this->setFragment($components['fragment']);
+		}
+	}
 }

src/ServerRequestFactory.php

Indentation +52 added lines, -52 removed lines

@@ -20,58 +20,58 @@
  */
 class ServerRequestFactory implements ServerRequestFactoryInterface
 {
-    /**
-     * @param array<array-key, mixed>|null $serverParams
-     * @param array<array-key, mixed>|null $queryParams
-     * @param array<array-key, mixed>|null $cookieParams
-     * @param array<array-key, mixed>|null $uploadedFiles
-     * @param array<array-key, mixed>|null $parsedBody
-     *
-     * @link http://php.net/manual/en/language.variables.superglobals.php
-     * @link https://www.php-fig.org/psr/psr-15/meta/
-     */
-    public static function fromGlobals(
-        ?array $serverParams = null,
-        ?array $queryParams = null,
-        ?array $cookieParams = null,
-        ?array $uploadedFiles = null,
-        ?array $parsedBody = null
-    ): ServerRequestInterface {
-        $serverParams ??= $_SERVER;
-        $queryParams ??= $_GET;
-        $cookieParams ??= $_COOKIE;
-        $uploadedFiles ??= $_FILES;
-        $parsedBody ??= $_POST;
+	/**
+	 * @param array<array-key, mixed>|null $serverParams
+	 * @param array<array-key, mixed>|null $queryParams
+	 * @param array<array-key, mixed>|null $cookieParams
+	 * @param array<array-key, mixed>|null $uploadedFiles
+	 * @param array<array-key, mixed>|null $parsedBody
+	 *
+	 * @link http://php.net/manual/en/language.variables.superglobals.php
+	 * @link https://www.php-fig.org/psr/psr-15/meta/
+	 */
+	public static function fromGlobals(
+		?array $serverParams = null,
+		?array $queryParams = null,
+		?array $cookieParams = null,
+		?array $uploadedFiles = null,
+		?array $parsedBody = null
+	): ServerRequestInterface {
+		$serverParams ??= $_SERVER;
+		$queryParams ??= $_GET;
+		$cookieParams ??= $_COOKIE;
+		$uploadedFiles ??= $_FILES;
+		$parsedBody ??= $_POST;
 
-        return new ServerRequest(
-            server_request_protocol_version($serverParams),
-            server_request_method($serverParams),
-            server_request_uri($serverParams),
-            server_request_headers($serverParams),
-            new PhpInputStream(),
-            $serverParams,
-            $queryParams,
-            $cookieParams,
-            server_request_files($uploadedFiles),
-            $parsedBody
-        );
-    }
+		return new ServerRequest(
+			server_request_protocol_version($serverParams),
+			server_request_method($serverParams),
+			server_request_uri($serverParams),
+			server_request_headers($serverParams),
+			new PhpInputStream(),
+			$serverParams,
+			$queryParams,
+			$cookieParams,
+			server_request_files($uploadedFiles),
+			$parsedBody
+		);
+	}
 
-    /**
-     * {@inheritDoc}
-     *
-     * @param mixed $uri
-     * @param array<array-key, mixed> $serverParams
-     */
-    public function createServerRequest(string $method, $uri, array $serverParams = []): ServerRequestInterface
-    {
-        return new ServerRequest(
-            server_request_protocol_version($serverParams),
-            $method,
-            $uri,
-            server_request_headers($serverParams),
-            null, // body
-            $serverParams
-        );
-    }
+	/**
+	 * {@inheritDoc}
+	 *
+	 * @param mixed $uri
+	 * @param array<array-key, mixed> $serverParams
+	 */
+	public function createServerRequest(string $method, $uri, array $serverParams = []): ServerRequestInterface
+	{
+		return new ServerRequest(
+			server_request_protocol_version($serverParams),
+			$method,
+			$uri,
+			server_request_headers($serverParams),
+			null, // body
+			$serverParams
+		);
+	}
 }

src/RequestFactory.php

Indentation +7 added lines, -7 removed lines

@@ -19,11 +19,11 @@
  */
 class RequestFactory implements RequestFactoryInterface
 {
-    /**
-     * @inheritDoc
-     */
-    public function createRequest(string $method, $uri): RequestInterface
-    {
-        return new Request($method, $uri);
-    }
+	/**
+	 * @inheritDoc
+	 */
+	public function createRequest(string $method, $uri): RequestInterface
+	{
+		return new Request($method, $uri);
+	}
 }

src/ServerRequest.php

Indentation +313 added lines, -313 removed lines

@@ -26,317 +26,317 @@
  */
 class ServerRequest extends Request implements ServerRequestInterface
 {
-    /**
-     * @var array<array-key, mixed>
-     */
-    private array $serverParams;
-
-    /**
-     * @var array<array-key, mixed>
-     */
-    private array $queryParams;
-
-    /**
-     * @var array<array-key, mixed>
-     */
-    private array $cookieParams;
-
-    /**
-     * @var array<array-key, mixed>
-     */
-    private array $uploadedFiles = [];
-
-    /**
-     * @var array<array-key, mixed>|object|null
-     */
-    private $parsedBody = null;
-
-    /**
-     * @var array<array-key, mixed>
-     */
-    private array $attributes;
-
-    /**
-     * Constructor of the class
-     *
-     * @param mixed $uri
-     * @param array<string, string|string[]>|null $headers
-     *
-     * @param array<array-key, mixed> $serverParams
-     * @param array<array-key, mixed> $queryParams
-     * @param array<array-key, mixed> $cookieParams
-     * @param array<array-key, mixed> $uploadedFiles
-     * @param array<array-key, mixed>|object|null $parsedBody
-     * @param array<array-key, mixed> $attributes
-     *
-     * @throws InvalidArgumentException
-     */
-    public function __construct(
-        ?string $protocolVersion = null,
-        ?string $method = null,
-        $uri = null,
-        ?array $headers = null,
-        ?StreamInterface $body = null,
-        array $serverParams = [],
-        array $queryParams = [],
-        array $cookieParams = [],
-        array $uploadedFiles = [],
-        $parsedBody = null,
-        array $attributes = []
-    ) {
-        parent::__construct($method, $uri, $headers, $body);
-
-        if ($protocolVersion !== null) {
-            $this->setProtocolVersion($protocolVersion);
-        }
-
-        if ($uploadedFiles !== []) {
-            $this->setUploadedFiles($uploadedFiles);
-        }
-
-        if ($parsedBody !== null) {
-            $this->setParsedBody($parsedBody);
-        }
-
-        $this->serverParams = $serverParams;
-        $this->queryParams = $queryParams;
-        $this->cookieParams = $cookieParams;
-        $this->attributes = $attributes;
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * @return array<array-key, mixed>
-     */
-    public function getServerParams(): array
-    {
-        return $this->serverParams;
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * @return array<array-key, mixed>
-     */
-    public function getQueryParams(): array
-    {
-        return $this->queryParams;
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * @param array<array-key, mixed> $query
-     *
-     * @return static
-     */
-    public function withQueryParams(array $query): ServerRequestInterface
-    {
-        $clone = clone $this;
-        $clone->queryParams = $query;
-
-        return $clone;
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * @return array<array-key, mixed>
-     */
-    public function getCookieParams(): array
-    {
-        return $this->cookieParams;
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * @param array<array-key, mixed> $cookies
-     *
-     * @return static
-     */
-    public function withCookieParams(array $cookies): ServerRequestInterface
-    {
-        $clone = clone $this;
-        $clone->cookieParams = $cookies;
-
-        return $clone;
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * @return array<array-key, mixed>
-     */
-    public function getUploadedFiles(): array
-    {
-        return $this->uploadedFiles;
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * @param array<array-key, mixed> $uploadedFiles
-     *
-     * @return static
-     *
-     * @throws InvalidArgumentException
-     */
-    public function withUploadedFiles(array $uploadedFiles): ServerRequestInterface
-    {
-        $clone = clone $this;
-        $clone->setUploadedFiles($uploadedFiles);
-
-        return $clone;
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * @return array<array-key, mixed>|object|null
-     */
-    public function getParsedBody()
-    {
-        return $this->parsedBody;
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * @param array<array-key, mixed>|object|null $data
-     *
-     * @return static
-     *
-     * @throws InvalidArgumentException
-     */
-    public function withParsedBody($data): ServerRequestInterface
-    {
-        $clone = clone $this;
-        $clone->setParsedBody($data);
-
-        return $clone;
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * @return array<array-key, mixed>
-     */
-    public function getAttributes(): array
-    {
-        return $this->attributes;
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * @param array-key $name
-     * @param mixed $default
-     *
-     * @return mixed
-     */
-    public function getAttribute($name, $default = null)
-    {
-        if (!array_key_exists($name, $this->attributes)) {
-            return $default;
-        }
-
-        return $this->attributes[$name];
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * @param array-key $name
-     * @param mixed $value
-     *
-     * @return static
-     */
-    public function withAttribute($name, $value): ServerRequestInterface
-    {
-        $clone = clone $this;
-        $clone->attributes[$name] = $value;
-
-        return $clone;
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * @param array-key $name
-     *
-     * @return static
-     */
-    public function withoutAttribute($name): ServerRequestInterface
-    {
-        $clone = clone $this;
-        unset($clone->attributes[$name]);
-
-        return $clone;
-    }
-
-    /**
-     * Sets the given uploaded files to the request
-     *
-     * @param array<array-key, mixed> $files
-     *
-     * @throws InvalidArgumentException
-     */
-    final protected function setUploadedFiles(array $files): void
-    {
-        $this->validateUploadedFiles($files);
-
-        $this->uploadedFiles = $files;
-    }
-
-    /**
-     * Sets the given parsed body to the request
-     *
-     * @param array<array-key, mixed>|object|null $data
-     *
-     * @throws InvalidArgumentException
-     */
-    final protected function setParsedBody($data): void
-    {
-        $this->validateParsedBody($data);
-
-        $this->parsedBody = $data;
-    }
-
-    /**
-     * Validates the given uploaded files
-     *
-     * @param array<array-key, mixed> $files
-     *
-     * @throws InvalidArgumentException
-     */
-    private function validateUploadedFiles(array $files): void
-    {
-        if ($files === []) {
-            return;
-        }
-
-        array_walk_recursive($files, /** @param mixed $file */ static function ($file): void {
-            if (!($file instanceof UploadedFileInterface)) {
-                throw new InvalidArgumentException('Invalid uploaded file');
-            }
-        });
-    }
-
-    /**
-     * Validates the given parsed body
-     *
-     * @param mixed $data
-     *
-     * @throws InvalidArgumentException
-     */
-    private function validateParsedBody($data): void
-    {
-        if ($data === null || is_array($data) || is_object($data)) {
-            return;
-        }
-
-        throw new InvalidArgumentException('Invalid parsed body');
-    }
+	/**
+	 * @var array<array-key, mixed>
+	 */
+	private array $serverParams;
+
+	/**
+	 * @var array<array-key, mixed>
+	 */
+	private array $queryParams;
+
+	/**
+	 * @var array<array-key, mixed>
+	 */
+	private array $cookieParams;
+
+	/**
+	 * @var array<array-key, mixed>
+	 */
+	private array $uploadedFiles = [];
+
+	/**
+	 * @var array<array-key, mixed>|object|null
+	 */
+	private $parsedBody = null;
+
+	/**
+	 * @var array<array-key, mixed>
+	 */
+	private array $attributes;
+
+	/**
+	 * Constructor of the class
+	 *
+	 * @param mixed $uri
+	 * @param array<string, string|string[]>|null $headers
+	 *
+	 * @param array<array-key, mixed> $serverParams
+	 * @param array<array-key, mixed> $queryParams
+	 * @param array<array-key, mixed> $cookieParams
+	 * @param array<array-key, mixed> $uploadedFiles
+	 * @param array<array-key, mixed>|object|null $parsedBody
+	 * @param array<array-key, mixed> $attributes
+	 *
+	 * @throws InvalidArgumentException
+	 */
+	public function __construct(
+		?string $protocolVersion = null,
+		?string $method = null,
+		$uri = null,
+		?array $headers = null,
+		?StreamInterface $body = null,
+		array $serverParams = [],
+		array $queryParams = [],
+		array $cookieParams = [],
+		array $uploadedFiles = [],
+		$parsedBody = null,
+		array $attributes = []
+	) {
+		parent::__construct($method, $uri, $headers, $body);
+
+		if ($protocolVersion !== null) {
+			$this->setProtocolVersion($protocolVersion);
+		}
+
+		if ($uploadedFiles !== []) {
+			$this->setUploadedFiles($uploadedFiles);
+		}
+
+		if ($parsedBody !== null) {
+			$this->setParsedBody($parsedBody);
+		}
+
+		$this->serverParams = $serverParams;
+		$this->queryParams = $queryParams;
+		$this->cookieParams = $cookieParams;
+		$this->attributes = $attributes;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 *
+	 * @return array<array-key, mixed>
+	 */
+	public function getServerParams(): array
+	{
+		return $this->serverParams;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 *
+	 * @return array<array-key, mixed>
+	 */
+	public function getQueryParams(): array
+	{
+		return $this->queryParams;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 *
+	 * @param array<array-key, mixed> $query
+	 *
+	 * @return static
+	 */
+	public function withQueryParams(array $query): ServerRequestInterface
+	{
+		$clone = clone $this;
+		$clone->queryParams = $query;
+
+		return $clone;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 *
+	 * @return array<array-key, mixed>
+	 */
+	public function getCookieParams(): array
+	{
+		return $this->cookieParams;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 *
+	 * @param array<array-key, mixed> $cookies
+	 *
+	 * @return static
+	 */
+	public function withCookieParams(array $cookies): ServerRequestInterface
+	{
+		$clone = clone $this;
+		$clone->cookieParams = $cookies;
+
+		return $clone;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 *
+	 * @return array<array-key, mixed>
+	 */
+	public function getUploadedFiles(): array
+	{
+		return $this->uploadedFiles;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 *
+	 * @param array<array-key, mixed> $uploadedFiles
+	 *
+	 * @return static
+	 *
+	 * @throws InvalidArgumentException
+	 */
+	public function withUploadedFiles(array $uploadedFiles): ServerRequestInterface
+	{
+		$clone = clone $this;
+		$clone->setUploadedFiles($uploadedFiles);
+
+		return $clone;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 *
+	 * @return array<array-key, mixed>|object|null
+	 */
+	public function getParsedBody()
+	{
+		return $this->parsedBody;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 *
+	 * @param array<array-key, mixed>|object|null $data
+	 *
+	 * @return static
+	 *
+	 * @throws InvalidArgumentException
+	 */
+	public function withParsedBody($data): ServerRequestInterface
+	{
+		$clone = clone $this;
+		$clone->setParsedBody($data);
+
+		return $clone;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 *
+	 * @return array<array-key, mixed>
+	 */
+	public function getAttributes(): array
+	{
+		return $this->attributes;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 *
+	 * @param array-key $name
+	 * @param mixed $default
+	 *
+	 * @return mixed
+	 */
+	public function getAttribute($name, $default = null)
+	{
+		if (!array_key_exists($name, $this->attributes)) {
+			return $default;
+		}
+
+		return $this->attributes[$name];
+	}
+
+	/**
+	 * {@inheritDoc}
+	 *
+	 * @param array-key $name
+	 * @param mixed $value
+	 *
+	 * @return static
+	 */
+	public function withAttribute($name, $value): ServerRequestInterface
+	{
+		$clone = clone $this;
+		$clone->attributes[$name] = $value;
+
+		return $clone;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 *
+	 * @param array-key $name
+	 *
+	 * @return static
+	 */
+	public function withoutAttribute($name): ServerRequestInterface
+	{
+		$clone = clone $this;
+		unset($clone->attributes[$name]);
+
+		return $clone;
+	}
+
+	/**
+	 * Sets the given uploaded files to the request
+	 *
+	 * @param array<array-key, mixed> $files
+	 *
+	 * @throws InvalidArgumentException
+	 */
+	final protected function setUploadedFiles(array $files): void
+	{
+		$this->validateUploadedFiles($files);
+
+		$this->uploadedFiles = $files;
+	}
+
+	/**
+	 * Sets the given parsed body to the request
+	 *
+	 * @param array<array-key, mixed>|object|null $data
+	 *
+	 * @throws InvalidArgumentException
+	 */
+	final protected function setParsedBody($data): void
+	{
+		$this->validateParsedBody($data);
+
+		$this->parsedBody = $data;
+	}
+
+	/**
+	 * Validates the given uploaded files
+	 *
+	 * @param array<array-key, mixed> $files
+	 *
+	 * @throws InvalidArgumentException
+	 */
+	private function validateUploadedFiles(array $files): void
+	{
+		if ($files === []) {
+			return;
+		}
+
+		array_walk_recursive($files, /** @param mixed $file */ static function ($file): void {
+			if (!($file instanceof UploadedFileInterface)) {
+				throw new InvalidArgumentException('Invalid uploaded file');
+			}
+		});
+	}
+
+	/**
+	 * Validates the given parsed body
+	 *
+	 * @param mixed $data
+	 *
+	 * @throws InvalidArgumentException
+	 */
+	private function validateParsedBody($data): void
+	{
+		if ($data === null || is_array($data) || is_object($data)) {
+			return;
+		}
+
+		throw new InvalidArgumentException('Invalid parsed body');
+	}
 }

src/StreamFactory.php

Indentation +31 added lines, -31 removed lines

@@ -21,35 +21,35 @@
  */
 class StreamFactory implements StreamFactoryInterface
 {
-    /**
-     * @inheritDoc
-     */
-    public function createStream(string $content = ''): StreamInterface
-    {
-        $stream = new PhpTempStream();
-        if ($content === '') {
-            return $stream;
-        }
-
-        $stream->write($content);
-        $stream->rewind();
-
-        return $stream;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function createStreamFromFile(string $filename, string $mode = 'r'): StreamInterface
-    {
-        return new FileStream($filename, $mode);
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function createStreamFromResource($resource): StreamInterface
-    {
-        return new Stream($resource);
-    }
+	/**
+	 * @inheritDoc
+	 */
+	public function createStream(string $content = ''): StreamInterface
+	{
+		$stream = new PhpTempStream();
+		if ($content === '') {
+			return $stream;
+		}
+
+		$stream->write($content);
+		$stream->rewind();
+
+		return $stream;
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function createStreamFromFile(string $filename, string $mode = 'r'): StreamInterface
+	{
+		return new FileStream($filename, $mode);
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function createStreamFromResource($resource): StreamInterface
+	{
+		return new Stream($resource);
+	}
 }

src/Request/UrlEncodedRequest.php

Indentation +30 added lines, -30 removed lines

@@ -26,40 +26,40 @@
  */
 final class UrlEncodedRequest extends Request
 {
-    public const ENCODING_TYPE_RFC1738 = PHP_QUERY_RFC1738;
-    public const ENCODING_TYPE_RFC3986 = PHP_QUERY_RFC3986;
+	public const ENCODING_TYPE_RFC1738 = PHP_QUERY_RFC1738;
+	public const ENCODING_TYPE_RFC3986 = PHP_QUERY_RFC3986;
 
-    /**
-     * @param mixed $uri
-     * @param mixed $data
-     * @param self::ENCODING_TYPE_* $encodingType
-     *
-     * @throws InvalidArgumentException
-     */
-    public function __construct(string $method, $uri, $data, int $encodingType = self::ENCODING_TYPE_RFC1738)
-    {
-        parent::__construct($method, $uri);
+	/**
+	 * @param mixed $uri
+	 * @param mixed $data
+	 * @param self::ENCODING_TYPE_* $encodingType
+	 *
+	 * @throws InvalidArgumentException
+	 */
+	public function __construct(string $method, $uri, $data, int $encodingType = self::ENCODING_TYPE_RFC1738)
+	{
+		parent::__construct($method, $uri);
 
-        $this->setBody(self::createBody($data, $encodingType));
-        $this->setHeader('Content-Type', 'application/x-www-form-urlencoded; charset=utf-8');
-    }
+		$this->setBody(self::createBody($data, $encodingType));
+		$this->setHeader('Content-Type', 'application/x-www-form-urlencoded; charset=utf-8');
+	}
 
-    /**
-     * @param mixed $data
-     * @param self::ENCODING_TYPE_* $encodingType
-     */
-    private static function createBody($data, int $encodingType): StreamInterface
-    {
-        if ($data instanceof StreamInterface) {
-            return $data;
-        }
+	/**
+	 * @param mixed $data
+	 * @param self::ENCODING_TYPE_* $encodingType
+	 */
+	private static function createBody($data, int $encodingType): StreamInterface
+	{
+		if ($data instanceof StreamInterface) {
+			return $data;
+		}
 
-        $query = http_build_query((array) $data, '', '&', $encodingType);
+		$query = http_build_query((array) $data, '', '&', $encodingType);
 
-        $stream = new PhpTempStream('r+b');
-        $stream->write($query);
-        $stream->rewind();
+		$stream = new PhpTempStream('r+b');
+		$stream->write($query);
+		$stream->rewind();
 
-        return $stream;
-    }
+		return $stream;
+	}
 }

src/UriFactory.php

Indentation +7 added lines, -7 removed lines

@@ -19,11 +19,11 @@
  */
 class UriFactory implements UriFactoryInterface
 {
-    /**
-     * @inheritDoc
-     */
-    public function createUri(string $uri = ''): UriInterface
-    {
-        return new Uri($uri);
-    }
+	/**
+	 * @inheritDoc
+	 */
+	public function createUri(string $uri = ''): UriInterface
+	{
+		return new Uri($uri);
+	}
 }