sunrise-php / http-message

src/Response.php

Indentation +134 added lines, -134 removed lines

@@ -42,138 +42,138 @@
 class Response extends Message implements ResponseInterface, StatusCodeInterface
 {
 
-    /**
-     * The response's status code
-     *
-     * @var int
-     */
-    protected $statusCode = self::STATUS_OK;
-
-    /**
-     * The response's reason phrase
-     *
-     * @var string
-     */
-    protected $reasonPhrase = 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
-     * @param string|null $protocolVersion
-     */
-    public function __construct(
-        ?int $statusCode = null,
-        ?string $reasonPhrase = null,
-        ?array $headers = null,
-        ?StreamInterface $body = null,
-        ?string $protocolVersion = null
-    ) {
-        parent::__construct(
-            $headers,
-            $body,
-            $protocolVersion
-        );
-
-        if (isset($statusCode)) {
-            $this->setStatus($statusCode, $reasonPhrase ?? '');
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getStatusCode() : int
-    {
-        return $this->statusCode;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getReasonPhrase() : string
-    {
-        return $this->reasonPhrase;
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @psalm-suppress ParamNameMismatch
-     */
-    public function withStatus($statusCode, $reasonPhrase = '') : ResponseInterface
-    {
-        $clone = clone $this;
-        $clone->setStatus($statusCode, $reasonPhrase);
-
-        return $clone;
-    }
-
-    /**
-     * Sets the given status to the response
-     *
-     * @param int $statusCode
-     * @param string $reasonPhrase
-     *
-     * @return void
-     */
-    protected function setStatus($statusCode, $reasonPhrase) : void
-    {
-        $this->validateStatusCode($statusCode);
-        $this->validateReasonPhrase($reasonPhrase);
-
-        if ('' === $reasonPhrase) {
-            $reasonPhrase = REASON_PHRASES[$statusCode] ?? 'Unknown Status Code';
-        }
-
-        $this->statusCode = $statusCode;
-        $this->reasonPhrase = $reasonPhrase;
-    }
-
-    /**
-     * Validates the given status-code
-     *
-     * @param mixed $statusCode
-     *
-     * @return void
-     *
-     * @throws InvalidArgumentException
-     *
-     * @link https://tools.ietf.org/html/rfc7230#section-3.1.2
-     */
-    protected 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(sprintf('HTTP status-code "%d" is not valid', $statusCode));
-        }
-    }
-
-    /**
-     * Validates the given reason-phrase
-     *
-     * @param mixed $reasonPhrase
-     *
-     * @return void
-     *
-     * @throws InvalidArgumentException
-     *
-     * @link https://tools.ietf.org/html/rfc7230#section-3.1.2
-     */
-    protected function validateReasonPhrase($reasonPhrase) : void
-    {
-        if (!is_string($reasonPhrase)) {
-            throw new InvalidArgumentException('HTTP reason-phrase must be a string');
-        }
-
-        if (!preg_match(HeaderInterface::RFC7230_FIELD_VALUE, $reasonPhrase)) {
-            throw new InvalidArgumentException(sprintf('HTTP reason-phrase "%s" is not valid', $reasonPhrase));
-        }
-    }
+	/**
+	 * The response's status code
+	 *
+	 * @var int
+	 */
+	protected $statusCode = self::STATUS_OK;
+
+	/**
+	 * The response's reason phrase
+	 *
+	 * @var string
+	 */
+	protected $reasonPhrase = 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
+	 * @param string|null $protocolVersion
+	 */
+	public function __construct(
+		?int $statusCode = null,
+		?string $reasonPhrase = null,
+		?array $headers = null,
+		?StreamInterface $body = null,
+		?string $protocolVersion = null
+	) {
+		parent::__construct(
+			$headers,
+			$body,
+			$protocolVersion
+		);
+
+		if (isset($statusCode)) {
+			$this->setStatus($statusCode, $reasonPhrase ?? '');
+		}
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getStatusCode() : int
+	{
+		return $this->statusCode;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getReasonPhrase() : string
+	{
+		return $this->reasonPhrase;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 *
+	 * @psalm-suppress ParamNameMismatch
+	 */
+	public function withStatus($statusCode, $reasonPhrase = '') : ResponseInterface
+	{
+		$clone = clone $this;
+		$clone->setStatus($statusCode, $reasonPhrase);
+
+		return $clone;
+	}
+
+	/**
+	 * Sets the given status to the response
+	 *
+	 * @param int $statusCode
+	 * @param string $reasonPhrase
+	 *
+	 * @return void
+	 */
+	protected function setStatus($statusCode, $reasonPhrase) : void
+	{
+		$this->validateStatusCode($statusCode);
+		$this->validateReasonPhrase($reasonPhrase);
+
+		if ('' === $reasonPhrase) {
+			$reasonPhrase = REASON_PHRASES[$statusCode] ?? 'Unknown Status Code';
+		}
+
+		$this->statusCode = $statusCode;
+		$this->reasonPhrase = $reasonPhrase;
+	}
+
+	/**
+	 * Validates the given status-code
+	 *
+	 * @param mixed $statusCode
+	 *
+	 * @return void
+	 *
+	 * @throws InvalidArgumentException
+	 *
+	 * @link https://tools.ietf.org/html/rfc7230#section-3.1.2
+	 */
+	protected 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(sprintf('HTTP status-code "%d" is not valid', $statusCode));
+		}
+	}
+
+	/**
+	 * Validates the given reason-phrase
+	 *
+	 * @param mixed $reasonPhrase
+	 *
+	 * @return void
+	 *
+	 * @throws InvalidArgumentException
+	 *
+	 * @link https://tools.ietf.org/html/rfc7230#section-3.1.2
+	 */
+	protected function validateReasonPhrase($reasonPhrase) : void
+	{
+		if (!is_string($reasonPhrase)) {
+			throw new InvalidArgumentException('HTTP reason-phrase must be a string');
+		}
+
+		if (!preg_match(HeaderInterface::RFC7230_FIELD_VALUE, $reasonPhrase)) {
+			throw new InvalidArgumentException(sprintf('HTTP reason-phrase "%s" is not valid', $reasonPhrase));
+		}
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -150,7 +150,7 @@
             throw new InvalidArgumentException('HTTP status-code must be an integer');
         }
 
-        if (! ($statusCode >= 100 && $statusCode <= 599)) {
+        if (!($statusCode >= 100 && $statusCode <= 599)) {
             throw new InvalidArgumentException(sprintf('HTTP status-code "%d" is not valid', $statusCode));
         }
     }

src/RequestFactory.php

Indentation +37 added lines, -37 removed lines

@@ -39,46 +39,46 @@
 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);
+	}
 
-    /**
-     * Creates a JSON request
-     *
-     * @param string $method
-     * @param string|UriInterface|null $uri
-     * @param mixed $data
-     * @param int $flags
-     * @param int $depth
-     *
-     * @return RequestInterface
-     *
-     * @throws InvalidArgumentException
-     *         If the data cannot be encoded.
-     */
-    public function createJsonRequest(string $method, $uri, $data, int $flags = 0, int $depth = 512) : RequestInterface
-    {
-        /**
-         * @psalm-suppress UnusedFunctionCall
-         */
-        json_encode('');
+	/**
+	 * Creates a JSON request
+	 *
+	 * @param string $method
+	 * @param string|UriInterface|null $uri
+	 * @param mixed $data
+	 * @param int $flags
+	 * @param int $depth
+	 *
+	 * @return RequestInterface
+	 *
+	 * @throws InvalidArgumentException
+	 *         If the data cannot be encoded.
+	 */
+	public function createJsonRequest(string $method, $uri, $data, int $flags = 0, int $depth = 512) : RequestInterface
+	{
+		/**
+		 * @psalm-suppress UnusedFunctionCall
+		 */
+		json_encode('');
 
-        $json = json_encode($data, $flags, $depth);
-        if (JSON_ERROR_NONE <> json_last_error()) {
-            throw new InvalidArgumentException(json_last_error_msg());
-        }
+		$json = json_encode($data, $flags, $depth);
+		if (JSON_ERROR_NONE <> json_last_error()) {
+			throw new InvalidArgumentException(json_last_error_msg());
+		}
 
-        $request = new Request($method, $uri, [
-            'Content-Type' => 'application/json; charset=UTF-8',
-        ]);
+		$request = new Request($method, $uri, [
+			'Content-Type' => 'application/json; charset=UTF-8',
+		]);
 
-        $request->getBody()->write($json);
+		$request->getBody()->write($json);
 
-        return $request;
-    }
+		return $request;
+	}
 }

src/ResponseFactory.php

Indentation +64 added lines, -64 removed lines

@@ -40,68 +40,68 @@
 class ResponseFactory implements ResponseFactoryInterface
 {
 
-    /**
-     * {@inheritdoc}
-     *
-     * @psalm-suppress ParamNameMismatch
-     */
-    public function createResponse(int $statusCode = 200, string $reasonPhrase = '') : ResponseInterface
-    {
-        return new Response($statusCode, $reasonPhrase);
-    }
-
-    /**
-     * Creates a HTML response
-     *
-     * @param int $statusCode
-     * @param string|StreamInterface|Stringable $html
-     *
-     * @return ResponseInterface
-     */
-    public function createHtmlResponse(int $statusCode, $html) : ResponseInterface
-    {
-        $html = (string) $html;
-
-        $response = new Response($statusCode, null, [
-            'Content-Type' => 'text/html; charset=UTF-8',
-        ]);
-
-        $response->getBody()->write($html);
-
-        return $response;
-    }
-
-    /**
-     * Creates a JSON response
-     *
-     * @param int $statusCode
-     * @param mixed $data
-     * @param int $flags
-     * @param int $depth
-     *
-     * @return ResponseInterface
-     *
-     * @throws InvalidArgumentException
-     *         If the data cannot be encoded.
-     */
-    public function createJsonResponse(int $statusCode, $data, int $flags = 0, int $depth = 512) : ResponseInterface
-    {
-        /**
-         * @psalm-suppress UnusedFunctionCall
-         */
-        json_encode('');
-
-        $json = json_encode($data, $flags, $depth);
-        if (JSON_ERROR_NONE <> json_last_error()) {
-            throw new InvalidArgumentException(json_last_error_msg());
-        }
-
-        $response = new Response($statusCode, null, [
-            'Content-Type' => 'application/json; charset=UTF-8',
-        ]);
-
-        $response->getBody()->write($json);
-
-        return $response;
-    }
+	/**
+	 * {@inheritdoc}
+	 *
+	 * @psalm-suppress ParamNameMismatch
+	 */
+	public function createResponse(int $statusCode = 200, string $reasonPhrase = '') : ResponseInterface
+	{
+		return new Response($statusCode, $reasonPhrase);
+	}
+
+	/**
+	 * Creates a HTML response
+	 *
+	 * @param int $statusCode
+	 * @param string|StreamInterface|Stringable $html
+	 *
+	 * @return ResponseInterface
+	 */
+	public function createHtmlResponse(int $statusCode, $html) : ResponseInterface
+	{
+		$html = (string) $html;
+
+		$response = new Response($statusCode, null, [
+			'Content-Type' => 'text/html; charset=UTF-8',
+		]);
+
+		$response->getBody()->write($html);
+
+		return $response;
+	}
+
+	/**
+	 * Creates a JSON response
+	 *
+	 * @param int $statusCode
+	 * @param mixed $data
+	 * @param int $flags
+	 * @param int $depth
+	 *
+	 * @return ResponseInterface
+	 *
+	 * @throws InvalidArgumentException
+	 *         If the data cannot be encoded.
+	 */
+	public function createJsonResponse(int $statusCode, $data, int $flags = 0, int $depth = 512) : ResponseInterface
+	{
+		/**
+		 * @psalm-suppress UnusedFunctionCall
+		 */
+		json_encode('');
+
+		$json = json_encode($data, $flags, $depth);
+		if (JSON_ERROR_NONE <> json_last_error()) {
+			throw new InvalidArgumentException(json_last_error_msg());
+		}
+
+		$response = new Response($statusCode, null, [
+			'Content-Type' => 'application/json; charset=UTF-8',
+		]);
+
+		$response->getBody()->write($json);
+
+		return $response;
+	}
 }

src/Request.php

Indentation +247 added lines, -247 removed lines

@@ -40,251 +40,251 @@
 class Request extends Message implements RequestInterface, RequestMethodInterface
 {
 
-    /**
-     * The request method (aka verb)
-     *
-     * @var string
-     */
-    protected $method = self::METHOD_GET;
-
-    /**
-     * The request target
-     *
-     * @var string|null
-     */
-    protected $requestTarget = null;
-
-    /**
-     * The request URI
-     *
-     * @var UriInterface|null
-     */
-    protected $uri = null;
-
-    /**
-     * Constructor of the class
-     *
-     * @param string|null $method
-     * @param string|UriInterface|null $uri
-     * @param array<string, string|string[]>|null $headers
-     * @param StreamInterface|null $body
-     * @param string|null $requestTarget
-     * @param string|null $protocolVersion
-     */
-    public function __construct(
-        ?string $method = null,
-        $uri = null,
-        ?array $headers = null,
-        ?StreamInterface $body = null,
-        ?string $requestTarget = null,
-        ?string $protocolVersion = null
-    ) {
-        parent::__construct(
-            $headers,
-            $body,
-            $protocolVersion
-        );
-
-        if (isset($method)) {
-            $this->setMethod($method);
-        }
-
-        if (isset($requestTarget)) {
-            $this->setRequestTarget($requestTarget);
-        }
-
-        if (isset($uri)) {
-            $this->setUri($uri);
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getMethod() : string
-    {
-        return $this->method;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function withMethod($method) : RequestInterface
-    {
-        $clone = clone $this;
-        $clone->setMethod($method);
-
-        return $clone;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getRequestTarget() : string
-    {
-        if (isset($this->requestTarget)) {
-            return $this->requestTarget;
-        }
-
-        $uri = $this->getUri();
-        $path = $uri->getPath();
-
-        // https://tools.ietf.org/html/rfc7230#section-5.3.1
-        // https://tools.ietf.org/html/rfc7230#section-2.7
-        //
-        // origin-form = absolute-path [ "?" query ]
-        // absolute-path = 1*( "/" segment )
-        if (0 !== strncmp($path, '/', 1)) {
-            return '/';
-        }
-
-        $requestTarget = $path;
-
-        $query = $uri->getQuery();
-        if ('' !== $query) {
-            $requestTarget .= '?' . $query;
-        }
-
-        return $requestTarget;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function withRequestTarget($requestTarget) : RequestInterface
-    {
-        $clone = clone $this;
-        $clone->setRequestTarget($requestTarget);
-
-        return $clone;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getUri() : UriInterface
-    {
-        if (null === $this->uri) {
-            $this->uri = (new UriFactory)->createUri();
-        }
-
-        return $this->uri;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function withUri(UriInterface $uri, $preserveHost = false) : RequestInterface
-    {
-        $clone = clone $this;
-        $clone->setUri($uri, $preserveHost);
-
-        return $clone;
-    }
-
-    /**
-     * Sets the given method to the request
-     *
-     * @param string $method
-     *
-     * @return void
-     */
-    protected function setMethod($method) : void
-    {
-        $this->validateMethod($method);
-
-        $this->method = strtoupper($method);
-    }
-
-    /**
-     * Sets the given request-target to the request
-     *
-     * @param mixed $requestTarget
-     *
-     * @return void
-     */
-    protected function setRequestTarget($requestTarget) : void
-    {
-        $this->validateRequestTarget($requestTarget);
-
-        /**
-         * @var string $requestTarget
-         */
-
-        $this->requestTarget = $requestTarget;
-    }
-
-    /**
-     * Sets the given URI to the request
-     *
-     * @param string|UriInterface $uri
-     * @param bool $preserveHost
-     *
-     * @return void
-     */
-    protected function setUri($uri, $preserveHost = false) : void
-    {
-        if (! ($uri instanceof UriInterface)) {
-            $uri = (new UriFactory)->createUri($uri);
-        }
-
-        $this->uri = $uri;
-
-        if ('' === $uri->getHost() || ($preserveHost && $this->hasHeader('Host'))) {
-            return;
-        }
-
-        $newHost = $uri->getHost();
-
-        $port = $uri->getPort();
-        if (null !== $port) {
-            $newHost .= ':' . $port;
-        }
-
-        $this->addHeader('Host', $newHost);
-    }
-
-    /**
-     * Validates the given method
-     *
-     * @param mixed $method
-     *
-     * @return void
-     *
-     * @throws InvalidArgumentException
-     *
-     * @link https://tools.ietf.org/html/rfc7230#section-3.1.1
-     */
-    protected function validateMethod($method) : void
-    {
-        if (!is_string($method)) {
-            throw new InvalidArgumentException('HTTP method must be a string');
-        }
-
-        if (!preg_match(HeaderInterface::RFC7230_TOKEN, $method)) {
-            throw new InvalidArgumentException(sprintf('HTTP method "%s" is not valid', $method));
-        }
-    }
-
-    /**
-     * Validates the given request-target
-     *
-     * @param mixed $requestTarget
-     *
-     * @return void
-     *
-     * @throws InvalidArgumentException
-     *
-     * @link https://tools.ietf.org/html/rfc7230#section-5.3
-     */
-    protected function validateRequestTarget($requestTarget) : void
-    {
-        if (!is_string($requestTarget)) {
-            throw new InvalidArgumentException('HTTP request-target must be a string');
-        }
-
-        if (!preg_match('/^[\x21-\x7E\x80-\xFF]+$/', $requestTarget)) {
-            throw new InvalidArgumentException(sprintf('HTTP request-target "%s" is not valid', $requestTarget));
-        }
-    }
+	/**
+	 * The request method (aka verb)
+	 *
+	 * @var string
+	 */
+	protected $method = self::METHOD_GET;
+
+	/**
+	 * The request target
+	 *
+	 * @var string|null
+	 */
+	protected $requestTarget = null;
+
+	/**
+	 * The request URI
+	 *
+	 * @var UriInterface|null
+	 */
+	protected $uri = null;
+
+	/**
+	 * Constructor of the class
+	 *
+	 * @param string|null $method
+	 * @param string|UriInterface|null $uri
+	 * @param array<string, string|string[]>|null $headers
+	 * @param StreamInterface|null $body
+	 * @param string|null $requestTarget
+	 * @param string|null $protocolVersion
+	 */
+	public function __construct(
+		?string $method = null,
+		$uri = null,
+		?array $headers = null,
+		?StreamInterface $body = null,
+		?string $requestTarget = null,
+		?string $protocolVersion = null
+	) {
+		parent::__construct(
+			$headers,
+			$body,
+			$protocolVersion
+		);
+
+		if (isset($method)) {
+			$this->setMethod($method);
+		}
+
+		if (isset($requestTarget)) {
+			$this->setRequestTarget($requestTarget);
+		}
+
+		if (isset($uri)) {
+			$this->setUri($uri);
+		}
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getMethod() : string
+	{
+		return $this->method;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function withMethod($method) : RequestInterface
+	{
+		$clone = clone $this;
+		$clone->setMethod($method);
+
+		return $clone;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getRequestTarget() : string
+	{
+		if (isset($this->requestTarget)) {
+			return $this->requestTarget;
+		}
+
+		$uri = $this->getUri();
+		$path = $uri->getPath();
+
+		// https://tools.ietf.org/html/rfc7230#section-5.3.1
+		// https://tools.ietf.org/html/rfc7230#section-2.7
+		//
+		// origin-form = absolute-path [ "?" query ]
+		// absolute-path = 1*( "/" segment )
+		if (0 !== strncmp($path, '/', 1)) {
+			return '/';
+		}
+
+		$requestTarget = $path;
+
+		$query = $uri->getQuery();
+		if ('' !== $query) {
+			$requestTarget .= '?' . $query;
+		}
+
+		return $requestTarget;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function withRequestTarget($requestTarget) : RequestInterface
+	{
+		$clone = clone $this;
+		$clone->setRequestTarget($requestTarget);
+
+		return $clone;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getUri() : UriInterface
+	{
+		if (null === $this->uri) {
+			$this->uri = (new UriFactory)->createUri();
+		}
+
+		return $this->uri;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function withUri(UriInterface $uri, $preserveHost = false) : RequestInterface
+	{
+		$clone = clone $this;
+		$clone->setUri($uri, $preserveHost);
+
+		return $clone;
+	}
+
+	/**
+	 * Sets the given method to the request
+	 *
+	 * @param string $method
+	 *
+	 * @return void
+	 */
+	protected function setMethod($method) : void
+	{
+		$this->validateMethod($method);
+
+		$this->method = strtoupper($method);
+	}
+
+	/**
+	 * Sets the given request-target to the request
+	 *
+	 * @param mixed $requestTarget
+	 *
+	 * @return void
+	 */
+	protected function setRequestTarget($requestTarget) : void
+	{
+		$this->validateRequestTarget($requestTarget);
+
+		/**
+		 * @var string $requestTarget
+		 */
+
+		$this->requestTarget = $requestTarget;
+	}
+
+	/**
+	 * Sets the given URI to the request
+	 *
+	 * @param string|UriInterface $uri
+	 * @param bool $preserveHost
+	 *
+	 * @return void
+	 */
+	protected function setUri($uri, $preserveHost = false) : void
+	{
+		if (! ($uri instanceof UriInterface)) {
+			$uri = (new UriFactory)->createUri($uri);
+		}
+
+		$this->uri = $uri;
+
+		if ('' === $uri->getHost() || ($preserveHost && $this->hasHeader('Host'))) {
+			return;
+		}
+
+		$newHost = $uri->getHost();
+
+		$port = $uri->getPort();
+		if (null !== $port) {
+			$newHost .= ':' . $port;
+		}
+
+		$this->addHeader('Host', $newHost);
+	}
+
+	/**
+	 * Validates the given method
+	 *
+	 * @param mixed $method
+	 *
+	 * @return void
+	 *
+	 * @throws InvalidArgumentException
+	 *
+	 * @link https://tools.ietf.org/html/rfc7230#section-3.1.1
+	 */
+	protected function validateMethod($method) : void
+	{
+		if (!is_string($method)) {
+			throw new InvalidArgumentException('HTTP method must be a string');
+		}
+
+		if (!preg_match(HeaderInterface::RFC7230_TOKEN, $method)) {
+			throw new InvalidArgumentException(sprintf('HTTP method "%s" is not valid', $method));
+		}
+	}
+
+	/**
+	 * Validates the given request-target
+	 *
+	 * @param mixed $requestTarget
+	 *
+	 * @return void
+	 *
+	 * @throws InvalidArgumentException
+	 *
+	 * @link https://tools.ietf.org/html/rfc7230#section-5.3
+	 */
+	protected function validateRequestTarget($requestTarget) : void
+	{
+		if (!is_string($requestTarget)) {
+			throw new InvalidArgumentException('HTTP request-target must be a string');
+		}
+
+		if (!preg_match('/^[\x21-\x7E\x80-\xFF]+$/', $requestTarget)) {
+			throw new InvalidArgumentException(sprintf('HTTP request-target "%s" is not valid', $requestTarget));
+		}
+	}
 }

src/Message.php

Indentation +320 added lines, -320 removed lines

@@ -39,324 +39,324 @@
 class Message implements MessageInterface
 {
 
-    /**
-     * HTTP version
-     *
-     * @var string
-     */
-    protected $protocolVersion = '1.1';
-
-    /**
-     * The message headers
-     *
-     * @var array<string, string[]>
-     */
-    protected $headers = [];
-
-    /**
-     * The message body
-     *
-     * @var StreamInterface|null
-     */
-    protected $body = null;
-
-    /**
-     * Constructor of the class
-     *
-     * @param array<string, string|string[]>|null $headers
-     * @param StreamInterface|null $body
-     * @param string|null $protocolVersion
-     */
-    public function __construct(
-        ?array $headers = null,
-        ?StreamInterface $body = null,
-        ?string $protocolVersion = null
-    ) {
-        if (isset($protocolVersion)) {
-            $this->setProtocolVersion($protocolVersion);
-        }
-
-        if (isset($headers)) {
-            foreach ($headers as $name => $value) {
-                $this->addHeader($name, $value);
-            }
-        }
-
-        if (isset($body)) {
-            $this->body = $body;
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getProtocolVersion() : string
-    {
-        return $this->protocolVersion;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function withProtocolVersion($version) : MessageInterface
-    {
-        $clone = clone $this;
-        $clone->setProtocolVersion($version);
-
-        return $clone;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getHeaders() : array
-    {
-        return $this->headers;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function hasHeader($name) : bool
-    {
-        $name = $this->normalizeHeaderName($name);
-
-        return ! empty($this->headers[$name]);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getHeader($name) : array
-    {
-        $name = $this->normalizeHeaderName($name);
-
-        if (empty($this->headers[$name])) {
-            return [];
-        }
-
-        return $this->headers[$name];
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getHeaderLine($name) : string
-    {
-        $name = $this->normalizeHeaderName($name);
-
-        if (empty($this->headers[$name])) {
-            return '';
-        }
-
-        return implode(', ', $this->headers[$name]);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function withHeader($name, $value) : MessageInterface
-    {
-        $clone = clone $this;
-        $clone->addHeader($name, $value);
-
-        return $clone;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function withAddedHeader($name, $value) : MessageInterface
-    {
-        $clone = clone $this;
-        $clone->addHeader($name, $value, false);
-
-        return $clone;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function withoutHeader($name) : MessageInterface
-    {
-        $name = $this->normalizeHeaderName($name);
-
-        $clone = clone $this;
-        unset($clone->headers[$name]);
-
-        return $clone;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getBody() : StreamInterface
-    {
-        if (null === $this->body) {
-            $this->body = (new StreamFactory)->createStream();
-        }
-
-        return $this->body;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function withBody(StreamInterface $body) : MessageInterface
-    {
-        $clone = clone $this;
-        $clone->body = $body;
-
-        return $clone;
-    }
-
-    /**
-     * Sets the given HTTP version to the message
-     *
-     * @param string $version
-     *
-     * @return void
-     */
-    protected function setProtocolVersion($version) : void
-    {
-        $this->validateProtocolVersion($version);
-
-        $this->protocolVersion = $version;
-    }
-
-    /**
-     * Adds the given header field to the message
-     *
-     * @param string $name
-     * @param string|string[] $value
-     * @param bool $replace
-     *
-     * @return void
-     */
-    protected function addHeader($name, $value, bool $replace = true) : void
-    {
-        $this->validateHeaderName($name);
-        $this->validateHeaderValue($value, $name);
-
-        $name = $this->normalizeHeaderName($name);
-        $value = (array) $value;
-
-        if ($replace) {
-            $this->headers[$name] = $value;
-            return;
-        }
-
-        foreach ($value as $item) {
-            $this->headers[$name][] = $item;
-        }
-    }
-
-    /**
-     * Validates the given HTTP version
-     *
-     * @param mixed $version
-     *
-     * @return void
-     *
-     * @throws InvalidArgumentException
-     *
-     * @link https://tools.ietf.org/html/rfc2145
-     * @link https://tools.ietf.org/html/rfc7230#section-2.6
-     * @link https://tools.ietf.org/html/rfc7540
-     */
-    protected function validateProtocolVersion($version) : void
-    {
-        static $allowed = ['1.0' => true, '1.1' => true, '2.0' => true, '2' => true];
-
-        if (!is_string($version)) {
-            throw new InvalidArgumentException('HTTP version must be a string');
-        }
-
-        if (!isset($allowed[$version])) {
-            throw new InvalidArgumentException(sprintf(
-                'The HTTP version "%s" is not valid, use only: 1.0, 1.1, 2{.0}',
-                $version
-            ));
-        }
-    }
-
-    /**
-     * Validates the given header name
-     *
-     * @param mixed $name
-     *
-     * @return void
-     *
-     * @throws InvalidArgumentException
-     *
-     * @link https://tools.ietf.org/html/rfc7230#section-3.2
-     */
-    protected function validateHeaderName($name) : void
-    {
-        if (!is_string($name)) {
-            throw new InvalidArgumentException('Header name must be a string');
-        }
-
-        if (!preg_match(HeaderInterface::RFC7230_TOKEN, $name)) {
-            throw new InvalidArgumentException(sprintf(
-                'The header name "%s" is not valid',
-                $name
-            ));
-        }
-    }
-
-    /**
-     * Validates the given header value
-     *
-     * @param mixed $value
-     * @param string $name
-     *
-     * @return void
-     *
-     * @throws InvalidArgumentException
-     *
-     * @link https://tools.ietf.org/html/rfc7230#section-3.2
-     */
-    protected function validateHeaderValue($value, string $name) : void
-    {
-        $items = (array) $value;
-
-        if ([] === $items) {
-            throw new InvalidArgumentException(sprintf(
-                'The header "%s" value must be a string or a non-empty array',
-                $name
-            ));
-        }
-
-        foreach ($items as $item) {
-            if (!is_string($item)) {
-                throw new InvalidArgumentException(sprintf(
-                    'The header "%s" value must be a string or an array with strings only',
-                    $name
-                ));
-            }
-
-            if (!preg_match(HeaderInterface::RFC7230_FIELD_VALUE, $item)) {
-                throw new InvalidArgumentException(sprintf(
-                    'The header "%s" value "%s" is not valid',
-                    $name,
-                    $item
-                ));
-            }
-        }
-    }
-
-    /**
-     * Normalizes the given header name
-     *
-     * @param string $name
-     *
-     * @return string
-     *
-     * @link https://tools.ietf.org/html/rfc7230#section-3.2
-     */
-    protected function normalizeHeaderName($name) : string
-    {
-        return ucwords(strtolower($name), '-');
-    }
+	/**
+	 * HTTP version
+	 *
+	 * @var string
+	 */
+	protected $protocolVersion = '1.1';
+
+	/**
+	 * The message headers
+	 *
+	 * @var array<string, string[]>
+	 */
+	protected $headers = [];
+
+	/**
+	 * The message body
+	 *
+	 * @var StreamInterface|null
+	 */
+	protected $body = null;
+
+	/**
+	 * Constructor of the class
+	 *
+	 * @param array<string, string|string[]>|null $headers
+	 * @param StreamInterface|null $body
+	 * @param string|null $protocolVersion
+	 */
+	public function __construct(
+		?array $headers = null,
+		?StreamInterface $body = null,
+		?string $protocolVersion = null
+	) {
+		if (isset($protocolVersion)) {
+			$this->setProtocolVersion($protocolVersion);
+		}
+
+		if (isset($headers)) {
+			foreach ($headers as $name => $value) {
+				$this->addHeader($name, $value);
+			}
+		}
+
+		if (isset($body)) {
+			$this->body = $body;
+		}
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getProtocolVersion() : string
+	{
+		return $this->protocolVersion;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function withProtocolVersion($version) : MessageInterface
+	{
+		$clone = clone $this;
+		$clone->setProtocolVersion($version);
+
+		return $clone;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getHeaders() : array
+	{
+		return $this->headers;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function hasHeader($name) : bool
+	{
+		$name = $this->normalizeHeaderName($name);
+
+		return ! empty($this->headers[$name]);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getHeader($name) : array
+	{
+		$name = $this->normalizeHeaderName($name);
+
+		if (empty($this->headers[$name])) {
+			return [];
+		}
+
+		return $this->headers[$name];
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getHeaderLine($name) : string
+	{
+		$name = $this->normalizeHeaderName($name);
+
+		if (empty($this->headers[$name])) {
+			return '';
+		}
+
+		return implode(', ', $this->headers[$name]);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function withHeader($name, $value) : MessageInterface
+	{
+		$clone = clone $this;
+		$clone->addHeader($name, $value);
+
+		return $clone;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function withAddedHeader($name, $value) : MessageInterface
+	{
+		$clone = clone $this;
+		$clone->addHeader($name, $value, false);
+
+		return $clone;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function withoutHeader($name) : MessageInterface
+	{
+		$name = $this->normalizeHeaderName($name);
+
+		$clone = clone $this;
+		unset($clone->headers[$name]);
+
+		return $clone;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getBody() : StreamInterface
+	{
+		if (null === $this->body) {
+			$this->body = (new StreamFactory)->createStream();
+		}
+
+		return $this->body;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function withBody(StreamInterface $body) : MessageInterface
+	{
+		$clone = clone $this;
+		$clone->body = $body;
+
+		return $clone;
+	}
+
+	/**
+	 * Sets the given HTTP version to the message
+	 *
+	 * @param string $version
+	 *
+	 * @return void
+	 */
+	protected function setProtocolVersion($version) : void
+	{
+		$this->validateProtocolVersion($version);
+
+		$this->protocolVersion = $version;
+	}
+
+	/**
+	 * Adds the given header field to the message
+	 *
+	 * @param string $name
+	 * @param string|string[] $value
+	 * @param bool $replace
+	 *
+	 * @return void
+	 */
+	protected function addHeader($name, $value, bool $replace = true) : void
+	{
+		$this->validateHeaderName($name);
+		$this->validateHeaderValue($value, $name);
+
+		$name = $this->normalizeHeaderName($name);
+		$value = (array) $value;
+
+		if ($replace) {
+			$this->headers[$name] = $value;
+			return;
+		}
+
+		foreach ($value as $item) {
+			$this->headers[$name][] = $item;
+		}
+	}
+
+	/**
+	 * Validates the given HTTP version
+	 *
+	 * @param mixed $version
+	 *
+	 * @return void
+	 *
+	 * @throws InvalidArgumentException
+	 *
+	 * @link https://tools.ietf.org/html/rfc2145
+	 * @link https://tools.ietf.org/html/rfc7230#section-2.6
+	 * @link https://tools.ietf.org/html/rfc7540
+	 */
+	protected function validateProtocolVersion($version) : void
+	{
+		static $allowed = ['1.0' => true, '1.1' => true, '2.0' => true, '2' => true];
+
+		if (!is_string($version)) {
+			throw new InvalidArgumentException('HTTP version must be a string');
+		}
+
+		if (!isset($allowed[$version])) {
+			throw new InvalidArgumentException(sprintf(
+				'The HTTP version "%s" is not valid, use only: 1.0, 1.1, 2{.0}',
+				$version
+			));
+		}
+	}
+
+	/**
+	 * Validates the given header name
+	 *
+	 * @param mixed $name
+	 *
+	 * @return void
+	 *
+	 * @throws InvalidArgumentException
+	 *
+	 * @link https://tools.ietf.org/html/rfc7230#section-3.2
+	 */
+	protected function validateHeaderName($name) : void
+	{
+		if (!is_string($name)) {
+			throw new InvalidArgumentException('Header name must be a string');
+		}
+
+		if (!preg_match(HeaderInterface::RFC7230_TOKEN, $name)) {
+			throw new InvalidArgumentException(sprintf(
+				'The header name "%s" is not valid',
+				$name
+			));
+		}
+	}
+
+	/**
+	 * Validates the given header value
+	 *
+	 * @param mixed $value
+	 * @param string $name
+	 *
+	 * @return void
+	 *
+	 * @throws InvalidArgumentException
+	 *
+	 * @link https://tools.ietf.org/html/rfc7230#section-3.2
+	 */
+	protected function validateHeaderValue($value, string $name) : void
+	{
+		$items = (array) $value;
+
+		if ([] === $items) {
+			throw new InvalidArgumentException(sprintf(
+				'The header "%s" value must be a string or a non-empty array',
+				$name
+			));
+		}
+
+		foreach ($items as $item) {
+			if (!is_string($item)) {
+				throw new InvalidArgumentException(sprintf(
+					'The header "%s" value must be a string or an array with strings only',
+					$name
+				));
+			}
+
+			if (!preg_match(HeaderInterface::RFC7230_FIELD_VALUE, $item)) {
+				throw new InvalidArgumentException(sprintf(
+					'The header "%s" value "%s" is not valid',
+					$name,
+					$item
+				));
+			}
+		}
+	}
+
+	/**
+	 * Normalizes the given header name
+	 *
+	 * @param string $name
+	 *
+	 * @return string
+	 *
+	 * @link https://tools.ietf.org/html/rfc7230#section-3.2
+	 */
+	protected function normalizeHeaderName($name) : string
+	{
+		return ucwords(strtolower($name), '-');
+	}
 }