sunrise-php / http-message

src/Response.php

Spacing +1 added lines, -1 removed lines

@@ -262,7 +262,7 @@
             throw new InvalidArgumentException('HTTP status code must be an integer');
         }
 
-        if (! ($statusCode >= 100 && $statusCode <= 599)) {
+        if (!($statusCode >= 100 && $statusCode <= 599)) {
             throw new InvalidArgumentException('Invalid HTTP status code');
         }
     }

Indentation +215 added lines, -215 removed lines

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

src/StreamFactory.php

Indentation +31 added lines, -31 removed lines

@@ -27,35 +27,35 @@
 class StreamFactory implements StreamFactoryInterface
 {
 
-    /**
-     * {@inheritdoc}
-     */
-    public function createStream(string $content = ''): StreamInterface
-    {
-        $stream = new PhpTempStream();
-        if ($content === '') {
-            return $stream;
-        }
-
-        $stream->write($content);
-        $stream->rewind();
-
-        return $stream;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function createStreamFromFile(string $filename, string $mode = 'r'): StreamInterface
-    {
-        return new FileStream($filename, $mode);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function createStreamFromResource($resource): StreamInterface
-    {
-        return new Stream($resource);
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function createStream(string $content = ''): StreamInterface
+	{
+		$stream = new PhpTempStream();
+		if ($content === '') {
+			return $stream;
+		}
+
+		$stream->write($content);
+		$stream->rewind();
+
+		return $stream;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function createStreamFromFile(string $filename, string $mode = 'r'): StreamInterface
+	{
+		return new FileStream($filename, $mode);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function createStreamFromResource($resource): StreamInterface
+	{
+		return new Stream($resource);
+	}
 }

src/UriFactory.php

Indentation +7 added lines, -7 removed lines

@@ -25,11 +25,11 @@
 class UriFactory implements UriFactoryInterface
 {
 
-    /**
-     * {@inheritdoc}
-     */
-    public function createUri(string $uri = ''): UriInterface
-    {
-        return new Uri($uri);
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function createUri(string $uri = ''): UriInterface
+	{
+		return new Uri($uri);
+	}
 }

src/RequestFactory.php

Indentation +7 added lines, -7 removed lines

@@ -25,11 +25,11 @@
 class RequestFactory implements RequestFactoryInterface
 {
 
-    /**
-     * {@inheritdoc}
-     */
-    public function createRequest(string $method, $uri): RequestInterface
-    {
-        return new Request($method, $uri);
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function createRequest(string $method, $uri): RequestInterface
+	{
+		return new Request($method, $uri);
+	}
 }

src/Uri/Component/ComponentInterface.php

Indentation +6 added lines, -6 removed lines

@@ -17,10 +17,10 @@
 interface ComponentInterface
 {
 
-    /**
-     * Gets the component value
-     *
-     * @return mixed
-     */
-    public function getValue();
+	/**
+	 * Gets the component value
+	 *
+	 * @return mixed
+	 */
+	public function getValue();
 }

src/Uri/Component/Port.php

Indentation +38 added lines, -38 removed lines

@@ -29,48 +29,48 @@
 final class Port implements ComponentInterface
 {
 
-    /**
-     * The component value
-     *
-     * @var int|null
-     */
-    private ?int $value = null;
+	/**
+	 * The component value
+	 *
+	 * @var int|null
+	 */
+	private ?int $value = null;
 
-    /**
-     * Constructor of the class
-     *
-     * @param mixed $value
-     *
-     * @throws InvalidUriComponentException
-     *         If the component isn't valid.
-     */
-    public function __construct($value)
-    {
-        $min = 1;
-        $max = (2 ** 16) - 1;
+	/**
+	 * Constructor of the class
+	 *
+	 * @param mixed $value
+	 *
+	 * @throws InvalidUriComponentException
+	 *         If the component isn't valid.
+	 */
+	public function __construct($value)
+	{
+		$min = 1;
+		$max = (2 ** 16) - 1;
 
-        if ($value === null) {
-            return;
-        }
+		if ($value === null) {
+			return;
+		}
 
-        if (!is_int($value)) {
-            throw new InvalidUriComponentException('URI component "port" must be an integer');
-        }
+		if (!is_int($value)) {
+			throw new InvalidUriComponentException('URI component "port" must be an integer');
+		}
 
-        if (!($value >= $min && $value <= $max)) {
-            throw new InvalidUriComponentException('Invalid URI component "port"');
-        }
+		if (!($value >= $min && $value <= $max)) {
+			throw new InvalidUriComponentException('Invalid URI component "port"');
+		}
 
-        $this->value = $value;
-    }
+		$this->value = $value;
+	}
 
-    /**
-     * {@inheritdoc}
-     *
-     * @return int|null
-     */
-    public function getValue(): ?int
-    {
-        return $this->value;
-    }
+	/**
+	 * {@inheritdoc}
+	 *
+	 * @return int|null
+	 */
+	public function getValue(): ?int
+	{
+		return $this->value;
+	}
 }

src/ResponseFactory.php

Indentation +7 added lines, -7 removed lines

@@ -25,11 +25,11 @@
 class ResponseFactory implements ResponseFactoryInterface
 {
 
-    /**
-     * {@inheritdoc}
-     */
-    public function createResponse(int $code = 200, string $reasonPhrase = ''): ResponseInterface
-    {
-        return new Response($code, $reasonPhrase);
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function createResponse(int $code = 200, string $reasonPhrase = ''): ResponseInterface
+	{
+		return new Response($code, $reasonPhrase);
+	}
 }

src/ServerRequest.php

Spacing +2 added lines, -2 removed lines

@@ -358,8 +358,8 @@
          *
          * @psalm-suppress MissingClosureParamType
          */
-        array_walk_recursive($files, static function ($file): void {
-            if (! ($file instanceof UploadedFileInterface)) {
+        array_walk_recursive($files, static function($file): void {
+            if (!($file instanceof UploadedFileInterface)) {
                 throw new InvalidArgumentException('Invalid uploaded files');
             }
         });

Indentation +350 added lines, -350 removed lines

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

src/UploadedFileFactory.php

Indentation +18 added lines, -18 removed lines

@@ -31,22 +31,22 @@
 class UploadedFileFactory implements UploadedFileFactoryInterface
 {
 
-    /**
-     * {@inheritdoc}
-     */
-    public function createUploadedFile(
-        StreamInterface $stream,
-        ?int $size = null,
-        int $error = UPLOAD_ERR_OK,
-        ?string $clientFilename = null,
-        ?string $clientMediaType = null
-    ): UploadedFileInterface {
-        return new UploadedFile(
-            $stream,
-            $size,
-            $error,
-            $clientFilename,
-            $clientMediaType
-        );
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function createUploadedFile(
+		StreamInterface $stream,
+		?int $size = null,
+		int $error = UPLOAD_ERR_OK,
+		?string $clientFilename = null,
+		?string $clientMediaType = null
+	): UploadedFileInterface {
+		return new UploadedFile(
+			$stream,
+			$size,
+			$error,
+			$clientFilename,
+			$clientMediaType
+		);
+	}
 }