sunrise-php / http-message

src/Stream/FileStream.php

Indentation +26 added lines, -26 removed lines

@@ -31,30 +31,30 @@
 final class FileStream extends Stream
 {
 
-    /**
-     * Constructor of the class
-     *
-     * @param string $filename
-     * @param string $mode
-     *
-     * @throws RuntimeException
-     */
-    public function __construct(string $filename, string $mode)
-    {
-        try {
-            $resource = fopen($filename, $mode);
-        } catch (Throwable $e) {
-            $resource = false;
-        }
-
-        if (!is_resource($resource)) {
-            throw new RuntimeException(sprintf(
-                'Unable to open the file "%s" in the mode "%s"',
-                $filename,
-                $mode
-            ));
-        }
-
-        parent::__construct($resource);
-    }
+	/**
+	 * Constructor of the class
+	 *
+	 * @param string $filename
+	 * @param string $mode
+	 *
+	 * @throws RuntimeException
+	 */
+	public function __construct(string $filename, string $mode)
+	{
+		try {
+			$resource = fopen($filename, $mode);
+		} catch (Throwable $e) {
+			$resource = false;
+		}
+
+		if (!is_resource($resource)) {
+			throw new RuntimeException(sprintf(
+				'Unable to open the file "%s" in the mode "%s"',
+				$filename,
+				$mode
+			));
+		}
+
+		parent::__construct($resource);
+	}
 }

src/Stream/TempFileStream.php

Indentation +28 added lines, -28 removed lines

@@ -32,32 +32,32 @@
 final class TempFileStream extends Stream
 {
 
-    /**
-     * Constructor of the class
-     *
-     * @param string|null $prefix
-     *
-     * @throws RuntimeException
-     */
-    public function __construct(?string $prefix = null)
-    {
-        $prefix ??= 'sunrisephp';
-
-        $dirname = sys_get_temp_dir();
-        if (!is_writable($dirname)) {
-            throw new RuntimeException('Temporary files directory is not writable');
-        }
-
-        $filename = tempnam($dirname, $prefix);
-        if ($filename === false) {
-            throw new RuntimeException('Temporary file name cannot be generated');
-        }
-
-        $resource = fopen($filename, 'w+b');
-        if (!is_resource($resource)) {
-            throw new RuntimeException('Temporary file cannot be created or opened');
-        }
-
-        parent::__construct($resource);
-    }
+	/**
+	 * Constructor of the class
+	 *
+	 * @param string|null $prefix
+	 *
+	 * @throws RuntimeException
+	 */
+	public function __construct(?string $prefix = null)
+	{
+		$prefix ??= 'sunrisephp';
+
+		$dirname = sys_get_temp_dir();
+		if (!is_writable($dirname)) {
+			throw new RuntimeException('Temporary files directory is not writable');
+		}
+
+		$filename = tempnam($dirname, $prefix);
+		if ($filename === false) {
+			throw new RuntimeException('Temporary file name cannot be generated');
+		}
+
+		$resource = fopen($filename, 'w+b');
+		if (!is_resource($resource)) {
+			throw new RuntimeException('Temporary file cannot be created or opened');
+		}
+
+		parent::__construct($resource);
+	}
 }

src/Stream/TmpfileStream.php

Indentation +19 added lines, -19 removed lines

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

src/Enum/CookieSameSite.php

Indentation +27 added lines, -27 removed lines

@@ -19,33 +19,33 @@
 final class CookieSameSite
 {
 
-    /**
-     * Cookies are not sent on normal cross-site subrequests, but are
-     * sent when a user is navigating to the origin site.
-     *
-     * This is the default cookie value if SameSite has not been
-     * explicitly specified in recent browser versions.
-     *
-     * @link https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie/SameSite#lax
-     */
-    public const LAX = 'Lax';
+	/**
+	 * Cookies are not sent on normal cross-site subrequests, but are
+	 * sent when a user is navigating to the origin site.
+	 *
+	 * This is the default cookie value if SameSite has not been
+	 * explicitly specified in recent browser versions.
+	 *
+	 * @link https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie/SameSite#lax
+	 */
+	public const LAX = 'Lax';
 
-    /**
-     * Cookies will only be sent in a first-party context and not be
-     * sent along with requests initiated by third party websites.
-     *
-     * @link https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie/SameSite#strict
-     */
-    public const STRICT = 'Strict';
+	/**
+	 * Cookies will only be sent in a first-party context and not be
+	 * sent along with requests initiated by third party websites.
+	 *
+	 * @link https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie/SameSite#strict
+	 */
+	public const STRICT = 'Strict';
 
-    /**
-     * Cookies will be sent in all contexts, i.e. in responses to both
-     * first-party and cross-site requests.
-     *
-     * If SameSite=None is set, the cookie Secure attribute must also
-     * be set (or the cookie will be blocked).
-     *
-     * @link https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie/SameSite#none
-     */
-    public const NONE = 'None';
+	/**
+	 * Cookies will be sent in all contexts, i.e. in responses to both
+	 * first-party and cross-site requests.
+	 *
+	 * If SameSite=None is set, the cookie Secure attribute must also
+	 * be set (or the cookie will be blocked).
+	 *
+	 * @link https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie/SameSite#none
+	 */
+	public const NONE = 'None';
 }

src/Enum/Encoding.php

Indentation +5 added lines, -5 removed lines

@@ -16,9 +16,9 @@
  */
 final class Encoding
 {
-    public const BR = 'br';
-    public const CHUNKED = 'chunked';
-    public const COMPRESS = 'compress';
-    public const DEFLATE = 'deflate';
-    public const GZIP = 'gzip';
+	public const BR = 'br';
+	public const CHUNKED = 'chunked';
+	public const COMPRESS = 'compress';
+	public const DEFLATE = 'deflate';
+	public const GZIP = 'gzip';
 }

src/Enum/WarningCode.php

Indentation +7 added lines, -7 removed lines

@@ -18,11 +18,11 @@
  */
 final class WarningCode
 {
-    public const RESPONSE_IS_STALE = 110;
-    public const REVALIDATION_FAILED = 111;
-    public const DISCONNECTED_OPERATION = 112;
-    public const HEURISTIC_EXPIRATION = 113;
-    public const MISCELLANEOUS_WARNING = 199;
-    public const TRANSFORMATION_APPLIED = 214;
-    public const MISCELLANEOUS_PERSISTENT_WARNING = 299;
+	public const RESPONSE_IS_STALE = 110;
+	public const REVALIDATION_FAILED = 111;
+	public const DISCONNECTED_OPERATION = 112;
+	public const HEURISTIC_EXPIRATION = 113;
+	public const MISCELLANEOUS_WARNING = 199;
+	public const TRANSFORMATION_APPLIED = 214;
+	public const MISCELLANEOUS_PERSISTENT_WARNING = 299;
 }

src/Enum/AuthenticationScheme.php

Indentation +10 added lines, -10 removed lines

@@ -18,14 +18,14 @@
  */
 final class AuthenticationScheme
 {
-    public const BASIC         = 'Basic';
-    public const BEARER        = 'Bearer';
-    public const DIGEST        = 'Digest';
-    public const HOBA          = 'HOBA';
-    public const MUTUAL        = 'Mutual';
-    public const NEGOTIATE     = 'Negotiate';
-    public const OAUTH         = 'OAuth';
-    public const SCRAM_SHA_1   = 'SCRAM-SHA-1';
-    public const SCRAM_SHA_256 = 'SCRAM-SHA-256';
-    public const VAPID         = 'vapid';
+	public const BASIC         = 'Basic';
+	public const BEARER        = 'Bearer';
+	public const DIGEST        = 'Digest';
+	public const HOBA          = 'HOBA';
+	public const MUTUAL        = 'Mutual';
+	public const NEGOTIATE     = 'Negotiate';
+	public const OAUTH         = 'OAuth';
+	public const SCRAM_SHA_1   = 'SCRAM-SHA-1';
+	public const SCRAM_SHA_256 = 'SCRAM-SHA-256';
+	public const VAPID         = 'vapid';
 }

src/Message.php

Indentation +391 added lines, -391 removed lines

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

src/ServerRequest.php

Indentation +350 added lines, -350 removed lines

@@ -35,354 +35,354 @@
 class ServerRequest extends Request implements ServerRequestInterface
 {
 
-    /**
-     * The server parameters
-     *
-     * @var array
-     */
-    private array $serverParams;
-
-    /**
-     * The request's query parameters
-     *
-     * @var array
-     */
-    private array $queryParams;
-
-    /**
-     * The request's cookie parameters
-     *
-     * @var array
-     */
-    private array $cookieParams;
-
-    /**
-     * The request's uploaded files
-     *
-     * @var array
-     */
-    private array $uploadedFiles;
-
-    /**
-     * The request's parsed body
-     *
-     * @var array|object|null
-     */
-    private $parsedBody;
-
-    /**
-     * The request attributes
-     *
-     * @var array
-     */
-    private array $attributes;
-
-    /**
-     * Constructor of the class
-     *
-     * @param string|null $protocolVersion
-     * @param string|null $method
-     * @param mixed $uri
-     * @param array<string, string|string[]>|null $headers
-     * @param StreamInterface|null $body
-     *
-     * @param array $serverParams
-     * @param array $queryParams
-     * @param array $cookieParams
-     * @param array $uploadedFiles
-     * @param array|object|null $parsedBody
-     * @param array $attributes
-     *
-     * @throws InvalidArgumentException
-     *         If one of the arguments isn't valid.
-     */
-    public function __construct(
-        ?string $protocolVersion = null,
-        ?string $method = null,
-        $uri = null,
-        ?array $headers = null,
-        ?StreamInterface $body = null,
-        array $serverParams = [],
-        array $queryParams = [],
-        array $cookieParams = [],
-        array $uploadedFiles = [],
-        $parsedBody = null,
-        array $attributes = []
-    ) {
-        if (isset($protocolVersion)) {
-            $this->setProtocolVersion($protocolVersion);
-        }
-
-        parent::__construct($method, $uri, $headers, $body);
-
-        $this->serverParams = $serverParams;
-        $this->queryParams = $queryParams;
-        $this->cookieParams = $cookieParams;
-        $this->setUploadedFiles($uploadedFiles);
-        $this->setParsedBody($parsedBody);
-        $this->attributes = $attributes;
-    }
-
-    /**
-     * Gets the server parameters
-     *
-     * @return array
-     */
-    public function getServerParams(): array
-    {
-        return $this->serverParams;
-    }
-
-    /**
-     * Gets the request's query parameters
-     *
-     * @return array
-     */
-    public function getQueryParams(): array
-    {
-        return $this->queryParams;
-    }
-
-    /**
-     * Creates a new instance of the request with the given query parameters
-     *
-     * @param array $query
-     *
-     * @return static
-     */
-    public function withQueryParams(array $query): ServerRequestInterface
-    {
-        $clone = clone $this;
-        $clone->queryParams = $query;
-
-        return $clone;
-    }
-
-    /**
-     * Gets the request's cookie parameters
-     *
-     * @return array
-     */
-    public function getCookieParams(): array
-    {
-        return $this->cookieParams;
-    }
-
-    /**
-     * Creates a new instance of the request with the given cookie parameters
-     *
-     * @param array $cookies
-     *
-     * @return static
-     */
-    public function withCookieParams(array $cookies): ServerRequestInterface
-    {
-        $clone = clone $this;
-        $clone->cookieParams = $cookies;
-
-        return $clone;
-    }
-
-    /**
-     * Gets the request's uploaded files
-     *
-     * @return array
-     */
-    public function getUploadedFiles(): array
-    {
-        return $this->uploadedFiles;
-    }
-
-    /**
-     * Creates a new instance of the request with the given uploaded files
-     *
-     * @param array $uploadedFiles
-     *
-     * @return static
-     *
-     * @throws InvalidArgumentException
-     *         If one of the files isn't valid.
-     */
-    public function withUploadedFiles(array $uploadedFiles): ServerRequestInterface
-    {
-        $clone = clone $this;
-        $clone->setUploadedFiles($uploadedFiles);
-
-        return $clone;
-    }
-
-    /**
-     * Gets the request's parsed body
-     *
-     * @return array|object|null
-     */
-    public function getParsedBody()
-    {
-        return $this->parsedBody;
-    }
-
-    /**
-     * Creates a new instance of the request with the given parsed body
-     *
-     * @param array|object|null $data
-     *
-     * @return static
-     *
-     * @throws InvalidArgumentException
-     *         If the data isn't valid.
-     */
-    public function withParsedBody($data): ServerRequestInterface
-    {
-        $clone = clone $this;
-        $clone->setParsedBody($data);
-
-        return $clone;
-    }
-
-    /**
-     * Gets the request attributes
-     *
-     * @return array
-     */
-    public function getAttributes(): array
-    {
-        return $this->attributes;
-    }
-
-    /**
-     * Gets the request's attribute value by the given name
-     *
-     * Returns the default value if the attribute wasn't found.
-     *
-     * @param array-key $name
-     * @param mixed $default
-     *
-     * @return mixed
-     */
-    public function getAttribute($name, $default = null)
-    {
-        if (!array_key_exists($name, $this->attributes)) {
-            return $default;
-        }
-
-        return $this->attributes[$name];
-    }
-
-    /**
-     * Creates a new instance of the request with the given attribute
-     *
-     * @param array-key $name
-     * @param mixed $value
-     *
-     * @return static
-     */
-    public function withAttribute($name, $value): ServerRequestInterface
-    {
-        $clone = clone $this;
-        $clone->attributes[$name] = $value;
-
-        return $clone;
-    }
-
-    /**
-     * Creates a new instance of the request without an attribute with the given name
-     *
-     * @param array-key $name
-     *
-     * @return static
-     */
-    public function withoutAttribute($name): ServerRequestInterface
-    {
-        $clone = clone $this;
-        unset($clone->attributes[$name]);
-
-        return $clone;
-    }
-
-    /**
-     * Sets the given uploaded files to the request
-     *
-     * @param array $files
-     *
-     * @return void
-     *
-     * @throws InvalidArgumentException
-     *         If one of the files isn't valid.
-     */
-    final protected function setUploadedFiles(array $files): void
-    {
-        $this->validateUploadedFiles($files);
-
-        $this->uploadedFiles = $files;
-    }
-
-    /**
-     * Sets the given parsed body to the request
-     *
-     * @param array|object|null $data
-     *
-     * @return void
-     *
-     * @throws InvalidArgumentException
-     *         If the parsed body isn't valid.
-     */
-    final protected function setParsedBody($data): void
-    {
-        $this->validateParsedBody($data);
-
-        $this->parsedBody = $data;
-    }
-
-    /**
-     * Validates the given uploaded files
-     *
-     * @param array $files
-     *
-     * @return void
-     *
-     * @throws InvalidArgumentException
-     *         If one of the files isn't valid.
-     */
-    private function validateUploadedFiles(array $files): void
-    {
-        if ([] === $files) {
-            return;
-        }
-
-        /**
-         * @param mixed $file
-         *
-         * @return void
-         *
-         * @throws InvalidArgumentException
-         *
-         * @psalm-suppress MissingClosureParamType
-         */
-        array_walk_recursive($files, static function ($file): void {
-            if (! ($file instanceof UploadedFileInterface)) {
-                throw new InvalidArgumentException('Invalid uploaded files');
-            }
-        });
-    }
-
-    /**
-     * Validates the given parsed body
-     *
-     * @param mixed $data
-     *
-     * @return void
-     *
-     * @throws InvalidArgumentException
-     *         If the parsed body isn't valid.
-     */
-    private function validateParsedBody($data): void
-    {
-        if (null === $data) {
-            return;
-        }
-
-        if (!is_array($data) && !is_object($data)) {
-            throw new InvalidArgumentException('Invalid parsed body');
-        }
-    }
+	/**
+	 * The server parameters
+	 *
+	 * @var array
+	 */
+	private array $serverParams;
+
+	/**
+	 * The request's query parameters
+	 *
+	 * @var array
+	 */
+	private array $queryParams;
+
+	/**
+	 * The request's cookie parameters
+	 *
+	 * @var array
+	 */
+	private array $cookieParams;
+
+	/**
+	 * The request's uploaded files
+	 *
+	 * @var array
+	 */
+	private array $uploadedFiles;
+
+	/**
+	 * The request's parsed body
+	 *
+	 * @var array|object|null
+	 */
+	private $parsedBody;
+
+	/**
+	 * The request attributes
+	 *
+	 * @var array
+	 */
+	private array $attributes;
+
+	/**
+	 * Constructor of the class
+	 *
+	 * @param string|null $protocolVersion
+	 * @param string|null $method
+	 * @param mixed $uri
+	 * @param array<string, string|string[]>|null $headers
+	 * @param StreamInterface|null $body
+	 *
+	 * @param array $serverParams
+	 * @param array $queryParams
+	 * @param array $cookieParams
+	 * @param array $uploadedFiles
+	 * @param array|object|null $parsedBody
+	 * @param array $attributes
+	 *
+	 * @throws InvalidArgumentException
+	 *         If one of the arguments isn't valid.
+	 */
+	public function __construct(
+		?string $protocolVersion = null,
+		?string $method = null,
+		$uri = null,
+		?array $headers = null,
+		?StreamInterface $body = null,
+		array $serverParams = [],
+		array $queryParams = [],
+		array $cookieParams = [],
+		array $uploadedFiles = [],
+		$parsedBody = null,
+		array $attributes = []
+	) {
+		if (isset($protocolVersion)) {
+			$this->setProtocolVersion($protocolVersion);
+		}
+
+		parent::__construct($method, $uri, $headers, $body);
+
+		$this->serverParams = $serverParams;
+		$this->queryParams = $queryParams;
+		$this->cookieParams = $cookieParams;
+		$this->setUploadedFiles($uploadedFiles);
+		$this->setParsedBody($parsedBody);
+		$this->attributes = $attributes;
+	}
+
+	/**
+	 * Gets the server parameters
+	 *
+	 * @return array
+	 */
+	public function getServerParams(): array
+	{
+		return $this->serverParams;
+	}
+
+	/**
+	 * Gets the request's query parameters
+	 *
+	 * @return array
+	 */
+	public function getQueryParams(): array
+	{
+		return $this->queryParams;
+	}
+
+	/**
+	 * Creates a new instance of the request with the given query parameters
+	 *
+	 * @param array $query
+	 *
+	 * @return static
+	 */
+	public function withQueryParams(array $query): ServerRequestInterface
+	{
+		$clone = clone $this;
+		$clone->queryParams = $query;
+
+		return $clone;
+	}
+
+	/**
+	 * Gets the request's cookie parameters
+	 *
+	 * @return array
+	 */
+	public function getCookieParams(): array
+	{
+		return $this->cookieParams;
+	}
+
+	/**
+	 * Creates a new instance of the request with the given cookie parameters
+	 *
+	 * @param array $cookies
+	 *
+	 * @return static
+	 */
+	public function withCookieParams(array $cookies): ServerRequestInterface
+	{
+		$clone = clone $this;
+		$clone->cookieParams = $cookies;
+
+		return $clone;
+	}
+
+	/**
+	 * Gets the request's uploaded files
+	 *
+	 * @return array
+	 */
+	public function getUploadedFiles(): array
+	{
+		return $this->uploadedFiles;
+	}
+
+	/**
+	 * Creates a new instance of the request with the given uploaded files
+	 *
+	 * @param array $uploadedFiles
+	 *
+	 * @return static
+	 *
+	 * @throws InvalidArgumentException
+	 *         If one of the files isn't valid.
+	 */
+	public function withUploadedFiles(array $uploadedFiles): ServerRequestInterface
+	{
+		$clone = clone $this;
+		$clone->setUploadedFiles($uploadedFiles);
+
+		return $clone;
+	}
+
+	/**
+	 * Gets the request's parsed body
+	 *
+	 * @return array|object|null
+	 */
+	public function getParsedBody()
+	{
+		return $this->parsedBody;
+	}
+
+	/**
+	 * Creates a new instance of the request with the given parsed body
+	 *
+	 * @param array|object|null $data
+	 *
+	 * @return static
+	 *
+	 * @throws InvalidArgumentException
+	 *         If the data isn't valid.
+	 */
+	public function withParsedBody($data): ServerRequestInterface
+	{
+		$clone = clone $this;
+		$clone->setParsedBody($data);
+
+		return $clone;
+	}
+
+	/**
+	 * Gets the request attributes
+	 *
+	 * @return array
+	 */
+	public function getAttributes(): array
+	{
+		return $this->attributes;
+	}
+
+	/**
+	 * Gets the request's attribute value by the given name
+	 *
+	 * Returns the default value if the attribute wasn't found.
+	 *
+	 * @param array-key $name
+	 * @param mixed $default
+	 *
+	 * @return mixed
+	 */
+	public function getAttribute($name, $default = null)
+	{
+		if (!array_key_exists($name, $this->attributes)) {
+			return $default;
+		}
+
+		return $this->attributes[$name];
+	}
+
+	/**
+	 * Creates a new instance of the request with the given attribute
+	 *
+	 * @param array-key $name
+	 * @param mixed $value
+	 *
+	 * @return static
+	 */
+	public function withAttribute($name, $value): ServerRequestInterface
+	{
+		$clone = clone $this;
+		$clone->attributes[$name] = $value;
+
+		return $clone;
+	}
+
+	/**
+	 * Creates a new instance of the request without an attribute with the given name
+	 *
+	 * @param array-key $name
+	 *
+	 * @return static
+	 */
+	public function withoutAttribute($name): ServerRequestInterface
+	{
+		$clone = clone $this;
+		unset($clone->attributes[$name]);
+
+		return $clone;
+	}
+
+	/**
+	 * Sets the given uploaded files to the request
+	 *
+	 * @param array $files
+	 *
+	 * @return void
+	 *
+	 * @throws InvalidArgumentException
+	 *         If one of the files isn't valid.
+	 */
+	final protected function setUploadedFiles(array $files): void
+	{
+		$this->validateUploadedFiles($files);
+
+		$this->uploadedFiles = $files;
+	}
+
+	/**
+	 * Sets the given parsed body to the request
+	 *
+	 * @param array|object|null $data
+	 *
+	 * @return void
+	 *
+	 * @throws InvalidArgumentException
+	 *         If the parsed body isn't valid.
+	 */
+	final protected function setParsedBody($data): void
+	{
+		$this->validateParsedBody($data);
+
+		$this->parsedBody = $data;
+	}
+
+	/**
+	 * Validates the given uploaded files
+	 *
+	 * @param array $files
+	 *
+	 * @return void
+	 *
+	 * @throws InvalidArgumentException
+	 *         If one of the files isn't valid.
+	 */
+	private function validateUploadedFiles(array $files): void
+	{
+		if ([] === $files) {
+			return;
+		}
+
+		/**
+		 * @param mixed $file
+		 *
+		 * @return void
+		 *
+		 * @throws InvalidArgumentException
+		 *
+		 * @psalm-suppress MissingClosureParamType
+		 */
+		array_walk_recursive($files, static function ($file): void {
+			if (! ($file instanceof UploadedFileInterface)) {
+				throw new InvalidArgumentException('Invalid uploaded files');
+			}
+		});
+	}
+
+	/**
+	 * Validates the given parsed body
+	 *
+	 * @param mixed $data
+	 *
+	 * @return void
+	 *
+	 * @throws InvalidArgumentException
+	 *         If the parsed body isn't valid.
+	 */
+	private function validateParsedBody($data): void
+	{
+		if (null === $data) {
+			return;
+		}
+
+		if (!is_array($data) && !is_object($data)) {
+			throw new InvalidArgumentException('Invalid parsed body');
+		}
+	}
 }