sunrise-php / http-message

src/Response.php

Indentation +92 added lines, -92 removed lines

@@ -26,96 +26,96 @@
 class Response extends Message implements ResponseInterface
 {
 
-    /**
-     * Status code of the message
-     *
-     * @var int
-     */
-    protected $statusCode = 200;
-
-    /**
-     * Reason phrase of the message
-     *
-     * @var string
-     */
-    protected $reasonPhrase = 'OK';
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getStatusCode() : int
-    {
-        return $this->statusCode;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getReasonPhrase() : string
-    {
-        return $this->reasonPhrase;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function withStatus($statusCode, $reasonPhrase = '') : ResponseInterface
-    {
-        $this->validateStatusCode($statusCode);
-        $this->validateReasonPhrase($reasonPhrase);
-
-        if ('' === $reasonPhrase) {
-            $reasonPhrase = PHRASES[$statusCode] ?? 'Unknown Status Code';
-        }
-
-        $clone = clone $this;
-        $clone->statusCode = $statusCode;
-        $clone->reasonPhrase = $reasonPhrase;
-
-        return $clone;
-    }
-
-    /**
-     * 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('The given 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('The given reason-phrase "%s" is not valid', $reasonPhrase));
-        }
-    }
+	/**
+	 * Status code of the message
+	 *
+	 * @var int
+	 */
+	protected $statusCode = 200;
+
+	/**
+	 * Reason phrase of the message
+	 *
+	 * @var string
+	 */
+	protected $reasonPhrase = 'OK';
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function getStatusCode() : int
+	{
+		return $this->statusCode;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function getReasonPhrase() : string
+	{
+		return $this->reasonPhrase;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function withStatus($statusCode, $reasonPhrase = '') : ResponseInterface
+	{
+		$this->validateStatusCode($statusCode);
+		$this->validateReasonPhrase($reasonPhrase);
+
+		if ('' === $reasonPhrase) {
+			$reasonPhrase = PHRASES[$statusCode] ?? 'Unknown Status Code';
+		}
+
+		$clone = clone $this;
+		$clone->statusCode = $statusCode;
+		$clone->reasonPhrase = $reasonPhrase;
+
+		return $clone;
+	}
+
+	/**
+	 * 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('The given 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('The given reason-phrase "%s" is not valid', $reasonPhrase));
+		}
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -88,11 +88,11 @@ 
      */
     protected function validateStatusCode($statusCode) : void
     {
-        if (! \is_int($statusCode)) {
+        if (!\is_int($statusCode)) {
             throw new \InvalidArgumentException('HTTP status-code must be an integer');
         }
 
-        if (! ($statusCode >= 100 && $statusCode <= 599)) {
+        if (!($statusCode >= 100 && $statusCode <= 599)) {
             throw new \InvalidArgumentException(\sprintf('The given status-code "%d" is not valid', $statusCode));
         }
     }
@@ -110,11 +110,11 @@ 
      */
     protected function validateReasonPhrase($reasonPhrase) : void
     {
-        if (! \is_string($reasonPhrase)) {
+        if (!\is_string($reasonPhrase)) {
             throw new \InvalidArgumentException('HTTP reason-phrase must be a string');
         }
 
-        if (! \preg_match(HeaderInterface::RFC7230_FIELD_VALUE, $reasonPhrase)) {
+        if (!\preg_match(HeaderInterface::RFC7230_FIELD_VALUE, $reasonPhrase)) {
             throw new \InvalidArgumentException(\sprintf('The given reason-phrase "%s" is not valid', $reasonPhrase));
         }
     }

src/Request.php

Indentation +157 added lines, -157 removed lines

@@ -27,161 +27,161 @@
 class Request extends Message implements RequestInterface
 {
 
-    /**
-     * Method of the message
-     *
-     * @var string
-     */
-    protected $method = 'GET';
-
-    /**
-     * Request target of the message
-     *
-     * @var null|string
-     */
-    protected $requestTarget;
-
-    /**
-     * URI of the message
-     *
-     * @var null|UriInterface
-     */
-    protected $uri;
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getMethod() : string
-    {
-        return $this->method;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function withMethod($method) : RequestInterface
-    {
-        $this->validateMethod($method);
-
-        $clone = clone $this;
-        $clone->method = \strtoupper($method);
-
-        return $clone;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getRequestTarget() : string
-    {
-        if (! (null === $this->requestTarget)) {
-            return $this->requestTarget;
-        }
-
-        if (! ($this->uri instanceof UriInterface)) {
-            return '/';
-        }
-
-        // 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($this->uri->getPath(), '/', 1))) {
-            return '/';
-        }
-
-        $origin = $this->uri->getPath();
-        if (! ('' === $this->uri->getQuery())) {
-            $origin .= '?' . $this->uri->getQuery();
-        }
-
-        return $origin;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function withRequestTarget($requestTarget) : RequestInterface
-    {
-        $this->validateRequestTarget($requestTarget);
-
-        $clone = clone $this;
-        $clone->requestTarget = $requestTarget;
-
-        return $clone;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getUri() : ?UriInterface
-    {
-        return $this->uri;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function withUri(UriInterface $uri, $preserveHost = false) : RequestInterface
-    {
-        $clone = clone $this;
-        $clone->uri = $uri;
-
-        if ('' === $uri->getHost() || ($preserveHost && $clone->hasHeader('host'))) {
-            return $clone;
-        }
-
-        $newhost = $uri->getHost();
-        if (! (null === $uri->getPort())) {
-            $newhost .= ':' . $uri->getPort();
-        }
-
-        // Reassigning the "Host" header
-        return $clone->withHeader('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('The given 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('The given request-target "%s" is not valid', $requestTarget));
-        }
-    }
+	/**
+	 * Method of the message
+	 *
+	 * @var string
+	 */
+	protected $method = 'GET';
+
+	/**
+	 * Request target of the message
+	 *
+	 * @var null|string
+	 */
+	protected $requestTarget;
+
+	/**
+	 * URI of the message
+	 *
+	 * @var null|UriInterface
+	 */
+	protected $uri;
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function getMethod() : string
+	{
+		return $this->method;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function withMethod($method) : RequestInterface
+	{
+		$this->validateMethod($method);
+
+		$clone = clone $this;
+		$clone->method = \strtoupper($method);
+
+		return $clone;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function getRequestTarget() : string
+	{
+		if (! (null === $this->requestTarget)) {
+			return $this->requestTarget;
+		}
+
+		if (! ($this->uri instanceof UriInterface)) {
+			return '/';
+		}
+
+		// 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($this->uri->getPath(), '/', 1))) {
+			return '/';
+		}
+
+		$origin = $this->uri->getPath();
+		if (! ('' === $this->uri->getQuery())) {
+			$origin .= '?' . $this->uri->getQuery();
+		}
+
+		return $origin;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function withRequestTarget($requestTarget) : RequestInterface
+	{
+		$this->validateRequestTarget($requestTarget);
+
+		$clone = clone $this;
+		$clone->requestTarget = $requestTarget;
+
+		return $clone;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function getUri() : ?UriInterface
+	{
+		return $this->uri;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function withUri(UriInterface $uri, $preserveHost = false) : RequestInterface
+	{
+		$clone = clone $this;
+		$clone->uri = $uri;
+
+		if ('' === $uri->getHost() || ($preserveHost && $clone->hasHeader('host'))) {
+			return $clone;
+		}
+
+		$newhost = $uri->getHost();
+		if (! (null === $uri->getPort())) {
+			$newhost .= ':' . $uri->getPort();
+		}
+
+		// Reassigning the "Host" header
+		return $clone->withHeader('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('The given 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('The given request-target "%s" is not valid', $requestTarget));
+		}
+	}
 }

Spacing +9 added lines, -9 removed lines

@@ -74,11 +74,11 @@ 
      */
     public function getRequestTarget() : string
     {
-        if (! (null === $this->requestTarget)) {
+        if (!(null === $this->requestTarget)) {
             return $this->requestTarget;
         }
 
-        if (! ($this->uri instanceof UriInterface)) {
+        if (!($this->uri instanceof UriInterface)) {
             return '/';
         }
 
@@ -87,12 +87,12 @@ 
         //
         // origin-form = absolute-path [ "?" query ]
         // absolute-path = 1*( "/" segment )
-        if (! (0 === \strncmp($this->uri->getPath(), '/', 1))) {
+        if (!(0 === \strncmp($this->uri->getPath(), '/', 1))) {
             return '/';
         }
 
         $origin = $this->uri->getPath();
-        if (! ('' === $this->uri->getQuery())) {
+        if (!('' === $this->uri->getQuery())) {
             $origin .= '?' . $this->uri->getQuery();
         }
 
@@ -133,7 +133,7 @@ 
         }
 
         $newhost = $uri->getHost();
-        if (! (null === $uri->getPort())) {
+        if (!(null === $uri->getPort())) {
             $newhost .= ':' . $uri->getPort();
         }
 
@@ -154,11 +154,11 @@ 
      */
     protected function validateMethod($method) : void
     {
-        if (! \is_string($method)) {
+        if (!\is_string($method)) {
             throw new \InvalidArgumentException('HTTP method must be a string');
         }
 
-        if (! \preg_match(HeaderInterface::RFC7230_TOKEN, $method)) {
+        if (!\preg_match(HeaderInterface::RFC7230_TOKEN, $method)) {
             throw new \InvalidArgumentException(\sprintf('The given method "%s" is not valid', $method));
         }
     }
@@ -176,11 +176,11 @@ 
      */
     protected function validateRequestTarget($requestTarget) : void
     {
-        if (! \is_string($requestTarget)) {
+        if (!\is_string($requestTarget)) {
             throw new \InvalidArgumentException('HTTP request-target must be a string');
         }
 
-        if (! \preg_match('/^[\x21-\x7E\x80-\xFF]+$/', $requestTarget)) {
+        if (!\preg_match('/^[\x21-\x7E\x80-\xFF]+$/', $requestTarget)) {
             throw new \InvalidArgumentException(\sprintf('The given request-target "%s" is not valid', $requestTarget));
         }
     }

src/Message.php

Indentation +338 added lines, -338 removed lines

@@ -28,342 +28,342 @@
 class Message implements MessageInterface
 {
 
-    /**
-     * Protocol version for the message
-     *
-     * @var string
-     */
-    protected $protocolVersion = '1.1';
-
-    /**
-     * Headers of the message
-     *
-     * @var array
-     */
-    protected $headers = [];
-
-    /**
-     * Body of the message
-     *
-     * @var null|StreamInterface
-     */
-    protected $body;
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getProtocolVersion() : string
-    {
-        return $this->protocolVersion;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function withProtocolVersion($protocolVersion) : MessageInterface
-    {
-        $this->validateProtocolVersion($protocolVersion);
-
-        $clone = clone $this;
-        $clone->protocolVersion = $protocolVersion;
-
-        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, bool $append = false) : MessageInterface
-    {
-        $this->validateHeaderName($name);
-        $this->validateHeaderValue($value);
-
-        $name = $this->normalizeHeaderName($name);
-        $value = $this->normalizeHeaderValue($value);
-
-        if (isset($this->headers[$name]) && $append) {
-            $value = \array_merge($this->headers[$name], $value);
-        }
-
-        $clone = clone $this;
-        $clone->headers[$name] = $value;
-
-        return $clone;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function withAddedHeader($name, $value) : MessageInterface
-    {
-        return $this->withHeader($name, $value, true);
-    }
-
-    /**
-     * Returns a new instance with the given headers
-     *
-     * [!] This method is not associated with PSR-7.
-     *
-     * @param iterable $headers
-     * @param bool $append
-     *
-     * @return MessageInterface
-     *
-     * @since 1.3.0
-     */
-    public function withMultipleHeaders(iterable $headers, bool $append = false) : MessageInterface
-    {
-        $result = clone $this;
-
-        foreach ($headers as $name => $value) {
-            $result = $result->withHeader($name, $value, $append);
-        }
-
-        return $result;
-    }
-
-    /**
-     * Returns a new instance with the given header
-     *
-     * [!] This method is not associated with PSR-7.
-     *
-     * @param HeaderInterface $header
-     * @param bool $append
-     *
-     * @return MessageInterface
-     *
-     * @since 1.4.0
-     */
-    public function withHeaderObject(HeaderInterface $header, bool $append = false) : MessageInterface
-    {
-        $name = $header->getFieldName();
-        $value = $header->getFieldValue();
-
-        $result = clone $this;
-        $result = $result->withHeader($name, $value, $append);
-
-        return $result;
-    }
-
-    /**
-     * Returns a new instance with the given headers
-     *
-     * [!] This method is not associated with PSR-7.
-     *
-     * @param HeaderCollectionInterface $headers
-     * @param bool $append
-     *
-     * @return MessageInterface
-     *
-     * @since 1.4.0
-     */
-    public function withHeaderCollection(HeaderCollectionInterface $headers, bool $append = false) : MessageInterface
-    {
-        $result = clone $this;
-
-        foreach ($headers as $header) {
-            $name = $header->getFieldName();
-            $value = $header->getFieldValue();
-
-            $result = $result->withHeader($name, $value, $append);
-        }
-
-        return $result;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function withoutHeader($name) : MessageInterface
-    {
-        $name = $this->normalizeHeaderName($name);
-
-        $clone = clone $this;
-
-        unset($clone->headers[$name]);
-
-        return $clone;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getBody() : ?StreamInterface
-    {
-        return $this->body;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function withBody(StreamInterface $body) : MessageInterface
-    {
-        $clone = clone $this;
-        $clone->body = $body;
-
-        return $clone;
-    }
-
-    /**
-     * Validates the given protocol version
-     *
-     * @param mixed $protocolVersion
-     *
-     * @return void
-     *
-     * @throws \InvalidArgumentException
-     *
-     * @link https://tools.ietf.org/html/rfc7230#section-2.6
-     * @link https://tools.ietf.org/html/rfc7540
-     */
-    protected function validateProtocolVersion($protocolVersion) : void
-    {
-        if (! \is_string($protocolVersion)) {
-            throw new \InvalidArgumentException('HTTP protocol version must be a string');
-        }
-
-        if (! \preg_match('/^\d(?:\.\d)?$/', $protocolVersion)) {
-            throw new \InvalidArgumentException(
-                \sprintf('The given protocol version "%s" is not valid', $protocolVersion)
-            );
-        }
-    }
-
-    /**
-     * Validates the given header name
-     *
-     * @param mixed $headerName
-     *
-     * @return void
-     *
-     * @throws \InvalidArgumentException
-     *
-     * @link https://tools.ietf.org/html/rfc7230#section-3.2
-     */
-    protected function validateHeaderName($headerName) : void
-    {
-        if (! \is_string($headerName)) {
-            throw new \InvalidArgumentException('Header name must be a string');
-        }
-
-        if (! \preg_match(HeaderInterface::RFC7230_TOKEN, $headerName)) {
-            throw new \InvalidArgumentException(
-                \sprintf('The given header name "%s" is not valid', $headerName)
-            );
-        }
-    }
-
-    /**
-     * Validates the given header value
-     *
-     * @param mixed $headerValue
-     *
-     * @return void
-     *
-     * @throws \InvalidArgumentException
-     *
-     * @link https://tools.ietf.org/html/rfc7230#section-3.2
-     */
-    protected function validateHeaderValue($headerValue) : void
-    {
-        if (\is_string($headerValue)) {
-            $headerValue = [$headerValue];
-        }
-
-        if (! \is_array($headerValue) || [] === $headerValue) {
-            throw new \InvalidArgumentException(
-                'Header value must be a string or not an empty array'
-            );
-        }
-
-        foreach ($headerValue as $oneOf) {
-            if (! \is_string($oneOf)) {
-                throw new \InvalidArgumentException(
-                    'Header value must be a string or an array containing only strings'
-                );
-            }
-
-            if (! \preg_match(HeaderInterface::RFC7230_FIELD_VALUE, $oneOf)) {
-                throw new \InvalidArgumentException(
-                    \sprintf('The given header value "%s" is not valid', $oneOf)
-                );
-            }
-        }
-    }
-
-    /**
-     * Normalizes the given header name
-     *
-     * @param string $headerName
-     *
-     * @return string
-     *
-     * @link https://tools.ietf.org/html/rfc7230#section-3.2
-     */
-    protected function normalizeHeaderName($headerName) : string
-    {
-        // Each header field consists of a case-insensitive field name...
-        $headerName = \strtolower($headerName);
-
-        return $headerName;
-    }
-
-    /**
-     * Normalizes the given header value
-     *
-     * @param string|array $headerValue
-     *
-     * @return array
-     */
-    protected function normalizeHeaderValue($headerValue) : array
-    {
-        $headerValue = (array) $headerValue;
-        $headerValue = \array_values($headerValue);
-
-        return $headerValue;
-    }
+	/**
+	 * Protocol version for the message
+	 *
+	 * @var string
+	 */
+	protected $protocolVersion = '1.1';
+
+	/**
+	 * Headers of the message
+	 *
+	 * @var array
+	 */
+	protected $headers = [];
+
+	/**
+	 * Body of the message
+	 *
+	 * @var null|StreamInterface
+	 */
+	protected $body;
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function getProtocolVersion() : string
+	{
+		return $this->protocolVersion;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function withProtocolVersion($protocolVersion) : MessageInterface
+	{
+		$this->validateProtocolVersion($protocolVersion);
+
+		$clone = clone $this;
+		$clone->protocolVersion = $protocolVersion;
+
+		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, bool $append = false) : MessageInterface
+	{
+		$this->validateHeaderName($name);
+		$this->validateHeaderValue($value);
+
+		$name = $this->normalizeHeaderName($name);
+		$value = $this->normalizeHeaderValue($value);
+
+		if (isset($this->headers[$name]) && $append) {
+			$value = \array_merge($this->headers[$name], $value);
+		}
+
+		$clone = clone $this;
+		$clone->headers[$name] = $value;
+
+		return $clone;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function withAddedHeader($name, $value) : MessageInterface
+	{
+		return $this->withHeader($name, $value, true);
+	}
+
+	/**
+	 * Returns a new instance with the given headers
+	 *
+	 * [!] This method is not associated with PSR-7.
+	 *
+	 * @param iterable $headers
+	 * @param bool $append
+	 *
+	 * @return MessageInterface
+	 *
+	 * @since 1.3.0
+	 */
+	public function withMultipleHeaders(iterable $headers, bool $append = false) : MessageInterface
+	{
+		$result = clone $this;
+
+		foreach ($headers as $name => $value) {
+			$result = $result->withHeader($name, $value, $append);
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Returns a new instance with the given header
+	 *
+	 * [!] This method is not associated with PSR-7.
+	 *
+	 * @param HeaderInterface $header
+	 * @param bool $append
+	 *
+	 * @return MessageInterface
+	 *
+	 * @since 1.4.0
+	 */
+	public function withHeaderObject(HeaderInterface $header, bool $append = false) : MessageInterface
+	{
+		$name = $header->getFieldName();
+		$value = $header->getFieldValue();
+
+		$result = clone $this;
+		$result = $result->withHeader($name, $value, $append);
+
+		return $result;
+	}
+
+	/**
+	 * Returns a new instance with the given headers
+	 *
+	 * [!] This method is not associated with PSR-7.
+	 *
+	 * @param HeaderCollectionInterface $headers
+	 * @param bool $append
+	 *
+	 * @return MessageInterface
+	 *
+	 * @since 1.4.0
+	 */
+	public function withHeaderCollection(HeaderCollectionInterface $headers, bool $append = false) : MessageInterface
+	{
+		$result = clone $this;
+
+		foreach ($headers as $header) {
+			$name = $header->getFieldName();
+			$value = $header->getFieldValue();
+
+			$result = $result->withHeader($name, $value, $append);
+		}
+
+		return $result;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function withoutHeader($name) : MessageInterface
+	{
+		$name = $this->normalizeHeaderName($name);
+
+		$clone = clone $this;
+
+		unset($clone->headers[$name]);
+
+		return $clone;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function getBody() : ?StreamInterface
+	{
+		return $this->body;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function withBody(StreamInterface $body) : MessageInterface
+	{
+		$clone = clone $this;
+		$clone->body = $body;
+
+		return $clone;
+	}
+
+	/**
+	 * Validates the given protocol version
+	 *
+	 * @param mixed $protocolVersion
+	 *
+	 * @return void
+	 *
+	 * @throws \InvalidArgumentException
+	 *
+	 * @link https://tools.ietf.org/html/rfc7230#section-2.6
+	 * @link https://tools.ietf.org/html/rfc7540
+	 */
+	protected function validateProtocolVersion($protocolVersion) : void
+	{
+		if (! \is_string($protocolVersion)) {
+			throw new \InvalidArgumentException('HTTP protocol version must be a string');
+		}
+
+		if (! \preg_match('/^\d(?:\.\d)?$/', $protocolVersion)) {
+			throw new \InvalidArgumentException(
+				\sprintf('The given protocol version "%s" is not valid', $protocolVersion)
+			);
+		}
+	}
+
+	/**
+	 * Validates the given header name
+	 *
+	 * @param mixed $headerName
+	 *
+	 * @return void
+	 *
+	 * @throws \InvalidArgumentException
+	 *
+	 * @link https://tools.ietf.org/html/rfc7230#section-3.2
+	 */
+	protected function validateHeaderName($headerName) : void
+	{
+		if (! \is_string($headerName)) {
+			throw new \InvalidArgumentException('Header name must be a string');
+		}
+
+		if (! \preg_match(HeaderInterface::RFC7230_TOKEN, $headerName)) {
+			throw new \InvalidArgumentException(
+				\sprintf('The given header name "%s" is not valid', $headerName)
+			);
+		}
+	}
+
+	/**
+	 * Validates the given header value
+	 *
+	 * @param mixed $headerValue
+	 *
+	 * @return void
+	 *
+	 * @throws \InvalidArgumentException
+	 *
+	 * @link https://tools.ietf.org/html/rfc7230#section-3.2
+	 */
+	protected function validateHeaderValue($headerValue) : void
+	{
+		if (\is_string($headerValue)) {
+			$headerValue = [$headerValue];
+		}
+
+		if (! \is_array($headerValue) || [] === $headerValue) {
+			throw new \InvalidArgumentException(
+				'Header value must be a string or not an empty array'
+			);
+		}
+
+		foreach ($headerValue as $oneOf) {
+			if (! \is_string($oneOf)) {
+				throw new \InvalidArgumentException(
+					'Header value must be a string or an array containing only strings'
+				);
+			}
+
+			if (! \preg_match(HeaderInterface::RFC7230_FIELD_VALUE, $oneOf)) {
+				throw new \InvalidArgumentException(
+					\sprintf('The given header value "%s" is not valid', $oneOf)
+				);
+			}
+		}
+	}
+
+	/**
+	 * Normalizes the given header name
+	 *
+	 * @param string $headerName
+	 *
+	 * @return string
+	 *
+	 * @link https://tools.ietf.org/html/rfc7230#section-3.2
+	 */
+	protected function normalizeHeaderName($headerName) : string
+	{
+		// Each header field consists of a case-insensitive field name...
+		$headerName = \strtolower($headerName);
+
+		return $headerName;
+	}
+
+	/**
+	 * Normalizes the given header value
+	 *
+	 * @param string|array $headerValue
+	 *
+	 * @return array
+	 */
+	protected function normalizeHeaderValue($headerValue) : array
+	{
+		$headerValue = (array) $headerValue;
+		$headerValue = \array_values($headerValue);
+
+		return $headerValue;
+	}
 }

Spacing +8 added lines, -8 removed lines

@@ -85,7 +85,7 @@ 
     {
         $name = $this->normalizeHeaderName($name);
 
-        return ! empty($this->headers[$name]);
+        return !empty($this->headers[$name]);
     }
 
     /**
@@ -262,11 +262,11 @@ 
      */
     protected function validateProtocolVersion($protocolVersion) : void
     {
-        if (! \is_string($protocolVersion)) {
+        if (!\is_string($protocolVersion)) {
             throw new \InvalidArgumentException('HTTP protocol version must be a string');
         }
 
-        if (! \preg_match('/^\d(?:\.\d)?$/', $protocolVersion)) {
+        if (!\preg_match('/^\d(?:\.\d)?$/', $protocolVersion)) {
             throw new \InvalidArgumentException(
                 \sprintf('The given protocol version "%s" is not valid', $protocolVersion)
             );
@@ -286,11 +286,11 @@ 
      */
     protected function validateHeaderName($headerName) : void
     {
-        if (! \is_string($headerName)) {
+        if (!\is_string($headerName)) {
             throw new \InvalidArgumentException('Header name must be a string');
         }
 
-        if (! \preg_match(HeaderInterface::RFC7230_TOKEN, $headerName)) {
+        if (!\preg_match(HeaderInterface::RFC7230_TOKEN, $headerName)) {
             throw new \InvalidArgumentException(
                 \sprintf('The given header name "%s" is not valid', $headerName)
             );
@@ -314,20 +314,20 @@ 
             $headerValue = [$headerValue];
         }
 
-        if (! \is_array($headerValue) || [] === $headerValue) {
+        if (!\is_array($headerValue) || [] === $headerValue) {
             throw new \InvalidArgumentException(
                 'Header value must be a string or not an empty array'
             );
         }
 
         foreach ($headerValue as $oneOf) {
-            if (! \is_string($oneOf)) {
+            if (!\is_string($oneOf)) {
                 throw new \InvalidArgumentException(
                     'Header value must be a string or an array containing only strings'
                 );
             }
 
-            if (! \preg_match(HeaderInterface::RFC7230_FIELD_VALUE, $oneOf)) {
+            if (!\preg_match(HeaderInterface::RFC7230_FIELD_VALUE, $oneOf)) {
                 throw new \InvalidArgumentException(
                     \sprintf('The given header value "%s" is not valid', $oneOf)
                 );

src/RequestFactory.php

Indentation +14 added lines, -14 removed lines

@@ -28,20 +28,20 @@
 class RequestFactory implements RequestFactoryInterface
 {
 
-    /**
-     * {@inheritDoc}
-     */
-    public function createRequest(string $method, $uri) : RequestInterface
-    {
-        if (! ($uri instanceof UriInterface)) {
-            $uri = (new UriFactory)->createUri($uri);
-        }
+	/**
+	 * {@inheritDoc}
+	 */
+	public function createRequest(string $method, $uri) : RequestInterface
+	{
+		if (! ($uri instanceof UriInterface)) {
+			$uri = (new UriFactory)->createUri($uri);
+		}
 
-        $body = (new StreamFactory)->createStream();
+		$body = (new StreamFactory)->createStream();
 
-        return (new Request)
-            ->withMethod($method)
-            ->withUri($uri)
-            ->withBody($body);
-    }
+		return (new Request)
+			->withMethod($method)
+			->withUri($uri)
+			->withBody($body);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
      */
     public function createRequest(string $method, $uri) : RequestInterface
     {
-        if (! ($uri instanceof UriInterface)) {
+        if (!($uri instanceof UriInterface)) {
             $uri = (new UriFactory)->createUri($uri);
         }
 

src/Exception/JsonException.php

Indentation +15 added lines, -15 removed lines

@@ -33,19 +33,19 @@
 class JsonException extends RuntimeException
 {
 
-    /**
-     * @return void
-     *
-     * @throws self
-     */
-    public static function assert() : void
-    {
-        $code = json_last_error();
-
-        if (JSON_ERROR_NONE === $code) {
-            return;
-        }
-
-        throw new self(json_last_error_msg(), $code);
-    }
+	/**
+	 * @return void
+	 *
+	 * @throws self
+	 */
+	public static function assert() : void
+	{
+		$code = json_last_error();
+
+		if (JSON_ERROR_NONE === $code) {
+			return;
+		}
+
+		throw new self(json_last_error_msg(), $code);
+	}
 }

src/ResponseFactory.php

Indentation +53 added lines, -53 removed lines

@@ -31,66 +31,66 @@
 class ResponseFactory implements ResponseFactoryInterface
 {
 
-    /**
-     * {@inheritDoc}
-     */
-    public function createResponse(int $code = 200, string $reasonPhrase = '') : ResponseInterface
-    {
-        $body = (new StreamFactory)->createStream();
+	/**
+	 * {@inheritDoc}
+	 */
+	public function createResponse(int $code = 200, string $reasonPhrase = '') : ResponseInterface
+	{
+		$body = (new StreamFactory)->createStream();
 
-        return (new Response)
-            ->withStatus($code, $reasonPhrase)
-            ->withBody($body);
-    }
+		return (new Response)
+			->withStatus($code, $reasonPhrase)
+			->withBody($body);
+	}
 
-    /**
-     * Creates a HTML response instance
-     *
-     * @param int $status
-     * @param mixed $content
-     *
-     * @return ResponseInterface
-     */
-    public function createHtmlResponse(int $status, $content) : ResponseInterface
-    {
-        $content = (string) $content;
+	/**
+	 * Creates a HTML response instance
+	 *
+	 * @param int $status
+	 * @param mixed $content
+	 *
+	 * @return ResponseInterface
+	 */
+	public function createHtmlResponse(int $status, $content) : ResponseInterface
+	{
+		$content = (string) $content;
 
-        $body = (new StreamFactory)->createStream();
-        $body->write($content);
+		$body = (new StreamFactory)->createStream();
+		$body->write($content);
 
-        return (new Response)
-            ->withStatus($status)
-            ->withHeader('Content-Type', 'text/html; charset=utf-8')
-            ->withBody($body);
-    }
+		return (new Response)
+			->withStatus($status)
+			->withHeader('Content-Type', 'text/html; charset=utf-8')
+			->withBody($body);
+	}
 
-    /**
-     * Creates a JSON response instance
-     *
-     * @param int $status
-     * @param mixed $payload
-     * @param int $options
-     * @param int $depth
-     *
-     * @return ResponseInterface
-     *
-     * @throws Exception\JsonException
-     */
-    public function createJsonResponse(int $status, $payload, int $options = 0, int $depth = 512) : ResponseInterface
-    {
-        // clears a previous error...
-        json_encode(null);
+	/**
+	 * Creates a JSON response instance
+	 *
+	 * @param int $status
+	 * @param mixed $payload
+	 * @param int $options
+	 * @param int $depth
+	 *
+	 * @return ResponseInterface
+	 *
+	 * @throws Exception\JsonException
+	 */
+	public function createJsonResponse(int $status, $payload, int $options = 0, int $depth = 512) : ResponseInterface
+	{
+		// clears a previous error...
+		json_encode(null);
 
-        $content = json_encode($payload, $options, $depth);
+		$content = json_encode($payload, $options, $depth);
 
-        Exception\JsonException::assert();
+		Exception\JsonException::assert();
 
-        $body = (new StreamFactory)->createStream();
-        $body->write($content);
+		$body = (new StreamFactory)->createStream();
+		$body->write($content);
 
-        return (new Response)
-            ->withStatus($status)
-            ->withHeader('Content-Type', 'application/json; charset=utf-8')
-            ->withBody($body);
-    }
+		return (new Response)
+			->withStatus($status)
+			->withHeader('Content-Type', 'application/json; charset=utf-8')
+			->withBody($body);
+	}
 }

data/phrases.php

Indentation +68 added lines, -68 removed lines

@@ -20,76 +20,76 @@
  */
 const 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',
-    306 => '(Unused)',
-    307 => 'Temporary Redirect',
-    308 => 'Permanent Redirect',
+	// 3xx
+	300 => 'Multiple Choices',
+	301 => 'Moved Permanently',
+	302 => 'Found',
+	303 => 'See Other',
+	304 => 'Not Modified',
+	305 => 'Use Proxy',
+	306 => '(Unused)',
+	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',
-    418 => 'I\'m a teapot',
-    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',
+	418 => 'I\'m a teapot',
+	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',
 ];