sunrise-php / http-message

src/Request.php

Indentation +297 added lines, -297 removed lines

@@ -36,301 +36,301 @@
 class Request extends Message implements RequestInterface, RequestMethodInterface
 {
 
-    /**
-     * Regular Expression for a request target validation
-     *
-     * @link https://tools.ietf.org/html/rfc7230#section-5.3
-     *
-     * @var string
-     */
-    public const RFC7230_VALID_REQUEST_TARGET = '/^[\x21-\x7E\x80-\xFF]+$/';
-
-    /**
-     * Default request method
-     *
-     * @var string
-     */
-    public const DEFAULT_METHOD = self::METHOD_GET;
-
-    /**
-     * Default request URI
-     *
-     * @var string
-     */
-    public const DEFAULT_URI = '/';
-
-    /**
-     * The request method (aka verb)
-     *
-     * @var string
-     */
-    private string $method = self::DEFAULT_METHOD;
-
-    /**
-     * The request URI
-     *
-     * @var UriInterface
-     */
-    private UriInterface $uri;
-
-    /**
-     * The request target
-     *
-     * @var string|null
-     */
-    private ?string $requestTarget = null;
-
-    /**
-     * Constructor of the class
-     *
-     * @param string|null $method
-     * @param mixed $uri
-     * @param array<string, string|string[]>|null $headers
-     * @param StreamInterface|null $body
-     *
-     * @throws InvalidArgumentException
-     *         If one of the arguments isn't valid.
-     */
-    public function __construct(
-        ?string $method = null,
-        $uri = null,
-        ?array $headers = null,
-        ?StreamInterface $body = null
-    ) {
-        if (isset($method)) {
-            $this->setMethod($method);
-        }
-
-        $this->setUri($uri ?? self::DEFAULT_URI);
-
-        if (isset($headers)) {
-            $this->setHeaders($headers);
-        }
-
-        if (isset($body)) {
-            $this->setBody($body);
-        }
-    }
-
-    /**
-     * Gets the request method
-     *
-     * @return string
-     */
-    public function getMethod(): string
-    {
-        return $this->method;
-    }
-
-    /**
-     * Creates a new instance of the request with the given method
-     *
-     * @param string $method
-     *
-     * @return static
-     *
-     * @throws InvalidArgumentException
-     *         If the method isn't valid.
-     */
-    public function withMethod($method): RequestInterface
-    {
-        $clone = clone $this;
-        $clone->setMethod($method);
-
-        return $clone;
-    }
-
-    /**
-     * Gets the request URI
-     *
-     * @return UriInterface
-     */
-    public function getUri(): UriInterface
-    {
-        return $this->uri;
-    }
-
-    /**
-     * Creates a new instance of the request with the given URI
-     *
-     * @param UriInterface $uri
-     * @param bool $preserveHost
-     *
-     * @return static
-     */
-    public function withUri(UriInterface $uri, $preserveHost = false): RequestInterface
-    {
-        $clone = clone $this;
-        $clone->setUri($uri, $preserveHost);
-
-        return $clone;
-    }
-
-    /**
-     * Gets the request target
-     *
-     * @return string
-     */
-    public function getRequestTarget(): string
-    {
-        if (isset($this->requestTarget)) {
-            return $this->requestTarget;
-        }
-
-        $requestTarget = $this->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 (strncmp($requestTarget, '/', 1) !== 0) {
-            return '/';
-        }
-
-        $queryString = $this->uri->getQuery();
-        if ($queryString !== '') {
-            $requestTarget .= '?' . $queryString;
-        }
-
-        return $requestTarget;
-    }
-
-    /**
-     * Creates a new instance of the request with the given request target
-     *
-     * @param mixed $requestTarget
-     *
-     * @return static
-     *
-     * @throws InvalidArgumentException
-     *         If the request target isn't valid.
-     */
-    public function withRequestTarget($requestTarget): RequestInterface
-    {
-        $clone = clone $this;
-        $clone->setRequestTarget($requestTarget);
-
-        return $clone;
-    }
-
-    /**
-     * Sets the given method to the request
-     *
-     * @param string $method
-     *
-     * @return void
-     *
-     * @throws InvalidArgumentException
-     *         If the method isn't valid.
-     */
-    final protected function setMethod($method): void
-    {
-        $this->validateMethod($method);
-
-        $this->method = $method;
-    }
-
-    /**
-     * Sets the given URI to the request
-     *
-     * @param mixed $uri
-     * @param bool $preserveHost
-     *
-     * @return void
-     *
-     * @throws InvalidArgumentException
-     *         If the URI isn't valid.
-     */
-    final protected function setUri($uri, $preserveHost = false): void
-    {
-        $this->uri = Uri::create($uri);
-
-        if ($preserveHost && $this->hasHeader('Host')) {
-            return;
-        }
-
-        $host = $this->uri->getHost();
-        if ($host === '') {
-            return;
-        }
-
-        $port = $this->uri->getPort();
-        if (isset($port)) {
-            $host .= ':' . $port;
-        }
-
-        $this->setHeader('Host', $host, true);
-    }
-
-    /**
-     * Sets the given request target to the request
-     *
-     * @param mixed $requestTarget
-     *
-     * @return void
-     *
-     * @throws InvalidArgumentException
-     *         If the request target isn't valid.
-     */
-    final protected function setRequestTarget($requestTarget): void
-    {
-        $this->validateRequestTarget($requestTarget);
-
-        /** @var string $requestTarget */
-
-        $this->requestTarget = $requestTarget;
-    }
-
-    /**
-     * Validates the given method
-     *
-     * @link https://tools.ietf.org/html/rfc7230#section-3.1.1
-     *
-     * @param mixed $method
-     *
-     * @return void
-     *
-     * @throws InvalidArgumentException
-     *         If the method isn't valid.
-     */
-    private function validateMethod($method): void
-    {
-        if ('' === $method) {
-            throw new InvalidArgumentException('HTTP method cannot be an empty');
-        }
-
-        if (!is_string($method)) {
-            throw new InvalidArgumentException('HTTP method must be a string');
-        }
-
-        if (!preg_match(Header::RFC7230_VALID_TOKEN, $method)) {
-            throw new InvalidArgumentException('Invalid HTTP method');
-        }
-    }
-
-    /**
-     * Validates the given request target
-     *
-     * @param mixed $requestTarget
-     *
-     * @return void
-     *
-     * @throws InvalidArgumentException
-     *         If the request target isn't valid.
-     */
-    private function validateRequestTarget($requestTarget): void
-    {
-        if ('' === $requestTarget) {
-            throw new InvalidArgumentException('HTTP request target cannot be an empty');
-        }
-
-        if (!is_string($requestTarget)) {
-            throw new InvalidArgumentException('HTTP request target must be a string');
-        }
-
-        if (!preg_match(self::RFC7230_VALID_REQUEST_TARGET, $requestTarget)) {
-            throw new InvalidArgumentException('Invalid HTTP request target');
-        }
-    }
+	/**
+	 * Regular Expression for a request target validation
+	 *
+	 * @link https://tools.ietf.org/html/rfc7230#section-5.3
+	 *
+	 * @var string
+	 */
+	public const RFC7230_VALID_REQUEST_TARGET = '/^[\x21-\x7E\x80-\xFF]+$/';
+
+	/**
+	 * Default request method
+	 *
+	 * @var string
+	 */
+	public const DEFAULT_METHOD = self::METHOD_GET;
+
+	/**
+	 * Default request URI
+	 *
+	 * @var string
+	 */
+	public const DEFAULT_URI = '/';
+
+	/**
+	 * The request method (aka verb)
+	 *
+	 * @var string
+	 */
+	private string $method = self::DEFAULT_METHOD;
+
+	/**
+	 * The request URI
+	 *
+	 * @var UriInterface
+	 */
+	private UriInterface $uri;
+
+	/**
+	 * The request target
+	 *
+	 * @var string|null
+	 */
+	private ?string $requestTarget = null;
+
+	/**
+	 * Constructor of the class
+	 *
+	 * @param string|null $method
+	 * @param mixed $uri
+	 * @param array<string, string|string[]>|null $headers
+	 * @param StreamInterface|null $body
+	 *
+	 * @throws InvalidArgumentException
+	 *         If one of the arguments isn't valid.
+	 */
+	public function __construct(
+		?string $method = null,
+		$uri = null,
+		?array $headers = null,
+		?StreamInterface $body = null
+	) {
+		if (isset($method)) {
+			$this->setMethod($method);
+		}
+
+		$this->setUri($uri ?? self::DEFAULT_URI);
+
+		if (isset($headers)) {
+			$this->setHeaders($headers);
+		}
+
+		if (isset($body)) {
+			$this->setBody($body);
+		}
+	}
+
+	/**
+	 * Gets the request method
+	 *
+	 * @return string
+	 */
+	public function getMethod(): string
+	{
+		return $this->method;
+	}
+
+	/**
+	 * Creates a new instance of the request with the given method
+	 *
+	 * @param string $method
+	 *
+	 * @return static
+	 *
+	 * @throws InvalidArgumentException
+	 *         If the method isn't valid.
+	 */
+	public function withMethod($method): RequestInterface
+	{
+		$clone = clone $this;
+		$clone->setMethod($method);
+
+		return $clone;
+	}
+
+	/**
+	 * Gets the request URI
+	 *
+	 * @return UriInterface
+	 */
+	public function getUri(): UriInterface
+	{
+		return $this->uri;
+	}
+
+	/**
+	 * Creates a new instance of the request with the given URI
+	 *
+	 * @param UriInterface $uri
+	 * @param bool $preserveHost
+	 *
+	 * @return static
+	 */
+	public function withUri(UriInterface $uri, $preserveHost = false): RequestInterface
+	{
+		$clone = clone $this;
+		$clone->setUri($uri, $preserveHost);
+
+		return $clone;
+	}
+
+	/**
+	 * Gets the request target
+	 *
+	 * @return string
+	 */
+	public function getRequestTarget(): string
+	{
+		if (isset($this->requestTarget)) {
+			return $this->requestTarget;
+		}
+
+		$requestTarget = $this->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 (strncmp($requestTarget, '/', 1) !== 0) {
+			return '/';
+		}
+
+		$queryString = $this->uri->getQuery();
+		if ($queryString !== '') {
+			$requestTarget .= '?' . $queryString;
+		}
+
+		return $requestTarget;
+	}
+
+	/**
+	 * Creates a new instance of the request with the given request target
+	 *
+	 * @param mixed $requestTarget
+	 *
+	 * @return static
+	 *
+	 * @throws InvalidArgumentException
+	 *         If the request target isn't valid.
+	 */
+	public function withRequestTarget($requestTarget): RequestInterface
+	{
+		$clone = clone $this;
+		$clone->setRequestTarget($requestTarget);
+
+		return $clone;
+	}
+
+	/**
+	 * Sets the given method to the request
+	 *
+	 * @param string $method
+	 *
+	 * @return void
+	 *
+	 * @throws InvalidArgumentException
+	 *         If the method isn't valid.
+	 */
+	final protected function setMethod($method): void
+	{
+		$this->validateMethod($method);
+
+		$this->method = $method;
+	}
+
+	/**
+	 * Sets the given URI to the request
+	 *
+	 * @param mixed $uri
+	 * @param bool $preserveHost
+	 *
+	 * @return void
+	 *
+	 * @throws InvalidArgumentException
+	 *         If the URI isn't valid.
+	 */
+	final protected function setUri($uri, $preserveHost = false): void
+	{
+		$this->uri = Uri::create($uri);
+
+		if ($preserveHost && $this->hasHeader('Host')) {
+			return;
+		}
+
+		$host = $this->uri->getHost();
+		if ($host === '') {
+			return;
+		}
+
+		$port = $this->uri->getPort();
+		if (isset($port)) {
+			$host .= ':' . $port;
+		}
+
+		$this->setHeader('Host', $host, true);
+	}
+
+	/**
+	 * Sets the given request target to the request
+	 *
+	 * @param mixed $requestTarget
+	 *
+	 * @return void
+	 *
+	 * @throws InvalidArgumentException
+	 *         If the request target isn't valid.
+	 */
+	final protected function setRequestTarget($requestTarget): void
+	{
+		$this->validateRequestTarget($requestTarget);
+
+		/** @var string $requestTarget */
+
+		$this->requestTarget = $requestTarget;
+	}
+
+	/**
+	 * Validates the given method
+	 *
+	 * @link https://tools.ietf.org/html/rfc7230#section-3.1.1
+	 *
+	 * @param mixed $method
+	 *
+	 * @return void
+	 *
+	 * @throws InvalidArgumentException
+	 *         If the method isn't valid.
+	 */
+	private function validateMethod($method): void
+	{
+		if ('' === $method) {
+			throw new InvalidArgumentException('HTTP method cannot be an empty');
+		}
+
+		if (!is_string($method)) {
+			throw new InvalidArgumentException('HTTP method must be a string');
+		}
+
+		if (!preg_match(Header::RFC7230_VALID_TOKEN, $method)) {
+			throw new InvalidArgumentException('Invalid HTTP method');
+		}
+	}
+
+	/**
+	 * Validates the given request target
+	 *
+	 * @param mixed $requestTarget
+	 *
+	 * @return void
+	 *
+	 * @throws InvalidArgumentException
+	 *         If the request target isn't valid.
+	 */
+	private function validateRequestTarget($requestTarget): void
+	{
+		if ('' === $requestTarget) {
+			throw new InvalidArgumentException('HTTP request target cannot be an empty');
+		}
+
+		if (!is_string($requestTarget)) {
+			throw new InvalidArgumentException('HTTP request target must be a string');
+		}
+
+		if (!preg_match(self::RFC7230_VALID_REQUEST_TARGET, $requestTarget)) {
+			throw new InvalidArgumentException('Invalid HTTP request target');
+		}
+	}
 }

src/Uri/Component/UserInfo.php

Indentation +38 added lines, -38 removed lines

@@ -19,48 +19,48 @@
 final class UserInfo implements ComponentInterface
 {
 
-    /**
-     * URI component "user"
-     *
-     * @var User
-     */
-    private User $user;
+	/**
+	 * URI component "user"
+	 *
+	 * @var User
+	 */
+	private User $user;
 
-    /**
-     * URI component "password"
-     *
-     * @var Password|null
-     */
-    private ?Password $password = null;
+	/**
+	 * URI component "password"
+	 *
+	 * @var Password|null
+	 */
+	private ?Password $password = null;
 
-    /**
-     * Constructor of the class
-     *
-     * @param mixed $user
-     * @param mixed $password
-     */
-    public function __construct($user, $password = null)
-    {
-        $this->user = User::create($user);
+	/**
+	 * Constructor of the class
+	 *
+	 * @param mixed $user
+	 * @param mixed $password
+	 */
+	public function __construct($user, $password = null)
+	{
+		$this->user = User::create($user);
 
-        if (isset($password)) {
-            $this->password = Password::create($password);
-        }
-    }
+		if (isset($password)) {
+			$this->password = Password::create($password);
+		}
+	}
 
-    /**
-     * {@inheritdoc}
-     *
-     * @return string
-     */
-    public function getValue(): string
-    {
-        $value = $this->user->getValue();
+	/**
+	 * {@inheritdoc}
+	 *
+	 * @return string
+	 */
+	public function getValue(): string
+	{
+		$value = $this->user->getValue();
 
-        if (isset($this->password)) {
-            $value .= ':' . $this->password->getValue();
-        }
+		if (isset($this->password)) {
+			$value .= ':' . $this->password->getValue();
+		}
 
-        return $value;
-    }
+		return $value;
+	}
 }