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];
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -54,7 +54,7 @@ 
 		$target = $target ?: '/';
 
 		if ('' !== $this->uri->getQuery()) {
-			$target .= '?' . $this->uri->getQuery();
+			$target .= '?'.$this->uri->getQuery();
 		}
 
 		$this->requestTarget = $target;
@@ -109,7 +109,7 @@ 
 		}
 
 		if (null !== ($port = $this->uri->getPort())) {
-			$host .= ':' . $port;
+			$host .= ':'.$port;
 		}
 
 		$this->headers['host'] = [$host];

src/Stream.php

Indentation +223 added lines, -223 removed lines

@@ -23,227 +23,227 @@
 
 class Stream implements StreamInterface
 {
-	/** @var resource|null A resource reference */
-	protected $stream = null;
-	protected bool $seekable = false;
-	protected bool $readable = false;
-	protected bool $writable = false;
-	/** @var array|mixed|void|null */
-	protected $uri;
-	/** @var int|null */
-	protected ?int $size = null;
-
-	protected const READ_WRITE_HASH = [
-		'read' => [
-			'r' => true, 'w+' => true, 'r+' => true, 'x+' => true, 'c+' => true,
-			'rb' => true, 'w+b' => true, 'r+b' => true, 'x+b' => true,
-			'c+b' => true, 'rt' => true, 'w+t' => true, 'r+t' => true,
-			'x+t' => true, 'c+t' => true, 'a+' => true,
-		],
-		'write' => [
-			'w' => true, 'w+' => true, 'rw' => true, 'r+' => true, 'x+' => true,
-			'c+' => true, 'wb' => true, 'w+b' => true, 'r+b' => true,
-			'x+b' => true, 'c+b' => true, 'w+t' => true, 'r+t' => true,
-			'x+t' => true, 'c+t' => true, 'a' => true, 'a+' => true,
-		],
-	];
-
-	/**
-	 * Creates a new PSR-7 stream.
-	 *
-	 * @param string|resource|StreamInterface $body
-	 *
-	 * @return StreamInterface
-	 *
-	 * @throws InvalidArgumentException
-	 */
-	public static function create($body = ''): StreamInterface
-	{
-		if ($body instanceof StreamInterface) {
-			return $body;
-		}
-
-		if (is_string($body)) {
-			$resource = fopen('php://temp', 'rw+');
-			fwrite($resource, $body);
-			$body = $resource;
-		}
-
-		if (is_resource($body)) {
-			$new = new self();
-			$new->stream = $body;
-			$meta = stream_get_meta_data($new->stream);
-			$new->seekable = $meta['seekable'] && 0 === \fseek($new->stream, 0, \SEEK_CUR);
-			$new->readable = isset(self::READ_WRITE_HASH['read'][$meta['mode']]);
-			$new->writable = isset(self::READ_WRITE_HASH['write'][$meta['mode']]);
-			$new->uri = $new->getMetadata('uri');
-
-			return $new;
-		}
-
-		throw new InvalidArgumentException('First argument to Stream::create() must be a string, resource or StreamInterface.');
-	}
-
-	/**
-	 * Closes the stream when the destructed.
-	 */
-	public function __destruct()
-	{
-		$this->close();
-	}
-
-	public function __toString(): string
-	{
-		if ($this->isSeekable()) {
-			$this->seek(0);
-		}
-
-		return $this->getContents();
-	}
-
-	public function close(): void
-	{
-		if (isset($this->stream) && is_resource($this->stream)) {
-			fclose($this->stream);
-			$this->detach();
-		}
-	}
-
-	public function detach()
-	{
-		if (!isset($this->stream)) {
-			return null;
-		}
-
-		$result = $this->stream;
-		unset($this->stream);
-
-		$this->size = $this->uri = null;
-		$this->readable = $this->writable = $this->seekable = false;
-
-		return $result;
-	}
-
-	public function getSize(): ?int
-	{
-		if (null !== $this->size) {
-			return $this->size;
-		}
-
-		if (!isset($this->stream)) {
-			return null;
-		}
-
-		// Clear the stat cache if the stream has a URI
-		if ($this->uri) {
-			clearstatcache(true, $this->uri);
-		}
-
-		$stats = fstat($this->stream);
-		if (isset($stats['size'])) {
-			$this->size = $stats['size'];
-			return $this->size;
-		}
-
-		return null;
-	}
-
-	public function tell(): int
-	{
-		$position = ftell($this->stream);
-		if (false === $position) {
-			throw new RuntimeException('Unable to determine stream position');
-		}
-
-		return $position;
-	}
-
-	public function eof(): bool
-	{
-		return !$this->stream || feof($this->stream);
-	}
-
-	public function isSeekable(): bool
-	{
-		return $this->seekable;
-	}
-
-	public function seek($offset, $whence = SEEK_SET): void
-	{
-		if (!$this->seekable) {
-			throw new RuntimeException('Stream is not seekable');
-		}
-
-		if (-1 === fseek($this->stream, $offset, $whence)) {
-			throw new RuntimeException('Unable to seek to stream position ' . $offset . ' with whence ' . \var_export($whence, true));
-		}
-	}
-
-	public function rewind(): void
-	{
-		$this->seek(0);
-	}
-
-	public function isWritable(): bool
-	{
-		return $this->writable;
-	}
-
-	public function write($string): int
-	{
-		if (!$this->writable) {
-			throw new RuntimeException('Cannot write to a non-writable stream');
-		}
-
-		// We can't know the size after writing anything
-		$this->size = null;
-
-		if (false === $result = fwrite($this->stream, $string)) {
-			throw new RuntimeException('Unable to write to stream');
-		}
-
-		return $result;
-	}
-
-	public function isReadable(): bool
-	{
-		return $this->readable;
-	}
-
-	public function read($length): string
-	{
-		if (!$this->readable) {
-			throw new RuntimeException('Cannot read from non-readable stream');
-		}
-
-		return fread($this->stream, $length);
-	}
-
-	public function getContents(): string
-	{
-		if (!isset($this->stream)) {
-			throw new RuntimeException('Unable to read stream contents');
-		}
-
-		if (false === $contents = stream_get_contents($this->stream)) {
-			throw new RuntimeException('Unable to read stream contents');
-		}
-
-		return $contents;
-	}
-
-	public function getMetadata($key = null)
-	{
-		if (!isset($this->stream)) {
-			return $key ? null : [];
-		}
-
-		$meta = stream_get_meta_data($this->stream);
-
-		if (null === $key) {
-			return $meta;
-		}
-
-		return $meta[$key] ?? null;
-	}
+    /** @var resource|null A resource reference */
+    protected $stream = null;
+    protected bool $seekable = false;
+    protected bool $readable = false;
+    protected bool $writable = false;
+    /** @var array|mixed|void|null */
+    protected $uri;
+    /** @var int|null */
+    protected ?int $size = null;
+
+    protected const READ_WRITE_HASH = [
+        'read' => [
+            'r' => true, 'w+' => true, 'r+' => true, 'x+' => true, 'c+' => true,
+            'rb' => true, 'w+b' => true, 'r+b' => true, 'x+b' => true,
+            'c+b' => true, 'rt' => true, 'w+t' => true, 'r+t' => true,
+            'x+t' => true, 'c+t' => true, 'a+' => true,
+        ],
+        'write' => [
+            'w' => true, 'w+' => true, 'rw' => true, 'r+' => true, 'x+' => true,
+            'c+' => true, 'wb' => true, 'w+b' => true, 'r+b' => true,
+            'x+b' => true, 'c+b' => true, 'w+t' => true, 'r+t' => true,
+            'x+t' => true, 'c+t' => true, 'a' => true, 'a+' => true,
+        ],
+    ];
+
+    /**
+     * Creates a new PSR-7 stream.
+     *
+     * @param string|resource|StreamInterface $body
+     *
+     * @return StreamInterface
+     *
+     * @throws InvalidArgumentException
+     */
+    public static function create($body = ''): StreamInterface
+    {
+        if ($body instanceof StreamInterface) {
+            return $body;
+        }
+
+        if (is_string($body)) {
+            $resource = fopen('php://temp', 'rw+');
+            fwrite($resource, $body);
+            $body = $resource;
+        }
+
+        if (is_resource($body)) {
+            $new = new self();
+            $new->stream = $body;
+            $meta = stream_get_meta_data($new->stream);
+            $new->seekable = $meta['seekable'] && 0 === \fseek($new->stream, 0, \SEEK_CUR);
+            $new->readable = isset(self::READ_WRITE_HASH['read'][$meta['mode']]);
+            $new->writable = isset(self::READ_WRITE_HASH['write'][$meta['mode']]);
+            $new->uri = $new->getMetadata('uri');
+
+            return $new;
+        }
+
+        throw new InvalidArgumentException('First argument to Stream::create() must be a string, resource or StreamInterface.');
+    }
+
+    /**
+     * Closes the stream when the destructed.
+     */
+    public function __destruct()
+    {
+        $this->close();
+    }
+
+    public function __toString(): string
+    {
+        if ($this->isSeekable()) {
+            $this->seek(0);
+        }
+
+        return $this->getContents();
+    }
+
+    public function close(): void
+    {
+        if (isset($this->stream) && is_resource($this->stream)) {
+            fclose($this->stream);
+            $this->detach();
+        }
+    }
+
+    public function detach()
+    {
+        if (!isset($this->stream)) {
+            return null;
+        }
+
+        $result = $this->stream;
+        unset($this->stream);
+
+        $this->size = $this->uri = null;
+        $this->readable = $this->writable = $this->seekable = false;
+
+        return $result;
+    }
+
+    public function getSize(): ?int
+    {
+        if (null !== $this->size) {
+            return $this->size;
+        }
+
+        if (!isset($this->stream)) {
+            return null;
+        }
+
+        // Clear the stat cache if the stream has a URI
+        if ($this->uri) {
+            clearstatcache(true, $this->uri);
+        }
+
+        $stats = fstat($this->stream);
+        if (isset($stats['size'])) {
+            $this->size = $stats['size'];
+            return $this->size;
+        }
+
+        return null;
+    }
+
+    public function tell(): int
+    {
+        $position = ftell($this->stream);
+        if (false === $position) {
+            throw new RuntimeException('Unable to determine stream position');
+        }
+
+        return $position;
+    }
+
+    public function eof(): bool
+    {
+        return !$this->stream || feof($this->stream);
+    }
+
+    public function isSeekable(): bool
+    {
+        return $this->seekable;
+    }
+
+    public function seek($offset, $whence = SEEK_SET): void
+    {
+        if (!$this->seekable) {
+            throw new RuntimeException('Stream is not seekable');
+        }
+
+        if (-1 === fseek($this->stream, $offset, $whence)) {
+            throw new RuntimeException('Unable to seek to stream position ' . $offset . ' with whence ' . \var_export($whence, true));
+        }
+    }
+
+    public function rewind(): void
+    {
+        $this->seek(0);
+    }
+
+    public function isWritable(): bool
+    {
+        return $this->writable;
+    }
+
+    public function write($string): int
+    {
+        if (!$this->writable) {
+            throw new RuntimeException('Cannot write to a non-writable stream');
+        }
+
+        // We can't know the size after writing anything
+        $this->size = null;
+
+        if (false === $result = fwrite($this->stream, $string)) {
+            throw new RuntimeException('Unable to write to stream');
+        }
+
+        return $result;
+    }
+
+    public function isReadable(): bool
+    {
+        return $this->readable;
+    }
+
+    public function read($length): string
+    {
+        if (!$this->readable) {
+            throw new RuntimeException('Cannot read from non-readable stream');
+        }
+
+        return fread($this->stream, $length);
+    }
+
+    public function getContents(): string
+    {
+        if (!isset($this->stream)) {
+            throw new RuntimeException('Unable to read stream contents');
+        }
+
+        if (false === $contents = stream_get_contents($this->stream)) {
+            throw new RuntimeException('Unable to read stream contents');
+        }
+
+        return $contents;
+    }
+
+    public function getMetadata($key = null)
+    {
+        if (!isset($this->stream)) {
+            return $key ? null : [];
+        }
+
+        $meta = stream_get_meta_data($this->stream);
+
+        if (null === $key) {
+            return $meta;
+        }
+
+        return $meta[$key] ?? null;
+    }
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -175,7 +175,7 @@
 		}
 
 		if (-1 === fseek($this->stream, $offset, $whence)) {
-			throw new RuntimeException('Unable to seek to stream position ' . $offset . ' with whence ' . \var_export($whence, true));
+			throw new RuntimeException('Unable to seek to stream position '.$offset.' with whence '.\var_export($whence, true));
 		}
 	}
 

src/ServerRequest.php

Indentation +83 added lines, -83 removed lines

@@ -13,87 +13,87 @@
 
 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;
-	}
-
-	public function getServerParams(): array
-	{
-		return $this->serverParams;
-	}
-
-	public function getUploadedFiles(): array
-	{
-		return $this->uploadedFiles;
-	}
-
-	public function withUploadedFiles(array $uploadedFiles)
-	{
-		$new = clone $this;
-		$new->uploadedFiles = $uploadedFiles;
-
-		return $new;
-	}
-
-	public function getCookieParams(): array
-	{
-		return $this->cookieParams;
-	}
-
-	public function withCookieParams(array $cookies)
-	{
-		$new = clone $this;
-		$new->cookieParams = $cookies;
-
-		return $new;
-	}
-
-	public function getQueryParams(): array
-	{
-		return $this->queryParams;
-	}
-
-	public function withQueryParams(array $query)
-	{
-		$new = clone $this;
-		$new->queryParams = $query;
-
-		return $new;
-	}
-
-	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;
+    }
+
+    public function getServerParams(): array
+    {
+        return $this->serverParams;
+    }
+
+    public function getUploadedFiles(): array
+    {
+        return $this->uploadedFiles;
+    }
+
+    public function withUploadedFiles(array $uploadedFiles)
+    {
+        $new = clone $this;
+        $new->uploadedFiles = $uploadedFiles;
+
+        return $new;
+    }
+
+    public function getCookieParams(): array
+    {
+        return $this->cookieParams;
+    }
+
+    public function withCookieParams(array $cookies)
+    {
+        $new = clone $this;
+        $new->cookieParams = $cookies;
+
+        return $new;
+    }
+
+    public function getQueryParams(): array
+    {
+        return $this->queryParams;
+    }
+
+    public function withQueryParams(array $query)
+    {
+        $new = clone $this;
+        $new->queryParams = $query;
+
+        return $new;
+    }
+
+    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;
+    }
 }

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/JsonResponse.php

Indentation +51 added lines, -51 removed lines

@@ -10,64 +10,64 @@
 
 class JsonResponse extends HttpResponse implements JsonResponseInterface
 {
-	protected array $data = [];
-	protected bool $isSyncBody = false;
+    protected array $data = [];
+    protected bool $isSyncBody = false;
 
-	public function __construct(
-		array $data,
-		int $status = 200,
-		array $headers = [],
-		string $version = '1.1'
-	) {
-		$headers['Content-Type'] = 'application/json';
-		parent::__construct($status, $headers, null, $version);
-		$this->data = $data;
-	}
+    public function __construct(
+        array $data,
+        int $status = 200,
+        array $headers = [],
+        string $version = '1.1'
+    ) {
+        $headers['Content-Type'] = 'application/json';
+        parent::__construct($status, $headers, null, $version);
+        $this->data = $data;
+    }
 
-	public function getData(): array
-	{
-		return $this->data;
-	}
+    public function getData(): array
+    {
+        return $this->data;
+    }
 
-	public function getBody(): StreamInterface
-	{
-		if (!$this->isSyncBody) {
-			$this->isSyncBody = true;
-			$data = json_encode($this->data, JSON_THROW_ON_ERROR | JSON_UNESCAPED_UNICODE, 512);
-			parent::withBody(Stream::create($data));
-		}
+    public function getBody(): StreamInterface
+    {
+        if (!$this->isSyncBody) {
+            $this->isSyncBody = true;
+            $data = json_encode($this->data, JSON_THROW_ON_ERROR | JSON_UNESCAPED_UNICODE, 512);
+            parent::withBody(Stream::create($data));
+        }
 
-		return parent::getBody();
-	}
+        return parent::getBody();
+    }
 
-	public function withBody(StreamInterface $body): Message
-	{
-		$this->data = json_decode((string)$body, true, 512, JSON_THROW_ON_ERROR);
-		$this->isSyncBody = true;
-		return parent::withBody($body);
-	}
+    public function withBody(StreamInterface $body): Message
+    {
+        $this->data = json_decode((string)$body, true, 512, JSON_THROW_ON_ERROR);
+        $this->isSyncBody = true;
+        return parent::withBody($body);
+    }
 
-	public function setData(array $data): self
-	{
-		$this->isSyncBody = false;
-		$this->data = $data;
-		return $this;
-	}
+    public function setData(array $data): self
+    {
+        $this->isSyncBody = false;
+        $this->data = $data;
+        return $this;
+    }
 
-	public function reset(): self
-	{
-		$this->setData([]);
-		$this->protocol = '1.1';
-		$this->statusCode = 200;
-		$this->attributes = [];
-		$this->headers = [];
-		$this->withHeader('Content-Type', 'application/json');
+    public function reset(): self
+    {
+        $this->setData([]);
+        $this->protocol = '1.1';
+        $this->statusCode = 200;
+        $this->attributes = [];
+        $this->headers = [];
+        $this->withHeader('Content-Type', 'application/json');
 
-		if ($this->stream) {
-			$this->stream->close();
-			unset($this->stream);
-		}
+        if ($this->stream) {
+            $this->stream->close();
+            unset($this->stream);
+        }
 
-		return $this;
-	}
+        return $this;
+    }
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
 
 	public function withBody(StreamInterface $body): Message
 	{
-		$this->data = json_decode((string)$body, true, 512, JSON_THROW_ON_ERROR);
+		$this->data = json_decode((string) $body, true, 512, JSON_THROW_ON_ERROR);
 		$this->isSyncBody = true;
 		return parent::withBody($body);
 	}

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