alexpts / php-mutable-psr7

src/LowercaseTrait.php

Indentation +4 added lines, -4 removed lines

@@ -7,8 +7,8 @@
 
 trait LowercaseTrait
 {
-	protected static function lowercase(string $value): string
-	{
-		return strtr($value, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'abcdefghijklmnopqrstuvwxyz');
-	}
+    protected static function lowercase(string $value): string
+    {
+        return strtr($value, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'abcdefghijklmnopqrstuvwxyz');
+    }
 }
\ No newline at end of file

src/Response.php

Indentation +109 added lines, -109 removed lines

@@ -11,124 +11,124 @@
 class Response extends Message implements ServerMessageInterface, ResponseInterface
 {
 
-	use ServerMessage;
+    use ServerMessage;
 
-	/** @var array Map of standard HTTP status code/reason phrases */
-	protected const PHRASES = [
-		100 => 'Continue',
-		101 => 'Switching Protocols',
-		102 => 'Processing',
-		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',
-		300 => 'Multiple Choices',
-		301 => 'Moved Permanently',
-		302 => 'Found',
-		303 => 'See Other',
-		304 => 'Not Modified',
-		305 => 'Use Proxy',
-		306 => 'Switch Proxy',
-		307 => 'Temporary Redirect',
-		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 Time-out',
-		409 => 'Conflict',
-		410 => 'Gone',
-		411 => 'Length Required',
-		412 => 'Precondition Failed',
-		413 => 'Request Entity Too Large',
-		414 => 'Request-URI Too Large',
-		415 => 'Unsupported Media Type',
-		416 => 'Requested range not satisfiable',
-		417 => 'Expectation Failed',
-		418 => 'I\'m a teapot',
-		422 => 'Unprocessable Entity',
-		423 => 'Locked',
-		424 => 'Failed Dependency',
-		425 => 'Unordered Collection',
-		426 => 'Upgrade Required',
-		428 => 'Precondition Required',
-		429 => 'Too Many Requests',
-		431 => 'Request Header Fields Too Large',
-		451 => 'Unavailable For Legal Reasons',
-		500 => 'Internal Server Error',
-		501 => 'Not Implemented',
-		502 => 'Bad Gateway',
-		503 => 'Service Unavailable',
-		504 => 'Gateway Time-out',
-		505 => 'HTTP Version not supported',
-		506 => 'Variant Also Negotiates',
-		507 => 'Insufficient Storage',
-		508 => 'Loop Detected',
-		511 => 'Network Authentication Required',
-	];
+    /** @var array Map of standard HTTP status code/reason phrases */
+    protected const PHRASES = [
+        100 => 'Continue',
+        101 => 'Switching Protocols',
+        102 => 'Processing',
+        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',
+        300 => 'Multiple Choices',
+        301 => 'Moved Permanently',
+        302 => 'Found',
+        303 => 'See Other',
+        304 => 'Not Modified',
+        305 => 'Use Proxy',
+        306 => 'Switch Proxy',
+        307 => 'Temporary Redirect',
+        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 Time-out',
+        409 => 'Conflict',
+        410 => 'Gone',
+        411 => 'Length Required',
+        412 => 'Precondition Failed',
+        413 => 'Request Entity Too Large',
+        414 => 'Request-URI Too Large',
+        415 => 'Unsupported Media Type',
+        416 => 'Requested range not satisfiable',
+        417 => 'Expectation Failed',
+        418 => 'I\'m a teapot',
+        422 => 'Unprocessable Entity',
+        423 => 'Locked',
+        424 => 'Failed Dependency',
+        425 => 'Unordered Collection',
+        426 => 'Upgrade Required',
+        428 => 'Precondition Required',
+        429 => 'Too Many Requests',
+        431 => 'Request Header Fields Too Large',
+        451 => 'Unavailable For Legal Reasons',
+        500 => 'Internal Server Error',
+        501 => 'Not Implemented',
+        502 => 'Bad Gateway',
+        503 => 'Service Unavailable',
+        504 => 'Gateway Time-out',
+        505 => 'HTTP Version not supported',
+        506 => 'Variant Also Negotiates',
+        507 => 'Insufficient Storage',
+        508 => 'Loop Detected',
+        511 => 'Network Authentication Required',
+    ];
 
-	protected string $reasonPhrase = '';
-	protected int $statusCode = 200;
+    protected string $reasonPhrase = '';
+    protected int $statusCode = 200;
 
-	/**
-	 * @param int $status Status code
-	 * @param array $headers Response headers
-	 * @param string|resource|StreamInterface|null $body Response body
-	 * @param string $version Protocol version
-	 * @param string|null $reason Reason phrase (when empty a default will be used based on the status code)
-	 */
-	public function __construct(
-		int $status = 200,
-		array $headers = [],
-		$body = null,
-		string $version = '1.1',
-		string $reason = null
-	) {
-		// If we got no body, defer initialization of the stream until Response::getBody()
-		if ('' !== $body && null !== $body) {
-			$this->stream = Stream::create($body);
-		}
+    /**
+     * @param int $status Status code
+     * @param array $headers Response headers
+     * @param string|resource|StreamInterface|null $body Response body
+     * @param string $version Protocol version
+     * @param string|null $reason Reason phrase (when empty a default will be used based on the status code)
+     */
+    public function __construct(
+        int $status = 200,
+        array $headers = [],
+        $body = null,
+        string $version = '1.1',
+        string $reason = null
+    ) {
+        // If we got no body, defer initialization of the stream until Response::getBody()
+        if ('' !== $body && null !== $body) {
+            $this->stream = Stream::create($body);
+        }
 
-		$this->statusCode = $status;
-		$this->setHeaders($headers);
+        $this->statusCode = $status;
+        $this->setHeaders($headers);
 
-		$this->reasonPhrase = $reason === null && isset(self::PHRASES[$this->statusCode])
-			? self::PHRASES[$status]
-			: $reason ?? '';
+        $this->reasonPhrase = $reason === null && isset(self::PHRASES[$this->statusCode])
+            ? self::PHRASES[$status]
+            : $reason ?? '';
 
-		$this->protocol = $version;
-	}
+        $this->protocol = $version;
+    }
 
-	public function getStatusCode(): int
-	{
-		return $this->statusCode;
-	}
+    public function getStatusCode(): int
+    {
+        return $this->statusCode;
+    }
 
-	public function getReasonPhrase(): string
-	{
-		return $this->reasonPhrase;
-	}
+    public function getReasonPhrase(): string
+    {
+        return $this->reasonPhrase;
+    }
 
-	public function withStatus($code, $reasonPhrase = ''): self
-	{
-		if ($code < 100 || $code > 599) {
-			throw new InvalidArgumentException('Status code has to be an integer between 100 and 599');
-		}
+    public function withStatus($code, $reasonPhrase = ''): self
+    {
+        if ($code < 100 || $code > 599) {
+            throw new InvalidArgumentException('Status code has to be an integer between 100 and 599');
+        }
 
-		$this->statusCode = $code;
-		if ('' === $reasonPhrase && isset(self::PHRASES[$this->statusCode])) {
-			$reasonPhrase = self::PHRASES[$this->statusCode];
-		}
+        $this->statusCode = $code;
+        if ('' === $reasonPhrase && isset(self::PHRASES[$this->statusCode])) {
+            $reasonPhrase = self::PHRASES[$this->statusCode];
+        }
 
-		$this->reasonPhrase = $reasonPhrase;
-		return $this;
-	}
+        $this->reasonPhrase = $reasonPhrase;
+        return $this;
+    }
 }
\ No newline at end of file

src/Request.php

Indentation +103 added lines, -103 removed lines

@@ -11,107 +11,107 @@
 
 class Request extends Message implements RequestInterface
 {
-	protected string $method;
-
-	protected ?string $requestTarget = null;
-	protected ?UriInterface $uri;
-
-	/**
-	 * @param string $method HTTP method
-	 * @param UriInterface $uri URI
-	 * @param array $headers Request headers
-	 * @param string|resource|StreamInterface|null $body Request body
-	 * @param string $version Protocol version
-	 */
-	public function __construct(
-		string $method,
-		UriInterface $uri,
-		array $headers = [],
-		$body = null,
-		string $version = '1.1'
-	) {
-		$this->method = $method;
-		$this->uri = $uri;
-		$this->setHeaders($headers);
-		$this->protocol = $version;
-
-		if (!$this->hasHeader('host')) {
-			$this->updateHostFromUri();
-		}
-
-		if ('' !== $body && null !== $body) {
-			$this->stream = Stream::create($body);
-		}
-	}
-
-	public function getRequestTarget(): string
-	{
-		if (null !== $this->requestTarget) {
-			return $this->requestTarget;
-		}
-
-		$target = $this->uri->getPath();
-		$target = $target ?: '/';
-
-		if ('' !== $this->uri->getQuery()) {
-			$target .= '?' . $this->uri->getQuery();
-		}
-
-		$this->requestTarget = $target;
-		return $target;
-	}
-
-	public function withRequestTarget($requestTarget): self
-	{
-		if (preg_match('#\s#', $requestTarget)) {
-			throw new InvalidArgumentException('Invalid request target provided; cannot contain whitespace');
-		}
-
-		$this->requestTarget = $requestTarget;
-		return $this;
-	}
-
-	public function getMethod(): string
-	{
-		return $this->method;
-	}
-
-	public function withMethod($method): self
-	{
-		$this->method = $method;
-		return $this;
-	}
-
-	public function getUri(): UriInterface
-	{
-		return $this->uri;
-	}
-
-	public function withUri(UriInterface $uri, $preserveHost = false): self
-	{
-		if ($uri === $this->uri) {
-			return $this;
-		}
-
-		$this->uri = $uri;
-
-		if (!$preserveHost || !$this->hasHeader('Host')) {
-			$this->updateHostFromUri();
-		}
-
-		return $this;
-	}
-
-	protected function updateHostFromUri(): void
-	{
-		if ('' === $host = $this->uri->getHost()) {
-			return;
-		}
-
-		if (null !== ($port = $this->uri->getPort())) {
-			$host .= ':' . $port;
-		}
-
-		$this->headers['host'] = [$host];
-	}
+    protected string $method;
+
+    protected ?string $requestTarget = null;
+    protected ?UriInterface $uri;
+
+    /**
+     * @param string $method HTTP method
+     * @param UriInterface $uri URI
+     * @param array $headers Request headers
+     * @param string|resource|StreamInterface|null $body Request body
+     * @param string $version Protocol version
+     */
+    public function __construct(
+        string $method,
+        UriInterface $uri,
+        array $headers = [],
+        $body = null,
+        string $version = '1.1'
+    ) {
+        $this->method = $method;
+        $this->uri = $uri;
+        $this->setHeaders($headers);
+        $this->protocol = $version;
+
+        if (!$this->hasHeader('host')) {
+            $this->updateHostFromUri();
+        }
+
+        if ('' !== $body && null !== $body) {
+            $this->stream = Stream::create($body);
+        }
+    }
+
+    public function getRequestTarget(): string
+    {
+        if (null !== $this->requestTarget) {
+            return $this->requestTarget;
+        }
+
+        $target = $this->uri->getPath();
+        $target = $target ?: '/';
+
+        if ('' !== $this->uri->getQuery()) {
+            $target .= '?' . $this->uri->getQuery();
+        }
+
+        $this->requestTarget = $target;
+        return $target;
+    }
+
+    public function withRequestTarget($requestTarget): self
+    {
+        if (preg_match('#\s#', $requestTarget)) {
+            throw new InvalidArgumentException('Invalid request target provided; cannot contain whitespace');
+        }
+
+        $this->requestTarget = $requestTarget;
+        return $this;
+    }
+
+    public function getMethod(): string
+    {
+        return $this->method;
+    }
+
+    public function withMethod($method): self
+    {
+        $this->method = $method;
+        return $this;
+    }
+
+    public function getUri(): UriInterface
+    {
+        return $this->uri;
+    }
+
+    public function withUri(UriInterface $uri, $preserveHost = false): self
+    {
+        if ($uri === $this->uri) {
+            return $this;
+        }
+
+        $this->uri = $uri;
+
+        if (!$preserveHost || !$this->hasHeader('Host')) {
+            $this->updateHostFromUri();
+        }
+
+        return $this;
+    }
+
+    protected function updateHostFromUri(): void
+    {
+        if ('' === $host = $this->uri->getHost()) {
+            return;
+        }
+
+        if (null !== ($port = $this->uri->getPort())) {
+            $host .= ':' . $port;
+        }
+
+        $this->headers['host'] = [$host];
+    }
 }

src/Response/JsonResponseInterface.php

Indentation +3 added lines, -3 removed lines

@@ -5,8 +5,8 @@
 
 interface JsonResponseInterface extends ServerMessageInterface
 {
-	public function getData(): array;
-	public function setData(array $data): self;
-	public function reset(): self;
+    public function getData(): array;
+    public function setData(array $data): self;
+    public function reset(): self;
 
 }
\ No newline at end of file

src/Response/ServerMessageInterface.php

Indentation +24 added lines, -24 removed lines

@@ -5,31 +5,31 @@
 
 interface ServerMessageInterface
 {
-	/**
-	 * @return array
-	 */
-	public function getAttributes(): array;
+    /**
+     * @return array
+     */
+    public function getAttributes(): array;
 
-	/**
-	 * @param string $attribute
-	 * @param mixed $default
-	 *
-	 * @return mixed
-	 */
-	public function getAttribute($attribute, $default = null);
+    /**
+     * @param string $attribute
+     * @param mixed $default
+     *
+     * @return mixed
+     */
+    public function getAttribute($attribute, $default = null);
 
-	/**
-	 * @param string $attribute
-	 * @param mixed $value
-	 *
-	 * @return $this
-	 */
-	public function withAttribute($attribute, $value);
+    /**
+     * @param string $attribute
+     * @param mixed $value
+     *
+     * @return $this
+     */
+    public function withAttribute($attribute, $value);
 
-	/**
-	 * @param string $attribute
-	 *
-	 * @return $this
-	 */
-	public function withoutAttribute($attribute);
+    /**
+     * @param string $attribute
+     *
+     * @return $this
+     */
+    public function withoutAttribute($attribute);
 }
\ No newline at end of file

src/UploadedFile.php

Indentation +150 added lines, -150 removed lines

@@ -17,154 +17,154 @@
 
 final class UploadedFile implements UploadedFileInterface
 {
-	/** @var array */
-	private const ERRORS = [
-		\UPLOAD_ERR_OK => 1,
-		\UPLOAD_ERR_INI_SIZE => 1,
-		\UPLOAD_ERR_FORM_SIZE => 1,
-		\UPLOAD_ERR_PARTIAL => 1,
-		\UPLOAD_ERR_NO_FILE => 1,
-		\UPLOAD_ERR_NO_TMP_DIR => 1,
-		\UPLOAD_ERR_CANT_WRITE => 1,
-		\UPLOAD_ERR_EXTENSION => 1,
-	];
-
-	protected ?string $clientFilename = null;
-	protected ?string $clientMediaType = null;
-	protected int $error;
-	private ?string $file = null;
-	private bool $moved = false;
-	private int $size;
-	private ?StreamInterface $stream = null;
-
-	/**
-	 * @param StreamInterface|string|resource $streamOrFile
-	 * @param int $size
-	 * @param int $errorStatus
-	 * @param string|null $clientFilename
-	 * @param string|null $clientMediaType
-	 */
-	public function __construct($streamOrFile, $size, $errorStatus, $clientFilename = null, $clientMediaType = null)
-	{
-		if (false === is_int($errorStatus) || !isset(self::ERRORS[$errorStatus])) {
-			throw new InvalidArgumentException('Upload file error status must be an integer value and one of the "UPLOAD_ERR_*" constants.');
-		}
-
-		if (false === is_int($size)) {
-			throw new InvalidArgumentException('Upload file size must be an integer');
-		}
-
-		if (null !== $clientFilename && !is_string($clientFilename)) {
-			throw new InvalidArgumentException('Upload file client filename must be a string or null');
-		}
-
-		if (null !== $clientMediaType && !is_string($clientMediaType)) {
-			throw new InvalidArgumentException('Upload file client media type must be a string or null');
-		}
-
-		$this->error = $errorStatus;
-		$this->size = $size;
-		$this->clientFilename = $clientFilename;
-		$this->clientMediaType = $clientMediaType;
-
-		if (\UPLOAD_ERR_OK === $this->error) {
-			// Depending on the value set file or stream variable.
-			if (is_string($streamOrFile)) {
-				$this->file = $streamOrFile;
-			} elseif (\is_resource($streamOrFile)) {
-				$this->stream = Stream::create($streamOrFile);
-			} elseif ($streamOrFile instanceof StreamInterface) {
-				$this->stream = $streamOrFile;
-			} else {
-				throw new InvalidArgumentException('Invalid stream or file provided for UploadedFile');
-			}
-		}
-	}
-
-	/**
-	 * @throws RuntimeException if is moved or not ok
-	 */
-	private function validateActive(): void
-	{
-		if (\UPLOAD_ERR_OK !== $this->error) {
-			throw new RuntimeException('Cannot retrieve stream due to upload error');
-		}
-
-		if ($this->moved) {
-			throw new RuntimeException('Cannot retrieve stream after it has already been moved');
-		}
-	}
-
-	public function getStream(): StreamInterface
-	{
-		$this->validateActive();
-
-		if ($this->stream instanceof StreamInterface) {
-			return $this->stream;
-		}
-
-		$resource = fopen($this->file, 'r');
-
-		return Stream::create($resource);
-	}
-
-	public function moveTo($targetPath): void
-	{
-		$this->validateActive();
-
-		if (!is_string($targetPath) || '' === $targetPath) {
-			throw new InvalidArgumentException('Invalid path provided for move operation; must be a non-empty string');
-		}
-
-		if (null !== $this->file) {
-			$this->moved = 'cli' === \PHP_SAPI
-				? rename($this->file, $targetPath)
-				: move_uploaded_file($this->file, $targetPath);
-
-			if (false === $this->moved) {
-				throw new RuntimeException(sprintf('Uploaded file could not be moved to %s', $targetPath));
-			}
-
-			return;
-		}
-
-		$stream = $this->getStream();
-		if ($stream->isSeekable()) {
-			$stream->rewind();
-		}
-
-		// Copy the contents of a stream into another stream until end-of-file.
-		try {
-			$dest = Stream::create(fopen($targetPath, 'w'));
-			while (!$stream->eof()) {
-				if (!$dest->write($stream->read(1048576))) {
-					break;
-				}
-			}
-
-			$this->moved = true;
-		} catch (Throwable $throwable) {
-			throw new RuntimeException(sprintf('Uploaded file could not be moved to %s', $targetPath), 0, $throwable);
-		}
-	}
-
-	public function getSize(): int
-	{
-		return $this->size;
-	}
-
-	public function getError(): int
-	{
-		return $this->error;
-	}
-
-	public function getClientFilename(): ?string
-	{
-		return $this->clientFilename;
-	}
-
-	public function getClientMediaType(): ?string
-	{
-		return $this->clientMediaType;
-	}
+    /** @var array */
+    private const ERRORS = [
+        \UPLOAD_ERR_OK => 1,
+        \UPLOAD_ERR_INI_SIZE => 1,
+        \UPLOAD_ERR_FORM_SIZE => 1,
+        \UPLOAD_ERR_PARTIAL => 1,
+        \UPLOAD_ERR_NO_FILE => 1,
+        \UPLOAD_ERR_NO_TMP_DIR => 1,
+        \UPLOAD_ERR_CANT_WRITE => 1,
+        \UPLOAD_ERR_EXTENSION => 1,
+    ];
+
+    protected ?string $clientFilename = null;
+    protected ?string $clientMediaType = null;
+    protected int $error;
+    private ?string $file = null;
+    private bool $moved = false;
+    private int $size;
+    private ?StreamInterface $stream = null;
+
+    /**
+     * @param StreamInterface|string|resource $streamOrFile
+     * @param int $size
+     * @param int $errorStatus
+     * @param string|null $clientFilename
+     * @param string|null $clientMediaType
+     */
+    public function __construct($streamOrFile, $size, $errorStatus, $clientFilename = null, $clientMediaType = null)
+    {
+        if (false === is_int($errorStatus) || !isset(self::ERRORS[$errorStatus])) {
+            throw new InvalidArgumentException('Upload file error status must be an integer value and one of the "UPLOAD_ERR_*" constants.');
+        }
+
+        if (false === is_int($size)) {
+            throw new InvalidArgumentException('Upload file size must be an integer');
+        }
+
+        if (null !== $clientFilename && !is_string($clientFilename)) {
+            throw new InvalidArgumentException('Upload file client filename must be a string or null');
+        }
+
+        if (null !== $clientMediaType && !is_string($clientMediaType)) {
+            throw new InvalidArgumentException('Upload file client media type must be a string or null');
+        }
+
+        $this->error = $errorStatus;
+        $this->size = $size;
+        $this->clientFilename = $clientFilename;
+        $this->clientMediaType = $clientMediaType;
+
+        if (\UPLOAD_ERR_OK === $this->error) {
+            // Depending on the value set file or stream variable.
+            if (is_string($streamOrFile)) {
+                $this->file = $streamOrFile;
+            } elseif (\is_resource($streamOrFile)) {
+                $this->stream = Stream::create($streamOrFile);
+            } elseif ($streamOrFile instanceof StreamInterface) {
+                $this->stream = $streamOrFile;
+            } else {
+                throw new InvalidArgumentException('Invalid stream or file provided for UploadedFile');
+            }
+        }
+    }
+
+    /**
+     * @throws RuntimeException if is moved or not ok
+     */
+    private function validateActive(): void
+    {
+        if (\UPLOAD_ERR_OK !== $this->error) {
+            throw new RuntimeException('Cannot retrieve stream due to upload error');
+        }
+
+        if ($this->moved) {
+            throw new RuntimeException('Cannot retrieve stream after it has already been moved');
+        }
+    }
+
+    public function getStream(): StreamInterface
+    {
+        $this->validateActive();
+
+        if ($this->stream instanceof StreamInterface) {
+            return $this->stream;
+        }
+
+        $resource = fopen($this->file, 'r');
+
+        return Stream::create($resource);
+    }
+
+    public function moveTo($targetPath): void
+    {
+        $this->validateActive();
+
+        if (!is_string($targetPath) || '' === $targetPath) {
+            throw new InvalidArgumentException('Invalid path provided for move operation; must be a non-empty string');
+        }
+
+        if (null !== $this->file) {
+            $this->moved = 'cli' === \PHP_SAPI
+                ? rename($this->file, $targetPath)
+                : move_uploaded_file($this->file, $targetPath);
+
+            if (false === $this->moved) {
+                throw new RuntimeException(sprintf('Uploaded file could not be moved to %s', $targetPath));
+            }
+
+            return;
+        }
+
+        $stream = $this->getStream();
+        if ($stream->isSeekable()) {
+            $stream->rewind();
+        }
+
+        // Copy the contents of a stream into another stream until end-of-file.
+        try {
+            $dest = Stream::create(fopen($targetPath, 'w'));
+            while (!$stream->eof()) {
+                if (!$dest->write($stream->read(1048576))) {
+                    break;
+                }
+            }
+
+            $this->moved = true;
+        } catch (Throwable $throwable) {
+            throw new RuntimeException(sprintf('Uploaded file could not be moved to %s', $targetPath), 0, $throwable);
+        }
+    }
+
+    public function getSize(): int
+    {
+        return $this->size;
+    }
+
+    public function getError(): int
+    {
+        return $this->error;
+    }
+
+    public function getClientFilename(): ?string
+    {
+        return $this->clientFilename;
+    }
+
+    public function getClientMediaType(): ?string
+    {
+        return $this->clientMediaType;
+    }
 }
\ No newline at end of file

src/Factory/Psr17Factory.php

Indentation +64 added lines, -64 removed lines

@@ -29,68 +29,68 @@
 
 class Psr17Factory implements RequestFactoryInterface, ResponseFactoryInterface, ServerRequestFactoryInterface, StreamFactoryInterface, UploadedFileFactoryInterface, UriFactoryInterface
 {
-	public function createRequest(string $method, $uri): RequestInterface
-	{
-		if (is_string($uri)) {
-			$uri = $this->createUri($uri);
-		}
-
-		return new Request($method, $uri);
-	}
-
-	public function createResponse(int $code = 200, string $reasonPhrase = ''): ResponseInterface
-	{
-		if (2 > func_num_args()) {
-			$reasonPhrase = null;
-		}
-
-		return new Response($code, [], null, '1.1', $reasonPhrase);
-	}
-
-	public function createStream(string $content = ''): StreamInterface
-	{
-		return Stream::create($content);
-	}
-
-	public function createStreamFromFile(string $filename, string $mode = 'r'): StreamInterface
-	{
-		$resource = @fopen($filename, $mode);
-		if (false === $resource) {
-			if ('' === $mode || false === in_array($mode[0], ['r', 'w', 'a', 'x', 'c'])) {
-				throw new InvalidArgumentException('The mode ' . $mode . ' is invalid.');
-			}
-
-			throw new RuntimeException('The file ' . $filename . ' cannot be opened.');
-		}
-
-		return Stream::create($resource);
-	}
-
-	public function createStreamFromResource($resource): StreamInterface
-	{
-		return Stream::create($resource);
-	}
-
-	public function createUploadedFile(StreamInterface $stream, int $size = null, int $error = \UPLOAD_ERR_OK, string $clientFilename = null, string $clientMediaType = null): UploadedFileInterface
-	{
-		if (null === $size) {
-			$size = $stream->getSize();
-		}
-
-		return new UploadedFile($stream, $size, $error, $clientFilename, $clientMediaType);
-	}
-
-	public function createUri(string $uri = ''): UriInterface
-	{
-		return new Uri($uri);
-	}
-
-	public function createServerRequest(string $method, $uri, array $serverParams = []): ServerRequestInterface
-	{
-		if (is_string($uri)) {
-			$uri = $this->createUri($uri);
-		}
-
-		return new ServerRequest($method, $uri, [], null, '1.1', $serverParams);
-	}
+    public function createRequest(string $method, $uri): RequestInterface
+    {
+        if (is_string($uri)) {
+            $uri = $this->createUri($uri);
+        }
+
+        return new Request($method, $uri);
+    }
+
+    public function createResponse(int $code = 200, string $reasonPhrase = ''): ResponseInterface
+    {
+        if (2 > func_num_args()) {
+            $reasonPhrase = null;
+        }
+
+        return new Response($code, [], null, '1.1', $reasonPhrase);
+    }
+
+    public function createStream(string $content = ''): StreamInterface
+    {
+        return Stream::create($content);
+    }
+
+    public function createStreamFromFile(string $filename, string $mode = 'r'): StreamInterface
+    {
+        $resource = @fopen($filename, $mode);
+        if (false === $resource) {
+            if ('' === $mode || false === in_array($mode[0], ['r', 'w', 'a', 'x', 'c'])) {
+                throw new InvalidArgumentException('The mode ' . $mode . ' is invalid.');
+            }
+
+            throw new RuntimeException('The file ' . $filename . ' cannot be opened.');
+        }
+
+        return Stream::create($resource);
+    }
+
+    public function createStreamFromResource($resource): StreamInterface
+    {
+        return Stream::create($resource);
+    }
+
+    public function createUploadedFile(StreamInterface $stream, int $size = null, int $error = \UPLOAD_ERR_OK, string $clientFilename = null, string $clientMediaType = null): UploadedFileInterface
+    {
+        if (null === $size) {
+            $size = $stream->getSize();
+        }
+
+        return new UploadedFile($stream, $size, $error, $clientFilename, $clientMediaType);
+    }
+
+    public function createUri(string $uri = ''): UriInterface
+    {
+        return new Uri($uri);
+    }
+
+    public function createServerRequest(string $method, $uri, array $serverParams = []): ServerRequestInterface
+    {
+        if (is_string($uri)) {
+            $uri = $this->createUri($uri);
+        }
+
+        return new ServerRequest($method, $uri, [], null, '1.1', $serverParams);
+    }
 }
\ No newline at end of file

src/Factory/HttplugFactory.php

Indentation +20 added lines, -20 removed lines

@@ -14,28 +14,28 @@
 
 class HttplugFactory implements MessageFactory, StreamFactory, UriFactory
 {
-	public function createRequest($method, $uri, array $headers = [], $body = null, $protocolVersion = '1.1')
-	{
-		$uri = $this->createUri($uri);
-		return new Request($method, $uri, $headers, $body, $protocolVersion);
-	}
+    public function createRequest($method, $uri, array $headers = [], $body = null, $protocolVersion = '1.1')
+    {
+        $uri = $this->createUri($uri);
+        return new Request($method, $uri, $headers, $body, $protocolVersion);
+    }
 
-	public function createResponse($statusCode = 200, $reasonPhrase = null, array $headers = [], $body = null, $version = '1.1')
-	{
-		return new Response((int)$statusCode, $headers, $body, $version, $reasonPhrase);
-	}
+    public function createResponse($statusCode = 200, $reasonPhrase = null, array $headers = [], $body = null, $version = '1.1')
+    {
+        return new Response((int)$statusCode, $headers, $body, $version, $reasonPhrase);
+    }
 
-	public function createStream($body = null)
-	{
-		return Stream::create($body ?? '');
-	}
+    public function createStream($body = null)
+    {
+        return Stream::create($body ?? '');
+    }
 
-	public function createUri($uri = ''): UriInterface
-	{
-		if ($uri instanceof UriInterface) {
-			return $uri;
-		}
+    public function createUri($uri = ''): UriInterface
+    {
+        if ($uri instanceof UriInterface) {
+            return $uri;
+        }
 
-		return new Uri($uri);
-	}
+        return new Uri($uri);
+    }
 }
\ No newline at end of file

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