sunrise-php / http-message

src/Uri.php

Indentation +474 added lines, -474 removed lines

@@ -41,478 +41,478 @@
 class Uri implements UriInterface
 {
 
-    /**
-     * Scheme of the URI
-     *
-     * @var string
-     */
-    private string $scheme = '';
-
-    /**
-     * User Information of the URI
-     *
-     * @var string
-     */
-    private string $userInfo = '';
-
-    /**
-     * Host of the URI
-     *
-     * @var string
-     */
-    private string $host = '';
-
-    /**
-     * Port of the URI
-     *
-     * @var int|null
-     */
-    private ?int $port = null;
-
-    /**
-     * Path of the URI
-     *
-     * @var string
-     */
-    private string $path = '';
-
-    /**
-     * Query of the URI
-     *
-     * @var string
-     */
-    private string $query = '';
-
-    /**
-     * Fragment of the URI
-     *
-     * @var string
-     */
-    private string $fragment = '';
-
-    /**
-     * Constructor of the class
-     *
-     * @param string $uri
-     *
-     * @throws InvalidArgumentException
-     *         If the URI isn't valid.
-     */
-    public function __construct(string $uri = '')
-    {
-        if ($uri === '') {
-            return;
-        }
-
-        $components = parse_url($uri);
-        if ($components === false) {
-            throw new InvalidArgumentException('Unable to parse 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']);
-        }
-    }
-
-    /**
-     * Creates a URI
-     *
-     * @param mixed $uri
-     *
-     * @return UriInterface
-     *
-     * @throws InvalidArgumentException
-     *         If the URI isn't valid.
-     */
-    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}
-     *
-     * @throws InvalidArgumentException
-     *         If the scheme isn't valid.
-     */
-    public function withScheme($scheme): UriInterface
-    {
-        $clone = clone $this;
-        $clone->setScheme($scheme);
-
-        return $clone;
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @throws InvalidArgumentException
-     *         If the user information isn't valid.
-     */
-    public function withUserInfo($user, $password = null): UriInterface
-    {
-        $clone = clone $this;
-        $clone->setUserInfo($user, $password);
-
-        return $clone;
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @throws InvalidArgumentException
-     *         If the host isn't valid.
-     */
-    public function withHost($host): UriInterface
-    {
-        $clone = clone $this;
-        $clone->setHost($host);
-
-        return $clone;
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @throws InvalidArgumentException
-     *         If the port isn't valid.
-     */
-    public function withPort($port): UriInterface
-    {
-        $clone = clone $this;
-        $clone->setPort($port);
-
-        return $clone;
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @throws InvalidArgumentException
-     *         If the path isn't valid.
-     */
-    public function withPath($path): UriInterface
-    {
-        $clone = clone $this;
-        $clone->setPath($path);
-
-        return $clone;
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @throws InvalidArgumentException
-     *         If the query isn't valid.
-     */
-    public function withQuery($query): UriInterface
-    {
-        $clone = clone $this;
-        $clone->setQuery($query);
-
-        return $clone;
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @throws InvalidArgumentException
-     *         If the fragment isn't valid.
-     */
-    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;
-    }
-
-    /**
-     * Sets the given scheme to the URI
-     *
-     * @param mixed $scheme
-     *
-     * @return void
-     *
-     * @throws InvalidArgumentException
-     *         If the scheme isn't valid.
-     */
-    final protected function setScheme($scheme): void
-    {
-        $this->scheme = (new Scheme($scheme))->getValue();
-    }
-
-    /**
-     * Sets the given user information to the URI
-     *
-     * @param mixed $user
-     * @param mixed $password
-     *
-     * @return void
-     *
-     * @throws InvalidArgumentException
-     *         If the user information isn't valid.
-     */
-    final protected function setUserInfo($user, $password): void
-    {
-        $this->userInfo = (new UserInfo($user, $password))->getValue();
-    }
-
-    /**
-     * Sets the given host to the URI
-     *
-     * @param mixed $host
-     *
-     * @return void
-     *
-     * @throws InvalidArgumentException
-     *         If the host isn't valid.
-     */
-    final protected function setHost($host): void
-    {
-        $this->host = (new Host($host))->getValue();
-    }
-
-    /**
-     * Sets the given port to the URI
-     *
-     * @param mixed $port
-     *
-     * @return void
-     *
-     * @throws InvalidArgumentException
-     *         If the port isn't valid.
-     */
-    final protected function setPort($port): void
-    {
-        $this->port = (new Port($port))->getValue();
-    }
-
-    /**
-     * Sets the given path to the URI
-     *
-     * @param mixed $path
-     *
-     * @return void
-     *
-     * @throws InvalidArgumentException
-     *         If the path isn't valid.
-     */
-    final protected function setPath($path): void
-    {
-        $this->path = (new Path($path))->getValue();
-    }
-
-    /**
-     * Sets the given query to the URI
-     *
-     * @param mixed $query
-     *
-     * @return void
-     *
-     * @throws InvalidArgumentException
-     *         If the query isn't valid.
-     */
-    final protected function setQuery($query): void
-    {
-        $this->query = (new Query($query))->getValue();
-    }
-
-    /**
-     * Sets the given fragment to the URI
-     *
-     * @param mixed $fragment
-     *
-     * @return void
-     *
-     * @throws InvalidArgumentException
-     *         If the fragment isn't valid.
-     */
-    final protected function setFragment($fragment): void
-    {
-        $this->fragment = (new Fragment($fragment))->getValue();
-    }
+	/**
+	 * Scheme of the URI
+	 *
+	 * @var string
+	 */
+	private string $scheme = '';
+
+	/**
+	 * User Information of the URI
+	 *
+	 * @var string
+	 */
+	private string $userInfo = '';
+
+	/**
+	 * Host of the URI
+	 *
+	 * @var string
+	 */
+	private string $host = '';
+
+	/**
+	 * Port of the URI
+	 *
+	 * @var int|null
+	 */
+	private ?int $port = null;
+
+	/**
+	 * Path of the URI
+	 *
+	 * @var string
+	 */
+	private string $path = '';
+
+	/**
+	 * Query of the URI
+	 *
+	 * @var string
+	 */
+	private string $query = '';
+
+	/**
+	 * Fragment of the URI
+	 *
+	 * @var string
+	 */
+	private string $fragment = '';
+
+	/**
+	 * Constructor of the class
+	 *
+	 * @param string $uri
+	 *
+	 * @throws InvalidArgumentException
+	 *         If the URI isn't valid.
+	 */
+	public function __construct(string $uri = '')
+	{
+		if ($uri === '') {
+			return;
+		}
+
+		$components = parse_url($uri);
+		if ($components === false) {
+			throw new InvalidArgumentException('Unable to parse 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']);
+		}
+	}
+
+	/**
+	 * Creates a URI
+	 *
+	 * @param mixed $uri
+	 *
+	 * @return UriInterface
+	 *
+	 * @throws InvalidArgumentException
+	 *         If the URI isn't valid.
+	 */
+	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}
+	 *
+	 * @throws InvalidArgumentException
+	 *         If the scheme isn't valid.
+	 */
+	public function withScheme($scheme): UriInterface
+	{
+		$clone = clone $this;
+		$clone->setScheme($scheme);
+
+		return $clone;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 *
+	 * @throws InvalidArgumentException
+	 *         If the user information isn't valid.
+	 */
+	public function withUserInfo($user, $password = null): UriInterface
+	{
+		$clone = clone $this;
+		$clone->setUserInfo($user, $password);
+
+		return $clone;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 *
+	 * @throws InvalidArgumentException
+	 *         If the host isn't valid.
+	 */
+	public function withHost($host): UriInterface
+	{
+		$clone = clone $this;
+		$clone->setHost($host);
+
+		return $clone;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 *
+	 * @throws InvalidArgumentException
+	 *         If the port isn't valid.
+	 */
+	public function withPort($port): UriInterface
+	{
+		$clone = clone $this;
+		$clone->setPort($port);
+
+		return $clone;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 *
+	 * @throws InvalidArgumentException
+	 *         If the path isn't valid.
+	 */
+	public function withPath($path): UriInterface
+	{
+		$clone = clone $this;
+		$clone->setPath($path);
+
+		return $clone;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 *
+	 * @throws InvalidArgumentException
+	 *         If the query isn't valid.
+	 */
+	public function withQuery($query): UriInterface
+	{
+		$clone = clone $this;
+		$clone->setQuery($query);
+
+		return $clone;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 *
+	 * @throws InvalidArgumentException
+	 *         If the fragment isn't valid.
+	 */
+	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;
+	}
+
+	/**
+	 * Sets the given scheme to the URI
+	 *
+	 * @param mixed $scheme
+	 *
+	 * @return void
+	 *
+	 * @throws InvalidArgumentException
+	 *         If the scheme isn't valid.
+	 */
+	final protected function setScheme($scheme): void
+	{
+		$this->scheme = (new Scheme($scheme))->getValue();
+	}
+
+	/**
+	 * Sets the given user information to the URI
+	 *
+	 * @param mixed $user
+	 * @param mixed $password
+	 *
+	 * @return void
+	 *
+	 * @throws InvalidArgumentException
+	 *         If the user information isn't valid.
+	 */
+	final protected function setUserInfo($user, $password): void
+	{
+		$this->userInfo = (new UserInfo($user, $password))->getValue();
+	}
+
+	/**
+	 * Sets the given host to the URI
+	 *
+	 * @param mixed $host
+	 *
+	 * @return void
+	 *
+	 * @throws InvalidArgumentException
+	 *         If the host isn't valid.
+	 */
+	final protected function setHost($host): void
+	{
+		$this->host = (new Host($host))->getValue();
+	}
+
+	/**
+	 * Sets the given port to the URI
+	 *
+	 * @param mixed $port
+	 *
+	 * @return void
+	 *
+	 * @throws InvalidArgumentException
+	 *         If the port isn't valid.
+	 */
+	final protected function setPort($port): void
+	{
+		$this->port = (new Port($port))->getValue();
+	}
+
+	/**
+	 * Sets the given path to the URI
+	 *
+	 * @param mixed $path
+	 *
+	 * @return void
+	 *
+	 * @throws InvalidArgumentException
+	 *         If the path isn't valid.
+	 */
+	final protected function setPath($path): void
+	{
+		$this->path = (new Path($path))->getValue();
+	}
+
+	/**
+	 * Sets the given query to the URI
+	 *
+	 * @param mixed $query
+	 *
+	 * @return void
+	 *
+	 * @throws InvalidArgumentException
+	 *         If the query isn't valid.
+	 */
+	final protected function setQuery($query): void
+	{
+		$this->query = (new Query($query))->getValue();
+	}
+
+	/**
+	 * Sets the given fragment to the URI
+	 *
+	 * @param mixed $fragment
+	 *
+	 * @return void
+	 *
+	 * @throws InvalidArgumentException
+	 *         If the fragment isn't valid.
+	 */
+	final protected function setFragment($fragment): void
+	{
+		$this->fragment = (new Fragment($fragment))->getValue();
+	}
 }

src/Message.php

Indentation +390 added lines, -390 removed lines

@@ -39,394 +39,394 @@
 abstract class Message implements MessageInterface
 {
 
-    /**
-     * Supported HTTP versions
-     *
-     * @var list<string>
-     */
-    public const SUPPORTED_HTTP_VERSIONS = ['1.0', '1.1', '2.0', '2'];
-
-    /**
-     * Default HTTP version
-     *
-     * @var string
-     */
-    public const DEFAULT_HTTP_VERSION = '1.1';
-
-    /**
-     * The message HTTP version
-     *
-     * @var string
-     */
-    private string $protocolVersion = self::DEFAULT_HTTP_VERSION;
-
-    /**
-     * The message headers
-     *
-     * @var array<string, list<string>>
-     */
-    private array $headers = [];
-
-    /**
-     * Original header names (see $headers)
-     *
-     * @var array<string, string>
-     */
-    private array $headerNames = [];
-
-    /**
-     * The message body
-     *
-     * @var StreamInterface|null
-     */
-    private ?StreamInterface $body = null;
-
-    /**
-     * Gets the message HTTP version
-     *
-     * @return string
-     */
-    public function getProtocolVersion(): string
-    {
-        return $this->protocolVersion;
-    }
-
-    /**
-     * Creates a new instance of the message with the given HTTP version
-     *
-     * @param string $version
-     *
-     * @return static
-     *
-     * @throws InvalidArgumentException
-     *         If the HTTP version isn't valid.
-     */
-    public function withProtocolVersion($version): MessageInterface
-    {
-        $clone = clone $this;
-        $clone->setProtocolVersion($version);
-
-        return $clone;
-    }
-
-    /**
-     * Gets the message headers
-     *
-     * @return array<string, list<string>>
-     */
-    public function getHeaders(): array
-    {
-        return $this->headers;
-    }
-
-    /**
-     * Checks if a header exists in the message by the given name
-     *
-     * @param string $name
-     *
-     * @return bool
-     */
-    public function hasHeader($name): bool
-    {
-        $key = strtolower($name);
-
-        return isset($this->headerNames[$key]);
-    }
-
-    /**
-     * Gets a header value(s) from the message by the given name
-     *
-     * @param string $name
-     *
-     * @return list<string>
-     */
-    public function getHeader($name): array
-    {
-        $key = strtolower($name);
-
-        if (!isset($this->headerNames[$key])) {
-            return [];
-        }
-
-        return $this->headers[$this->headerNames[$key]];
-    }
-
-    /**
-     * Gets a header value as a string from the message by the given name
-     *
-     * @param string $name
-     *
-     * @return string
-     */
-    public function getHeaderLine($name): string
-    {
-        $key = strtolower($name);
-
-        if (!isset($this->headerNames[$key])) {
-            return '';
-        }
-
-        return implode(',', $this->headers[$this->headerNames[$key]]);
-    }
-
-    /**
-     * Creates a new instance of the message with the given header overwriting the old header
-     *
-     * @param string $name
-     * @param string|string[] $value
-     *
-     * @return static
-     *
-     * @throws InvalidArgumentException
-     *         If the header isn't valid.
-     */
-    public function withHeader($name, $value): MessageInterface
-    {
-        $clone = clone $this;
-        $clone->setHeader($name, $value, true);
-
-        return $clone;
-    }
-
-    /**
-     * Creates a new instance of the message with the given header NOT overwriting the old header
-     *
-     * @param string $name
-     * @param string|string[] $value
-     *
-     * @return static
-     *
-     * @throws InvalidArgumentException
-     *         If the header isn't valid.
-     */
-    public function withAddedHeader($name, $value): MessageInterface
-    {
-        $clone = clone $this;
-        $clone->setHeader($name, $value, false);
-
-        return $clone;
-    }
-
-    /**
-     * Creates a new instance of the message without a header by the given name
-     *
-     * @param string $name
-     *
-     * @return static
-     */
-    public function withoutHeader($name): MessageInterface
-    {
-        $clone = clone $this;
-        $clone->deleteHeader($name);
-
-        return $clone;
-    }
-
-    /**
-     * Gets the message body
-     *
-     * @return StreamInterface
-     */
-    public function getBody(): StreamInterface
-    {
-        return $this->body ??= new PhpTempStream();
-    }
-
-    /**
-     * Creates a new instance of the message with the given body
-     *
-     * @param StreamInterface $body
-     *
-     * @return static
-     */
-    public function withBody(StreamInterface $body): MessageInterface
-    {
-        $clone = clone $this;
-        $clone->setBody($body);
-
-        return $clone;
-    }
-
-    /**
-     * Sets the given HTTP version to the message
-     *
-     * @param string $protocolVersion
-     *
-     * @return void
-     *
-     * @throws InvalidArgumentException
-     *         If the HTTP version isn't valid.
-     */
-    final protected function setProtocolVersion($protocolVersion): void
-    {
-        $this->validateProtocolVersion($protocolVersion);
-
-        $this->protocolVersion = $protocolVersion;
-    }
-
-    /**
-     * Sets a new header to the message with the given name and value(s)
-     *
-     * @param string $name
-     * @param string|string[] $value
-     * @param bool $replace
-     *
-     * @return void
-     *
-     * @throws InvalidArgumentException
-     *         If the header isn't valid.
-     */
-    final protected function setHeader($name, $value, bool $replace = true): void
-    {
-        if (!is_array($value)) {
-            $value = [$value];
-        }
-
-        $this->validateHeaderName($name);
-        $this->validateHeaderValue($name, $value);
-
-        if ($replace) {
-            $this->deleteHeader($name);
-        }
-
-        $key = strtolower($name);
-
-        $this->headerNames[$key] ??= $name;
-        $this->headers[$this->headerNames[$key]] ??= [];
-
-        foreach ($value as $item) {
-            $this->headers[$this->headerNames[$key]][] = $item;
-        }
-    }
-
-    /**
-     * Sets the given headers to the message
-     *
-     * @param array<string, string|string[]> $headers
-     *
-     * @return void
-     *
-     * @throws InvalidArgumentException
-     *         If one of the headers isn't valid.
-     */
-    final protected function setHeaders(array $headers): void
-    {
-        foreach ($headers as $name => $value) {
-            $this->setHeader($name, $value, false);
-        }
-    }
-
-    /**
-     * Deletes a header from the message by the given name
-     *
-     * @param string $name
-     *
-     * @return void
-     */
-    final protected function deleteHeader($name): void
-    {
-        $key = strtolower($name);
-
-        if (isset($this->headerNames[$key])) {
-            unset($this->headers[$this->headerNames[$key]]);
-            unset($this->headerNames[$key]);
-        }
-    }
-
-    /**
-     * Sets the given body to the message
-     *
-     * @param StreamInterface $body
-     *
-     * @return void
-     */
-    final protected function setBody(StreamInterface $body): void
-    {
-        $this->body = $body;
-    }
-
-    /**
-     * Validates the given HTTP version
-     *
-     * @param mixed $protocolVersion
-     *
-     * @return void
-     *
-     * @throws InvalidArgumentException
-     *         If the HTTP version isn't valid.
-     */
-    private function validateProtocolVersion($protocolVersion): void
-    {
-        if (!in_array($protocolVersion, self::SUPPORTED_HTTP_VERSIONS, true)) {
-            throw new InvalidArgumentException('Invalid or unsupported HTTP version');
-        }
-    }
-
-    /**
-     * Validates the given header name
-     *
-     * @param mixed $name
-     *
-     * @return void
-     *
-     * @throws InvalidArgumentException
-     *         If the header name isn't valid.
-     */
-    private function validateHeaderName($name): void
-    {
-        if ($name === '') {
-            throw new InvalidArgumentException('HTTP header name cannot be an empty');
-        }
-
-        if (!is_string($name)) {
-            throw new InvalidArgumentException('HTTP header name must be a string');
-        }
-
-        if (!preg_match(HeaderInterface::RFC7230_TOKEN_REGEX, $name)) {
-            throw new InvalidArgumentException('HTTP header name is invalid');
-        }
-    }
-
-    /**
-     * Validates the given header value
-     *
-     * @param string $name
-     * @param array $value
-     *
-     * @return void
-     *
-     * @throws InvalidArgumentException
-     *         If the header value isn't valid.
-     */
-    private function validateHeaderValue(string $name, array $value): void
-    {
-        if ([] === $value) {
-            throw new InvalidArgumentException(sprintf(
-                'The "%s" HTTP header value cannot be an empty array',
-                $name,
-            ));
-        }
-
-        foreach ($value as $key => $item) {
-            if ('' === $item) {
-                continue;
-            }
-
-            if (!is_string($item)) {
-                throw new InvalidArgumentException(sprintf(
-                    'The "%s[%s]" HTTP header value must be a string',
-                    $name,
-                    $key
-                ));
-            }
-
-            if (!preg_match(HeaderInterface::RFC7230_FIELD_VALUE_REGEX, $item)) {
-                throw new InvalidArgumentException(sprintf(
-                    'The "%s[%s]" HTTP header value is invalid',
-                    $name,
-                    $key
-                ));
-            }
-        }
-    }
+	/**
+	 * Supported HTTP versions
+	 *
+	 * @var list<string>
+	 */
+	public const SUPPORTED_HTTP_VERSIONS = ['1.0', '1.1', '2.0', '2'];
+
+	/**
+	 * Default HTTP version
+	 *
+	 * @var string
+	 */
+	public const DEFAULT_HTTP_VERSION = '1.1';
+
+	/**
+	 * The message HTTP version
+	 *
+	 * @var string
+	 */
+	private string $protocolVersion = self::DEFAULT_HTTP_VERSION;
+
+	/**
+	 * The message headers
+	 *
+	 * @var array<string, list<string>>
+	 */
+	private array $headers = [];
+
+	/**
+	 * Original header names (see $headers)
+	 *
+	 * @var array<string, string>
+	 */
+	private array $headerNames = [];
+
+	/**
+	 * The message body
+	 *
+	 * @var StreamInterface|null
+	 */
+	private ?StreamInterface $body = null;
+
+	/**
+	 * Gets the message HTTP version
+	 *
+	 * @return string
+	 */
+	public function getProtocolVersion(): string
+	{
+		return $this->protocolVersion;
+	}
+
+	/**
+	 * Creates a new instance of the message with the given HTTP version
+	 *
+	 * @param string $version
+	 *
+	 * @return static
+	 *
+	 * @throws InvalidArgumentException
+	 *         If the HTTP version isn't valid.
+	 */
+	public function withProtocolVersion($version): MessageInterface
+	{
+		$clone = clone $this;
+		$clone->setProtocolVersion($version);
+
+		return $clone;
+	}
+
+	/**
+	 * Gets the message headers
+	 *
+	 * @return array<string, list<string>>
+	 */
+	public function getHeaders(): array
+	{
+		return $this->headers;
+	}
+
+	/**
+	 * Checks if a header exists in the message by the given name
+	 *
+	 * @param string $name
+	 *
+	 * @return bool
+	 */
+	public function hasHeader($name): bool
+	{
+		$key = strtolower($name);
+
+		return isset($this->headerNames[$key]);
+	}
+
+	/**
+	 * Gets a header value(s) from the message by the given name
+	 *
+	 * @param string $name
+	 *
+	 * @return list<string>
+	 */
+	public function getHeader($name): array
+	{
+		$key = strtolower($name);
+
+		if (!isset($this->headerNames[$key])) {
+			return [];
+		}
+
+		return $this->headers[$this->headerNames[$key]];
+	}
+
+	/**
+	 * Gets a header value as a string from the message by the given name
+	 *
+	 * @param string $name
+	 *
+	 * @return string
+	 */
+	public function getHeaderLine($name): string
+	{
+		$key = strtolower($name);
+
+		if (!isset($this->headerNames[$key])) {
+			return '';
+		}
+
+		return implode(',', $this->headers[$this->headerNames[$key]]);
+	}
+
+	/**
+	 * Creates a new instance of the message with the given header overwriting the old header
+	 *
+	 * @param string $name
+	 * @param string|string[] $value
+	 *
+	 * @return static
+	 *
+	 * @throws InvalidArgumentException
+	 *         If the header isn't valid.
+	 */
+	public function withHeader($name, $value): MessageInterface
+	{
+		$clone = clone $this;
+		$clone->setHeader($name, $value, true);
+
+		return $clone;
+	}
+
+	/**
+	 * Creates a new instance of the message with the given header NOT overwriting the old header
+	 *
+	 * @param string $name
+	 * @param string|string[] $value
+	 *
+	 * @return static
+	 *
+	 * @throws InvalidArgumentException
+	 *         If the header isn't valid.
+	 */
+	public function withAddedHeader($name, $value): MessageInterface
+	{
+		$clone = clone $this;
+		$clone->setHeader($name, $value, false);
+
+		return $clone;
+	}
+
+	/**
+	 * Creates a new instance of the message without a header by the given name
+	 *
+	 * @param string $name
+	 *
+	 * @return static
+	 */
+	public function withoutHeader($name): MessageInterface
+	{
+		$clone = clone $this;
+		$clone->deleteHeader($name);
+
+		return $clone;
+	}
+
+	/**
+	 * Gets the message body
+	 *
+	 * @return StreamInterface
+	 */
+	public function getBody(): StreamInterface
+	{
+		return $this->body ??= new PhpTempStream();
+	}
+
+	/**
+	 * Creates a new instance of the message with the given body
+	 *
+	 * @param StreamInterface $body
+	 *
+	 * @return static
+	 */
+	public function withBody(StreamInterface $body): MessageInterface
+	{
+		$clone = clone $this;
+		$clone->setBody($body);
+
+		return $clone;
+	}
+
+	/**
+	 * Sets the given HTTP version to the message
+	 *
+	 * @param string $protocolVersion
+	 *
+	 * @return void
+	 *
+	 * @throws InvalidArgumentException
+	 *         If the HTTP version isn't valid.
+	 */
+	final protected function setProtocolVersion($protocolVersion): void
+	{
+		$this->validateProtocolVersion($protocolVersion);
+
+		$this->protocolVersion = $protocolVersion;
+	}
+
+	/**
+	 * Sets a new header to the message with the given name and value(s)
+	 *
+	 * @param string $name
+	 * @param string|string[] $value
+	 * @param bool $replace
+	 *
+	 * @return void
+	 *
+	 * @throws InvalidArgumentException
+	 *         If the header isn't valid.
+	 */
+	final protected function setHeader($name, $value, bool $replace = true): void
+	{
+		if (!is_array($value)) {
+			$value = [$value];
+		}
+
+		$this->validateHeaderName($name);
+		$this->validateHeaderValue($name, $value);
+
+		if ($replace) {
+			$this->deleteHeader($name);
+		}
+
+		$key = strtolower($name);
+
+		$this->headerNames[$key] ??= $name;
+		$this->headers[$this->headerNames[$key]] ??= [];
+
+		foreach ($value as $item) {
+			$this->headers[$this->headerNames[$key]][] = $item;
+		}
+	}
+
+	/**
+	 * Sets the given headers to the message
+	 *
+	 * @param array<string, string|string[]> $headers
+	 *
+	 * @return void
+	 *
+	 * @throws InvalidArgumentException
+	 *         If one of the headers isn't valid.
+	 */
+	final protected function setHeaders(array $headers): void
+	{
+		foreach ($headers as $name => $value) {
+			$this->setHeader($name, $value, false);
+		}
+	}
+
+	/**
+	 * Deletes a header from the message by the given name
+	 *
+	 * @param string $name
+	 *
+	 * @return void
+	 */
+	final protected function deleteHeader($name): void
+	{
+		$key = strtolower($name);
+
+		if (isset($this->headerNames[$key])) {
+			unset($this->headers[$this->headerNames[$key]]);
+			unset($this->headerNames[$key]);
+		}
+	}
+
+	/**
+	 * Sets the given body to the message
+	 *
+	 * @param StreamInterface $body
+	 *
+	 * @return void
+	 */
+	final protected function setBody(StreamInterface $body): void
+	{
+		$this->body = $body;
+	}
+
+	/**
+	 * Validates the given HTTP version
+	 *
+	 * @param mixed $protocolVersion
+	 *
+	 * @return void
+	 *
+	 * @throws InvalidArgumentException
+	 *         If the HTTP version isn't valid.
+	 */
+	private function validateProtocolVersion($protocolVersion): void
+	{
+		if (!in_array($protocolVersion, self::SUPPORTED_HTTP_VERSIONS, true)) {
+			throw new InvalidArgumentException('Invalid or unsupported HTTP version');
+		}
+	}
+
+	/**
+	 * Validates the given header name
+	 *
+	 * @param mixed $name
+	 *
+	 * @return void
+	 *
+	 * @throws InvalidArgumentException
+	 *         If the header name isn't valid.
+	 */
+	private function validateHeaderName($name): void
+	{
+		if ($name === '') {
+			throw new InvalidArgumentException('HTTP header name cannot be an empty');
+		}
+
+		if (!is_string($name)) {
+			throw new InvalidArgumentException('HTTP header name must be a string');
+		}
+
+		if (!preg_match(HeaderInterface::RFC7230_TOKEN_REGEX, $name)) {
+			throw new InvalidArgumentException('HTTP header name is invalid');
+		}
+	}
+
+	/**
+	 * Validates the given header value
+	 *
+	 * @param string $name
+	 * @param array $value
+	 *
+	 * @return void
+	 *
+	 * @throws InvalidArgumentException
+	 *         If the header value isn't valid.
+	 */
+	private function validateHeaderValue(string $name, array $value): void
+	{
+		if ([] === $value) {
+			throw new InvalidArgumentException(sprintf(
+				'The "%s" HTTP header value cannot be an empty array',
+				$name,
+			));
+		}
+
+		foreach ($value as $key => $item) {
+			if ('' === $item) {
+				continue;
+			}
+
+			if (!is_string($item)) {
+				throw new InvalidArgumentException(sprintf(
+					'The "%s[%s]" HTTP header value must be a string',
+					$name,
+					$key
+				));
+			}
+
+			if (!preg_match(HeaderInterface::RFC7230_FIELD_VALUE_REGEX, $item)) {
+				throw new InvalidArgumentException(sprintf(
+					'The "%s[%s]" HTTP header value is invalid',
+					$name,
+					$key
+				));
+			}
+		}
+	}
 }

src/Uri/Component/Path.php

Indentation +43 added lines, -43 removed lines

@@ -31,53 +31,53 @@
 final class Path implements ComponentInterface
 {
 
-    /**
-     * Regular expression used for the component normalization
-     *
-     * @var string
-     */
-    // phpcs:ignore Generic.Files.LineLength
-    private const NORMALIZATION_REGEX = '/(?:%[0-9A-Fa-f]{2}|[\x21\x24\x26-\x3b\x3d\x40-\x5a\x5f\x61-\x7a\x7e]+)|(.?)/u';
+	/**
+	 * Regular expression used for the component normalization
+	 *
+	 * @var string
+	 */
+	// phpcs:ignore Generic.Files.LineLength
+	private const NORMALIZATION_REGEX = '/(?:%[0-9A-Fa-f]{2}|[\x21\x24\x26-\x3b\x3d\x40-\x5a\x5f\x61-\x7a\x7e]+)|(.?)/u';
 
-    /**
-     * The component value
-     *
-     * @var string
-     */
-    private string $value = '';
+	/**
+	 * The component value
+	 *
+	 * @var string
+	 */
+	private string $value = '';
 
-    /**
-     * Constructor of the class
-     *
-     * @param mixed $value
-     *
-     * @throws InvalidArgumentException
-     *         If the component isn't valid.
-     */
-    public function __construct($value)
-    {
-        if ($value === '') {
-            return;
-        }
+	/**
+	 * Constructor of the class
+	 *
+	 * @param mixed $value
+	 *
+	 * @throws InvalidArgumentException
+	 *         If the component isn't valid.
+	 */
+	public function __construct($value)
+	{
+		if ($value === '') {
+			return;
+		}
 
-        if (!is_string($value)) {
-            throw new InvalidArgumentException('URI component "path" must be a string');
-        }
+		if (!is_string($value)) {
+			throw new InvalidArgumentException('URI component "path" must be a string');
+		}
 
-        $this->value = preg_replace_callback(self::NORMALIZATION_REGEX, static function (array $match): string {
-            /** @var array{0: string, 1?: string} $match */
+		$this->value = preg_replace_callback(self::NORMALIZATION_REGEX, static function (array $match): string {
+			/** @var array{0: string, 1?: string} $match */
 
-            return isset($match[1]) ? rawurlencode($match[1]) : $match[0];
-        }, $value);
-    }
+			return isset($match[1]) ? rawurlencode($match[1]) : $match[0];
+		}, $value);
+	}
 
-    /**
-     * {@inheritdoc}
-     *
-     * @return string
-     */
-    public function getValue(): string
-    {
-        return $this->value;
-    }
+	/**
+	 * {@inheritdoc}
+	 *
+	 * @return string
+	 */
+	public function getValue(): string
+	{
+		return $this->value;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
             throw new InvalidArgumentException('URI component "path" must be a string');
         }
 
-        $this->value = preg_replace_callback(self::NORMALIZATION_REGEX, static function (array $match): string {
+        $this->value = preg_replace_callback(self::NORMALIZATION_REGEX, static function(array $match): string {
             /** @var array{0: string, 1?: string} $match */
 
             return isset($match[1]) ? rawurlencode($match[1]) : $match[0];

src/Uri/Component/User.php

Indentation +59 added lines, -59 removed lines

@@ -31,71 +31,71 @@
 final class User implements ComponentInterface
 {
 
-    /**
-     * Regular expression used for the component normalization
-     *
-     * @var string
-     */
-    // phpcs:ignore Generic.Files.LineLength
-    private const NORMALIZATION_REGEX = '/(?:%[0-9A-Fa-f]{2}|[\x21\x24\x26-\x2e\x30-\x39\x3b\x3d\x41-\x5a\x5f\x61-\x7a\x7e]+)|(.?)/u';
+	/**
+	 * Regular expression used for the component normalization
+	 *
+	 * @var string
+	 */
+	// phpcs:ignore Generic.Files.LineLength
+	private const NORMALIZATION_REGEX = '/(?:%[0-9A-Fa-f]{2}|[\x21\x24\x26-\x2e\x30-\x39\x3b\x3d\x41-\x5a\x5f\x61-\x7a\x7e]+)|(.?)/u';
 
-    /**
-     * The component value
-     *
-     * @var string
-     */
-    private string $value = '';
+	/**
+	 * The component value
+	 *
+	 * @var string
+	 */
+	private string $value = '';
 
-    /**
-     * Constructor of the class
-     *
-     * @param mixed $value
-     *
-     * @throws InvalidArgumentException
-     *         If the component isn't valid.
-     */
-    public function __construct($value)
-    {
-        if ($value === '') {
-            return;
-        }
+	/**
+	 * Constructor of the class
+	 *
+	 * @param mixed $value
+	 *
+	 * @throws InvalidArgumentException
+	 *         If the component isn't valid.
+	 */
+	public function __construct($value)
+	{
+		if ($value === '') {
+			return;
+		}
 
-        if (!is_string($value)) {
-            throw new InvalidArgumentException('URI component "user" must be a string');
-        }
+		if (!is_string($value)) {
+			throw new InvalidArgumentException('URI component "user" must be a string');
+		}
 
-        $this->value = preg_replace_callback(self::NORMALIZATION_REGEX, static function (array $match): string {
-            /** @var array{0: string, 1?: string} $match */
+		$this->value = preg_replace_callback(self::NORMALIZATION_REGEX, static function (array $match): string {
+			/** @var array{0: string, 1?: string} $match */
 
-            return isset($match[1]) ? rawurlencode($match[1]) : $match[0];
-        }, $value);
-    }
+			return isset($match[1]) ? rawurlencode($match[1]) : $match[0];
+		}, $value);
+	}
 
-    /**
-     * Creates a user component
-     *
-     * @param mixed $user
-     *
-     * @return User
-     *
-     * @throws InvalidArgumentException
-     */
-    public static function create($user): User
-    {
-        if ($user instanceof User) {
-            return $user;
-        }
+	/**
+	 * Creates a user component
+	 *
+	 * @param mixed $user
+	 *
+	 * @return User
+	 *
+	 * @throws InvalidArgumentException
+	 */
+	public static function create($user): User
+	{
+		if ($user instanceof User) {
+			return $user;
+		}
 
-        return new User($user);
-    }
+		return new User($user);
+	}
 
-    /**
-     * {@inheritdoc}
-     *
-     * @return string
-     */
-    public function getValue(): string
-    {
-        return $this->value;
-    }
+	/**
+	 * {@inheritdoc}
+	 *
+	 * @return string
+	 */
+	public function getValue(): string
+	{
+		return $this->value;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
             throw new InvalidArgumentException('URI component "user" must be a string');
         }
 
-        $this->value = preg_replace_callback(self::NORMALIZATION_REGEX, static function (array $match): string {
+        $this->value = preg_replace_callback(self::NORMALIZATION_REGEX, static function(array $match): string {
             /** @var array{0: string, 1?: string} $match */
 
             return isset($match[1]) ? rawurlencode($match[1]) : $match[0];

src/Uri/Component/Password.php

Indentation +59 added lines, -59 removed lines

@@ -31,71 +31,71 @@
 final class Password implements ComponentInterface
 {
 
-    /**
-     * Regular expression used for the component normalization
-     *
-     * @var string
-     */
-    // phpcs:ignore Generic.Files.LineLength
-    private const NORMALIZATION_REGEX = '/(?:%[0-9A-Fa-f]{2}|[\x21\x24\x26-\x2e\x30-\x39\x3b\x3d\x41-\x5a\x5f\x61-\x7a\x7e]+)|(.?)/u';
+	/**
+	 * Regular expression used for the component normalization
+	 *
+	 * @var string
+	 */
+	// phpcs:ignore Generic.Files.LineLength
+	private const NORMALIZATION_REGEX = '/(?:%[0-9A-Fa-f]{2}|[\x21\x24\x26-\x2e\x30-\x39\x3b\x3d\x41-\x5a\x5f\x61-\x7a\x7e]+)|(.?)/u';
 
-    /**
-     * The component value
-     *
-     * @var string
-     */
-    private string $value = '';
+	/**
+	 * The component value
+	 *
+	 * @var string
+	 */
+	private string $value = '';
 
-    /**
-     * Constructor of the class
-     *
-     * @param mixed $value
-     *
-     * @throws InvalidArgumentException
-     *         If the component isn't valid.
-     */
-    public function __construct($value)
-    {
-        if ($value === '') {
-            return;
-        }
+	/**
+	 * Constructor of the class
+	 *
+	 * @param mixed $value
+	 *
+	 * @throws InvalidArgumentException
+	 *         If the component isn't valid.
+	 */
+	public function __construct($value)
+	{
+		if ($value === '') {
+			return;
+		}
 
-        if (!is_string($value)) {
-            throw new InvalidArgumentException('URI component "password" must be a string');
-        }
+		if (!is_string($value)) {
+			throw new InvalidArgumentException('URI component "password" must be a string');
+		}
 
-        $this->value = preg_replace_callback(self::NORMALIZATION_REGEX, static function (array $match): string {
-            /** @var array{0: string, 1?: string} $match */
+		$this->value = preg_replace_callback(self::NORMALIZATION_REGEX, static function (array $match): string {
+			/** @var array{0: string, 1?: string} $match */
 
-            return isset($match[1]) ? rawurlencode($match[1]) : $match[0];
-        }, $value);
-    }
+			return isset($match[1]) ? rawurlencode($match[1]) : $match[0];
+		}, $value);
+	}
 
-    /**
-     * Creates a password component
-     *
-     * @param mixed $password
-     *
-     * @return Password
-     *
-     * @throws InvalidArgumentException
-     */
-    public static function create($password): Password
-    {
-        if ($password instanceof Password) {
-            return $password;
-        }
+	/**
+	 * Creates a password component
+	 *
+	 * @param mixed $password
+	 *
+	 * @return Password
+	 *
+	 * @throws InvalidArgumentException
+	 */
+	public static function create($password): Password
+	{
+		if ($password instanceof Password) {
+			return $password;
+		}
 
-        return new Password($password);
-    }
+		return new Password($password);
+	}
 
-    /**
-     * {@inheritdoc}
-     *
-     * @return string
-     */
-    public function getValue(): string
-    {
-        return $this->value;
-    }
+	/**
+	 * {@inheritdoc}
+	 *
+	 * @return string
+	 */
+	public function getValue(): string
+	{
+		return $this->value;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
             throw new InvalidArgumentException('URI component "password" must be a string');
         }
 
-        $this->value = preg_replace_callback(self::NORMALIZATION_REGEX, static function (array $match): string {
+        $this->value = preg_replace_callback(self::NORMALIZATION_REGEX, static function(array $match): string {
             /** @var array{0: string, 1?: string} $match */
 
             return isset($match[1]) ? rawurlencode($match[1]) : $match[0];

src/Uri/Component/Host.php

Indentation +45 added lines, -45 removed lines

@@ -32,56 +32,56 @@
 final class Host implements ComponentInterface
 {
 
-    /**
-     * Regular expression used for the component normalization
-     *
-     * @var string
-     */
-    // phpcs:ignore Generic.Files.LineLength
-    private const NORMALIZATION_REGEX = '/(?:%[0-9A-Fa-f]{2}|[\x21\x24\x26-\x2e\x30-\x39\x3b\x3d\x41-\x5a\x5f\x61-\x7a\x7e]+)|(.?)/u';
+	/**
+	 * Regular expression used for the component normalization
+	 *
+	 * @var string
+	 */
+	// phpcs:ignore Generic.Files.LineLength
+	private const NORMALIZATION_REGEX = '/(?:%[0-9A-Fa-f]{2}|[\x21\x24\x26-\x2e\x30-\x39\x3b\x3d\x41-\x5a\x5f\x61-\x7a\x7e]+)|(.?)/u';
 
-    /**
-     * The component value
-     *
-     * @var string
-     */
-    private string $value = '';
+	/**
+	 * The component value
+	 *
+	 * @var string
+	 */
+	private string $value = '';
 
-    /**
-     * Constructor of the class
-     *
-     * @param mixed $value
-     *
-     * @throws InvalidArgumentException
-     *         If the component isn't valid.
-     */
-    public function __construct($value)
-    {
-        if ($value === '') {
-            return;
-        }
+	/**
+	 * Constructor of the class
+	 *
+	 * @param mixed $value
+	 *
+	 * @throws InvalidArgumentException
+	 *         If the component isn't valid.
+	 */
+	public function __construct($value)
+	{
+		if ($value === '') {
+			return;
+		}
 
-        if (!is_string($value)) {
-            throw new InvalidArgumentException('URI component "host" must be a string');
-        }
+		if (!is_string($value)) {
+			throw new InvalidArgumentException('URI component "host" must be a string');
+		}
 
-        $this->value = preg_replace_callback(self::NORMALIZATION_REGEX, static function (array $match): string {
-            /** @var array{0: string, 1?: string} $match */
+		$this->value = preg_replace_callback(self::NORMALIZATION_REGEX, static function (array $match): string {
+			/** @var array{0: string, 1?: string} $match */
 
-            return isset($match[1]) ? rawurlencode($match[1]) : $match[0];
-        }, $value);
+			return isset($match[1]) ? rawurlencode($match[1]) : $match[0];
+		}, $value);
 
-        // the component is case-insensitive...
-        $this->value = strtolower($this->value);
-    }
+		// the component is case-insensitive...
+		$this->value = strtolower($this->value);
+	}
 
-    /**
-     * {@inheritdoc}
-     *
-     * @return string
-     */
-    public function getValue(): string
-    {
-        return $this->value;
-    }
+	/**
+	 * {@inheritdoc}
+	 *
+	 * @return string
+	 */
+	public function getValue(): string
+	{
+		return $this->value;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -65,7 +65,7 @@
             throw new InvalidArgumentException('URI component "host" must be a string');
         }
 
-        $this->value = preg_replace_callback(self::NORMALIZATION_REGEX, static function (array $match): string {
+        $this->value = preg_replace_callback(self::NORMALIZATION_REGEX, static function(array $match): string {
             /** @var array{0: string, 1?: string} $match */
 
             return isset($match[1]) ? rawurlencode($match[1]) : $match[0];

src/Uri/Component/Query.php

Indentation +43 added lines, -43 removed lines

@@ -31,53 +31,53 @@
 final class Query implements ComponentInterface
 {
 
-    /**
-     * Regular expression used for the component normalization
-     *
-     * @var string
-     */
-    // 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';
+	/**
+	 * Regular expression used for the component normalization
+	 *
+	 * @var string
+	 */
+	// 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';
 
-    /**
-     * The component value
-     *
-     * @var string
-     */
-    private string $value = '';
+	/**
+	 * The component value
+	 *
+	 * @var string
+	 */
+	private string $value = '';
 
-    /**
-     * Constructor of the class
-     *
-     * @param mixed $value
-     *
-     * @throws InvalidArgumentException
-     *         If the component isn't valid.
-     */
-    public function __construct($value)
-    {
-        if ($value === '') {
-            return;
-        }
+	/**
+	 * Constructor of the class
+	 *
+	 * @param mixed $value
+	 *
+	 * @throws InvalidArgumentException
+	 *         If the component isn't valid.
+	 */
+	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 = preg_replace_callback(self::NORMALIZATION_REGEX, static function (array $match): string {
-            /** @var array{0: string, 1?: string} $match */
+		$this->value = preg_replace_callback(self::NORMALIZATION_REGEX, static function (array $match): string {
+			/** @var array{0: string, 1?: string} $match */
 
-            return isset($match[1]) ? rawurlencode($match[1]) : $match[0];
-        }, $value);
-    }
+			return isset($match[1]) ? rawurlencode($match[1]) : $match[0];
+		}, $value);
+	}
 
-    /**
-     * {@inheritdoc}
-     *
-     * @return string
-     */
-    public function getValue(): string
-    {
-        return $this->value;
-    }
+	/**
+	 * {@inheritdoc}
+	 *
+	 * @return string
+	 */
+	public function getValue(): string
+	{
+		return $this->value;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
             throw new InvalidArgumentException('URI component "query" must be a string');
         }
 
-        $this->value = preg_replace_callback(self::NORMALIZATION_REGEX, static function (array $match): string {
+        $this->value = preg_replace_callback(self::NORMALIZATION_REGEX, static function(array $match): string {
             /** @var array{0: string, 1?: string} $match */
 
             return isset($match[1]) ? rawurlencode($match[1]) : $match[0];

src/Uri/Component/Fragment.php

Indentation +43 added lines, -43 removed lines

@@ -31,53 +31,53 @@
 final class Fragment implements ComponentInterface
 {
 
-    /**
-     * Regular expression used for the component normalization
-     *
-     * @var string
-     */
-    // 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';
+	/**
+	 * Regular expression used for the component normalization
+	 *
+	 * @var string
+	 */
+	// 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';
 
-    /**
-     * The component value
-     *
-     * @var string
-     */
-    private string $value = '';
+	/**
+	 * The component value
+	 *
+	 * @var string
+	 */
+	private string $value = '';
 
-    /**
-     * Constructor of the class
-     *
-     * @param mixed $value
-     *
-     * @throws InvalidArgumentException
-     *         If the component isn't valid.
-     */
-    public function __construct($value)
-    {
-        if ($value === '') {
-            return;
-        }
+	/**
+	 * Constructor of the class
+	 *
+	 * @param mixed $value
+	 *
+	 * @throws InvalidArgumentException
+	 *         If the component isn't valid.
+	 */
+	public function __construct($value)
+	{
+		if ($value === '') {
+			return;
+		}
 
-        if (!is_string($value)) {
-            throw new InvalidArgumentException('URI component "fragment" must be a string');
-        }
+		if (!is_string($value)) {
+			throw new InvalidArgumentException('URI component "fragment" must be a string');
+		}
 
-        $this->value = preg_replace_callback(self::NORMALIZATION_REGEX, static function (array $match): string {
-            /** @var array{0: string, 1?: string} $match */
+		$this->value = preg_replace_callback(self::NORMALIZATION_REGEX, static function (array $match): string {
+			/** @var array{0: string, 1?: string} $match */
 
-            return isset($match[1]) ? rawurlencode($match[1]) : $match[0];
-        }, $value);
-    }
+			return isset($match[1]) ? rawurlencode($match[1]) : $match[0];
+		}, $value);
+	}
 
-    /**
-     * {@inheritdoc}
-     *
-     * @return string
-     */
-    public function getValue(): string
-    {
-        return $this->value;
-    }
+	/**
+	 * {@inheritdoc}
+	 *
+	 * @return string
+	 */
+	public function getValue(): string
+	{
+		return $this->value;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
             throw new InvalidArgumentException('URI component "fragment" must be a string');
         }
 
-        $this->value = preg_replace_callback(self::NORMALIZATION_REGEX, static function (array $match): string {
+        $this->value = preg_replace_callback(self::NORMALIZATION_REGEX, static function(array $match): string {
             /** @var array{0: string, 1?: string} $match */
 
             return isset($match[1]) ? rawurlencode($match[1]) : $match[0];