sunrise-php / http-message

src/Stream/TmpfileStream.php

Indentation +27 added lines, -27 removed lines

@@ -26,31 +26,31 @@
  */
 final class TmpfileStream extends Stream
 {
-    /**
-     * @throws RuntimeException
-     */
-    public function __construct()
-    {
-        parent::__construct(self::createFile());
-    }
-
-    /**
-     * @return resource
-     *
-     * @throws RuntimeException
-     */
-    private static function createFile()
-    {
-        $dirname = sys_get_temp_dir();
-        if (!is_writable($dirname)) {
-            throw new RuntimeException('Temporary files directory is not writable');
-        }
-
-        $resource = tmpfile();
-        if (!is_resource($resource)) {
-            throw new RuntimeException('Temporary file cannot be created or opened');
-        }
-
-        return $resource;
-    }
+	/**
+	 * @throws RuntimeException
+	 */
+	public function __construct()
+	{
+		parent::__construct(self::createFile());
+	}
+
+	/**
+	 * @return resource
+	 *
+	 * @throws RuntimeException
+	 */
+	private static function createFile()
+	{
+		$dirname = sys_get_temp_dir();
+		if (!is_writable($dirname)) {
+			throw new RuntimeException('Temporary files directory is not writable');
+		}
+
+		$resource = tmpfile();
+		if (!is_resource($resource)) {
+			throw new RuntimeException('Temporary file cannot be created or opened');
+		}
+
+		return $resource;
+	}
 }

src/ServerRequestFactory.php

Indentation +52 added lines, -52 removed lines

@@ -17,58 +17,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/Request.php

Indentation +214 added lines, -214 removed lines

@@ -23,218 +23,218 @@
 
 class Request extends Message implements RequestInterface, RequestMethodInterface
 {
-    private const RFC7230_REQUEST_TARGET_REGEX = '/^[\x21-\x7E\x80-\xFF]+$/';
-
-    private string $method = self::METHOD_GET;
-    private UriInterface $uri;
-    private ?string $requestTarget = null;
-
-    /**
-     * @param mixed $uri
-     * @param array<string, string|string[]>|null $headers
-     *
-     * @throws InvalidArgumentException
-     */
-    public function __construct(
-        ?string $method = null,
-        $uri = null,
-        ?array $headers = null,
-        ?StreamInterface $body = null
-    ) {
-        if ($method !== null) {
-            $this->setMethod($method);
-        }
-
-        $this->setUri($uri ?? '/');
-
-        if ($headers !== null) {
-            $this->setHeaders($headers);
-        }
-
-        if ($body !== null) {
-            $this->setBody($body);
-        }
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function getMethod(): string
-    {
-        return $this->method;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function withMethod($method): RequestInterface
-    {
-        $clone = clone $this;
-        $clone->setMethod($method);
-
-        return $clone;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function getUri(): UriInterface
-    {
-        return $this->uri;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function withUri(UriInterface $uri, $preserveHost = false): RequestInterface
-    {
-        $clone = clone $this;
-        $clone->setUri($uri, $preserveHost);
-
-        return $clone;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function getRequestTarget(): string
-    {
-        if ($this->requestTarget !== null) {
-            return $this->requestTarget;
-        }
-
-        $requestTarget = $this->uri->getPath();
-
-        // https://tools.ietf.org/html/rfc7230#section-5.3.1
-        // https://tools.ietf.org/html/rfc7230#section-2.7
-        //
-        // origin-form = absolute-path [ "?" query ]
-        // absolute-path = 1*( "/" segment )
-        if (strncmp($requestTarget, '/', 1) !== 0) {
-            return '/';
-        }
-
-        $queryString = $this->uri->getQuery();
-        if ($queryString !== '') {
-            $requestTarget .= '?' . $queryString;
-        }
-
-        return $requestTarget;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function withRequestTarget($requestTarget): RequestInterface
-    {
-        $clone = clone $this;
-        $clone->setRequestTarget($requestTarget);
-
-        return $clone;
-    }
-
-    /**
-     * Sets the given method to the request
-     *
-     * @param string $method
-     *
-     * @throws InvalidArgumentException
-     */
-    final protected function setMethod($method): void
-    {
-        $this->validateMethod($method);
-
-        $this->method = $method;
-    }
-
-    /**
-     * Sets the given URI to the request
-     *
-     * @param mixed $uri
-     * @param bool $preserveHost
-     *
-     * @throws InvalidArgumentException
-     */
-    final protected function setUri($uri, $preserveHost = false): void
-    {
-        $this->uri = Uri::create($uri);
-
-        if ($preserveHost && $this->hasHeader('Host')) {
-            return;
-        }
-
-        $host = $this->uri->getHost();
-        if ($host === '') {
-            return;
-        }
-
-        $port = $this->uri->getPort();
-        if ($port !== null) {
-            $host .= ':' . $port;
-        }
-
-        $this->setHeader('Host', $host, true);
-    }
-
-    /**
-     * Sets the given request target to the request
-     *
-     * @param mixed $requestTarget
-     *
-     * @throws InvalidArgumentException
-     */
-    final protected function setRequestTarget($requestTarget): void
-    {
-        $this->validateRequestTarget($requestTarget);
-
-        /** @var string $requestTarget */
-
-        $this->requestTarget = $requestTarget;
-    }
-
-    /**
-     * Validates the given method
-     *
-     * @link https://tools.ietf.org/html/rfc7230#section-3.1.1
-     *
-     * @param mixed $method
-     *
-     * @throws InvalidArgumentException
-     */
-    private function validateMethod($method): void
-    {
-        if ($method === '') {
-            throw new InvalidArgumentException('HTTP method cannot be an empty');
-        }
-
-        if (!is_string($method)) {
-            throw new InvalidArgumentException('HTTP method must be a string');
-        }
-
-        if (!preg_match(HeaderInterface::RFC7230_TOKEN_REGEX, $method)) {
-            throw new InvalidArgumentException('Invalid HTTP method');
-        }
-    }
-
-    /**
-     * Validates the given request target
-     *
-     * @param mixed $requestTarget
-     *
-     * @throws InvalidArgumentException
-     */
-    private function validateRequestTarget($requestTarget): void
-    {
-        if ($requestTarget === '') {
-            throw new InvalidArgumentException('HTTP request target cannot be an empty');
-        }
-
-        if (!is_string($requestTarget)) {
-            throw new InvalidArgumentException('HTTP request target must be a string');
-        }
-
-        if (!preg_match(self::RFC7230_REQUEST_TARGET_REGEX, $requestTarget)) {
-            throw new InvalidArgumentException('Invalid HTTP request target');
-        }
-    }
+	private const RFC7230_REQUEST_TARGET_REGEX = '/^[\x21-\x7E\x80-\xFF]+$/';
+
+	private string $method = self::METHOD_GET;
+	private UriInterface $uri;
+	private ?string $requestTarget = null;
+
+	/**
+	 * @param mixed $uri
+	 * @param array<string, string|string[]>|null $headers
+	 *
+	 * @throws InvalidArgumentException
+	 */
+	public function __construct(
+		?string $method = null,
+		$uri = null,
+		?array $headers = null,
+		?StreamInterface $body = null
+	) {
+		if ($method !== null) {
+			$this->setMethod($method);
+		}
+
+		$this->setUri($uri ?? '/');
+
+		if ($headers !== null) {
+			$this->setHeaders($headers);
+		}
+
+		if ($body !== null) {
+			$this->setBody($body);
+		}
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function getMethod(): string
+	{
+		return $this->method;
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function withMethod($method): RequestInterface
+	{
+		$clone = clone $this;
+		$clone->setMethod($method);
+
+		return $clone;
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function getUri(): UriInterface
+	{
+		return $this->uri;
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function withUri(UriInterface $uri, $preserveHost = false): RequestInterface
+	{
+		$clone = clone $this;
+		$clone->setUri($uri, $preserveHost);
+
+		return $clone;
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function getRequestTarget(): string
+	{
+		if ($this->requestTarget !== null) {
+			return $this->requestTarget;
+		}
+
+		$requestTarget = $this->uri->getPath();
+
+		// https://tools.ietf.org/html/rfc7230#section-5.3.1
+		// https://tools.ietf.org/html/rfc7230#section-2.7
+		//
+		// origin-form = absolute-path [ "?" query ]
+		// absolute-path = 1*( "/" segment )
+		if (strncmp($requestTarget, '/', 1) !== 0) {
+			return '/';
+		}
+
+		$queryString = $this->uri->getQuery();
+		if ($queryString !== '') {
+			$requestTarget .= '?' . $queryString;
+		}
+
+		return $requestTarget;
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function withRequestTarget($requestTarget): RequestInterface
+	{
+		$clone = clone $this;
+		$clone->setRequestTarget($requestTarget);
+
+		return $clone;
+	}
+
+	/**
+	 * Sets the given method to the request
+	 *
+	 * @param string $method
+	 *
+	 * @throws InvalidArgumentException
+	 */
+	final protected function setMethod($method): void
+	{
+		$this->validateMethod($method);
+
+		$this->method = $method;
+	}
+
+	/**
+	 * Sets the given URI to the request
+	 *
+	 * @param mixed $uri
+	 * @param bool $preserveHost
+	 *
+	 * @throws InvalidArgumentException
+	 */
+	final protected function setUri($uri, $preserveHost = false): void
+	{
+		$this->uri = Uri::create($uri);
+
+		if ($preserveHost && $this->hasHeader('Host')) {
+			return;
+		}
+
+		$host = $this->uri->getHost();
+		if ($host === '') {
+			return;
+		}
+
+		$port = $this->uri->getPort();
+		if ($port !== null) {
+			$host .= ':' . $port;
+		}
+
+		$this->setHeader('Host', $host, true);
+	}
+
+	/**
+	 * Sets the given request target to the request
+	 *
+	 * @param mixed $requestTarget
+	 *
+	 * @throws InvalidArgumentException
+	 */
+	final protected function setRequestTarget($requestTarget): void
+	{
+		$this->validateRequestTarget($requestTarget);
+
+		/** @var string $requestTarget */
+
+		$this->requestTarget = $requestTarget;
+	}
+
+	/**
+	 * Validates the given method
+	 *
+	 * @link https://tools.ietf.org/html/rfc7230#section-3.1.1
+	 *
+	 * @param mixed $method
+	 *
+	 * @throws InvalidArgumentException
+	 */
+	private function validateMethod($method): void
+	{
+		if ($method === '') {
+			throw new InvalidArgumentException('HTTP method cannot be an empty');
+		}
+
+		if (!is_string($method)) {
+			throw new InvalidArgumentException('HTTP method must be a string');
+		}
+
+		if (!preg_match(HeaderInterface::RFC7230_TOKEN_REGEX, $method)) {
+			throw new InvalidArgumentException('Invalid HTTP method');
+		}
+	}
+
+	/**
+	 * Validates the given request target
+	 *
+	 * @param mixed $requestTarget
+	 *
+	 * @throws InvalidArgumentException
+	 */
+	private function validateRequestTarget($requestTarget): void
+	{
+		if ($requestTarget === '') {
+			throw new InvalidArgumentException('HTTP request target cannot be an empty');
+		}
+
+		if (!is_string($requestTarget)) {
+			throw new InvalidArgumentException('HTTP request target must be a string');
+		}
+
+		if (!preg_match(self::RFC7230_REQUEST_TARGET_REGEX, $requestTarget)) {
+			throw new InvalidArgumentException('Invalid HTTP request target');
+		}
+	}
 }

src/StreamFactory.php

Indentation +31 added lines, -31 removed lines

@@ -18,35 +18,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/Uri.php

Indentation +370 added lines, -370 removed lines

@@ -28,374 +28,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 . ':' . $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 . ':' . $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/UriFactory.php

Indentation +7 added lines, -7 removed lines

@@ -16,11 +16,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);
+	}
 }

src/Request/JsonRequest.php

Indentation +39 added lines, -39 removed lines

@@ -27,48 +27,48 @@
  */
 final class JsonRequest extends Request
 {
-    /**
-     * @param mixed $uri
-     * @param mixed $data
-     * @param int<1, max> $depth
-     * @psalm-param int<1, 2147483647> $depth
-     *
-     * @throws InvalidArgumentException
-     */
-    public function __construct(string $method, $uri, $data, int $flags = 0, int $depth = 512)
-    {
-        parent::__construct($method, $uri);
+	/**
+	 * @param mixed $uri
+	 * @param mixed $data
+	 * @param int<1, max> $depth
+	 * @psalm-param int<1, 2147483647> $depth
+	 *
+	 * @throws InvalidArgumentException
+	 */
+	public function __construct(string $method, $uri, $data, int $flags = 0, int $depth = 512)
+	{
+		parent::__construct($method, $uri);
 
-        $this->setBody(self::createBody($data, $flags, $depth));
-        $this->setHeader('Content-Type', 'application/json; charset=utf-8');
-    }
+		$this->setBody(self::createBody($data, $flags, $depth));
+		$this->setHeader('Content-Type', 'application/json; charset=utf-8');
+	}
 
-    /**
-     * @param mixed $data
-     * @param int<1, max> $depth
-     * @psalm-param int<1, 2147483647> $depth
-     *
-     * @throws InvalidArgumentException
-     */
-    private static function createBody($data, int $flags, int $depth): StreamInterface
-    {
-        if ($data instanceof StreamInterface) {
-            return $data;
-        }
+	/**
+	 * @param mixed $data
+	 * @param int<1, max> $depth
+	 * @psalm-param int<1, 2147483647> $depth
+	 *
+	 * @throws InvalidArgumentException
+	 */
+	private static function createBody($data, int $flags, int $depth): StreamInterface
+	{
+		if ($data instanceof StreamInterface) {
+			return $data;
+		}
 
-        try {
-            $json = json_encode($data, $flags | JSON_THROW_ON_ERROR, $depth);
-        } catch (JsonException $e) {
-            throw new InvalidArgumentException(sprintf(
-                'Unable to create the JSON request due to an invalid data: %s',
-                $e->getMessage(),
-            ), 0, $e);
-        }
+		try {
+			$json = json_encode($data, $flags | JSON_THROW_ON_ERROR, $depth);
+		} catch (JsonException $e) {
+			throw new InvalidArgumentException(sprintf(
+				'Unable to create the JSON request due to an invalid data: %s',
+				$e->getMessage(),
+			), 0, $e);
+		}
 
-        $stream = new PhpTempStream('r+b');
-        $stream->write($json);
-        $stream->rewind();
+		$stream = new PhpTempStream('r+b');
+		$stream->write($json);
+		$stream->rewind();
 
-        return $stream;
-    }
+		return $stream;
+	}
 }

src/Uri/Component/Port.php

Indentation +36 added lines, -36 removed lines

@@ -20,40 +20,40 @@
  */
 final class Port implements ComponentInterface
 {
-    private const MIN_VALUE = 1;
-    private const MAX_VALUE = (2 ** 16) - 1;
-
-    private ?int $value = null;
-
-    /**
-     * @param mixed $value
-     *
-     * @throws InvalidArgumentException
-     */
-    public function __construct($value)
-    {
-        if ($value === null) {
-            return;
-        }
-
-        if (!is_int($value)) {
-            throw new InvalidArgumentException('URI component "port" must be an integer');
-        }
-
-        if (!($value >= self::MIN_VALUE && $value <= self::MAX_VALUE)) {
-            throw new InvalidArgumentException('Invalid URI component "port"');
-        }
-
-        $this->value = $value;
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @return int|null
-     */
-    public function getValue(): ?int
-    {
-        return $this->value;
-    }
+	private const MIN_VALUE = 1;
+	private const MAX_VALUE = (2 ** 16) - 1;
+
+	private ?int $value = null;
+
+	/**
+	 * @param mixed $value
+	 *
+	 * @throws InvalidArgumentException
+	 */
+	public function __construct($value)
+	{
+		if ($value === null) {
+			return;
+		}
+
+		if (!is_int($value)) {
+			throw new InvalidArgumentException('URI component "port" must be an integer');
+		}
+
+		if (!($value >= self::MIN_VALUE && $value <= self::MAX_VALUE)) {
+			throw new InvalidArgumentException('Invalid URI component "port"');
+		}
+
+		$this->value = $value;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 *
+	 * @return int|null
+	 */
+	public function getValue(): ?int
+	{
+		return $this->value;
+	}
 }

src/Uri/Component/Query.php

Indentation +34 added lines, -34 removed lines

@@ -22,43 +22,43 @@
  */
 final class Query implements ComponentInterface
 {
-    // phpcs:ignore Generic.Files.LineLength
-    private const NORMALIZATION_REGEX = '/(?:%[0-9A-Fa-f]{2}|[\x21\x24\x26-\x3b\x3d\x3f-\x5a\x5f\x61-\x7a\x7e]+)|(.?)/u';
+	// phpcs:ignore Generic.Files.LineLength
+	private const NORMALIZATION_REGEX = '/(?:%[0-9A-Fa-f]{2}|[\x21\x24\x26-\x3b\x3d\x3f-\x5a\x5f\x61-\x7a\x7e]+)|(.?)/u';
 
-    private string $value = '';
+	private string $value = '';
 
-    /**
-     * @param mixed $value
-     *
-     * @throws InvalidArgumentException
-     */
-    public function __construct($value)
-    {
-        if ($value === '') {
-            return;
-        }
+	/**
+	 * @param mixed $value
+	 *
+	 * @throws InvalidArgumentException
+	 */
+	public function __construct($value)
+	{
+		if ($value === '') {
+			return;
+		}
 
-        if (!is_string($value)) {
-            throw new InvalidArgumentException('URI component "query" must be a string');
-        }
+		if (!is_string($value)) {
+			throw new InvalidArgumentException('URI component "query" must be a string');
+		}
 
-        $this->value = (string) preg_replace_callback(
-            self::NORMALIZATION_REGEX,
-            static fn(array $matches): string => (
-                /** @var array{0: string, 1?: string} $matches */
-                isset($matches[1]) ? rawurlencode($matches[1]) : $matches[0]
-            ),
-            $value,
-        );
-    }
+		$this->value = (string) preg_replace_callback(
+			self::NORMALIZATION_REGEX,
+			static fn(array $matches): string => (
+				/** @var array{0: string, 1?: string} $matches */
+				isset($matches[1]) ? rawurlencode($matches[1]) : $matches[0]
+			),
+			$value,
+		);
+	}
 
-    /**
-     * {@inheritdoc}
-     *
-     * @return string
-     */
-    public function getValue(): string
-    {
-        return $this->value;
-    }
+	/**
+	 * {@inheritdoc}
+	 *
+	 * @return string
+	 */
+	public function getValue(): string
+	{
+		return $this->value;
+	}
 }