sunrise-php / http-message

src/UploadedFile.php

Indentation +227 added lines, -227 removed lines

@@ -49,231 +49,231 @@
 class UploadedFile implements UploadedFileInterface
 {
 
-    /**
-     * List of upload errors
-     *
-     * @link https://www.php.net/manual/en/features.file-upload.errors.php
-     *
-     * @var array<int, string>
-     */
-    public const UPLOAD_ERRORS = [
-        UPLOAD_ERR_OK         => 'No error',
-        UPLOAD_ERR_INI_SIZE   => 'Uploaded file exceeds the upload_max_filesize directive in php.ini',
-        UPLOAD_ERR_FORM_SIZE  => 'Uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the form',
-        UPLOAD_ERR_PARTIAL    => 'Uploaded file was only partially uploaded',
-        UPLOAD_ERR_NO_FILE    => 'No file was uploaded',
-        UPLOAD_ERR_NO_TMP_DIR => 'Missing a temporary folder',
-        UPLOAD_ERR_CANT_WRITE => 'Failed to write file to disk',
-        UPLOAD_ERR_EXTENSION  => 'File upload stopped by extension',
-    ];
-
-    /**
-     * The file stream
-     *
-     * @var StreamInterface|null
-     */
-    private ?StreamInterface $stream = null;
-
-    /**
-     * The file size
-     *
-     * @var int|null
-     */
-    private ?int $size;
-
-    /**
-     * The file's error code
-     *
-     * @var int
-     */
-    private int $errorCode;
-
-    /**
-     * The file's error message
-     *
-     * @var string
-     */
-    private string $errorMessage;
-
-    /**
-     * The client's file name
-     *
-     * @var string|null
-     */
-    private ?string $clientFilename;
-
-    /**
-     * The client's file media type
-     *
-     * @var string|null
-     */
-    private ?string $clientMediaType;
-
-    /**
-     * Constructor of the class
-     *
-     * @param StreamInterface $stream
-     * @param int|null $size
-     * @param int $error
-     * @param string|null $clientFilename
-     * @param string|null $clientMediaType
-     */
-    public function __construct(
-        StreamInterface $stream,
-        ?int $size = null,
-        int $error = UPLOAD_ERR_OK,
-        ?string $clientFilename = null,
-        ?string $clientMediaType = null
-    ) {
-        if (UPLOAD_ERR_OK === $error) {
-            $this->stream = $stream;
-        }
-
-        $message = self::UPLOAD_ERRORS[$error] ?? 'Unknown error';
-
-        $this->size = $size;
-        $this->errorCode = $error;
-        $this->errorMessage = $message;
-        $this->clientFilename = $clientFilename;
-        $this->clientMediaType = $clientMediaType;
-    }
-
-    /**
-     * Gets the file stream
-     *
-     * @return StreamInterface
-     *
-     * @throws RuntimeException
-     *         - If the file has no a stream due to an error;
-     *         - If the file was already moved.
-     */
-    public function getStream(): StreamInterface
-    {
-        if (UPLOAD_ERR_OK <> $this->errorCode) {
-            throw new RuntimeException(sprintf(
-                'Uploaded file has no a stream due to the error #%d (%s)',
-                $this->errorCode,
-                $this->errorMessage
-            ));
-        }
-
-        if (!isset($this->stream)) {
-            throw new RuntimeException(
-                'Uploaded file has no a stream because it was already moved'
-            );
-        }
-
-        return $this->stream;
-    }
-
-    /**
-     * Moves the file to the given path
-     *
-     * @param string $targetPath
-     *
-     * @return void
-     *
-     * @throws RuntimeException
-     *         - If the file has no a stream due to an error;
-     *         - If the file was already moved;
-     *         - If the file cannot be read;
-     *         - If the target path cannot be used.
-     */
-    public function moveTo($targetPath): void
-    {
-        if (UPLOAD_ERR_OK <> $this->errorCode) {
-            throw new RuntimeException(sprintf(
-                'Uploaded file cannot be moved due to the error #%d (%s)',
-                $this->errorCode,
-                $this->errorMessage
-            ));
-        }
-
-        if (!isset($this->stream)) {
-            throw new RuntimeException(
-                'Uploaded file cannot be moved because it was already moved'
-            );
-        }
-
-        if (!$this->stream->isReadable()) {
-            throw new RuntimeException(
-                'Uploaded file cannot be moved because it is not readable'
-            );
-        }
-
-        $targetDir = dirname($targetPath);
-        if (!is_dir($targetDir) || !is_writable($targetDir)) {
-            throw new RuntimeException(sprintf(
-                'Uploaded file cannot be moved because the directory "%s" is not writable',
-                $targetDir
-            ));
-        }
-
-        $targetStream = new FileStream($targetPath, 'wb');
-
-        if ($this->stream->isSeekable()) {
-            $this->stream->rewind();
-        }
-
-        while (!$this->stream->eof()) {
-            $targetStream->write(
-                $this->stream->read(4096)
-            );
-        }
-
-        $targetStream->close();
-
-        /** @var string|null */
-        $sourcePath = $this->stream->getMetadata('uri');
-
-        $this->stream->close();
-        $this->stream = null;
-
-        if (isset($sourcePath) && is_file($sourcePath)) {
-            $sourceDir = dirname($sourcePath);
-            if (is_writable($sourceDir)) {
-                unlink($sourcePath);
-            }
-        }
-    }
-
-    /**
-     * Gets the file size
-     *
-     * @return int|null
-     */
-    public function getSize(): ?int
-    {
-        return $this->size;
-    }
-
-    /**
-     * Gets the file's error code
-     *
-     * @return int
-     */
-    public function getError(): int
-    {
-        return $this->errorCode;
-    }
-
-    /**
-     * Gets the client's file name
-     *
-     * @return string|null
-     */
-    public function getClientFilename(): ?string
-    {
-        return $this->clientFilename;
-    }
-
-    /**
-     * Gets the client's file media type
-     *
-     * @return string|null
-     */
-    public function getClientMediaType(): ?string
-    {
-        return $this->clientMediaType;
-    }
+	/**
+	 * List of upload errors
+	 *
+	 * @link https://www.php.net/manual/en/features.file-upload.errors.php
+	 *
+	 * @var array<int, string>
+	 */
+	public const UPLOAD_ERRORS = [
+		UPLOAD_ERR_OK         => 'No error',
+		UPLOAD_ERR_INI_SIZE   => 'Uploaded file exceeds the upload_max_filesize directive in php.ini',
+		UPLOAD_ERR_FORM_SIZE  => 'Uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the form',
+		UPLOAD_ERR_PARTIAL    => 'Uploaded file was only partially uploaded',
+		UPLOAD_ERR_NO_FILE    => 'No file was uploaded',
+		UPLOAD_ERR_NO_TMP_DIR => 'Missing a temporary folder',
+		UPLOAD_ERR_CANT_WRITE => 'Failed to write file to disk',
+		UPLOAD_ERR_EXTENSION  => 'File upload stopped by extension',
+	];
+
+	/**
+	 * The file stream
+	 *
+	 * @var StreamInterface|null
+	 */
+	private ?StreamInterface $stream = null;
+
+	/**
+	 * The file size
+	 *
+	 * @var int|null
+	 */
+	private ?int $size;
+
+	/**
+	 * The file's error code
+	 *
+	 * @var int
+	 */
+	private int $errorCode;
+
+	/**
+	 * The file's error message
+	 *
+	 * @var string
+	 */
+	private string $errorMessage;
+
+	/**
+	 * The client's file name
+	 *
+	 * @var string|null
+	 */
+	private ?string $clientFilename;
+
+	/**
+	 * The client's file media type
+	 *
+	 * @var string|null
+	 */
+	private ?string $clientMediaType;
+
+	/**
+	 * Constructor of the class
+	 *
+	 * @param StreamInterface $stream
+	 * @param int|null $size
+	 * @param int $error
+	 * @param string|null $clientFilename
+	 * @param string|null $clientMediaType
+	 */
+	public function __construct(
+		StreamInterface $stream,
+		?int $size = null,
+		int $error = UPLOAD_ERR_OK,
+		?string $clientFilename = null,
+		?string $clientMediaType = null
+	) {
+		if (UPLOAD_ERR_OK === $error) {
+			$this->stream = $stream;
+		}
+
+		$message = self::UPLOAD_ERRORS[$error] ?? 'Unknown error';
+
+		$this->size = $size;
+		$this->errorCode = $error;
+		$this->errorMessage = $message;
+		$this->clientFilename = $clientFilename;
+		$this->clientMediaType = $clientMediaType;
+	}
+
+	/**
+	 * Gets the file stream
+	 *
+	 * @return StreamInterface
+	 *
+	 * @throws RuntimeException
+	 *         - If the file has no a stream due to an error;
+	 *         - If the file was already moved.
+	 */
+	public function getStream(): StreamInterface
+	{
+		if (UPLOAD_ERR_OK <> $this->errorCode) {
+			throw new RuntimeException(sprintf(
+				'Uploaded file has no a stream due to the error #%d (%s)',
+				$this->errorCode,
+				$this->errorMessage
+			));
+		}
+
+		if (!isset($this->stream)) {
+			throw new RuntimeException(
+				'Uploaded file has no a stream because it was already moved'
+			);
+		}
+
+		return $this->stream;
+	}
+
+	/**
+	 * Moves the file to the given path
+	 *
+	 * @param string $targetPath
+	 *
+	 * @return void
+	 *
+	 * @throws RuntimeException
+	 *         - If the file has no a stream due to an error;
+	 *         - If the file was already moved;
+	 *         - If the file cannot be read;
+	 *         - If the target path cannot be used.
+	 */
+	public function moveTo($targetPath): void
+	{
+		if (UPLOAD_ERR_OK <> $this->errorCode) {
+			throw new RuntimeException(sprintf(
+				'Uploaded file cannot be moved due to the error #%d (%s)',
+				$this->errorCode,
+				$this->errorMessage
+			));
+		}
+
+		if (!isset($this->stream)) {
+			throw new RuntimeException(
+				'Uploaded file cannot be moved because it was already moved'
+			);
+		}
+
+		if (!$this->stream->isReadable()) {
+			throw new RuntimeException(
+				'Uploaded file cannot be moved because it is not readable'
+			);
+		}
+
+		$targetDir = dirname($targetPath);
+		if (!is_dir($targetDir) || !is_writable($targetDir)) {
+			throw new RuntimeException(sprintf(
+				'Uploaded file cannot be moved because the directory "%s" is not writable',
+				$targetDir
+			));
+		}
+
+		$targetStream = new FileStream($targetPath, 'wb');
+
+		if ($this->stream->isSeekable()) {
+			$this->stream->rewind();
+		}
+
+		while (!$this->stream->eof()) {
+			$targetStream->write(
+				$this->stream->read(4096)
+			);
+		}
+
+		$targetStream->close();
+
+		/** @var string|null */
+		$sourcePath = $this->stream->getMetadata('uri');
+
+		$this->stream->close();
+		$this->stream = null;
+
+		if (isset($sourcePath) && is_file($sourcePath)) {
+			$sourceDir = dirname($sourcePath);
+			if (is_writable($sourceDir)) {
+				unlink($sourcePath);
+			}
+		}
+	}
+
+	/**
+	 * Gets the file size
+	 *
+	 * @return int|null
+	 */
+	public function getSize(): ?int
+	{
+		return $this->size;
+	}
+
+	/**
+	 * Gets the file's error code
+	 *
+	 * @return int
+	 */
+	public function getError(): int
+	{
+		return $this->errorCode;
+	}
+
+	/**
+	 * Gets the client's file name
+	 *
+	 * @return string|null
+	 */
+	public function getClientFilename(): ?string
+	{
+		return $this->clientFilename;
+	}
+
+	/**
+	 * Gets the client's file media type
+	 *
+	 * @return string|null
+	 */
+	public function getClientMediaType(): ?string
+	{
+		return $this->clientMediaType;
+	}
 }

src/Entity/IpAddress.php

Indentation +103 added lines, -103 removed lines

@@ -31,107 +31,107 @@
 final class IpAddress
 {
 
-    /**
-     * The IP address value
-     *
-     * @var string
-     */
-    private string $value;
-
-    /**
-     * The list of proxies in front of this IP address
-     *
-     * @var list<string>
-     */
-    private array $proxies;
-
-    /**
-     * Constructor of the class
-     *
-     * @param string $value
-     * @param list<string> $proxies
-     */
-    public function __construct(string $value, array $proxies = [])
-    {
-        $this->value = $value;
-        $this->proxies = $proxies;
-    }
-
-    /**
-     * Gets the IP address value
-     *
-     * @return string
-     */
-    public function getValue(): string
-    {
-        return $this->value;
-    }
-
-    /**
-     * Gets the list of proxies in front of this IP address
-     *
-     * @return list<string>
-     */
-    public function getProxies(): array
-    {
-        return $this->proxies;
-    }
-
-    /**
-     * Checks if the IP address is valid
-     *
-     * @return bool
-     */
-    public function isValid(): bool
-    {
-        return false !== filter_var($this->value, FILTER_VALIDATE_IP);
-    }
-
-    /**
-     * Checks if the IP address is IPv4
-     *
-     * @return bool
-     */
-    public function isVersion4(): bool
-    {
-        return false !== filter_var($this->value, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4);
-    }
-
-    /**
-     * Checks if the IP address is IPv6
-     *
-     * @return bool
-     */
-    public function isVersion6(): bool
-    {
-        return false !== filter_var($this->value, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6);
-    }
-
-    /**
-     * Checks if the IP address is in the private range
-     *
-     * @return bool
-     */
-    public function isInPrivateRange(): bool
-    {
-        if (!$this->isValid()) {
-            return false;
-        }
-
-        return false === filter_var($this->value, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE);
-    }
-
-    /**
-     * Checks if the IP address is in the reserved range
-     *
-     * @return bool
-     */
-    public function isInReservedRange(): bool
-    {
-        if (!$this->isValid()) {
-            return false;
-        }
-
-        return false === filter_var($this->value, FILTER_VALIDATE_IP, FILTER_FLAG_NO_RES_RANGE);
-    }
+	/**
+	 * The IP address value
+	 *
+	 * @var string
+	 */
+	private string $value;
+
+	/**
+	 * The list of proxies in front of this IP address
+	 *
+	 * @var list<string>
+	 */
+	private array $proxies;
+
+	/**
+	 * Constructor of the class
+	 *
+	 * @param string $value
+	 * @param list<string> $proxies
+	 */
+	public function __construct(string $value, array $proxies = [])
+	{
+		$this->value = $value;
+		$this->proxies = $proxies;
+	}
+
+	/**
+	 * Gets the IP address value
+	 *
+	 * @return string
+	 */
+	public function getValue(): string
+	{
+		return $this->value;
+	}
+
+	/**
+	 * Gets the list of proxies in front of this IP address
+	 *
+	 * @return list<string>
+	 */
+	public function getProxies(): array
+	{
+		return $this->proxies;
+	}
+
+	/**
+	 * Checks if the IP address is valid
+	 *
+	 * @return bool
+	 */
+	public function isValid(): bool
+	{
+		return false !== filter_var($this->value, FILTER_VALIDATE_IP);
+	}
+
+	/**
+	 * Checks if the IP address is IPv4
+	 *
+	 * @return bool
+	 */
+	public function isVersion4(): bool
+	{
+		return false !== filter_var($this->value, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4);
+	}
+
+	/**
+	 * Checks if the IP address is IPv6
+	 *
+	 * @return bool
+	 */
+	public function isVersion6(): bool
+	{
+		return false !== filter_var($this->value, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6);
+	}
+
+	/**
+	 * Checks if the IP address is in the private range
+	 *
+	 * @return bool
+	 */
+	public function isInPrivateRange(): bool
+	{
+		if (!$this->isValid()) {
+			return false;
+		}
+
+		return false === filter_var($this->value, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE);
+	}
+
+	/**
+	 * Checks if the IP address is in the reserved range
+	 *
+	 * @return bool
+	 */
+	public function isInReservedRange(): bool
+	{
+		if (!$this->isValid()) {
+			return false;
+		}
+
+		return false === filter_var($this->value, FILTER_VALIDATE_IP, FILTER_FLAG_NO_RES_RANGE);
+	}
 }

src/Request.php

Indentation +297 added lines, -297 removed lines

@@ -36,301 +36,301 @@
 class Request extends Message implements RequestInterface, RequestMethodInterface
 {
 
-    /**
-     * Regular Expression for a request target validation
-     *
-     * @link https://tools.ietf.org/html/rfc7230#section-5.3
-     *
-     * @var string
-     */
-    public const RFC7230_VALID_REQUEST_TARGET = '/^[\x21-\x7E\x80-\xFF]+$/';
-
-    /**
-     * Default request method
-     *
-     * @var string
-     */
-    public const DEFAULT_METHOD = self::METHOD_GET;
-
-    /**
-     * Default request URI
-     *
-     * @var string
-     */
-    public const DEFAULT_URI = '/';
-
-    /**
-     * The request method (aka verb)
-     *
-     * @var string
-     */
-    private string $method = self::DEFAULT_METHOD;
-
-    /**
-     * 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 ?? self::DEFAULT_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(Header::RFC7230_VALID_TOKEN, $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_VALID_REQUEST_TARGET, $requestTarget)) {
-            throw new InvalidArgumentException('Invalid HTTP request target');
-        }
-    }
+	/**
+	 * Regular Expression for a request target validation
+	 *
+	 * @link https://tools.ietf.org/html/rfc7230#section-5.3
+	 *
+	 * @var string
+	 */
+	public const RFC7230_VALID_REQUEST_TARGET = '/^[\x21-\x7E\x80-\xFF]+$/';
+
+	/**
+	 * Default request method
+	 *
+	 * @var string
+	 */
+	public const DEFAULT_METHOD = self::METHOD_GET;
+
+	/**
+	 * Default request URI
+	 *
+	 * @var string
+	 */
+	public const DEFAULT_URI = '/';
+
+	/**
+	 * The request method (aka verb)
+	 *
+	 * @var string
+	 */
+	private string $method = self::DEFAULT_METHOD;
+
+	/**
+	 * 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 ?? self::DEFAULT_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(Header::RFC7230_VALID_TOKEN, $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_VALID_REQUEST_TARGET, $requestTarget)) {
+			throw new InvalidArgumentException('Invalid HTTP request target');
+		}
+	}
 }

src/Uri/Component/UserInfo.php

Indentation +38 added lines, -38 removed lines

@@ -19,48 +19,48 @@
 final class UserInfo implements ComponentInterface
 {
 
-    /**
-     * URI component "user"
-     *
-     * @var User
-     */
-    private User $user;
+	/**
+	 * URI component "user"
+	 *
+	 * @var User
+	 */
+	private User $user;
 
-    /**
-     * URI component "password"
-     *
-     * @var Password|null
-     */
-    private ?Password $password = null;
+	/**
+	 * URI component "password"
+	 *
+	 * @var Password|null
+	 */
+	private ?Password $password = null;
 
-    /**
-     * Constructor of the class
-     *
-     * @param mixed $user
-     * @param mixed $password
-     */
-    public function __construct($user, $password = null)
-    {
-        $this->user = User::create($user);
+	/**
+	 * Constructor of the class
+	 *
+	 * @param mixed $user
+	 * @param mixed $password
+	 */
+	public function __construct($user, $password = null)
+	{
+		$this->user = User::create($user);
 
-        if (isset($password)) {
-            $this->password = Password::create($password);
-        }
-    }
+		if (isset($password)) {
+			$this->password = Password::create($password);
+		}
+	}
 
-    /**
-     * {@inheritdoc}
-     *
-     * @return string
-     */
-    public function getValue(): string
-    {
-        $value = $this->user->getValue();
+	/**
+	 * {@inheritdoc}
+	 *
+	 * @return string
+	 */
+	public function getValue(): string
+	{
+		$value = $this->user->getValue();
 
-        if (isset($this->password)) {
-            $value .= ':' . $this->password->getValue();
-        }
+		if (isset($this->password)) {
+			$value .= ':' . $this->password->getValue();
+		}
 
-        return $value;
-    }
+		return $value;
+	}
 }

src/Uri/Component/User.php

Indentation +58 added lines, -58 removed lines

@@ -31,70 +31,70 @@
 final class User implements ComponentInterface
 {
 
-    /**
-     * Regular expression to normalize the component value
-     *
-     * @var string
-     */
-    private const NORMALIZE_REGEX = '/(?:(?:%[0-9A-Fa-f]{2}|[0-9A-Za-z\-\._~\!\$&\'\(\)\*\+,;\=]+)|(.?))/u';
+	/**
+	 * Regular expression to normalize the component value
+	 *
+	 * @var string
+	 */
+	private const NORMALIZE_REGEX = '/(?:(?:%[0-9A-Fa-f]{2}|[0-9A-Za-z\-\._~\!\$&\'\(\)\*\+,;\=]+)|(.?))/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 InvalidUriComponentException
-     *         If the component isn't valid.
-     */
-    public function __construct($value)
-    {
-        if ($value === '') {
-            return;
-        }
+	/**
+	 * Constructor of the class
+	 *
+	 * @param mixed $value
+	 *
+	 * @throws InvalidUriComponentException
+	 *         If the component isn't valid.
+	 */
+	public function __construct($value)
+	{
+		if ($value === '') {
+			return;
+		}
 
-        if (!is_string($value)) {
-            throw new InvalidUriComponentException('URI component "user" must be a string');
-        }
+		if (!is_string($value)) {
+			throw new InvalidUriComponentException('URI component "user" must be a string');
+		}
 
-        $this->value = preg_replace_callback(self::NORMALIZE_REGEX, function (array $match): string {
-            /** @var array{0: string, 1?: string} $match */
+		$this->value = preg_replace_callback(self::NORMALIZE_REGEX, 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 InvalidUriComponentException
-     */
-    public static function create($user): User
-    {
-        if ($user instanceof User) {
-            return $user;
-        }
+	/**
+	 * Creates a user component
+	 *
+	 * @param mixed $user
+	 *
+	 * @return User
+	 *
+	 * @throws InvalidUriComponentException
+	 */
+	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;
+	}
 }

src/Uri/Component/Password.php

Indentation +58 added lines, -58 removed lines

@@ -31,70 +31,70 @@
 final class Password implements ComponentInterface
 {
 
-    /**
-     * Regular expression to normalize the component value
-     *
-     * @var string
-     */
-    private const NORMALIZE_REGEX = '/(?:(?:%[0-9A-Fa-f]{2}|[0-9A-Za-z\-\._~\!\$&\'\(\)\*\+,;\=]+)|(.?))/u';
+	/**
+	 * Regular expression to normalize the component value
+	 *
+	 * @var string
+	 */
+	private const NORMALIZE_REGEX = '/(?:(?:%[0-9A-Fa-f]{2}|[0-9A-Za-z\-\._~\!\$&\'\(\)\*\+,;\=]+)|(.?))/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 InvalidUriComponentException
-     *         If the component isn't valid.
-     */
-    public function __construct($value)
-    {
-        if ($value === '') {
-            return;
-        }
+	/**
+	 * Constructor of the class
+	 *
+	 * @param mixed $value
+	 *
+	 * @throws InvalidUriComponentException
+	 *         If the component isn't valid.
+	 */
+	public function __construct($value)
+	{
+		if ($value === '') {
+			return;
+		}
 
-        if (!is_string($value)) {
-            throw new InvalidUriComponentException('URI component "password" must be a string');
-        }
+		if (!is_string($value)) {
+			throw new InvalidUriComponentException('URI component "password" must be a string');
+		}
 
-        $this->value = preg_replace_callback(self::NORMALIZE_REGEX, function (array $match): string {
-            /** @var array{0: string, 1?: string} $match */
+		$this->value = preg_replace_callback(self::NORMALIZE_REGEX, 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 InvalidUriComponentException
-     */
-    public static function create($password): Password
-    {
-        if ($password instanceof Password) {
-            return $password;
-        }
+	/**
+	 * Creates a password component
+	 *
+	 * @param mixed $password
+	 *
+	 * @return Password
+	 *
+	 * @throws InvalidUriComponentException
+	 */
+	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;
+	}
 }