sunrise-php / http-message

src/Uri/Component/Scheme.php

Indentation +43 added lines, -43 removed lines

@@ -31,53 +31,53 @@
 final class Scheme implements ComponentInterface
 {
 
-    /**
-     * Regular expression used for the component validation
-     *
-     * @var string
-     */
-    private const VALIDATION_REGEX = '/^(?:[A-Za-z][0-9A-Za-z\x2b\x2d\x2e]*)?$/';
+	/**
+	 * Regular expression used for the component validation
+	 *
+	 * @var string
+	 */
+	private const VALIDATION_REGEX = '/^(?:[A-Za-z][0-9A-Za-z\x2b\x2d\x2e]*)?$/';
 
-    /**
-     * 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 "scheme" must be a string');
-        }
+		if (!is_string($value)) {
+			throw new InvalidArgumentException('URI component "scheme" must be a string');
+		}
 
-        if (!preg_match(self::VALIDATION_REGEX, $value)) {
-            throw new InvalidArgumentException('Invalid URI component "scheme"');
-        }
+		if (!preg_match(self::VALIDATION_REGEX, $value)) {
+			throw new InvalidArgumentException('Invalid URI component "scheme"');
+		}
 
-        // the component is case-insensitive...
-        $this->value = strtolower($value);
-    }
+		// the component is case-insensitive...
+		$this->value = strtolower($value);
+	}
 
-    /**
-     * {@inheritdoc}
-     *
-     * @return string
-     */
-    public function getValue(): string
-    {
-        return $this->value;
-    }
+	/**
+	 * {@inheritdoc}
+	 *
+	 * @return string
+	 */
+	public function getValue(): string
+	{
+		return $this->value;
+	}
 }

src/Uri/Component/Port.php

Indentation +38 added lines, -38 removed lines

@@ -29,48 +29,48 @@
 final class Port implements ComponentInterface
 {
 
-    /**
-     * The component value
-     *
-     * @var int|null
-     */
-    private ?int $value = null;
+	/**
+	 * The component value
+	 *
+	 * @var int|null
+	 */
+	private ?int $value = null;
 
-    /**
-     * Constructor of the class
-     *
-     * @param mixed $value
-     *
-     * @throws InvalidArgumentException
-     *         If the component isn't valid.
-     */
-    public function __construct($value)
-    {
-        $min = 1;
-        $max = (2 ** 16) - 1;
+	/**
+	 * Constructor of the class
+	 *
+	 * @param mixed $value
+	 *
+	 * @throws InvalidArgumentException
+	 *         If the component isn't valid.
+	 */
+	public function __construct($value)
+	{
+		$min = 1;
+		$max = (2 ** 16) - 1;
 
-        if ($value === null) {
-            return;
-        }
+		if ($value === null) {
+			return;
+		}
 
-        if (!is_int($value)) {
-            throw new InvalidArgumentException('URI component "port" must be an integer');
-        }
+		if (!is_int($value)) {
+			throw new InvalidArgumentException('URI component "port" must be an integer');
+		}
 
-        if (!($value >= $min && $value <= $max)) {
-            throw new InvalidArgumentException('Invalid URI component "port"');
-        }
+		if (!($value >= $min && $value <= $max)) {
+			throw new InvalidArgumentException('Invalid URI component "port"');
+		}
 
-        $this->value = $value;
-    }
+		$this->value = $value;
+	}
 
-    /**
-     * {@inheritdoc}
-     *
-     * @return int|null
-     */
-    public function getValue(): ?int
-    {
-        return $this->value;
-    }
+	/**
+	 * {@inheritdoc}
+	 *
+	 * @return int|null
+	 */
+	public function getValue(): ?int
+	{
+		return $this->value;
+	}
 }

src/Request.php

Indentation +281 added lines, -281 removed lines

@@ -36,285 +36,285 @@
 class Request extends Message implements RequestInterface, RequestMethodInterface
 {
 
-    /**
-     * Regular Expression used for a request target validation
-     *
-     * @var string
-     */
-    private const RFC7230_REQUEST_TARGET_REGEX = '/^[\x21-\x7E\x80-\xFF]+$/';
-
-    /**
-     * The request method (aka verb)
-     *
-     * @var string
-     */
-    private string $method = self::METHOD_GET;
-
-    /**
-     * The request URI
-     *
-     * @var UriInterface
-     */
-    private UriInterface $uri;
-
-    /**
-     * The request target
-     *
-     * @var string|null
-     */
-    private ?string $requestTarget = null;
-
-    /**
-     * Constructor of the class
-     *
-     * @param string|null $method
-     * @param mixed $uri
-     * @param array<string, string|string[]>|null $headers
-     * @param StreamInterface|null $body
-     *
-     * @throws InvalidArgumentException
-     *         If one of the arguments isn't valid.
-     */
-    public function __construct(
-        ?string $method = null,
-        $uri = null,
-        ?array $headers = null,
-        ?StreamInterface $body = null
-    ) {
-        if (isset($method)) {
-            $this->setMethod($method);
-        }
-
-        $this->setUri($uri ?? '/');
-
-        if (isset($headers)) {
-            $this->setHeaders($headers);
-        }
-
-        if (isset($body)) {
-            $this->setBody($body);
-        }
-    }
-
-    /**
-     * Gets the request method
-     *
-     * @return string
-     */
-    public function getMethod(): string
-    {
-        return $this->method;
-    }
-
-    /**
-     * Creates a new instance of the request with the given method
-     *
-     * @param string $method
-     *
-     * @return static
-     *
-     * @throws InvalidArgumentException
-     *         If the method isn't valid.
-     */
-    public function withMethod($method): RequestInterface
-    {
-        $clone = clone $this;
-        $clone->setMethod($method);
-
-        return $clone;
-    }
-
-    /**
-     * Gets the request URI
-     *
-     * @return UriInterface
-     */
-    public function getUri(): UriInterface
-    {
-        return $this->uri;
-    }
-
-    /**
-     * Creates a new instance of the request with the given URI
-     *
-     * @param UriInterface $uri
-     * @param bool $preserveHost
-     *
-     * @return static
-     */
-    public function withUri(UriInterface $uri, $preserveHost = false): RequestInterface
-    {
-        $clone = clone $this;
-        $clone->setUri($uri, $preserveHost);
-
-        return $clone;
-    }
-
-    /**
-     * Gets the request target
-     *
-     * @return string
-     */
-    public function getRequestTarget(): string
-    {
-        if (isset($this->requestTarget)) {
-            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;
-    }
-
-    /**
-     * Creates a new instance of the request with the given request target
-     *
-     * @param mixed $requestTarget
-     *
-     * @return static
-     *
-     * @throws InvalidArgumentException
-     *         If the request target isn't valid.
-     */
-    public function withRequestTarget($requestTarget): RequestInterface
-    {
-        $clone = clone $this;
-        $clone->setRequestTarget($requestTarget);
-
-        return $clone;
-    }
-
-    /**
-     * Sets the given method to the request
-     *
-     * @param string $method
-     *
-     * @return void
-     *
-     * @throws InvalidArgumentException
-     *         If the method isn't valid.
-     */
-    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
-     *
-     * @return void
-     *
-     * @throws InvalidArgumentException
-     *         If the URI isn't valid.
-     */
-    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 (isset($port)) {
-            $host .= ':' . $port;
-        }
-
-        $this->setHeader('Host', $host, true);
-    }
-
-    /**
-     * Sets the given request target to the request
-     *
-     * @param mixed $requestTarget
-     *
-     * @return void
-     *
-     * @throws InvalidArgumentException
-     *         If the request target isn't valid.
-     */
-    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
-     *
-     * @return void
-     *
-     * @throws InvalidArgumentException
-     *         If the method isn't valid.
-     */
-    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
-     *
-     * @return void
-     *
-     * @throws InvalidArgumentException
-     *         If the request target isn't valid.
-     */
-    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');
-        }
-    }
+	/**
+	 * Regular Expression used for a request target validation
+	 *
+	 * @var string
+	 */
+	private const RFC7230_REQUEST_TARGET_REGEX = '/^[\x21-\x7E\x80-\xFF]+$/';
+
+	/**
+	 * The request method (aka verb)
+	 *
+	 * @var string
+	 */
+	private string $method = self::METHOD_GET;
+
+	/**
+	 * The request URI
+	 *
+	 * @var UriInterface
+	 */
+	private UriInterface $uri;
+
+	/**
+	 * The request target
+	 *
+	 * @var string|null
+	 */
+	private ?string $requestTarget = null;
+
+	/**
+	 * Constructor of the class
+	 *
+	 * @param string|null $method
+	 * @param mixed $uri
+	 * @param array<string, string|string[]>|null $headers
+	 * @param StreamInterface|null $body
+	 *
+	 * @throws InvalidArgumentException
+	 *         If one of the arguments isn't valid.
+	 */
+	public function __construct(
+		?string $method = null,
+		$uri = null,
+		?array $headers = null,
+		?StreamInterface $body = null
+	) {
+		if (isset($method)) {
+			$this->setMethod($method);
+		}
+
+		$this->setUri($uri ?? '/');
+
+		if (isset($headers)) {
+			$this->setHeaders($headers);
+		}
+
+		if (isset($body)) {
+			$this->setBody($body);
+		}
+	}
+
+	/**
+	 * Gets the request method
+	 *
+	 * @return string
+	 */
+	public function getMethod(): string
+	{
+		return $this->method;
+	}
+
+	/**
+	 * Creates a new instance of the request with the given method
+	 *
+	 * @param string $method
+	 *
+	 * @return static
+	 *
+	 * @throws InvalidArgumentException
+	 *         If the method isn't valid.
+	 */
+	public function withMethod($method): RequestInterface
+	{
+		$clone = clone $this;
+		$clone->setMethod($method);
+
+		return $clone;
+	}
+
+	/**
+	 * Gets the request URI
+	 *
+	 * @return UriInterface
+	 */
+	public function getUri(): UriInterface
+	{
+		return $this->uri;
+	}
+
+	/**
+	 * Creates a new instance of the request with the given URI
+	 *
+	 * @param UriInterface $uri
+	 * @param bool $preserveHost
+	 *
+	 * @return static
+	 */
+	public function withUri(UriInterface $uri, $preserveHost = false): RequestInterface
+	{
+		$clone = clone $this;
+		$clone->setUri($uri, $preserveHost);
+
+		return $clone;
+	}
+
+	/**
+	 * Gets the request target
+	 *
+	 * @return string
+	 */
+	public function getRequestTarget(): string
+	{
+		if (isset($this->requestTarget)) {
+			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;
+	}
+
+	/**
+	 * Creates a new instance of the request with the given request target
+	 *
+	 * @param mixed $requestTarget
+	 *
+	 * @return static
+	 *
+	 * @throws InvalidArgumentException
+	 *         If the request target isn't valid.
+	 */
+	public function withRequestTarget($requestTarget): RequestInterface
+	{
+		$clone = clone $this;
+		$clone->setRequestTarget($requestTarget);
+
+		return $clone;
+	}
+
+	/**
+	 * Sets the given method to the request
+	 *
+	 * @param string $method
+	 *
+	 * @return void
+	 *
+	 * @throws InvalidArgumentException
+	 *         If the method isn't valid.
+	 */
+	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
+	 *
+	 * @return void
+	 *
+	 * @throws InvalidArgumentException
+	 *         If the URI isn't valid.
+	 */
+	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 (isset($port)) {
+			$host .= ':' . $port;
+		}
+
+		$this->setHeader('Host', $host, true);
+	}
+
+	/**
+	 * Sets the given request target to the request
+	 *
+	 * @param mixed $requestTarget
+	 *
+	 * @return void
+	 *
+	 * @throws InvalidArgumentException
+	 *         If the request target isn't valid.
+	 */
+	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
+	 *
+	 * @return void
+	 *
+	 * @throws InvalidArgumentException
+	 *         If the method isn't valid.
+	 */
+	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
+	 *
+	 * @return void
+	 *
+	 * @throws InvalidArgumentException
+	 *         If the request target isn't valid.
+	 */
+	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/ServerRequestFactory.php

Indentation +57 added lines, -57 removed lines

@@ -26,63 +26,63 @@
 class ServerRequestFactory implements ServerRequestFactoryInterface
 {
 
-    /**
-     * Creates a new request from superglobals variables
-     *
-     * @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
-     *
-     * @return ServerRequestInterface
-     *
-     * @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;
+	/**
+	 * Creates a new request from superglobals variables
+	 *
+	 * @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
+	 *
+	 * @return ServerRequestInterface
+	 *
+	 * @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
+		);
+	}
 
-    /**
-     * Creates a new request
-     *
-     * @param string $method
-     * @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
-        );
-    }
+	/**
+	 * Creates a new request
+	 *
+	 * @param string $method
+	 * @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/Uri/Component/Fragment.php

Indentation +47 added lines, -47 removed lines

@@ -31,56 +31,56 @@
 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 = (string) 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
-        );
-    }
+		$this->value = (string) 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
+		);
+	}
 
-    /**
-     * {@inheritdoc}
-     *
-     * @return string
-     */
-    public function getValue(): string
-    {
-        return $this->value;
-    }
+	/**
+	 * {@inheritdoc}
+	 *
+	 * @return string
+	 */
+	public function getValue(): string
+	{
+		return $this->value;
+	}
 }

src/Uri/Component/Password.php

Indentation +63 added lines, -63 removed lines

@@ -31,74 +31,74 @@
 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 = (string) 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
-        );
-    }
+		$this->value = (string) 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
+		);
+	}
 
-    /**
-     * 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;
+	}
 }

src/Uri/Component/Host.php

Indentation +49 added lines, -49 removed lines

@@ -32,59 +32,59 @@
 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 = (string) 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
-        );
+		$this->value = (string) 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
+		);
 
-        // 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;
+	}
 }

src/Uri/Component/Path.php

Indentation +47 added lines, -47 removed lines

@@ -31,56 +31,56 @@
 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 = (string) 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
-        );
-    }
+		$this->value = (string) 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
+		);
+	}
 
-    /**
-     * {@inheritdoc}
-     *
-     * @return string
-     */
-    public function getValue(): string
-    {
-        return $this->value;
-    }
+	/**
+	 * {@inheritdoc}
+	 *
+	 * @return string
+	 */
+	public function getValue(): string
+	{
+		return $this->value;
+	}
 }

src/Uri/Component/Query.php

Indentation +47 added lines, -47 removed lines

@@ -31,56 +31,56 @@
 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 = (string) 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
-        );
-    }
+		$this->value = (string) 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
+		);
+	}
 
-    /**
-     * {@inheritdoc}
-     *
-     * @return string
-     */
-    public function getValue(): string
-    {
-        return $this->value;
-    }
+	/**
+	 * {@inheritdoc}
+	 *
+	 * @return string
+	 */
+	public function getValue(): string
+	{
+		return $this->value;
+	}
 }