sunrise-php / http-message

src/Uri/Component/Scheme.php

Indentation +36 added lines, -36 removed lines

@@ -22,40 +22,40 @@
  */
 final class Scheme implements ComponentInterface
 {
-    private const VALIDATION_REGEX = '/^(?:[A-Za-z][0-9A-Za-z\x2b\x2d\x2e]*)?$/';
-
-    private string $value = '';
-
-    /**
-     * @param mixed $value
-     *
-     * @throws InvalidArgumentException
-     */
-    public function __construct($value)
-    {
-        if ($value === '') {
-            return;
-        }
-
-        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"');
-        }
-
-        // the component is case-insensitive...
-        $this->value = strtolower($value);
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @return string
-     */
-    public function getValue(): string
-    {
-        return $this->value;
-    }
+	private const VALIDATION_REGEX = '/^(?:[A-Za-z][0-9A-Za-z\x2b\x2d\x2e]*)?$/';
+
+	private string $value = '';
+
+	/**
+	 * @param mixed $value
+	 *
+	 * @throws InvalidArgumentException
+	 */
+	public function __construct($value)
+	{
+		if ($value === '') {
+			return;
+		}
+
+		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"');
+		}
+
+		// the component is case-insensitive...
+		$this->value = strtolower($value);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 *
+	 * @return string
+	 */
+	public function getValue(): string
+	{
+		return $this->value;
+	}
 }

src/HeaderInterface.php

Indentation +7 added lines, -7 removed lines

@@ -18,17 +18,17 @@
  */
 interface HeaderInterface extends IteratorAggregate
 {
-    public const RFC822_DATE_FORMAT = 'D, d M y H:i:s O';
+	public const RFC822_DATE_FORMAT = 'D, d M y H:i:s O';
 
-    public const RFC7230_TOKEN_REGEX = '/^[\x21\x23-\x27\x2A\x2B\x2D\x2E\x30-\x39\x41-\x5A\x5E-\x7A\x7C\x7E]+$/';
+	public const RFC7230_TOKEN_REGEX = '/^[\x21\x23-\x27\x2A\x2B\x2D\x2E\x30-\x39\x41-\x5A\x5E-\x7A\x7C\x7E]+$/';
 
-    public const RFC7230_FIELD_VALUE_REGEX = '/^[\x09\x20-\x7E\x80-\xFF]*$/';
+	public const RFC7230_FIELD_VALUE_REGEX = '/^[\x09\x20-\x7E\x80-\xFF]*$/';
 
-    public const RFC7230_QUOTED_STRING_REGEX = '/^(?:[\x5C][\x22]|[\x09\x20\x21\x23-\x5B\x5D-\x7E\x80-\xFF])*$/';
+	public const RFC7230_QUOTED_STRING_REGEX = '/^(?:[\x5C][\x22]|[\x09\x20\x21\x23-\x5B\x5D-\x7E\x80-\xFF])*$/';
 
-    public function getFieldName(): string;
+	public function getFieldName(): string;
 
-    public function getFieldValue(): string;
+	public function getFieldValue(): string;
 
-    public function __toString(): string;
+	public function __toString(): string;
 }

src/Response.php

Indentation +194 added lines, -194 removed lines

@@ -22,198 +22,198 @@
 
 class Response extends Message implements ResponseInterface, StatusCodeInterface
 {
-    /**
-     * List of Reason Phrases
-     *
-     * @link http://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml
-     *
-     * @var array<int<100, 599>, non-empty-string>
-     */
-    public const REASON_PHRASES = [
-        // 1xx
-        100 => 'Continue',
-        101 => 'Switching Protocols',
-        102 => 'Processing',
-        103 => 'Early Hints',
-        // 2xx
-        200 => 'OK',
-        201 => 'Created',
-        202 => 'Accepted',
-        203 => 'Non-Authoritative Information',
-        204 => 'No Content',
-        205 => 'Reset Content',
-        206 => 'Partial Content',
-        207 => 'Multi-Status',
-        208 => 'Already Reported',
-        226 => 'IM Used',
-        // 3xx
-        300 => 'Multiple Choices',
-        301 => 'Moved Permanently',
-        302 => 'Found',
-        303 => 'See Other',
-        304 => 'Not Modified',
-        305 => 'Use Proxy',
-        307 => 'Temporary Redirect',
-        308 => 'Permanent Redirect',
-        // 4xx
-        400 => 'Bad Request',
-        401 => 'Unauthorized',
-        402 => 'Payment Required',
-        403 => 'Forbidden',
-        404 => 'Not Found',
-        405 => 'Method Not Allowed',
-        406 => 'Not Acceptable',
-        407 => 'Proxy Authentication Required',
-        408 => 'Request Timeout',
-        409 => 'Conflict',
-        410 => 'Gone',
-        411 => 'Length Required',
-        412 => 'Precondition Failed',
-        413 => 'Payload Too Large',
-        414 => 'URI Too Long',
-        415 => 'Unsupported Media Type',
-        416 => 'Range Not Satisfiable',
-        417 => 'Expectation Failed',
-        421 => 'Misdirected Request',
-        422 => 'Unprocessable Entity',
-        423 => 'Locked',
-        424 => 'Failed Dependency',
-        425 => 'Too Early',
-        426 => 'Upgrade Required',
-        428 => 'Precondition Required',
-        429 => 'Too Many Requests',
-        431 => 'Request Header Fields Too Large',
-        451 => 'Unavailable For Legal Reasons',
-        // 5xx
-        500 => 'Internal Server Error',
-        501 => 'Not Implemented',
-        502 => 'Bad Gateway',
-        503 => 'Service Unavailable',
-        504 => 'Gateway Timeout',
-        505 => 'HTTP Version Not Supported',
-        506 => 'Variant Also Negotiates',
-        507 => 'Insufficient Storage',
-        508 => 'Loop Detected',
-        510 => 'Not Extended',
-        511 => 'Network Authentication Required',
-    ];
-
-    private int $statusCode = self::STATUS_OK;
-    private string $reasonPhrase = self::REASON_PHRASES[self::STATUS_OK];
-
-    /**
-     * @param array<string, string|string[]>|null $headers
-     *
-     * @throws InvalidArgumentException
-     */
-    public function __construct(
-        ?int $statusCode = null,
-        ?string $reasonPhrase = null,
-        ?array $headers = null,
-        ?StreamInterface $body = null
-    ) {
-        if ($statusCode !== null) {
-            $this->setStatus($statusCode, $reasonPhrase ?? '');
-        }
-
-        if ($headers !== null) {
-            $this->setHeaders($headers);
-        }
-
-        if ($body !== null) {
-            $this->setBody($body);
-        }
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function getStatusCode(): int
-    {
-        return $this->statusCode;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function getReasonPhrase(): string
-    {
-        return $this->reasonPhrase;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function withStatus($code, $reasonPhrase = ''): ResponseInterface
-    {
-        $clone = clone $this;
-        $clone->setStatus($code, $reasonPhrase);
-
-        return $clone;
-    }
-
-    /**
-     * Sets the given status code to the response
-     *
-     * @param int $statusCode
-     * @param string $reasonPhrase
-     *
-     * @throws InvalidArgumentException
-     */
-    final protected function setStatus($statusCode, $reasonPhrase): void
-    {
-        $this->validateStatusCode($statusCode);
-        $this->validateReasonPhrase($reasonPhrase);
-
-        if ($reasonPhrase === '') {
-            $reasonPhrase = self::REASON_PHRASES[$statusCode] ?? 'Unknown Status Code';
-        }
-
-        $this->statusCode = $statusCode;
-        $this->reasonPhrase = $reasonPhrase;
-    }
-
-    /**
-     * Validates the given status code
-     *
-     * @link https://tools.ietf.org/html/rfc7230#section-3.1.2
-     *
-     * @param mixed $statusCode
-     *
-     * @throws InvalidArgumentException
-     */
-    private function validateStatusCode($statusCode): void
-    {
-        if (!is_int($statusCode)) {
-            throw new InvalidArgumentException('HTTP status code must be an integer');
-        }
-
-        if (!($statusCode >= 100 && $statusCode <= 599)) {
-            throw new InvalidArgumentException('Invalid HTTP status code');
-        }
-    }
-
-    /**
-     * Validates the given reason phrase
-     *
-     * @link https://tools.ietf.org/html/rfc7230#section-3.1.2
-     *
-     * @param mixed $reasonPhrase
-     *
-     * @throws InvalidArgumentException
-     */
-    private function validateReasonPhrase($reasonPhrase): void
-    {
-        if ($reasonPhrase === '') {
-            return;
-        }
-
-        if (!is_string($reasonPhrase)) {
-            throw new InvalidArgumentException('HTTP reason phrase must be a string');
-        }
-
-        if (!preg_match(HeaderInterface::RFC7230_FIELD_VALUE_REGEX, $reasonPhrase)) {
-            throw new InvalidArgumentException('Invalid HTTP reason phrase');
-        }
-    }
+	/**
+	 * List of Reason Phrases
+	 *
+	 * @link http://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml
+	 *
+	 * @var array<int<100, 599>, non-empty-string>
+	 */
+	public const REASON_PHRASES = [
+		// 1xx
+		100 => 'Continue',
+		101 => 'Switching Protocols',
+		102 => 'Processing',
+		103 => 'Early Hints',
+		// 2xx
+		200 => 'OK',
+		201 => 'Created',
+		202 => 'Accepted',
+		203 => 'Non-Authoritative Information',
+		204 => 'No Content',
+		205 => 'Reset Content',
+		206 => 'Partial Content',
+		207 => 'Multi-Status',
+		208 => 'Already Reported',
+		226 => 'IM Used',
+		// 3xx
+		300 => 'Multiple Choices',
+		301 => 'Moved Permanently',
+		302 => 'Found',
+		303 => 'See Other',
+		304 => 'Not Modified',
+		305 => 'Use Proxy',
+		307 => 'Temporary Redirect',
+		308 => 'Permanent Redirect',
+		// 4xx
+		400 => 'Bad Request',
+		401 => 'Unauthorized',
+		402 => 'Payment Required',
+		403 => 'Forbidden',
+		404 => 'Not Found',
+		405 => 'Method Not Allowed',
+		406 => 'Not Acceptable',
+		407 => 'Proxy Authentication Required',
+		408 => 'Request Timeout',
+		409 => 'Conflict',
+		410 => 'Gone',
+		411 => 'Length Required',
+		412 => 'Precondition Failed',
+		413 => 'Payload Too Large',
+		414 => 'URI Too Long',
+		415 => 'Unsupported Media Type',
+		416 => 'Range Not Satisfiable',
+		417 => 'Expectation Failed',
+		421 => 'Misdirected Request',
+		422 => 'Unprocessable Entity',
+		423 => 'Locked',
+		424 => 'Failed Dependency',
+		425 => 'Too Early',
+		426 => 'Upgrade Required',
+		428 => 'Precondition Required',
+		429 => 'Too Many Requests',
+		431 => 'Request Header Fields Too Large',
+		451 => 'Unavailable For Legal Reasons',
+		// 5xx
+		500 => 'Internal Server Error',
+		501 => 'Not Implemented',
+		502 => 'Bad Gateway',
+		503 => 'Service Unavailable',
+		504 => 'Gateway Timeout',
+		505 => 'HTTP Version Not Supported',
+		506 => 'Variant Also Negotiates',
+		507 => 'Insufficient Storage',
+		508 => 'Loop Detected',
+		510 => 'Not Extended',
+		511 => 'Network Authentication Required',
+	];
+
+	private int $statusCode = self::STATUS_OK;
+	private string $reasonPhrase = self::REASON_PHRASES[self::STATUS_OK];
+
+	/**
+	 * @param array<string, string|string[]>|null $headers
+	 *
+	 * @throws InvalidArgumentException
+	 */
+	public function __construct(
+		?int $statusCode = null,
+		?string $reasonPhrase = null,
+		?array $headers = null,
+		?StreamInterface $body = null
+	) {
+		if ($statusCode !== null) {
+			$this->setStatus($statusCode, $reasonPhrase ?? '');
+		}
+
+		if ($headers !== null) {
+			$this->setHeaders($headers);
+		}
+
+		if ($body !== null) {
+			$this->setBody($body);
+		}
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function getStatusCode(): int
+	{
+		return $this->statusCode;
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function getReasonPhrase(): string
+	{
+		return $this->reasonPhrase;
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function withStatus($code, $reasonPhrase = ''): ResponseInterface
+	{
+		$clone = clone $this;
+		$clone->setStatus($code, $reasonPhrase);
+
+		return $clone;
+	}
+
+	/**
+	 * Sets the given status code to the response
+	 *
+	 * @param int $statusCode
+	 * @param string $reasonPhrase
+	 *
+	 * @throws InvalidArgumentException
+	 */
+	final protected function setStatus($statusCode, $reasonPhrase): void
+	{
+		$this->validateStatusCode($statusCode);
+		$this->validateReasonPhrase($reasonPhrase);
+
+		if ($reasonPhrase === '') {
+			$reasonPhrase = self::REASON_PHRASES[$statusCode] ?? 'Unknown Status Code';
+		}
+
+		$this->statusCode = $statusCode;
+		$this->reasonPhrase = $reasonPhrase;
+	}
+
+	/**
+	 * Validates the given status code
+	 *
+	 * @link https://tools.ietf.org/html/rfc7230#section-3.1.2
+	 *
+	 * @param mixed $statusCode
+	 *
+	 * @throws InvalidArgumentException
+	 */
+	private function validateStatusCode($statusCode): void
+	{
+		if (!is_int($statusCode)) {
+			throw new InvalidArgumentException('HTTP status code must be an integer');
+		}
+
+		if (!($statusCode >= 100 && $statusCode <= 599)) {
+			throw new InvalidArgumentException('Invalid HTTP status code');
+		}
+	}
+
+	/**
+	 * Validates the given reason phrase
+	 *
+	 * @link https://tools.ietf.org/html/rfc7230#section-3.1.2
+	 *
+	 * @param mixed $reasonPhrase
+	 *
+	 * @throws InvalidArgumentException
+	 */
+	private function validateReasonPhrase($reasonPhrase): void
+	{
+		if ($reasonPhrase === '') {
+			return;
+		}
+
+		if (!is_string($reasonPhrase)) {
+			throw new InvalidArgumentException('HTTP reason phrase must be a string');
+		}
+
+		if (!preg_match(HeaderInterface::RFC7230_FIELD_VALUE_REGEX, $reasonPhrase)) {
+			throw new InvalidArgumentException('Invalid HTTP reason phrase');
+		}
+	}
 }

src/Response/HtmlResponse.php

Indentation +38 added lines, -38 removed lines

@@ -22,42 +22,42 @@
 
 final class HtmlResponse extends Response
 {
-    /**
-     * @param mixed $html
-     *
-     * @throws InvalidArgumentException
-     */
-    public function __construct(int $statusCode, $html)
-    {
-        parent::__construct($statusCode);
-
-        $this->setBody(self::createBody($html));
-        $this->setHeader('Content-Type', 'text/html; charset=utf-8');
-    }
-
-    /**
-     * @param mixed $html
-     *
-     * @throws InvalidArgumentException
-     */
-    private static function createBody($html): StreamInterface
-    {
-        if ($html instanceof StreamInterface) {
-            return $html;
-        }
-
-        if (is_object($html) && method_exists($html, '__toString')) {
-            $html = (string) $html;
-        }
-
-        if (!is_string($html)) {
-            throw new InvalidArgumentException('Unable to create the HTML response due to a unexpected HTML type');
-        }
-
-        $stream = new PhpTempStream('r+b');
-        $stream->write($html);
-        $stream->rewind();
-
-        return $stream;
-    }
+	/**
+	 * @param mixed $html
+	 *
+	 * @throws InvalidArgumentException
+	 */
+	public function __construct(int $statusCode, $html)
+	{
+		parent::__construct($statusCode);
+
+		$this->setBody(self::createBody($html));
+		$this->setHeader('Content-Type', 'text/html; charset=utf-8');
+	}
+
+	/**
+	 * @param mixed $html
+	 *
+	 * @throws InvalidArgumentException
+	 */
+	private static function createBody($html): StreamInterface
+	{
+		if ($html instanceof StreamInterface) {
+			return $html;
+		}
+
+		if (is_object($html) && method_exists($html, '__toString')) {
+			$html = (string) $html;
+		}
+
+		if (!is_string($html)) {
+			throw new InvalidArgumentException('Unable to create the HTML response due to a unexpected HTML type');
+		}
+
+		$stream = new PhpTempStream('r+b');
+		$stream->write($html);
+		$stream->rewind();
+
+		return $stream;
+	}
 }

src/Message.php

Indentation +292 added lines, -292 removed lines

@@ -24,296 +24,296 @@
 
 abstract class Message implements MessageInterface
 {
-    /**
-     * @deprecated 3.2.0
-     */
-    public const ALLOWED_HTTP_VERSIONS = ['1.0', '1.1', '2.0', '2'];
-
-    public const HTTP_VERSION_REGEX = '/^[0-9](?:[.][0-9])?$/';
-    public const DEFAULT_HTTP_VERSION = '1.1';
-
-    private string $protocolVersion = self::DEFAULT_HTTP_VERSION;
-
-    /**
-     * @var array<string, list<string>>
-     */
-    private array $headers = [];
-
-    /**
-     * @var array<string, string>
-     */
-    private array $headerNames = [];
-
-    private ?StreamInterface $body = null;
-
-    /**
-     * @inheritDoc
-     */
-    public function getProtocolVersion(): string
-    {
-        return $this->protocolVersion;
-    }
-
-    /**
-     * @inheritDoc
-     *
-     * @throws InvalidArgumentException
-     */
-    public function withProtocolVersion($version): MessageInterface
-    {
-        $clone = clone $this;
-        $clone->setProtocolVersion($version);
-
-        return $clone;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function getHeaders(): array
-    {
-        return $this->headers;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function hasHeader($name): bool
-    {
-        $key = strtolower($name);
-
-        return isset($this->headerNames[$key]);
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function getHeader($name): array
-    {
-        $key = strtolower($name);
-
-        if (!isset($this->headerNames[$key])) {
-            return [];
-        }
-
-        return $this->headers[$this->headerNames[$key]];
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function getHeaderLine($name): string
-    {
-        $key = strtolower($name);
-
-        if (!isset($this->headerNames[$key])) {
-            return '';
-        }
-
-        return implode(',', $this->headers[$this->headerNames[$key]]);
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function withHeader($name, $value): MessageInterface
-    {
-        $clone = clone $this;
-        $clone->setHeader($name, $value, true);
-
-        return $clone;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function withAddedHeader($name, $value): MessageInterface
-    {
-        $clone = clone $this;
-        $clone->setHeader($name, $value, false);
-
-        return $clone;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function withoutHeader($name): MessageInterface
-    {
-        $clone = clone $this;
-        $clone->deleteHeader($name);
-
-        return $clone;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function getBody(): StreamInterface
-    {
-        return $this->body ??= new PhpTempStream();
-    }
-
-    /**
-     * @inheritDoc
-     */
-    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
-     *
-     * @throws InvalidArgumentException
-     */
-    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
-     *
-     * @throws InvalidArgumentException
-     */
-    final protected function setHeader($name, $value, bool $replace = true): void
-    {
-        if (!is_array($value)) {
-            $value = [$value];
-        }
-
-        $this->validateHeaderName($name);
-        $this->validateHeaderValue($name, $value);
-
-        $replace and $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
-     *
-     * @throws InvalidArgumentException
-     */
-    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
-     */
-    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
-     */
-    final protected function setBody(StreamInterface $body): void
-    {
-        $this->body = $body;
-    }
-
-    /**
-     * Validates the given HTTP version
-     *
-     * @param mixed $protocolVersion
-     *
-     * @throws InvalidArgumentException
-     */
-    private function validateProtocolVersion($protocolVersion): void
-    {
-        if ($protocolVersion === '') {
-            throw new InvalidArgumentException('HTTP version cannot be an empty');
-        }
-
-        if (!is_string($protocolVersion)) {
-            throw new InvalidArgumentException('HTTP version must be a string');
-        }
-
-        if (!preg_match(self::HTTP_VERSION_REGEX, $protocolVersion)) {
-            throw new InvalidArgumentException('HTTP version is invalid');
-        }
-    }
-
-    /**
-     * Validates the given header name
-     *
-     * @param mixed $name
-     *
-     * @throws InvalidArgumentException
-     */
-    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 array<array-key, mixed> $value
-     *
-     * @throws InvalidArgumentException
-     */
-    private function validateHeaderValue(string $name, array $value): void
-    {
-        if ($value === []) {
-            throw new InvalidArgumentException("The value of the HTTP header $name cannot be an empty array");
-        }
-
-        foreach ($value as $key => $item) {
-            if ($item === '') {
-                continue;
-            }
-
-            if (!is_string($item)) {
-                throw new InvalidArgumentException("The value of the HTTP header $name:$key must be a string");
-            }
-
-            if (!preg_match(HeaderInterface::RFC7230_FIELD_VALUE_REGEX, $item)) {
-                throw new InvalidArgumentException("The value of the HTTP header $name:$key is invalid");
-            }
-        }
-    }
+	/**
+	 * @deprecated 3.2.0
+	 */
+	public const ALLOWED_HTTP_VERSIONS = ['1.0', '1.1', '2.0', '2'];
+
+	public const HTTP_VERSION_REGEX = '/^[0-9](?:[.][0-9])?$/';
+	public const DEFAULT_HTTP_VERSION = '1.1';
+
+	private string $protocolVersion = self::DEFAULT_HTTP_VERSION;
+
+	/**
+	 * @var array<string, list<string>>
+	 */
+	private array $headers = [];
+
+	/**
+	 * @var array<string, string>
+	 */
+	private array $headerNames = [];
+
+	private ?StreamInterface $body = null;
+
+	/**
+	 * @inheritDoc
+	 */
+	public function getProtocolVersion(): string
+	{
+		return $this->protocolVersion;
+	}
+
+	/**
+	 * @inheritDoc
+	 *
+	 * @throws InvalidArgumentException
+	 */
+	public function withProtocolVersion($version): MessageInterface
+	{
+		$clone = clone $this;
+		$clone->setProtocolVersion($version);
+
+		return $clone;
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function getHeaders(): array
+	{
+		return $this->headers;
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function hasHeader($name): bool
+	{
+		$key = strtolower($name);
+
+		return isset($this->headerNames[$key]);
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function getHeader($name): array
+	{
+		$key = strtolower($name);
+
+		if (!isset($this->headerNames[$key])) {
+			return [];
+		}
+
+		return $this->headers[$this->headerNames[$key]];
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function getHeaderLine($name): string
+	{
+		$key = strtolower($name);
+
+		if (!isset($this->headerNames[$key])) {
+			return '';
+		}
+
+		return implode(',', $this->headers[$this->headerNames[$key]]);
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function withHeader($name, $value): MessageInterface
+	{
+		$clone = clone $this;
+		$clone->setHeader($name, $value, true);
+
+		return $clone;
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function withAddedHeader($name, $value): MessageInterface
+	{
+		$clone = clone $this;
+		$clone->setHeader($name, $value, false);
+
+		return $clone;
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function withoutHeader($name): MessageInterface
+	{
+		$clone = clone $this;
+		$clone->deleteHeader($name);
+
+		return $clone;
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function getBody(): StreamInterface
+	{
+		return $this->body ??= new PhpTempStream();
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	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
+	 *
+	 * @throws InvalidArgumentException
+	 */
+	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
+	 *
+	 * @throws InvalidArgumentException
+	 */
+	final protected function setHeader($name, $value, bool $replace = true): void
+	{
+		if (!is_array($value)) {
+			$value = [$value];
+		}
+
+		$this->validateHeaderName($name);
+		$this->validateHeaderValue($name, $value);
+
+		$replace and $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
+	 *
+	 * @throws InvalidArgumentException
+	 */
+	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
+	 */
+	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
+	 */
+	final protected function setBody(StreamInterface $body): void
+	{
+		$this->body = $body;
+	}
+
+	/**
+	 * Validates the given HTTP version
+	 *
+	 * @param mixed $protocolVersion
+	 *
+	 * @throws InvalidArgumentException
+	 */
+	private function validateProtocolVersion($protocolVersion): void
+	{
+		if ($protocolVersion === '') {
+			throw new InvalidArgumentException('HTTP version cannot be an empty');
+		}
+
+		if (!is_string($protocolVersion)) {
+			throw new InvalidArgumentException('HTTP version must be a string');
+		}
+
+		if (!preg_match(self::HTTP_VERSION_REGEX, $protocolVersion)) {
+			throw new InvalidArgumentException('HTTP version is invalid');
+		}
+	}
+
+	/**
+	 * Validates the given header name
+	 *
+	 * @param mixed $name
+	 *
+	 * @throws InvalidArgumentException
+	 */
+	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 array<array-key, mixed> $value
+	 *
+	 * @throws InvalidArgumentException
+	 */
+	private function validateHeaderValue(string $name, array $value): void
+	{
+		if ($value === []) {
+			throw new InvalidArgumentException("The value of the HTTP header $name cannot be an empty array");
+		}
+
+		foreach ($value as $key => $item) {
+			if ($item === '') {
+				continue;
+			}
+
+			if (!is_string($item)) {
+				throw new InvalidArgumentException("The value of the HTTP header $name:$key must be a string");
+			}
+
+			if (!preg_match(HeaderInterface::RFC7230_FIELD_VALUE_REGEX, $item)) {
+				throw new InvalidArgumentException("The value of the HTTP header $name:$key is invalid");
+			}
+		}
+	}
 }

resources/definitions/psr17.php

Indentation +6 added lines, -6 removed lines

@@ -18,10 +18,10 @@
 use function DI\create;
 
 return [
-    RequestFactoryInterface::class => create(RequestFactory::class),
-    ResponseFactoryInterface::class => create(ResponseFactory::class),
-    ServerRequestFactoryInterface::class => create(ServerRequestFactory::class),
-    StreamFactoryInterface::class => create(StreamFactory::class),
-    UploadedFileFactoryInterface::class => create(UploadedFileFactory::class),
-    UriFactoryInterface::class => create(UriFactory::class),
+	RequestFactoryInterface::class => create(RequestFactory::class),
+	ResponseFactoryInterface::class => create(ResponseFactory::class),
+	ServerRequestFactoryInterface::class => create(ServerRequestFactory::class),
+	StreamFactoryInterface::class => create(StreamFactory::class),
+	UploadedFileFactoryInterface::class => create(UploadedFileFactory::class),
+	UriFactoryInterface::class => create(UriFactory::class),
 ];

src/Response/JsonResponse.php

Indentation +39 added lines, -39 removed lines

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

src/Request/JsonRequest.php

Indentation +40 added lines, -40 removed lines

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

src/Request.php

Indentation +214 added lines, -214 removed lines

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