alexpts / php-mutable-psr7

src/Uri.php

Indentation +231 added lines, -231 removed lines

@@ -12,235 +12,235 @@
 
 class Uri implements UriInterface
 {
-	use LowercaseTrait;
-
-	protected const SCHEMES = ['http' => 80, 'https' => 443];
-	protected const CHAR_UNRESERVED = 'a-zA-Z0-9_\-\.~';
-	protected const CHAR_SUB_DELIMS = '!\$&\'\(\)\*\+,;=';
-
-	protected string $scheme = '';
-	protected string $userInfo = '';
-	protected string $host = '';
-
-	protected ?int $port = null;
-	protected string $path = '';
-	protected string $query = '';
-	protected string $fragment = '';
-
-	public function __construct(string $uri = '')
-	{
-		if ('' !== $uri) {
-			$parts = parse_url($uri);
-			if ($parts === false) {
-				throw new InvalidArgumentException("Unable to parse URI: $uri");
-			}
-
-			$this->withScheme($parts['scheme'] ?? '');
-			$this->userInfo = $parts['user'] ?? '';
-			$this->withHost($parts['host'] ?? '');
-			$this->port = isset($parts['port']) ? $this->filterPort($parts['port']) : null;
-			$this->path = isset($parts['path']) ? $this->filterPath($parts['path']) : '';
-			$this->query = isset($parts['query']) ? $this->filterQueryAndFragment($parts['query']) : '';
-			$this->fragment = isset($parts['fragment']) ? $this->filterQueryAndFragment($parts['fragment']) : '';
-			if (isset($parts['pass'])) {
-				$this->userInfo .= ':' . $parts['pass'];
-			}
-		}
-	}
-
-	public function __toString(): string
-	{
-		return self::createUriString($this->scheme, $this->getAuthority(), $this->path, $this->query, $this->fragment);
-	}
-
-	public function getScheme(): string
-	{
-		return $this->scheme;
-	}
-
-	public function getAuthority(): string
-	{
-		if ('' === $this->host) {
-			return '';
-		}
-
-		$authority = $this->host;
-		if ('' !== $this->userInfo) {
-			$authority = $this->userInfo . '@' . $authority;
-		}
-
-		if (null !== $this->port) {
-			$authority .= ':' . $this->port;
-		}
-
-		return $authority;
-	}
-
-	public function getUserInfo(): string
-	{
-		return $this->userInfo;
-	}
-
-	public function getHost(): string
-	{
-		return $this->host;
-	}
-
-	public function getPort(): ?int
-	{
-		return $this->port;
-	}
-
-	public function getPath(): string
-	{
-		return $this->path;
-	}
-
-	public function getQuery(): string
-	{
-		return $this->query;
-	}
-
-	public function getFragment(): string
-	{
-		return $this->fragment;
-	}
-
-	public function withScheme($scheme): self
-	{
-		$this->scheme = self::lowercase($scheme);
-		$this->port = $this->port ? $this->filterPort($this->port) : null;
-
-		return $this;
-	}
-
-	public function withUserInfo($user, $password = null): self
-	{
-		$info = $user;
-		if (null !== $password && '' !== $password) {
-			$info .= ':' . $password;
-		}
-
-		$this->userInfo = $info;
-
-		return $this;
-	}
-
-	public function withHost($host): self
-	{
-		$this->host = self::lowercase($host);
-		return $this;
-	}
-
-	public function withPort($port): self
-	{
-		$this->port = $port === null ? null : $this->filterPort($port);
-		return $this;
-	}
-
-	public function withPath($path): self
-	{
-		$path = $this->filterPath($path);
-		if ($this->path !== $path) {
-			$this->path = $path;
-		}
-
-		return $this;
-	}
-
-	public function withQuery($query): self
-	{
-		$query = $this->filterQueryAndFragment($query);
-		if ($this->query !== $query) {
-			$this->query = $query;
-		}
-
-		return $this;
-	}
-
-	public function withFragment($fragment): self
-	{
-		$fragment = $this->filterQueryAndFragment($fragment);
-		if ($this->fragment !== $fragment) {
-			$this->fragment = $fragment;
-		}
-
-		return $this;
-	}
-
-	private static function createUriString(string $scheme, string $authority, string $path, string $query, string $fragment): string
-	{
-		$uri = '';
-		if ('' !== $scheme) {
-			$uri .= $scheme . ':';
-		}
-
-		if ('' !== $authority) {
-			$uri .= '//' . $authority;
-		}
-
-		if ('' !== $path) {
-			if ('/' !== $path[0]) {
-				if ('' !== $authority) {
-					// If the path is rootless and an authority is present, the path MUST be prefixed by "/"
-					$path = '/' . $path;
-				}
-			} elseif (isset($path[1]) && '/' === $path[1]) {
-				if ('' === $authority) {
-					// If the path is starting with more than one "/" and no authority is present, the
-					// starting slashes MUST be reduced to one.
-					$path = '/' . \ltrim($path, '/');
-				}
-			}
-
-			$uri .= $path;
-		}
-
-		if ('' !== $query) {
-			$uri .= '?' . $query;
-		}
-
-		if ('' !== $fragment) {
-			$uri .= '#' . $fragment;
-		}
-
-		return $uri;
-	}
-
-	private static function isNonStandardPort(string $scheme, int $port): bool
-	{
-		return !isset(self::SCHEMES[$scheme]) || $port !== self::SCHEMES[$scheme];
-	}
-
-	protected function filterPort(int $port): ?int
-	{
-		if ($port < 1 || $port > 65535) {
-			throw new InvalidArgumentException(sprintf('Invalid port: %d. Must be between 0 and 65535', $port));
-		}
-
-		return self::isNonStandardPort($this->scheme, $port) ? $port : null;
-	}
-
-	private function filterPath($path): string
-	{
-		if (!is_string($path)) {
-			throw new InvalidArgumentException('Path must be a string');
-		}
-
-		return preg_replace_callback('/(?:[^' . self::CHAR_UNRESERVED . self::CHAR_SUB_DELIMS . '%:@\/]++|%(?![A-Fa-f0-9]{2}))/', [__CLASS__, 'rawurlencodeMatchZero'], $path);
-	}
-
-	private function filterQueryAndFragment($str): string
-	{
-		if (!is_string($str)) {
-			throw new InvalidArgumentException('Query and fragment must be a string');
-		}
-
-		return preg_replace_callback('/(?:[^' . self::CHAR_UNRESERVED . self::CHAR_SUB_DELIMS . '%:@\/\?]++|%(?![A-Fa-f0-9]{2}))/', [__CLASS__, 'rawurlencodeMatchZero'], $str);
-	}
-
-	private static function rawUrlEncodeMatchZero(array $match): string
-	{
-		return rawurlencode($match[0]);
-	}
+    use LowercaseTrait;
+
+    protected const SCHEMES = ['http' => 80, 'https' => 443];
+    protected const CHAR_UNRESERVED = 'a-zA-Z0-9_\-\.~';
+    protected const CHAR_SUB_DELIMS = '!\$&\'\(\)\*\+,;=';
+
+    protected string $scheme = '';
+    protected string $userInfo = '';
+    protected string $host = '';
+
+    protected ?int $port = null;
+    protected string $path = '';
+    protected string $query = '';
+    protected string $fragment = '';
+
+    public function __construct(string $uri = '')
+    {
+        if ('' !== $uri) {
+            $parts = parse_url($uri);
+            if ($parts === false) {
+                throw new InvalidArgumentException("Unable to parse URI: $uri");
+            }
+
+            $this->withScheme($parts['scheme'] ?? '');
+            $this->userInfo = $parts['user'] ?? '';
+            $this->withHost($parts['host'] ?? '');
+            $this->port = isset($parts['port']) ? $this->filterPort($parts['port']) : null;
+            $this->path = isset($parts['path']) ? $this->filterPath($parts['path']) : '';
+            $this->query = isset($parts['query']) ? $this->filterQueryAndFragment($parts['query']) : '';
+            $this->fragment = isset($parts['fragment']) ? $this->filterQueryAndFragment($parts['fragment']) : '';
+            if (isset($parts['pass'])) {
+                $this->userInfo .= ':' . $parts['pass'];
+            }
+        }
+    }
+
+    public function __toString(): string
+    {
+        return self::createUriString($this->scheme, $this->getAuthority(), $this->path, $this->query, $this->fragment);
+    }
+
+    public function getScheme(): string
+    {
+        return $this->scheme;
+    }
+
+    public function getAuthority(): string
+    {
+        if ('' === $this->host) {
+            return '';
+        }
+
+        $authority = $this->host;
+        if ('' !== $this->userInfo) {
+            $authority = $this->userInfo . '@' . $authority;
+        }
+
+        if (null !== $this->port) {
+            $authority .= ':' . $this->port;
+        }
+
+        return $authority;
+    }
+
+    public function getUserInfo(): string
+    {
+        return $this->userInfo;
+    }
+
+    public function getHost(): string
+    {
+        return $this->host;
+    }
+
+    public function getPort(): ?int
+    {
+        return $this->port;
+    }
+
+    public function getPath(): string
+    {
+        return $this->path;
+    }
+
+    public function getQuery(): string
+    {
+        return $this->query;
+    }
+
+    public function getFragment(): string
+    {
+        return $this->fragment;
+    }
+
+    public function withScheme($scheme): self
+    {
+        $this->scheme = self::lowercase($scheme);
+        $this->port = $this->port ? $this->filterPort($this->port) : null;
+
+        return $this;
+    }
+
+    public function withUserInfo($user, $password = null): self
+    {
+        $info = $user;
+        if (null !== $password && '' !== $password) {
+            $info .= ':' . $password;
+        }
+
+        $this->userInfo = $info;
+
+        return $this;
+    }
+
+    public function withHost($host): self
+    {
+        $this->host = self::lowercase($host);
+        return $this;
+    }
+
+    public function withPort($port): self
+    {
+        $this->port = $port === null ? null : $this->filterPort($port);
+        return $this;
+    }
+
+    public function withPath($path): self
+    {
+        $path = $this->filterPath($path);
+        if ($this->path !== $path) {
+            $this->path = $path;
+        }
+
+        return $this;
+    }
+
+    public function withQuery($query): self
+    {
+        $query = $this->filterQueryAndFragment($query);
+        if ($this->query !== $query) {
+            $this->query = $query;
+        }
+
+        return $this;
+    }
+
+    public function withFragment($fragment): self
+    {
+        $fragment = $this->filterQueryAndFragment($fragment);
+        if ($this->fragment !== $fragment) {
+            $this->fragment = $fragment;
+        }
+
+        return $this;
+    }
+
+    private static function createUriString(string $scheme, string $authority, string $path, string $query, string $fragment): string
+    {
+        $uri = '';
+        if ('' !== $scheme) {
+            $uri .= $scheme . ':';
+        }
+
+        if ('' !== $authority) {
+            $uri .= '//' . $authority;
+        }
+
+        if ('' !== $path) {
+            if ('/' !== $path[0]) {
+                if ('' !== $authority) {
+                    // If the path is rootless and an authority is present, the path MUST be prefixed by "/"
+                    $path = '/' . $path;
+                }
+            } elseif (isset($path[1]) && '/' === $path[1]) {
+                if ('' === $authority) {
+                    // If the path is starting with more than one "/" and no authority is present, the
+                    // starting slashes MUST be reduced to one.
+                    $path = '/' . \ltrim($path, '/');
+                }
+            }
+
+            $uri .= $path;
+        }
+
+        if ('' !== $query) {
+            $uri .= '?' . $query;
+        }
+
+        if ('' !== $fragment) {
+            $uri .= '#' . $fragment;
+        }
+
+        return $uri;
+    }
+
+    private static function isNonStandardPort(string $scheme, int $port): bool
+    {
+        return !isset(self::SCHEMES[$scheme]) || $port !== self::SCHEMES[$scheme];
+    }
+
+    protected function filterPort(int $port): ?int
+    {
+        if ($port < 1 || $port > 65535) {
+            throw new InvalidArgumentException(sprintf('Invalid port: %d. Must be between 0 and 65535', $port));
+        }
+
+        return self::isNonStandardPort($this->scheme, $port) ? $port : null;
+    }
+
+    private function filterPath($path): string
+    {
+        if (!is_string($path)) {
+            throw new InvalidArgumentException('Path must be a string');
+        }
+
+        return preg_replace_callback('/(?:[^' . self::CHAR_UNRESERVED . self::CHAR_SUB_DELIMS . '%:@\/]++|%(?![A-Fa-f0-9]{2}))/', [__CLASS__, 'rawurlencodeMatchZero'], $path);
+    }
+
+    private function filterQueryAndFragment($str): string
+    {
+        if (!is_string($str)) {
+            throw new InvalidArgumentException('Query and fragment must be a string');
+        }
+
+        return preg_replace_callback('/(?:[^' . self::CHAR_UNRESERVED . self::CHAR_SUB_DELIMS . '%:@\/\?]++|%(?![A-Fa-f0-9]{2}))/', [__CLASS__, 'rawurlencodeMatchZero'], $str);
+    }
+
+    private static function rawUrlEncodeMatchZero(array $match): string
+    {
+        return rawurlencode($match[0]);
+    }
 }
\ No newline at end of file

Spacing +12 added lines, -12 removed lines

@@ -43,7 +43,7 @@ 
 			$this->query = isset($parts['query']) ? $this->filterQueryAndFragment($parts['query']) : '';
 			$this->fragment = isset($parts['fragment']) ? $this->filterQueryAndFragment($parts['fragment']) : '';
 			if (isset($parts['pass'])) {
-				$this->userInfo .= ':' . $parts['pass'];
+				$this->userInfo .= ':'.$parts['pass'];
 			}
 		}
 	}
@@ -66,11 +66,11 @@ 
 
 		$authority = $this->host;
 		if ('' !== $this->userInfo) {
-			$authority = $this->userInfo . '@' . $authority;
+			$authority = $this->userInfo.'@'.$authority;
 		}
 
 		if (null !== $this->port) {
-			$authority .= ':' . $this->port;
+			$authority .= ':'.$this->port;
 		}
 
 		return $authority;
@@ -118,7 +118,7 @@ 
 	{
 		$info = $user;
 		if (null !== $password && '' !== $password) {
-			$info .= ':' . $password;
+			$info .= ':'.$password;
 		}
 
 		$this->userInfo = $info;
@@ -172,24 +172,24 @@ 
 	{
 		$uri = '';
 		if ('' !== $scheme) {
-			$uri .= $scheme . ':';
+			$uri .= $scheme.':';
 		}
 
 		if ('' !== $authority) {
-			$uri .= '//' . $authority;
+			$uri .= '//'.$authority;
 		}
 
 		if ('' !== $path) {
 			if ('/' !== $path[0]) {
 				if ('' !== $authority) {
 					// If the path is rootless and an authority is present, the path MUST be prefixed by "/"
-					$path = '/' . $path;
+					$path = '/'.$path;
 				}
 			} elseif (isset($path[1]) && '/' === $path[1]) {
 				if ('' === $authority) {
 					// If the path is starting with more than one "/" and no authority is present, the
 					// starting slashes MUST be reduced to one.
-					$path = '/' . \ltrim($path, '/');
+					$path = '/'.\ltrim($path, '/');
 				}
 			}
 
@@ -197,11 +197,11 @@ 
 		}
 
 		if ('' !== $query) {
-			$uri .= '?' . $query;
+			$uri .= '?'.$query;
 		}
 
 		if ('' !== $fragment) {
-			$uri .= '#' . $fragment;
+			$uri .= '#'.$fragment;
 		}
 
 		return $uri;
@@ -227,7 +227,7 @@ 
 			throw new InvalidArgumentException('Path must be a string');
 		}
 
-		return preg_replace_callback('/(?:[^' . self::CHAR_UNRESERVED . self::CHAR_SUB_DELIMS . '%:@\/]++|%(?![A-Fa-f0-9]{2}))/', [__CLASS__, 'rawurlencodeMatchZero'], $path);
+		return preg_replace_callback('/(?:[^'.self::CHAR_UNRESERVED.self::CHAR_SUB_DELIMS.'%:@\/]++|%(?![A-Fa-f0-9]{2}))/', [__CLASS__, 'rawurlencodeMatchZero'], $path);
 	}
 
 	private function filterQueryAndFragment($str): string
@@ -236,7 +236,7 @@ 
 			throw new InvalidArgumentException('Query and fragment must be a string');
 		}
 
-		return preg_replace_callback('/(?:[^' . self::CHAR_UNRESERVED . self::CHAR_SUB_DELIMS . '%:@\/\?]++|%(?![A-Fa-f0-9]{2}))/', [__CLASS__, 'rawurlencodeMatchZero'], $str);
+		return preg_replace_callback('/(?:[^'.self::CHAR_UNRESERVED.self::CHAR_SUB_DELIMS.'%:@\/\?]++|%(?![A-Fa-f0-9]{2}))/', [__CLASS__, 'rawurlencodeMatchZero'], $str);
 	}
 
 	private static function rawUrlEncodeMatchZero(array $match): string

src/ServerMessage.php

Indentation +47 added lines, -47 removed lines

@@ -7,51 +7,51 @@
 
 trait ServerMessage
 {
-	protected array $attributes = [];
-
-	/**
-	 * @return array
-	 */
-	public function getAttributes(): array
-	{
-		return $this->attributes;
-	}
-
-	/**
-	 * @param string $attribute
-	 * @param mixed $default
-	 *
-	 * @return mixed
-	 */
-	public function getAttribute($attribute, $default = null)
-	{
-		if (false === array_key_exists($attribute, $this->attributes)) {
-			return $default;
-		}
-
-		return $this->attributes[$attribute];
-	}
-
-	/**
-	 * @param string $attribute
-	 * @param mixed $value
-	 *
-	 * @return $this
-	 */
-	public function withAttribute($attribute, $value)
-	{
-		$this->attributes[$attribute] = $value;
-		return $this;
-	}
-
-	public function withoutAttribute($attribute)
-	{
-		if (false === array_key_exists($attribute, $this->attributes)) {
-			return $this;
-		}
-
-		unset($this->attributes[$attribute]);
-
-		return $this;
-	}
+    protected array $attributes = [];
+
+    /**
+     * @return array
+     */
+    public function getAttributes(): array
+    {
+        return $this->attributes;
+    }
+
+    /**
+     * @param string $attribute
+     * @param mixed $default
+     *
+     * @return mixed
+     */
+    public function getAttribute($attribute, $default = null)
+    {
+        if (false === array_key_exists($attribute, $this->attributes)) {
+            return $default;
+        }
+
+        return $this->attributes[$attribute];
+    }
+
+    /**
+     * @param string $attribute
+     * @param mixed $value
+     *
+     * @return $this
+     */
+    public function withAttribute($attribute, $value)
+    {
+        $this->attributes[$attribute] = $value;
+        return $this;
+    }
+
+    public function withoutAttribute($attribute)
+    {
+        if (false === array_key_exists($attribute, $this->attributes)) {
+            return $this;
+        }
+
+        unset($this->attributes[$attribute]);
+
+        return $this;
+    }
 }

src/Message.php

Indentation +126 added lines, -126 removed lines

@@ -14,130 +14,130 @@
 class Message implements MessageInterface
 {
 
-	/**
-	 * RFC-2616, RFC-7230 - case-insensitive; HTTP2 pack convert all header to lowercase
-	 *
-	 * @var array - all header name will be convert to lowercase
-	 */
-	protected array $headers = [];
-	protected string $protocol = '1.1';
-	protected ?StreamInterface $stream = null;
-
-	public function getProtocolVersion(): string
-	{
-		return $this->protocol;
-	}
-
-	public function withProtocolVersion($version): self
-	{
-		if ($this->protocol !== $version) {
-			$this->protocol = $version;
-		}
-
-		return $this;
-	}
-
-	public function getHeaders(): array
-	{
-		return $this->headers;
-	}
-
-	public function hasHeader($name): bool
-	{
-		$name = strtolower($name);
-		$hasHeader = $this->headers[$name] ?? null;
-		return $hasHeader !== null;
-	}
-
-	public function getHeader($name): array
-	{
-		$name = strtolower($name);
-		return $this->headers[$name] ?? [];
-	}
-
-	public function getHeaderLine($name): string
-	{
-		return implode(', ', $this->getHeader($name));
-	}
-
-	public function withHeader($name, $value): self
-	{
-		$name = strtolower($name);
-		$this->headers[$name] = $this->validateAndTrimHeader($name, (array)$value);
-		return $this;
-	}
-
-	public function withoutHeader($name): self
-	{
-		$name = strtolower($name);
-		unset($this->headers[$name]);
-		return $this;
-	}
-
-	public function getBody(): StreamInterface
-	{
-		if (!$this->stream) {
-			$this->stream = Stream::create('');
-		}
-
-		return $this->stream;
-	}
-
-	public function withBody(StreamInterface $body): self
-	{
-		$this->stream = $body;
-		return $this;
-	}
-
-	public function reset(): self
-	{
-		$this->headers = [];
-		if ($this->stream) {
-			$this->stream->close();
-			$this->stream = null;
-		}
-
-		return $this;
-	}
-
-	protected function validateAndTrimHeader(string $name, array $values): array
-	{
-		if (preg_match("@^[!#$%&'*+.^_`|~0-9A-Za-z-]+$@", $name) !== 1) {
-			throw new InvalidArgumentException('Header name must be an RFC 7230 compatible string.');
-		}
-
-		$returnValues = [];
-		foreach ($values as $v) {
-			if ((!is_numeric($v) && !is_string($v)) || 1 !== preg_match("@^[ \t\x21-\x7E\x80-\xFF]*$@", (string)$v)) {
-				throw new InvalidArgumentException('Header values must be RFC 7230 compatible strings.');
-			}
-
-			$returnValues[] = trim((string)$v);
-		}
-
-		return $returnValues;
-	}
-
-	public function withAddedHeader($name, $value): self
-	{
-		$this->setHeaders([$name => $value]);
-		return $this;
-	}
-
-	protected function setHeaders(array $headers): void
-	{
-		foreach ($headers as $name => $values) {
-			$values = (array)$values;
-			$name = strtolower((string)$name);
-
-			if (!$this->hasHeader($name)) {
-				$this->headers[$name] = [];
-			}
-
-			foreach ($values as $value) {
-				$value = $this->validateAndTrimHeader($name, (array)$value)[0];
-				$this->headers[$name][] = $value;
-			}
-		}
-	}
+    /**
+     * RFC-2616, RFC-7230 - case-insensitive; HTTP2 pack convert all header to lowercase
+     *
+     * @var array - all header name will be convert to lowercase
+     */
+    protected array $headers = [];
+    protected string $protocol = '1.1';
+    protected ?StreamInterface $stream = null;
+
+    public function getProtocolVersion(): string
+    {
+        return $this->protocol;
+    }
+
+    public function withProtocolVersion($version): self
+    {
+        if ($this->protocol !== $version) {
+            $this->protocol = $version;
+        }
+
+        return $this;
+    }
+
+    public function getHeaders(): array
+    {
+        return $this->headers;
+    }
+
+    public function hasHeader($name): bool
+    {
+        $name = strtolower($name);
+        $hasHeader = $this->headers[$name] ?? null;
+        return $hasHeader !== null;
+    }
+
+    public function getHeader($name): array
+    {
+        $name = strtolower($name);
+        return $this->headers[$name] ?? [];
+    }
+
+    public function getHeaderLine($name): string
+    {
+        return implode(', ', $this->getHeader($name));
+    }
+
+    public function withHeader($name, $value): self
+    {
+        $name = strtolower($name);
+        $this->headers[$name] = $this->validateAndTrimHeader($name, (array)$value);
+        return $this;
+    }
+
+    public function withoutHeader($name): self
+    {
+        $name = strtolower($name);
+        unset($this->headers[$name]);
+        return $this;
+    }
+
+    public function getBody(): StreamInterface
+    {
+        if (!$this->stream) {
+            $this->stream = Stream::create('');
+        }
+
+        return $this->stream;
+    }
+
+    public function withBody(StreamInterface $body): self
+    {
+        $this->stream = $body;
+        return $this;
+    }
+
+    public function reset(): self
+    {
+        $this->headers = [];
+        if ($this->stream) {
+            $this->stream->close();
+            $this->stream = null;
+        }
+
+        return $this;
+    }
+
+    protected function validateAndTrimHeader(string $name, array $values): array
+    {
+        if (preg_match("@^[!#$%&'*+.^_`|~0-9A-Za-z-]+$@", $name) !== 1) {
+            throw new InvalidArgumentException('Header name must be an RFC 7230 compatible string.');
+        }
+
+        $returnValues = [];
+        foreach ($values as $v) {
+            if ((!is_numeric($v) && !is_string($v)) || 1 !== preg_match("@^[ \t\x21-\x7E\x80-\xFF]*$@", (string)$v)) {
+                throw new InvalidArgumentException('Header values must be RFC 7230 compatible strings.');
+            }
+
+            $returnValues[] = trim((string)$v);
+        }
+
+        return $returnValues;
+    }
+
+    public function withAddedHeader($name, $value): self
+    {
+        $this->setHeaders([$name => $value]);
+        return $this;
+    }
+
+    protected function setHeaders(array $headers): void
+    {
+        foreach ($headers as $name => $values) {
+            $values = (array)$values;
+            $name = strtolower((string)$name);
+
+            if (!$this->hasHeader($name)) {
+                $this->headers[$name] = [];
+            }
+
+            foreach ($values as $value) {
+                $value = $this->validateAndTrimHeader($name, (array)$value)[0];
+                $this->headers[$name][] = $value;
+            }
+        }
+    }
 }

Spacing +6 added lines, -6 removed lines

@@ -63,7 +63,7 @@ 
 	public function withHeader($name, $value): self
 	{
 		$name = strtolower($name);
-		$this->headers[$name] = $this->validateAndTrimHeader($name, (array)$value);
+		$this->headers[$name] = $this->validateAndTrimHeader($name, (array) $value);
 		return $this;
 	}
 
@@ -108,11 +108,11 @@ 
 
 		$returnValues = [];
 		foreach ($values as $v) {
-			if ((!is_numeric($v) && !is_string($v)) || 1 !== preg_match("@^[ \t\x21-\x7E\x80-\xFF]*$@", (string)$v)) {
+			if ((!is_numeric($v) && !is_string($v)) || 1 !== preg_match("@^[ \t\x21-\x7E\x80-\xFF]*$@", (string) $v)) {
 				throw new InvalidArgumentException('Header values must be RFC 7230 compatible strings.');
 			}
 
-			$returnValues[] = trim((string)$v);
+			$returnValues[] = trim((string) $v);
 		}
 
 		return $returnValues;
@@ -127,15 +127,15 @@ 
 	protected function setHeaders(array $headers): void
 	{
 		foreach ($headers as $name => $values) {
-			$values = (array)$values;
-			$name = strtolower((string)$name);
+			$values = (array) $values;
+			$name = strtolower((string) $name);
 
 			if (!$this->hasHeader($name)) {
 				$this->headers[$name] = [];
 			}
 
 			foreach ($values as $value) {
-				$value = $this->validateAndTrimHeader($name, (array)$value)[0];
+				$value = $this->validateAndTrimHeader($name, (array) $value)[0];
 				$this->headers[$name][] = $value;
 			}
 		}

src/ServerRequest.php

Indentation +79 added lines, -79 removed lines

@@ -13,83 +13,83 @@
 
 class ServerRequest extends Request implements ServerRequestInterface, ServerMessageInterface
 {
-	use ServerMessage;
-
-	protected array $cookieParams = [];
-
-	/** @var array|object|null */
-	protected $parsedBody;
-	protected array $queryParams = [];
-	protected array $serverParams;
-
-	/** @var UploadedFileInterface[] */
-	protected array $uploadedFiles = [];
-
-
-	public function __construct(
-		string $method,
-		UriInterface $uri,
-		array $headers = [],
-		$body = null,
-		string $version = '1.1',
-		array $serverParams = []
-	) {
-		parent::__construct($method, $uri, $headers, $body, $version);
-
-		$this->serverParams = $serverParams;
-		parse_str($uri->getQuery(), $this->queryParams);
-	}
-
-	public function getServerParams(): array
-	{
-		return $this->serverParams;
-	}
-
-	public function getUploadedFiles(): array
-	{
-		return $this->uploadedFiles;
-	}
-
-	public function withUploadedFiles(array $uploadedFiles)
-	{
-		$this->uploadedFiles = $uploadedFiles;
-		return $this;
-	}
-
-	public function getCookieParams(): array
-	{
-		return $this->cookieParams;
-	}
-
-	public function withCookieParams(array $cookies)
-	{
-		$this->cookieParams = $cookies;
-		return $this;
-	}
-
-	public function getQueryParams(): array
-	{
-		return $this->queryParams;
-	}
-
-	public function withQueryParams(array $query)
-	{
-		$this->queryParams = $query;
-		return $this;
-	}
-
-	public function getParsedBody()
-	{
-		return $this->parsedBody;
-	}
-
-	public function withParsedBody($data)
-	{
-		if (!is_array($data) && !is_object($data) && null !== $data) {
-			throw new InvalidArgumentException('First parameter to withParsedBody MUST be object, array or null');
-		}
-
-		$this->parsedBody = $data;
-		return $this;
-	}
+    use ServerMessage;
+
+    protected array $cookieParams = [];
+
+    /** @var array|object|null */
+    protected $parsedBody;
+    protected array $queryParams = [];
+    protected array $serverParams;
+
+    /** @var UploadedFileInterface[] */
+    protected array $uploadedFiles = [];
+
+
+    public function __construct(
+        string $method,
+        UriInterface $uri,
+        array $headers = [],
+        $body = null,
+        string $version = '1.1',
+        array $serverParams = []
+    ) {
+        parent::__construct($method, $uri, $headers, $body, $version);
+
+        $this->serverParams = $serverParams;
+        parse_str($uri->getQuery(), $this->queryParams);
+    }
+
+    public function getServerParams(): array
+    {
+        return $this->serverParams;
+    }
+
+    public function getUploadedFiles(): array
+    {
+        return $this->uploadedFiles;
+    }
+
+    public function withUploadedFiles(array $uploadedFiles)
+    {
+        $this->uploadedFiles = $uploadedFiles;
+        return $this;
+    }
+
+    public function getCookieParams(): array
+    {
+        return $this->cookieParams;
+    }
+
+    public function withCookieParams(array $cookies)
+    {
+        $this->cookieParams = $cookies;
+        return $this;
+    }
+
+    public function getQueryParams(): array
+    {
+        return $this->queryParams;
+    }
+
+    public function withQueryParams(array $query)
+    {
+        $this->queryParams = $query;
+        return $this;
+    }
+
+    public function getParsedBody()
+    {
+        return $this->parsedBody;
+    }
+
+    public function withParsedBody($data)
+    {
+        if (!is_array($data) && !is_object($data) && null !== $data) {
+            throw new InvalidArgumentException('First parameter to withParsedBody MUST be object, array or null');
+        }
+
+        $this->parsedBody = $data;
+        return $this;
+    }
 }