lenevor / syscodes

src/components/Http/Loaders/Files.php

Indentation +20 added lines, -20 removed lines

@@ -40,29 +40,29 @@
     }
 
     /**
-	 * Replaces the current parameters.
-	 * 
-	 * @param  array  $parameters
-	 * 
-	 * @return void
-	 */
-	public function replace(array $files = []): void
-	{
-		$this->parameters = [];
+     * Replaces the current parameters.
+     * 
+     * @param  array  $parameters
+     * 
+     * @return void
+     */
+    public function replace(array $files = []): void
+    {
+        $this->parameters = [];
         $this->add($files);
-	}
+    }
 
-	/**
-	 * Adds parameters.
-	 * 
-	 * @param  array  $parameters
-	 * 
-	 * @return void
-	 */
-	public function add(array $files = []): void
-	{
+    /**
+     * Adds parameters.
+     * 
+     * @param  array  $parameters
+     * 
+     * @return void
+     */
+    public function add(array $files = []): void
+    {
         foreach ($files as $key => $file) {
             $this->set($key, $file);
         }
-	}
+    }
 }
\ No newline at end of file

src/components/Http/Loaders/Headers.php

Indentation +227 added lines, -227 removed lines

@@ -35,266 +35,266 @@
  */
 class Headers implements IteratorAggregate, Countable
 {
-	protected const STRING_UPPER = '_ABCDEFGHIJKLMNOPQRSTUVWXYZ';
-	protected const STRING_LOWER = '-abcdefghijklmnopqrstuvwxyz';
+    protected const STRING_UPPER = '_ABCDEFGHIJKLMNOPQRSTUVWXYZ';
+    protected const STRING_LOWER = '-abcdefghijklmnopqrstuvwxyz';
 
-	/**
-	 * An array of HTTP headers.
-	 * 
-	 * @var array $herders
-	 */
-	protected $headers = [];
+    /**
+     * An array of HTTP headers.
+     * 
+     * @var array $herders
+     */
+    protected $headers = [];
 	
-	/**
-	 * Specifies the directives for the caching mechanisms in both
-	 * the requests and the responses.
-	 * 
-	 * @var array $cacheControl
-	 */
-	protected $cacheControl = [];
+    /**
+     * Specifies the directives for the caching mechanisms in both
+     * the requests and the responses.
+     * 
+     * @var array $cacheControl
+     */
+    protected $cacheControl = [];
 	
-	/**
-	 * Constructor. The Headers class instance.
-	 * 
-	 * @param  array  $headers
-	 * 
-	 * @return void
-	 */
-	public function __construct(array $headers = [])
-	{
-		foreach ($headers as $key => $values) {
-			$this->set($key, $values);
-		}
-	}
+    /**
+     * Constructor. The Headers class instance.
+     * 
+     * @param  array  $headers
+     * 
+     * @return void
+     */
+    public function __construct(array $headers = [])
+    {
+        foreach ($headers as $key => $values) {
+            $this->set($key, $values);
+        }
+    }
 	
-	/**
-	 * Returns all the headers.
-	 * 
-	 * @param  string|null  $key  The name of the headers
-	 * 
-	 * @return array
-	 */
-	public function all(string $key = null): array
-	{
-		if (null !== $key) {
-			return $this->headers[strtr($key, self::STRING_UPPER, self::STRING_LOWER)] ?? [];
-		}
+    /**
+     * Returns all the headers.
+     * 
+     * @param  string|null  $key  The name of the headers
+     * 
+     * @return array
+     */
+    public function all(string $key = null): array
+    {
+        if (null !== $key) {
+            return $this->headers[strtr($key, self::STRING_UPPER, self::STRING_LOWER)] ?? [];
+        }
 
-		return $this->headers;
-	}
+        return $this->headers;
+    }
 	
-	/**
-	 * Returns the parameter keys.
-	 * 
-	 * @return array An array of parameter keys
-	 */
-	public function keys(): array
-	{
-		return array_keys($this->all());
-	}
+    /**
+     * Returns the parameter keys.
+     * 
+     * @return array An array of parameter keys
+     */
+    public function keys(): array
+    {
+        return array_keys($this->all());
+    }
 	
-	/**
-	 * Replaces the current HTTP headers by a new set.
-	 * 
-	 * @param  array  $headers
-	 * 
-	 * @return void
-	 */
-	public function replace(array $headers = []): void
-	{
-		$this->headers = [];
-		$this->add($headers);
-	}
+    /**
+     * Replaces the current HTTP headers by a new set.
+     * 
+     * @param  array  $headers
+     * 
+     * @return void
+     */
+    public function replace(array $headers = []): void
+    {
+        $this->headers = [];
+        $this->add($headers);
+    }
 	
-	/**
-	 * Adds multiple header to the queue.
-	 * 
-	 * @param  array  $headers  The header name
-	 * 
-	 * @return mixed
-	 */
-	public function add(array $headers = [])
-	{
-		foreach ($headers as $key => $values) {
-			$this->set($key, $values);
-		}
-	}
+    /**
+     * Adds multiple header to the queue.
+     * 
+     * @param  array  $headers  The header name
+     * 
+     * @return mixed
+     */
+    public function add(array $headers = [])
+    {
+        foreach ($headers as $key => $values) {
+            $this->set($key, $values);
+        }
+    }
 	
-	/**
-	 * Gets a header value by name.
-	 *
-	 * @param  string  $key  The header name, or null for all headers
-	 * @param  string|null  $default  The default value
-	 *
-	 * @return mixed
-	 */
-	public function get(string $key, string $default = null): ?string
-	{
-		$headers = $this->all($key);
+    /**
+     * Gets a header value by name.
+     *
+     * @param  string  $key  The header name, or null for all headers
+     * @param  string|null  $default  The default value
+     *
+     * @return mixed
+     */
+    public function get(string $key, string $default = null): ?string
+    {
+        $headers = $this->all($key);
 		
-		if ( ! $headers) {
-			return $default;
-		}
+        if ( ! $headers) {
+            return $default;
+        }
 		
-		if (null === $headers[0]) {
-			return null;
-		}
+        if (null === $headers[0]) {
+            return null;
+        }
 		
-		return (string) $headers[0];
-	}
+        return (string) $headers[0];
+    }
 
-	/**
-	 * Sets a header by name.
-	 * 
-	 * @param  string  $key  The header name
-	 * @param  string|string[]|null  $values  The value or an array of values
-	 * @param  bool  $replace  If you want to replace the value exists by the header, 
-	 * 					       it is not overwritten / overwritten when it is false
-	 *
-	 * @return void
-	 */
-	public function set(string $key, $values, bool $replace = true): void
-	{
-		$key = strtr($key, self::STRING_UPPER, self::STRING_LOWER);
+    /**
+     * Sets a header by name.
+     * 
+     * @param  string  $key  The header name
+     * @param  string|string[]|null  $values  The value or an array of values
+     * @param  bool  $replace  If you want to replace the value exists by the header, 
+     * 					       it is not overwritten / overwritten when it is false
+     *
+     * @return void
+     */
+    public function set(string $key, $values, bool $replace = true): void
+    {
+        $key = strtr($key, self::STRING_UPPER, self::STRING_LOWER);
 
-		if (is_array($values)) {
-			$values = array_values($values);
+        if (is_array($values)) {
+            $values = array_values($values);
 
-			if (true === $replace || ! isset($this->headers[$key])) {
-				$this->headers[$key] = $values;
-			} else {
-				$this->headers[$key] = array_merge($this->headers[$key], $values);
-			}
-		} else {
-			if (true === $replace || ! isset($this->headers[$key])) {
-				$this->headers[$key] = [$values];
-			} else {
-				$this->headers[$key][] = $values;
-			}
-		}
+            if (true === $replace || ! isset($this->headers[$key])) {
+                $this->headers[$key] = $values;
+            } else {
+                $this->headers[$key] = array_merge($this->headers[$key], $values);
+            }
+        } else {
+            if (true === $replace || ! isset($this->headers[$key])) {
+                $this->headers[$key] = [$values];
+            } else {
+                $this->headers[$key][] = $values;
+            }
+        }
 		
-		if ('cache-control' === $key) {
-			$this->cacheControl = $this->parseCacheControl(implode(', ', $this->headers[$key]));
-		}
-	}
+        if ('cache-control' === $key) {
+            $this->cacheControl = $this->parseCacheControl(implode(', ', $this->headers[$key]));
+        }
+    }
 
-	/**
-	 * Returns true if the HTTP header is defined.
-	 * 
-	 * @param  string  $key  The HTTP header
-	 * 
-	 * @return bool  true if the parameter exists, false otherwise
-	 */
-	public function has(string $key): bool
-	{
-		return array_key_exists(strtr($key, self::STRING_UPPER, self::STRING_LOWER), $this->all());
-	}
+    /**
+     * Returns true if the HTTP header is defined.
+     * 
+     * @param  string  $key  The HTTP header
+     * 
+     * @return bool  true if the parameter exists, false otherwise
+     */
+    public function has(string $key): bool
+    {
+        return array_key_exists(strtr($key, self::STRING_UPPER, self::STRING_LOWER), $this->all());
+    }
 
-	/**
-	 * Removes a header.
-	 * 
-	 * @param  string  $name  The header name
-	 * 
-	 * @return mixed
-	 */
-	public function remove(string $key)
-	{
-		$key = strtr($key, self::STRING_UPPER, self::STRING_LOWER);
+    /**
+     * Removes a header.
+     * 
+     * @param  string  $name  The header name
+     * 
+     * @return mixed
+     */
+    public function remove(string $key)
+    {
+        $key = strtr($key, self::STRING_UPPER, self::STRING_LOWER);
 
-		unset($this->headers[$key]);
+        unset($this->headers[$key]);
 
-		if ('cache-control' === $key) {
-			$this->cacheControl = [];
-		}
-	}
+        if ('cache-control' === $key) {
+            $this->cacheControl = [];
+        }
+    }
 	
-	/**
-	 * Returns the HTTP header value converted to a date.
-	 * 
-	 * @param  string  $key
-	 * @param  DateTime|null  $default
-	 * 
-	 * @throws \RuntimeException When the HTTP header is not parseable
-	 */
-	public function getDate(string $key, DateTime $default = null): ?DateTimeInterface
-	{
-		if (null === $value = $this->get($key)) {
-			return $default;
-		}
+    /**
+     * Returns the HTTP header value converted to a date.
+     * 
+     * @param  string  $key
+     * @param  DateTime|null  $default
+     * 
+     * @throws \RuntimeException When the HTTP header is not parseable
+     */
+    public function getDate(string $key, DateTime $default = null): ?DateTimeInterface
+    {
+        if (null === $value = $this->get($key)) {
+            return $default;
+        }
 		
-		if (false === $date = DateTime::createFromFormat(DATE_RFC2822, $value)) {
-			throw new RuntimeException(sprintf('The "%s" HTTP header is not parseable (%s).', $key, $value));
-		}
+        if (false === $date = DateTime::createFromFormat(DATE_RFC2822, $value)) {
+            throw new RuntimeException(sprintf('The "%s" HTTP header is not parseable (%s).', $key, $value));
+        }
 		
-		return $date;
-	}
+        return $date;
+    }
 	
-	/**
-	 * Returns an iterator for headers.
-	 * 
-	 * @return \ArrayIterator An \ArrayIterator instance
-	 */
-	public function getIterator(): Traversable
-	{
-		return new ArrayIterator($this->headers);
-	}
+    /**
+     * Returns an iterator for headers.
+     * 
+     * @return \ArrayIterator An \ArrayIterator instance
+     */
+    public function getIterator(): Traversable
+    {
+        return new ArrayIterator($this->headers);
+    }
 	
-	/**
-	 * Returns the number of headers.
-	 * 
-	 * @return int The number of headers
-	 */
-	public function count(): int
-	{
-		return count($this->headers);
-	}
+    /**
+     * Returns the number of headers.
+     * 
+     * @return int The number of headers
+     */
+    public function count(): int
+    {
+        return count($this->headers);
+    }
 	
-	/**
-	 * Parses a Cache-Control HTTP header.
-	 * 
-	 * @param string $header The value of the Cache-Control HTTP header
-	 * 
-	 * @return array An array representing the attribute values
-	 */
-	protected function parseCacheControl($header): array
-	{
-		$cacheControl = [];
+    /**
+     * Parses a Cache-Control HTTP header.
+     * 
+     * @param string $header The value of the Cache-Control HTTP header
+     * 
+     * @return array An array representing the attribute values
+     */
+    protected function parseCacheControl($header): array
+    {
+        $cacheControl = [];
 		
-		preg_match_all('~([a-zA-Z][a-zA-Z_-]*)\s*(?:=(?:"([^"]*)"|([^ \t",;]*)))?~', $header, $matches, PREG_SET_ORDER);
+        preg_match_all('~([a-zA-Z][a-zA-Z_-]*)\s*(?:=(?:"([^"]*)"|([^ \t",;]*)))?~', $header, $matches, PREG_SET_ORDER);
 		
-		foreach ($matches as $match) {
-			$cacheControl[strtolower($match[1])] = isset($match[3]) ? $match[3] : (isset($match[2]) ? $match[2] : true);
-		}
+        foreach ($matches as $match) {
+            $cacheControl[strtolower($match[1])] = isset($match[3]) ? $match[3] : (isset($match[2]) ? $match[2] : true);
+        }
 		
-		return $cacheControl;
-	}
+        return $cacheControl;
+    }
 	
-	/**
-	 * Magic method.
-	 * 
-	 * Returns the headers as a string.
-	 * 
-	 * @return string The headers
-	 */
-	public function __toString(): string
-	{
-		if ( ! $headers = $this->all()) {
-			return '';
-		}
+    /**
+     * Magic method.
+     * 
+     * Returns the headers as a string.
+     * 
+     * @return string The headers
+     */
+    public function __toString(): string
+    {
+        if ( ! $headers = $this->all()) {
+            return '';
+        }
 		
-		ksort($headers);
+        ksort($headers);
 		
-		$max     = max(array_map('strlen', array_keys($headers))) + 1;
-		$content = '';
+        $max     = max(array_map('strlen', array_keys($headers))) + 1;
+        $content = '';
 		
-		foreach ($headers as $name => $values) {
-			$name = ucwords($name, '-');
+        foreach ($headers as $name => $values) {
+            $name = ucwords($name, '-');
 			
-			foreach ($values as $value) {
-				$content .= sprintf("%-{$max}s %s\r\n", $name.':', $value);
-			}
-		}
+            foreach ($values as $value) {
+                $content .= sprintf("%-{$max}s %s\r\n", $name.':', $value);
+            }
+        }
 
-		return $content;
-	}
+        return $content;
+    }
 }
\ No newline at end of file

src/components/Http/URI.php

Indentation +493 added lines, -493 removed lines

@@ -31,499 +31,499 @@
  */
 class URI
 {
-	/**
-	 * Returns default schemes/ports.
-	 * 
-	 * @var array $defaultPorts
-	 */
-	protected $defaultPorts = [
-		'http'  => 80,
-		'https' => 443,
-		'ftp'   => 21,
-		'sftp'  => 22
-	];
-
-	/**
-	 * The name of any fragment.
-	 * 
-	 * @var string $fragment
-	 */
-	protected $fragment = '';
-
-	/**
-	 * The URI Host.
-	 * 
-	 * @var string $host
-	 */
-	protected $host;
+    /**
+     * Returns default schemes/ports.
+     * 
+     * @var array $defaultPorts
+     */
+    protected $defaultPorts = [
+        'http'  => 80,
+        'https' => 443,
+        'ftp'   => 21,
+        'sftp'  => 22
+    ];
+
+    /**
+     * The name of any fragment.
+     * 
+     * @var string $fragment
+     */
+    protected $fragment = '';
+
+    /**
+     * The URI Host.
+     * 
+     * @var string $host
+     */
+    protected $host;
 	
-	/**
-	 * The URI User Password.
-	 * 
-	 * @var string $password
-	 */
-	protected $password;
-
-	/**
-	 * The URI path.
-	 * 
-	 * @var string $path
-	 */
-	protected $path;
-
-	/**
-	 * The URI Port.
-	 * 
-	 * @var int $port
-	 */
-	protected $port;
-
-	/**
-	 * The query string.
-	 * 
-	 * @var string $query
-	 */
-	protected $query;
-
-	/**
-	 * The URI Scheme.
-	 * 
-	 * @var string $scheme
-	 */
-	protected $scheme = 'http';
-
-	/**
-	 * Whether passwords should be shown in userInfo/authority calls.
-	 * 
-	 * @var boolean $showPassword
-	 */
-	protected $showPassword = false;
+    /**
+     * The URI User Password.
+     * 
+     * @var string $password
+     */
+    protected $password;
+
+    /**
+     * The URI path.
+     * 
+     * @var string $path
+     */
+    protected $path;
+
+    /**
+     * The URI Port.
+     * 
+     * @var int $port
+     */
+    protected $port;
+
+    /**
+     * The query string.
+     * 
+     * @var string $query
+     */
+    protected $query;
+
+    /**
+     * The URI Scheme.
+     * 
+     * @var string $scheme
+     */
+    protected $scheme = 'http';
+
+    /**
+     * Whether passwords should be shown in userInfo/authority calls.
+     * 
+     * @var boolean $showPassword
+     */
+    protected $showPassword = false;
 	
-	/**
-	 * The URI User Info.
-	 * 
-	 * @var string $user
-	 */
-	protected $user;
-
-	/**
-	 * Constructor. The URI class instance.
-	 * 
-	 * @param  string|null  $uri  
-	 * 
-	 * @return void
-	 * 
-	 * @throws \Syscodes\Components\Http\Exceptions\HttpURIException
-	 */
-	public function __construct(string $uri = null)
-	{
-		if ( ! is_null($uri)) {
-			$this->setUri($uri);
-		}
-	}
-
-	/**
-	 * Sets and overwrites any current URI information.
-	 * 
-	 * @param  string|null  $uri  
-	 * 
-	 * @return static
-	 * 
-	 * @throws \Syscodes\Components\Http\Exceptions\HttpURIException
-	 */
-	public function setUri(string $uri = null): static
-	{
-		if ( ! is_null($uri)) {
-			$parts = parse_url($uri);
-
-			if ($parts === false) {
-				throw HttpURIException::UnableToParseURI($uri);
-			}
-
-			$this->applyParts($parts);
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Returns the full URI string.
-	 *
-	 * @return string  The URI string
-	 */
-	public function get(): string
-	{
-		return '/'.ltrim($this->path, '/');
-	}
-
-	/**
-	 * Sets of URI string.
-	 * 
-	 * @param  string  $uri
-	 * 
-	 * @return static
-	 */
-	public function set(string $uri): static
-	{
-		$this->path = $uri;
-
-		return $this;
-	}
-
-	/**
-	 * Retrieve the path component of the URI. The path can either be empty or absolute 
-	 * (starting with a slash) or rootless (not starting with a slash).
-	 * 
-	 * @return string
-	 */
-	public function getPath(): string
-	{
-		return (is_null($this->path) ? '' : $this->path);
-	}
-
-	/**
-	 * Sets the path portion of the URI.
-	 * 
-	 * @param  string  $uri
-	 *
-	 * @return array
-	 */
-	public function setPath(string $uri): array
-	{
-		$this->path = $this->filterPath($uri);
-
-		$tempPath = trim($this->path, '/');
-
-		return $this->filterSegments($tempPath);
-	} 
-
-	/**
-	 * Encodes any dangerous characters.
-	 * 
-	 * @param  string  $uri
-	 * 
-	 * @return string
-	 */
-	protected function filterPath(string $uri): string
-	{
-		return urldecode($uri);
-	}
-
-	/**
-	 * Filter the segments of path.
-	 * 
-	 * @param  string  $uri
-	 * 
-	 * @return string[]
-	 */
-	protected function filterSegments(string $uri): array
-	{
-		return ($uri == '') ? [] : explode('/', $uri);
-	}
-
-	/**
-	 * Get the specified URI segment, return default if it doesn't exist.
-	 * Segment index is 1 based, not 0 based.
-	 *
-	 * @param  int  $index  The 1-based segment index
-	 * @param  mixed  $default  The default value
-	 *
-	 * @return mixed
-	 */
-	public function getSegment(int $index, $default = null): mixed
-	{
-		return Arr::get($this->getSegments(), $index - 1, $default);
-	}
-
-	/**
-	 * Returns the segments of the path as an array.
-	 *
-	 * @return array  The URI segments
-	 */
-	public function getSegments(): array
-	{
-		$segments = $this->setPath(Request::decodedPath());
-
-		return array_values(array_filter($segments, fn ($value) => $value != ''));
-	}
-
-	/**
-	 * Returns the total number of segment.
-	 *
-	 * @return int  
-	 */
-	public function getTotalSegments(): int
-	{
-		return count($this->getSegments());
-	}
-
-	/**
-	 * Retrieve the scheme component of the URI.
-	 * 
-	 * @return string
-	 */
-	public function getScheme(): string
-	{
-		return $this->scheme;
-	}
-
-	/**
-	 * Sets the scheme for this URI.
-	 * 
-	 * @param  string  $str
-	 * 
-	 * @return string
-	 */
-	public function setScheme(string $str): string
-	{
-		$str = preg_replace('~:(//)?$~', '', strtolower($str));
-
-		$this->scheme = $str;
-
-		return $this->scheme;
-	}
-
-	/**
-	 * Retrieve the user component of the URI.
-	 * 
-	 * @return string|null
-	 */
-	public function getUserInfo()
-	{
-		$user = $this->user;
-		$pass = $this->password;
-
-		if ($this->showPassword === true && ! empty($pass)) {
-			$user .= ":$pass";
-		}
-
-		return $user;
-	}
-
-	/**
-	 * Sets the user portion of the URI.
-	 * 
-	 * @param  string  $user
-	 * 
-	 * @return string|null
-	 */
-	public function setUser($user): string
-	{
-		$this->user = trim($user);
-
-		return $this->user;
-	}
-
-	/**
-	 * Sets the password portion of the URI.
-	 * 
-	 * @param  string  $password
-	 * 
-	 * @return string|null
-	 */
-	public function setPassword($password): string
-	{
-		$this->password = trim($password);
-
-		return $this->password;
-	}
-
-	/**
-	 * Temporarily sets the URI to show a password in userInfo.
-	 * 
-	 * @param  boolean  $option  
-	 * 
-	 * @return static
-	 */
-	public function showPassword(bool $option = true): static
-	{
-		$this->showPassword = $option;
-
-		return $this;
-	}
-
-	/**
-	 * Retrieve the authority component of the URI.
-	 * 
-	 * @param  boolean  $ignore  
-	 * 
-	 * @return string
-	 */
-	public function getAuthority(bool $ignore = false): string
-	{
-		if (empty($this->host)) {
-			return '';
-		}
-
-		$authority = $this->host;
-
-		if ( ! empty($this->getUserInfo())) {
-			$authority = $this->getUserInfo().'@'.$authority;
-		}
-
-		if ( ! empty($this->port) && ! $ignore) {
-			if ($this->port !== $this->defaultPorts[$this->scheme]) {
-				$authority .= ":$this->port";
-			}
-		}
-
-		$this->showPassword = false;
-
-		return $authority;
-	}
-
-	/**
-	 * Parses the given string an saves the appropriate authority pieces.
-	 * 
-	 * @param  string  $str
-	 * 
-	 * @return static
-	 */
-	public function setAuthority(string $str): static
-	{
-		$parts = parse_url($str);
-
-		if (empty($parts['host']) && ! empty($parts['path'])) {
-			$parts['host'] = $parts['path'];
-			unset($parts['path']);
-		}
-
-		$this->applyParts($parts);
-
-		return $this;
-	}
-
-	/**
-	 * Retrieve the host component of the URI.
-	 * 
-	 * @return string
-	 */
-	public function getHost(): string
-	{
-		return $this->host;
-	}
-
-	/**
-	 * Sets the host name to use.
-	 * 
-	 * @param  string  $str
-	 * 
-	 * @return string
-	 */
-	public function setHost(string $str): string
-	{
-		$this->host = trim($str);
-
-		return $this->host;
-	}
-
-	/**
-	 * Retrieve the port component of the URI.
-	 * 
-	 * @return int|null
-	 */
-	public function getPort()
-	{
-		return $this->port;
-	}
-
-	/**
-	 * Sets the port portion of the URI.
-	 * 
-	 * @param  int|null  $port  
-	 * 
-	 * @return string
-	 */
-	public function setPort(int $port = null): string
-	{
-		if (is_null($port)) {
-			return $this;
-		}
-
-		if ($port <= 0 || $port > 65355) {
-			throw HttpURIException::invalidPort($port);
-		}
-
-		$this->port = $port;
-
-		return $this->port;
-	}
-
-	/**
-	 * Retrieve a URI fragment.
-	 * 
-	 * @return string
-	 */
-	public function getFragment(): string
-	{
-		return is_null($this->fragment) ? '' : $this->fragment;
-	}
-
-	/**
-	 * Sets the fragment portion of the URI.
-	 * 
-	 * @param  string  $str
-	 * 
-	 * @return string
-	 */
-	public function setFragment(string $str): string
-	{
-		$this->fragment = trim($str, '# ');
-
-		return $this->fragment;
-	}
-
-	/**
-	 * Saves our parts from a parse_url call.
-	 * 
-	 * @param  array  $parts
-	 * 
-	 * @return mixed
-	 */
-	public function applyParts(array $paths)
-	{
-		if (isset($parts['scheme'])) {
-			$this->SetScheme(rtrim($parts['scheme'], ':/'));
-		} else {
-			$this->setScheme('http');
-		}
-
-		if ( ! empty($parts['host'])) {
-			$this->host = $parts['host'];
-		}
-
-		if (isset($parts['port'])) {
-			if ( ! is_null($parts['port'])) {
-				$this->port = $parts['port'];
-			}
-		}
-
-		if ( ! empty($parts['user'])) {
-			$this->user = $parts['user'];
-		}
-
-		if ( ! empty($parts['pass'])) {
-			$this->password = $parts['pass'];
-		}
-
-		if ( ! empty($parts['path'])) {
-			$this->path = $this->filterPath($parts['path']);
-		}
-
-		if ( ! empty($parts['fragment'])) {
-			$this->fragment = $parts['fragment'];
-		}
-	}
-
-	/**
-	 * Magic method.
-	 * 
-	 * Returns the URI string.
-	 *
-	 * @return string
-	 */
-	public function __toString(): string
-	{
-		return (string) $this->getPath();
-	}
+    /**
+     * The URI User Info.
+     * 
+     * @var string $user
+     */
+    protected $user;
+
+    /**
+     * Constructor. The URI class instance.
+     * 
+     * @param  string|null  $uri  
+     * 
+     * @return void
+     * 
+     * @throws \Syscodes\Components\Http\Exceptions\HttpURIException
+     */
+    public function __construct(string $uri = null)
+    {
+        if ( ! is_null($uri)) {
+            $this->setUri($uri);
+        }
+    }
+
+    /**
+     * Sets and overwrites any current URI information.
+     * 
+     * @param  string|null  $uri  
+     * 
+     * @return static
+     * 
+     * @throws \Syscodes\Components\Http\Exceptions\HttpURIException
+     */
+    public function setUri(string $uri = null): static
+    {
+        if ( ! is_null($uri)) {
+            $parts = parse_url($uri);
+
+            if ($parts === false) {
+                throw HttpURIException::UnableToParseURI($uri);
+            }
+
+            $this->applyParts($parts);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Returns the full URI string.
+     *
+     * @return string  The URI string
+     */
+    public function get(): string
+    {
+        return '/'.ltrim($this->path, '/');
+    }
+
+    /**
+     * Sets of URI string.
+     * 
+     * @param  string  $uri
+     * 
+     * @return static
+     */
+    public function set(string $uri): static
+    {
+        $this->path = $uri;
+
+        return $this;
+    }
+
+    /**
+     * Retrieve the path component of the URI. The path can either be empty or absolute 
+     * (starting with a slash) or rootless (not starting with a slash).
+     * 
+     * @return string
+     */
+    public function getPath(): string
+    {
+        return (is_null($this->path) ? '' : $this->path);
+    }
+
+    /**
+     * Sets the path portion of the URI.
+     * 
+     * @param  string  $uri
+     *
+     * @return array
+     */
+    public function setPath(string $uri): array
+    {
+        $this->path = $this->filterPath($uri);
+
+        $tempPath = trim($this->path, '/');
+
+        return $this->filterSegments($tempPath);
+    } 
+
+    /**
+     * Encodes any dangerous characters.
+     * 
+     * @param  string  $uri
+     * 
+     * @return string
+     */
+    protected function filterPath(string $uri): string
+    {
+        return urldecode($uri);
+    }
+
+    /**
+     * Filter the segments of path.
+     * 
+     * @param  string  $uri
+     * 
+     * @return string[]
+     */
+    protected function filterSegments(string $uri): array
+    {
+        return ($uri == '') ? [] : explode('/', $uri);
+    }
+
+    /**
+     * Get the specified URI segment, return default if it doesn't exist.
+     * Segment index is 1 based, not 0 based.
+     *
+     * @param  int  $index  The 1-based segment index
+     * @param  mixed  $default  The default value
+     *
+     * @return mixed
+     */
+    public function getSegment(int $index, $default = null): mixed
+    {
+        return Arr::get($this->getSegments(), $index - 1, $default);
+    }
+
+    /**
+     * Returns the segments of the path as an array.
+     *
+     * @return array  The URI segments
+     */
+    public function getSegments(): array
+    {
+        $segments = $this->setPath(Request::decodedPath());
+
+        return array_values(array_filter($segments, fn ($value) => $value != ''));
+    }
+
+    /**
+     * Returns the total number of segment.
+     *
+     * @return int  
+     */
+    public function getTotalSegments(): int
+    {
+        return count($this->getSegments());
+    }
+
+    /**
+     * Retrieve the scheme component of the URI.
+     * 
+     * @return string
+     */
+    public function getScheme(): string
+    {
+        return $this->scheme;
+    }
+
+    /**
+     * Sets the scheme for this URI.
+     * 
+     * @param  string  $str
+     * 
+     * @return string
+     */
+    public function setScheme(string $str): string
+    {
+        $str = preg_replace('~:(//)?$~', '', strtolower($str));
+
+        $this->scheme = $str;
+
+        return $this->scheme;
+    }
+
+    /**
+     * Retrieve the user component of the URI.
+     * 
+     * @return string|null
+     */
+    public function getUserInfo()
+    {
+        $user = $this->user;
+        $pass = $this->password;
+
+        if ($this->showPassword === true && ! empty($pass)) {
+            $user .= ":$pass";
+        }
+
+        return $user;
+    }
+
+    /**
+     * Sets the user portion of the URI.
+     * 
+     * @param  string  $user
+     * 
+     * @return string|null
+     */
+    public function setUser($user): string
+    {
+        $this->user = trim($user);
+
+        return $this->user;
+    }
+
+    /**
+     * Sets the password portion of the URI.
+     * 
+     * @param  string  $password
+     * 
+     * @return string|null
+     */
+    public function setPassword($password): string
+    {
+        $this->password = trim($password);
+
+        return $this->password;
+    }
+
+    /**
+     * Temporarily sets the URI to show a password in userInfo.
+     * 
+     * @param  boolean  $option  
+     * 
+     * @return static
+     */
+    public function showPassword(bool $option = true): static
+    {
+        $this->showPassword = $option;
+
+        return $this;
+    }
+
+    /**
+     * Retrieve the authority component of the URI.
+     * 
+     * @param  boolean  $ignore  
+     * 
+     * @return string
+     */
+    public function getAuthority(bool $ignore = false): string
+    {
+        if (empty($this->host)) {
+            return '';
+        }
+
+        $authority = $this->host;
+
+        if ( ! empty($this->getUserInfo())) {
+            $authority = $this->getUserInfo().'@'.$authority;
+        }
+
+        if ( ! empty($this->port) && ! $ignore) {
+            if ($this->port !== $this->defaultPorts[$this->scheme]) {
+                $authority .= ":$this->port";
+            }
+        }
+
+        $this->showPassword = false;
+
+        return $authority;
+    }
+
+    /**
+     * Parses the given string an saves the appropriate authority pieces.
+     * 
+     * @param  string  $str
+     * 
+     * @return static
+     */
+    public function setAuthority(string $str): static
+    {
+        $parts = parse_url($str);
+
+        if (empty($parts['host']) && ! empty($parts['path'])) {
+            $parts['host'] = $parts['path'];
+            unset($parts['path']);
+        }
+
+        $this->applyParts($parts);
+
+        return $this;
+    }
+
+    /**
+     * Retrieve the host component of the URI.
+     * 
+     * @return string
+     */
+    public function getHost(): string
+    {
+        return $this->host;
+    }
+
+    /**
+     * Sets the host name to use.
+     * 
+     * @param  string  $str
+     * 
+     * @return string
+     */
+    public function setHost(string $str): string
+    {
+        $this->host = trim($str);
+
+        return $this->host;
+    }
+
+    /**
+     * Retrieve the port component of the URI.
+     * 
+     * @return int|null
+     */
+    public function getPort()
+    {
+        return $this->port;
+    }
+
+    /**
+     * Sets the port portion of the URI.
+     * 
+     * @param  int|null  $port  
+     * 
+     * @return string
+     */
+    public function setPort(int $port = null): string
+    {
+        if (is_null($port)) {
+            return $this;
+        }
+
+        if ($port <= 0 || $port > 65355) {
+            throw HttpURIException::invalidPort($port);
+        }
+
+        $this->port = $port;
+
+        return $this->port;
+    }
+
+    /**
+     * Retrieve a URI fragment.
+     * 
+     * @return string
+     */
+    public function getFragment(): string
+    {
+        return is_null($this->fragment) ? '' : $this->fragment;
+    }
+
+    /**
+     * Sets the fragment portion of the URI.
+     * 
+     * @param  string  $str
+     * 
+     * @return string
+     */
+    public function setFragment(string $str): string
+    {
+        $this->fragment = trim($str, '# ');
+
+        return $this->fragment;
+    }
+
+    /**
+     * Saves our parts from a parse_url call.
+     * 
+     * @param  array  $parts
+     * 
+     * @return mixed
+     */
+    public function applyParts(array $paths)
+    {
+        if (isset($parts['scheme'])) {
+            $this->SetScheme(rtrim($parts['scheme'], ':/'));
+        } else {
+            $this->setScheme('http');
+        }
+
+        if ( ! empty($parts['host'])) {
+            $this->host = $parts['host'];
+        }
+
+        if (isset($parts['port'])) {
+            if ( ! is_null($parts['port'])) {
+                $this->port = $parts['port'];
+            }
+        }
+
+        if ( ! empty($parts['user'])) {
+            $this->user = $parts['user'];
+        }
+
+        if ( ! empty($parts['pass'])) {
+            $this->password = $parts['pass'];
+        }
+
+        if ( ! empty($parts['path'])) {
+            $this->path = $this->filterPath($parts['path']);
+        }
+
+        if ( ! empty($parts['fragment'])) {
+            $this->fragment = $parts['fragment'];
+        }
+    }
+
+    /**
+     * Magic method.
+     * 
+     * Returns the URI string.
+     *
+     * @return string
+     */
+    public function __toString(): string
+    {
+        return (string) $this->getPath();
+    }
 }
\ No newline at end of file

src/components/Http/ResponseHeaders.php

Indentation +176 added lines, -176 removed lines

@@ -30,210 +30,210 @@
  */
 class ResponseHeaders extends Headers
 {
-	const COOKIE_FLAT = 'flat';
-	const COOKIE_ARRAY = 'array';
+    const COOKIE_FLAT = 'flat';
+    const COOKIE_ARRAY = 'array';
 	
-	/**
-	 * The list of cookies.
-	 * 
-	 * @var array $cookies
-	 */
-	protected $cookies = [];
+    /**
+     * The list of cookies.
+     * 
+     * @var array $cookies
+     */
+    protected $cookies = [];
 
     /**
      * The header names.
-	 * 
-	 * @var array $headerNames 
+     * 
+     * @var array $headerNames 
+     */
+    protected $headerNames = [];
+
+    /**
+     * Constructor. Create a new ResponseHeaders class instance.
+     * 
+     * @param  array  $headers
+     * 
+     * @return void 
      */
-	protected $headerNames = [];
-
-	/**
-	 * Constructor. Create a new ResponseHeaders class instance.
-	 * 
-	 * @param  array  $headers
-	 * 
-	 * @return void 
-	 */
-	public function __construct(array $headers = [])
-	{
-		parent::__construct($headers);
+    public function __construct(array $headers = [])
+    {
+        parent::__construct($headers);
 		
-		if ( ! isset($this->headers['cache-control'])) {
-			$this->set('Cache-Control', '');
-		}
-
-		if ( ! isset($this->headers['date'])) {
-			$this->initDate();
-		}
-	}
-
-	/**
-	 * Returns the headers, without cookies.
-	 * 
-	 * @return mixed
-	 */
-	public function allPreserveCaseWithoutCookies()
-	{
-		$headers = $this->allPreserveCase();
+        if ( ! isset($this->headers['cache-control'])) {
+            $this->set('Cache-Control', '');
+        }
+
+        if ( ! isset($this->headers['date'])) {
+            $this->initDate();
+        }
+    }
+
+    /**
+     * Returns the headers, without cookies.
+     * 
+     * @return mixed
+     */
+    public function allPreserveCaseWithoutCookies()
+    {
+        $headers = $this->allPreserveCase();
 		
-		if (isset($this->headerNames['set-cookie'])) {
-			unset($headers[$this->headerNames['set-cookie']]);
-		}
+        if (isset($this->headerNames['set-cookie'])) {
+            unset($headers[$this->headerNames['set-cookie']]);
+        }
 		
-		return $headers;
-	}
+        return $headers;
+    }
 
     /**
-	 * Returns the headers, with original capitalizations.
-	 * 
-	 * @return array An array of headers
-	 */
-	public function allPreserveCase(): array
-	{
-		$headers = [];
+     * Returns the headers, with original capitalizations.
+     * 
+     * @return array An array of headers
+     */
+    public function allPreserveCase(): array
+    {
+        $headers = [];
 		
-		foreach ($this->all() as $name => $value) {
-			$headers[$this->headerNames[$name] ?? $name] = $value;
-		}
+        foreach ($this->all() as $name => $value) {
+            $headers[$this->headerNames[$name] ?? $name] = $value;
+        }
 		
-		return $headers;
-	}
+        return $headers;
+    }
 	
-	/**
-	 * Returns all the headers.
-	 * 
-	 * @param  string|null  $key  The name of the headers
-	 * 
-	 * @return array
-	 */
-	public function all(string $key = null): array
-	{
-		$headers = parent::all();
+    /**
+     * Returns all the headers.
+     * 
+     * @param  string|null  $key  The name of the headers
+     * 
+     * @return array
+     */
+    public function all(string $key = null): array
+    {
+        $headers = parent::all();
 		
-		if (null !== $key) {
-			$key = strtr($key, self::STRING_UPPER, self::STRING_LOWER);
+        if (null !== $key) {
+            $key = strtr($key, self::STRING_UPPER, self::STRING_LOWER);
 			
-			return 'set-cookie' !== $key ? $headers[$key] ?? [] : array_map('strval', $this->getCookies());
-		}
+            return 'set-cookie' !== $key ? $headers[$key] ?? [] : array_map('strval', $this->getCookies());
+        }
 		
-		foreach ($this->getCookies() as $cookie) {
-			$headers['set-cookie'][] = (string) $cookie;
-		}
+        foreach ($this->getCookies() as $cookie) {
+            $headers['set-cookie'][] = (string) $cookie;
+        }
 		
-		return $headers;
-	}
-
-	/**
-	 * Replaces the current HTTP headers by a new set.
-	 * 
-	 * @param  array  $headers
-	 * 
-	 * @return void
-	 */
-	public function replace(array $headers = []): void
-	{
-		$this->headerNames = [];
-
-		parent::replace($headers);
-
-		if ( ! isset($this->headers['cache-control'])) {
-			$this->set('Cache-Control', '');
-		}
+        return $headers;
+    }
+
+    /**
+     * Replaces the current HTTP headers by a new set.
+     * 
+     * @param  array  $headers
+     * 
+     * @return void
+     */
+    public function replace(array $headers = []): void
+    {
+        $this->headerNames = [];
+
+        parent::replace($headers);
+
+        if ( ! isset($this->headers['cache-control'])) {
+            $this->set('Cache-Control', '');
+        }
 		
-		if ( ! isset($this->headers['date'])) {
-			$this->initDate();
-		}
-	}
-
-	/**
-	 * Sets a header by name.
-	 * 
-	 * @param  string  $key  The header name
-	 * @param  string|string[]|null  $values  The value or an array of values
-	 * @param  bool  $replace  If you want to replace the value exists by the header, 
-	 * 					       it is not overwritten / overwritten when it is false
-	 *
-	 * @return void
-	 */
-	public function set(string $key, $values, bool $replace = true): void
-	{
-		$unique = strtr($key, self::STRING_UPPER, self::STRING_LOWER); 
+        if ( ! isset($this->headers['date'])) {
+            $this->initDate();
+        }
+    }
+
+    /**
+     * Sets a header by name.
+     * 
+     * @param  string  $key  The header name
+     * @param  string|string[]|null  $values  The value or an array of values
+     * @param  bool  $replace  If you want to replace the value exists by the header, 
+     * 					       it is not overwritten / overwritten when it is false
+     *
+     * @return void
+     */
+    public function set(string $key, $values, bool $replace = true): void
+    {
+        $unique = strtr($key, self::STRING_UPPER, self::STRING_LOWER); 
 		
-		if ('set-cookie' === $unique) {
-			if ($replace) {
-				$this->cookies = [];
-			}
+        if ('set-cookie' === $unique) {
+            if ($replace) {
+                $this->cookies = [];
+            }
 			
-			foreach ((array) $values as $cookie) {
-				$this->setCookie($cookie);
-			}
+            foreach ((array) $values as $cookie) {
+                $this->setCookie($cookie);
+            }
 			
-			$this->headerNames[$unique] = $key;
+            $this->headerNames[$unique] = $key;
 
-			return;
-		}
+            return;
+        }
 		
-		$this->headerNames[$unique] = $key;
+        $this->headerNames[$unique] = $key;
 		
-		parent::set($key, $values, $replace);
-	}
+        parent::set($key, $values, $replace);
+    }
 	
-	/**
-	 * Gets an array with all cookies.
-	 * 
-	 * @param  string  $format
-	 * 
-	 * @return Cookie[]
-	 * 
-	 * @throws \InvalidArgumentException
-	 */
-	public function getCookies(string $format = self::COOKIE_FLAT): array
-	{
-		if ( ! in_array($format, [self::COOKIE_FLAT, self::COOKIE_ARRAY])) {
-			throw new InvalidArgumentException(
-				sprintf('Format "%s" invalid (%s)', $format, implode(', ', [self::COOKIE_FLAT, self::COOKIE_ARRAY])
-			));
-		}
+    /**
+     * Gets an array with all cookies.
+     * 
+     * @param  string  $format
+     * 
+     * @return Cookie[]
+     * 
+     * @throws \InvalidArgumentException
+     */
+    public function getCookies(string $format = self::COOKIE_FLAT): array
+    {
+        if ( ! in_array($format, [self::COOKIE_FLAT, self::COOKIE_ARRAY])) {
+            throw new InvalidArgumentException(
+                sprintf('Format "%s" invalid (%s)', $format, implode(', ', [self::COOKIE_FLAT, self::COOKIE_ARRAY])
+            ));
+        }
 		
-		if (self::COOKIE_ARRAY === $format) {
-			return $this->cookies;
-		}
+        if (self::COOKIE_ARRAY === $format) {
+            return $this->cookies;
+        }
 		
-		$stringCookies = [];
-
-		foreach ($this->cookies as $path) {
-			foreach ($path as $cookies) {
-				foreach ($cookies as $cookie) {
-					$stringCookies[] = $cookie;
-				}
-			}
-		}
+        $stringCookies = [];
+
+        foreach ($this->cookies as $path) {
+            foreach ($path as $cookies) {
+                foreach ($cookies as $cookie) {
+                    $stringCookies[] = $cookie;
+                }
+            }
+        }
 		
-		return $stringCookies;
+        return $stringCookies;
     }
 
-	/**
-	 * Sets the cookie.
-	 * 
-	 * @param  \Syscodes\Components\Http\Cookie  $cookie
-	 * 
-	 * @return static
-	 */
-	public function setCookie(Cookie $cookie): static
-	{
-		$this->cookies[$cookie->getDomain()][$cookie->getPath()][$cookie->getName()] = $cookie;
-		$this->headerNames['set-cookie'] = 'Set-Cookie';
-
-		return $this;
-	}
-
-	/**
-	 * Initialize the date.
-	 * 
-	 * @return void
-	 */
-	private function initDate(): void
-	{
-		$this->set('Date', gmdate('D, d M Y H:i:s').' GMT');
-	}
+    /**
+     * Sets the cookie.
+     * 
+     * @param  \Syscodes\Components\Http\Cookie  $cookie
+     * 
+     * @return static
+     */
+    public function setCookie(Cookie $cookie): static
+    {
+        $this->cookies[$cookie->getDomain()][$cookie->getPath()][$cookie->getName()] = $cookie;
+        $this->headerNames['set-cookie'] = 'Set-Cookie';
+
+        return $this;
+    }
+
+    /**
+     * Initialize the date.
+     * 
+     * @return void
+     */
+    private function initDate(): void
+    {
+        $this->set('Date', gmdate('D, d M Y H:i:s').' GMT');
+    }
 }
\ No newline at end of file

src/components/Http/Resources/HttpResources.php

Indentation +187 added lines, -187 removed lines

@@ -29,211 +29,211 @@
  */
 trait HttpResources
 {
-	/**
-	 * Filters a value from the start of a string in this case the passed URI string.
-	 *
-	 * @return string
-	 */
-	protected function parseRequestUri(): string
-	{
-		$requestUri = '';
-		
-		if ('1' == $this->server->get('IIS_WasUrlRewritten') && '' != $this->server->get('UNENCODED_URL')) {
-			// IIS7 with URL Rewrite: make sure we get the unencoded URL (double slash problem)
-			$requestUri = $this->server->get('UNENCODED_URL');
-			$this->server->remove('UNENCODED_URL');
-			$this->server->remove('IIS_WasUrlRewritten');
-		} elseif ($this->server->has('REQUEST_URI')) {
-			$requestUri = $this->server->get('REQUEST_URI');
+    /**
+     * Filters a value from the start of a string in this case the passed URI string.
+     *
+     * @return string
+     */
+    protected function parseRequestUri(): string
+    {
+        $requestUri = '';
+		
+        if ('1' == $this->server->get('IIS_WasUrlRewritten') && '' != $this->server->get('UNENCODED_URL')) {
+            // IIS7 with URL Rewrite: make sure we get the unencoded URL (double slash problem)
+            $requestUri = $this->server->get('UNENCODED_URL');
+            $this->server->remove('UNENCODED_URL');
+            $this->server->remove('IIS_WasUrlRewritten');
+        } elseif ($this->server->has('REQUEST_URI')) {
+            $requestUri = $this->server->get('REQUEST_URI');
 			
-			if ('' !== $requestUri && '/' === $requestUri[0]) {
-				// To only use path and query remove the fragment.
-				if (false !== $pos = strpos($requestUri, '#')) {
-					$requestUri = substr($requestUri, 0, $pos);
-				}
-			} else {
-				// HTTP proxy reqs setup request URI with scheme and host [and port] + the URL path,
-				// only use URL path.
-				$uriComponents = parse_url($requestUri);
+            if ('' !== $requestUri && '/' === $requestUri[0]) {
+                // To only use path and query remove the fragment.
+                if (false !== $pos = strpos($requestUri, '#')) {
+                    $requestUri = substr($requestUri, 0, $pos);
+                }
+            } else {
+                // HTTP proxy reqs setup request URI with scheme and host [and port] + the URL path,
+                // only use URL path.
+                $uriComponents = parse_url($requestUri);
 				
-				if (isset($uriComponents['path'])) {
-					$requestUri = $uriComponents['path'];
-				}
+                if (isset($uriComponents['path'])) {
+                    $requestUri = $uriComponents['path'];
+                }
 				
-				if (isset($uriComponents['query'])) {
-					$requestUri .= '?'.$uriComponents['query'];
-				}
-			}
-		} elseif ($this->server->has('ORIG_PATH_INFO')) {
-			// IIS 5.0, PHP as CGI
-			$requestUri = $this->server->get('ORIG_PATH_INFO');
+                if (isset($uriComponents['query'])) {
+                    $requestUri .= '?'.$uriComponents['query'];
+                }
+            }
+        } elseif ($this->server->has('ORIG_PATH_INFO')) {
+            // IIS 5.0, PHP as CGI
+            $requestUri = $this->server->get('ORIG_PATH_INFO');
 			
-			if ('' != $this->server->get('QUERY_STRING')) {
-				$requestUri .= '?'.$this->server->get('QUERY_STRING');
-			}
+            if ('' != $this->server->get('QUERY_STRING')) {
+                $requestUri .= '?'.$this->server->get('QUERY_STRING');
+            }
 			
-			$this->server->remove('ORIG_PATH_INFO');
-		}
+            $this->server->remove('ORIG_PATH_INFO');
+        }
 		
-		// normalize the request URI to ease creating sub-requests from this request
-		$this->server->set('REQUEST_URI', $requestUri);
+        // normalize the request URI to ease creating sub-requests from this request
+        $this->server->set('REQUEST_URI', $requestUri);
 		
-		return $this->filterDecode($requestUri);
-	}
+        return $this->filterDecode($requestUri);
+    }
 
-	/**
-	 * Will parse QUERY_STRING and automatically detect the URI from it.
-	 * 
-	 * @return string
-	 */
-	protected function parseQueryString(): string
-	{
-		$uri = $_SERVER['QUERY_STRING'] ?? @getenv('QUERY_STRING');
+    /**
+     * Will parse QUERY_STRING and automatically detect the URI from it.
+     * 
+     * @return string
+     */
+    protected function parseQueryString(): string
+    {
+        $uri = $_SERVER['QUERY_STRING'] ?? @getenv('QUERY_STRING');
 
-		if (trim($uri, '/') === '') {
-			return '';
-		} elseif (0 === strncmp($uri, '/', 1)) {
-			$uri    				 = explode('?', $uri, 2);
-			$_SERVER['QUERY_STRING'] = $uri[1] ?? '';
-			$uri    				 = $uri[0] ?? '';
-		}
+        if (trim($uri, '/') === '') {
+            return '';
+        } elseif (0 === strncmp($uri, '/', 1)) {
+            $uri    				 = explode('?', $uri, 2);
+            $_SERVER['QUERY_STRING'] = $uri[1] ?? '';
+            $uri    				 = $uri[0] ?? '';
+        }
 
-		parse_str($_SERVER['QUERY_STRING'], $_GET);
+        parse_str($_SERVER['QUERY_STRING'], $_GET);
 
-		return $this->filterDecode($uri);
-	}
+        return $this->filterDecode($uri);
+    }
 	
-	/**
-	 * Parse the base URL.
-	 * 
-	 * @return string
-	 */
-	public function parseBaseUrl(): string
-	{
-		$filename = basename($this->server('SCRIPT_FILENAME'));
-		
-		if ($filename === basename($this->server('SCRIPT_NAME'))) {
-			$baseUrl = $this->server('SCRIPT_NAME');
-		} elseif ($filename === basename($this->server('PHP_SELF'))) {
-			$baseUrl = $this->server('PHP_SELF');
-		} elseif ($filename === basename($this->server('ORIG_SCRIPT_NAME'))) {
-			$baseUrl = $this->server('ORIG_SCRIPT_NAME');
-		} else {
-			$path    = $this->server('PHP_SELF', '');
-			$file    = $this->server('SCRIPT_NAME', '');
-			$segs    = explode('/', trim($file, '/'));
-			$segs    = array_reverse($segs);
-			$index   = 0;
-			$last    = count($segs);
-			$baseUrl = '';
+    /**
+     * Parse the base URL.
+     * 
+     * @return string
+     */
+    public function parseBaseUrl(): string
+    {
+        $filename = basename($this->server('SCRIPT_FILENAME'));
+		
+        if ($filename === basename($this->server('SCRIPT_NAME'))) {
+            $baseUrl = $this->server('SCRIPT_NAME');
+        } elseif ($filename === basename($this->server('PHP_SELF'))) {
+            $baseUrl = $this->server('PHP_SELF');
+        } elseif ($filename === basename($this->server('ORIG_SCRIPT_NAME'))) {
+            $baseUrl = $this->server('ORIG_SCRIPT_NAME');
+        } else {
+            $path    = $this->server('PHP_SELF', '');
+            $file    = $this->server('SCRIPT_NAME', '');
+            $segs    = explode('/', trim($file, '/'));
+            $segs    = array_reverse($segs);
+            $index   = 0;
+            $last    = count($segs);
+            $baseUrl = '';
 			
-			do 	{
-				$seg     = $segs[$index];
-				$baseUrl = '/'.$seg.$baseUrl;
-				++$index;
-			} while ($last > $index && (false !== $pos = strpos($path, $baseUrl)) && 0 != $pos);
-		}
-		
-		// Does the baseUrl have anything in common with the request_uri?
-		$requestUri = $this->getRequestUri();
-		
-		if ('' !== $requestUri && '/' !== $requestUri[0]) {
-			$requestUri = '/'.$requestUri;
-		}
-		
-		if ($baseUrl && null !== $uri = $this->getUrlencoded($requestUri, $baseUrl)) {
-			// Full $baseUrl matches
-			return $this->filterDecode($uri);
-		}
-		
-		if ($baseUrl && null !== $uri = $this->getUrlencoded($requestUri, rtrim(dirname($baseUrl), '/'.DIRECTORY_SEPARATOR))) {
-			// Directory portion of $baseUrl matches
-			return $this->filterDecode($uri);
-		}
+            do 	{
+                $seg     = $segs[$index];
+                $baseUrl = '/'.$seg.$baseUrl;
+                ++$index;
+            } while ($last > $index && (false !== $pos = strpos($path, $baseUrl)) && 0 != $pos);
+        }
+		
+        // Does the baseUrl have anything in common with the request_uri?
+        $requestUri = $this->getRequestUri();
+		
+        if ('' !== $requestUri && '/' !== $requestUri[0]) {
+            $requestUri = '/'.$requestUri;
+        }
+		
+        if ($baseUrl && null !== $uri = $this->getUrlencoded($requestUri, $baseUrl)) {
+            // Full $baseUrl matches
+            return $this->filterDecode($uri);
+        }
+		
+        if ($baseUrl && null !== $uri = $this->getUrlencoded($requestUri, rtrim(dirname($baseUrl), '/'.DIRECTORY_SEPARATOR))) {
+            // Directory portion of $baseUrl matches
+            return $this->filterDecode($uri);
+        }
 
-		$baseUrl = dirname($baseUrl ?? '');
+        $baseUrl = dirname($baseUrl ?? '');
 		
-		// If using mod_rewrite or ISAPI_Rewrite strip the script filename
-		// out of baseUrl. $pos !== 0 makes sure it is not matching a value
-		// from PATH_INFO or QUERY_STRING
-		if (strlen($requestUri) >= strlen($baseUrl) && (false !== $pos = strpos($requestUri, $baseUrl)) && 0 !== $pos) {
-			$baseUrl = substr($requestUri, 0, $pos + strlen($baseUrl));
-		}
+        // If using mod_rewrite or ISAPI_Rewrite strip the script filename
+        // out of baseUrl. $pos !== 0 makes sure it is not matching a value
+        // from PATH_INFO or QUERY_STRING
+        if (strlen($requestUri) >= strlen($baseUrl) && (false !== $pos = strpos($requestUri, $baseUrl)) && 0 !== $pos) {
+            $baseUrl = substr($requestUri, 0, $pos + strlen($baseUrl));
+        }
 		
-		return $this->filterDecode($baseUrl);
-	}
+        return $this->filterDecode($baseUrl);
+    }
 	
-	/**
-	 * Returns the prefix as encoded in the string when the string starts with
-	 * the given prefix, null otherwise.
-	 *
-	 * return string|null
-	 */
-	private function getUrlencoded(string $string, string $prefix): ?string
-	{
-		if ( ! Str::startsWith(rawurldecode($string), $prefix)) {
-			return null;
-		}
-		
-		$length = strlen($prefix);
-		
-		if (preg_match(sprintf('#^(%%[[:xdigit:]]{2}|.){%d}#', $length), $string, $match)) {
-			return $match[0];
-		}
-		
-		return null;
-	}
+    /**
+     * Returns the prefix as encoded in the string when the string starts with
+     * the given prefix, null otherwise.
+     *
+     * return string|null
+     */
+    private function getUrlencoded(string $string, string $prefix): ?string
+    {
+        if ( ! Str::startsWith(rawurldecode($string), $prefix)) {
+            return null;
+        }
+		
+        $length = strlen($prefix);
+		
+        if (preg_match(sprintf('#^(%%[[:xdigit:]]{2}|.){%d}#', $length), $string, $match)) {
+            return $match[0];
+        }
+		
+        return null;
+    }
 
 
-	/**
-	 * Parse the path info.
-	 * 
-	 * @return string
-	 */
-	public function parsePathInfo(): string
-	{
-		if (null === ($requestUri = $this->getRequestUri())) {
-			return '/';
-		}
-		
-		// Remove the query string from REQUEST_URI
-		if (false !== $pos = strpos($requestUri, '?')) {
-			$requestUri = substr($requestUri, 0, $pos);
-		}
-		
-		if ('' !== $requestUri && '/' !== $requestUri[0]) {
-			$requestUri = '/'.$requestUri;
-		}
-		
-		if (null === ($baseUrl = $this->getBaseUrl())) {
-			return $requestUri;
-		}
-		
-		$pathInfo = substr($requestUri, \strlen($baseUrl));
-		
-		if (false === $pathInfo || '' === $pathInfo) {
-			// If substr() returns false then PATH_INFO is set to an empty string
-			return '/';
-		}
-		
-		return $this->filterDecode($pathInfo);
-	}
+    /**
+     * Parse the path info.
+     * 
+     * @return string
+     */
+    public function parsePathInfo(): string
+    {
+        if (null === ($requestUri = $this->getRequestUri())) {
+            return '/';
+        }
+		
+        // Remove the query string from REQUEST_URI
+        if (false !== $pos = strpos($requestUri, '?')) {
+            $requestUri = substr($requestUri, 0, $pos);
+        }
+		
+        if ('' !== $requestUri && '/' !== $requestUri[0]) {
+            $requestUri = '/'.$requestUri;
+        }
+		
+        if (null === ($baseUrl = $this->getBaseUrl())) {
+            return $requestUri;
+        }
+		
+        $pathInfo = substr($requestUri, \strlen($baseUrl));
+		
+        if (false === $pathInfo || '' === $pathInfo) {
+            // If substr() returns false then PATH_INFO is set to an empty string
+            return '/';
+        }
+		
+        return $this->filterDecode($pathInfo);
+    }
 
-	/**
-	 * Filters the uri string remove any malicious characters and inappropriate slashes.
-	 *
-	 * @param  string  $uri
-	 *
-	 * @return string
-	 */
-	protected function filterDecode($uri): string
-	{
-		// Remove all characters except letters,
-		// digits and $-_.+!*'(),{}|\\^~[]`<>#%";/?:@&=.
-		$uri = filter_var(rawurldecode($uri), FILTER_SANITIZE_URL);
-		$uri = mb_strtolower(trim($uri), 'UTF-8');
-		
-		// Return argument if not empty or return a single slash
-		return trim($uri);
-	}
+    /**
+     * Filters the uri string remove any malicious characters and inappropriate slashes.
+     *
+     * @param  string  $uri
+     *
+     * @return string
+     */
+    protected function filterDecode($uri): string
+    {
+        // Remove all characters except letters,
+        // digits and $-_.+!*'(),{}|\\^~[]`<>#%";/?:@&=.
+        $uri = filter_var(rawurldecode($uri), FILTER_SANITIZE_URL);
+        $uri = mb_strtolower(trim($uri), 'UTF-8');
+		
+        // Return argument if not empty or return a single slash
+        return trim($uri);
+    }
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -127,7 +127,7 @@
 			$last    = count($segs);
 			$baseUrl = '';
 			
-			do 	{
+			do {
 				$seg     = $segs[$index];
 				$baseUrl = '/'.$seg.$baseUrl;
 				++$index;

src/components/Http/Resources/HttpResponse.php

Indentation +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
      * 
      * @var \Syscodes\Components\Http\ResponseHeaders $headers
      */
-	public $headers;
+    public $headers;
 
     /**
      * The HTTP protocol version.

src/components/Http/Resources/HttpStatusCode.php

Indentation +202 added lines, -202 removed lines

@@ -30,209 +30,209 @@
  */
 trait HttpStatusCode
 {
-	/**
-	 * The HTTP status code.
-	 *
-	 * @var int $statusCode
-	 */
-	protected $statusCode = 200;
-
-	/**
-	 * An array of status codes and messages.
-	 *
-	 * @var array $statusCodeTexts
-	 */
-	public static $statusCodeTexts = [
-		// 1xx: Informational
-		100 => 'Continue',
-		101 => 'Switching Protocols',
-		102 => 'Processing',
-
-		// 2xx: Success
-		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: Redirection
-		300 => 'Multiple Choices',
-		301 => 'Moved Permanently',
-		302 => 'Found',
-		303 => 'See Other',
-		304 => 'Not Modified',
-		305 => 'Use Proxy',
-		307 => 'Temporary Redirect',
-		308 => 'Permanent Redirect',
-
-		// 4xx: Client error
-		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 => 'Request Entity Too Large',
-		414 => 'Request-URI Too Long',
-		415 => 'Unsupported Media Type',
-		416 => 'Requested Range Not Satisfiable',
-		417 => 'Expectation Failed',
-		418 => 'I\'m a Teapot',
-		// 419 (Authentication Timeout) is a non-standard status code with unknown origin
-		421 => 'Misdirected Request',
-		422 => 'Unprocessable Entity',
-		423 => 'Locked',
-		424 => 'Failed Dependency',
-		426 => 'Upgrade Required',
-		428 => 'Precondition Required',
-		429 => 'Too Many Requests',
-		431 => 'Request Header Fields Too Large',
-		451 => 'Unavailable For Legal Reasons',
-
-		// 5xx: Server error
-		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',
-		509 => 'Bandwidth Limit Exceeded',
-		510 => 'Not Extended',
-		511 => 'Network Authentication Required'
-	];
-
-	/**
-	 * Gets string of status code.
-	 * 
-	 * @var string $statusText
-	 */
-	protected $statusText;
-
-	/**
-	 * Gets the response status code.
-	 *
-	 * The status code is a 3-digit code to specify server response results to the browser.
-	 *
-	 * @return int
-	 *
-	 * @throws \BadMethodCallException
-	 */
-	public function getStatusCode(): int
-	{
-		if (empty($this->statusCode)) {
-			throw new BadMethodCallException('HTTP Response is missing a status code');
-		}
-
-		return $this->statusCode;
-	}
-
-	/**
-	* Sets the response status code.
-	*
-	* @param  int  $code  The status code
-	* @param  string|null  $text  The status text
-	*
-	* @return static
-	*
-	* @throws \InvalidArgumentException
-	*/
-	public function setStatusCode(int $code, $text = null): static
-	{
-		$this->statusCode = $code; 
-
-		// Valid range?
-		if ($this->isInvalid()) {
-			throw new InvalidArgumentException(__('response.statusCodeNotValid', ['code' => $code]));			
-		}
-
-		// Check if you have an accepted status code if not shows to a message of unknown status
-		if (null === $text) {
-			$this->statusText = self::$statusCodeTexts[$code] ?? __('response.UnknownStatus');
-
-			return $this;
-		}
-
-		if (false === $text) {
-			$this->statusText = '';
-
-			return $this;
-		}
-
-		$this->statusText = $text;
-
-		return $this;
-	}
-
-	/**
-	 * Is response invalid?
-	 * 
-	 * @final
-	 * 
-	 * @return bool
-	 */
-	public function isInvalid(): bool
-	{
-		return $this->statusCode < 100 || $this->statusCode >= 600;
-	}
-
-	/**
-	 * Is response informative?
-	 * 
-	 * @final
-	 * 
-	 * @return bool
-	 */
-	public function isInformational(): bool
-	{
-		return $this->statusCode >= 100 && $this->statusCode < 200;
-	}
+    /**
+     * The HTTP status code.
+     *
+     * @var int $statusCode
+     */
+    protected $statusCode = 200;
+
+    /**
+     * An array of status codes and messages.
+     *
+     * @var array $statusCodeTexts
+     */
+    public static $statusCodeTexts = [
+        // 1xx: Informational
+        100 => 'Continue',
+        101 => 'Switching Protocols',
+        102 => 'Processing',
+
+        // 2xx: Success
+        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: Redirection
+        300 => 'Multiple Choices',
+        301 => 'Moved Permanently',
+        302 => 'Found',
+        303 => 'See Other',
+        304 => 'Not Modified',
+        305 => 'Use Proxy',
+        307 => 'Temporary Redirect',
+        308 => 'Permanent Redirect',
+
+        // 4xx: Client error
+        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 => 'Request Entity Too Large',
+        414 => 'Request-URI Too Long',
+        415 => 'Unsupported Media Type',
+        416 => 'Requested Range Not Satisfiable',
+        417 => 'Expectation Failed',
+        418 => 'I\'m a Teapot',
+        // 419 (Authentication Timeout) is a non-standard status code with unknown origin
+        421 => 'Misdirected Request',
+        422 => 'Unprocessable Entity',
+        423 => 'Locked',
+        424 => 'Failed Dependency',
+        426 => 'Upgrade Required',
+        428 => 'Precondition Required',
+        429 => 'Too Many Requests',
+        431 => 'Request Header Fields Too Large',
+        451 => 'Unavailable For Legal Reasons',
+
+        // 5xx: Server error
+        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',
+        509 => 'Bandwidth Limit Exceeded',
+        510 => 'Not Extended',
+        511 => 'Network Authentication Required'
+    ];
+
+    /**
+     * Gets string of status code.
+     * 
+     * @var string $statusText
+     */
+    protected $statusText;
+
+    /**
+     * Gets the response status code.
+     *
+     * The status code is a 3-digit code to specify server response results to the browser.
+     *
+     * @return int
+     *
+     * @throws \BadMethodCallException
+     */
+    public function getStatusCode(): int
+    {
+        if (empty($this->statusCode)) {
+            throw new BadMethodCallException('HTTP Response is missing a status code');
+        }
+
+        return $this->statusCode;
+    }
+
+    /**
+     * Sets the response status code.
+     *
+     * @param  int  $code  The status code
+     * @param  string|null  $text  The status text
+     *
+     * @return static
+     *
+     * @throws \InvalidArgumentException
+     */
+    public function setStatusCode(int $code, $text = null): static
+    {
+        $this->statusCode = $code; 
+
+        // Valid range?
+        if ($this->isInvalid()) {
+            throw new InvalidArgumentException(__('response.statusCodeNotValid', ['code' => $code]));			
+        }
+
+        // Check if you have an accepted status code if not shows to a message of unknown status
+        if (null === $text) {
+            $this->statusText = self::$statusCodeTexts[$code] ?? __('response.UnknownStatus');
+
+            return $this;
+        }
+
+        if (false === $text) {
+            $this->statusText = '';
+
+            return $this;
+        }
+
+        $this->statusText = $text;
+
+        return $this;
+    }
+
+    /**
+     * Is response invalid?
+     * 
+     * @final
+     * 
+     * @return bool
+     */
+    public function isInvalid(): bool
+    {
+        return $this->statusCode < 100 || $this->statusCode >= 600;
+    }
+
+    /**
+     * Is response informative?
+     * 
+     * @final
+     * 
+     * @return bool
+     */
+    public function isInformational(): bool
+    {
+        return $this->statusCode >= 100 && $this->statusCode < 200;
+    }
 	
-	/**
-	 * Is the response a redirect?
-	 * 
-	 * @final
-	 * 
-	 * @return void
-	 */
-	public function isRedirection(): bool
-	{
-		return $this->statusCode >= 300 && $this->statusCode < 400;
-	}
+    /**
+     * Is the response a redirect?
+     * 
+     * @final
+     * 
+     * @return void
+     */
+    public function isRedirection(): bool
+    {
+        return $this->statusCode >= 300 && $this->statusCode < 400;
+    }
 	
-	/**
-	 * Is the response empty?
-	 * 
-	 * @final
-	 * 
-	 * @return bool
-	 */
-	public function isEmpty(): bool
-	{
-		return in_array($this->statusCode, [204, 304]);
-	}
+    /**
+     * Is the response empty?
+     * 
+     * @final
+     * 
+     * @return bool
+     */
+    public function isEmpty(): bool
+    {
+        return in_array($this->statusCode, [204, 304]);
+    }
 	
-	/**
-	 * Is the response a redirect of some form?
-	 * 
-	 * @return bool
-	 */
-	public function isRedirect(): bool
-	{
-		return in_array($this->statusCode, [301, 302, 303, 307, 308]);
-	}
+    /**
+     * Is the response a redirect of some form?
+     * 
+     * @return bool
+     */
+    public function isRedirect(): bool
+    {
+        return in_array($this->statusCode, [301, 302, 303, 307, 308]);
+    }
 }
\ No newline at end of file

src/components/Http/RedirectResponse.php

Indentation +7 added lines, -7 removed lines

@@ -127,13 +127,13 @@
     }
 
     /**
-    * Redirects to another url. Sets the redirect header, sends the headers and exits.
-    * Can redirect via a Location header.
-    *
-    * @param  string  $url  The url
-    *
-    * @return static
-    */
+     * Redirects to another url. Sets the redirect header, sends the headers and exits.
+     * Can redirect via a Location header.
+     *
+     * @param  string  $url  The url
+     *
+     * @return static
+     */
     public function setTargetUrl($url): static
     {
         if ('' === ($url ?? '')) {

src/components/Http/Resources/HttpRequest.php

Indentation +496 added lines, -496 removed lines

@@ -38,160 +38,160 @@ 
  */
 trait HttpRequest
 {
-	/**
-	 * Get the http method parameter.
-	 * 
-	 * @var bool $httpMethodParameterOverride
-	 */
-	protected static $httpMethodParameterOverride = false;
-
-	/**
-	 * Holds the global active request instance.
-	 *
-	 * @var bool $requestURI
-	 */
-	protected static $requestURI;
-
-	/**
-	 * Get the custom parameters.
-	 * 
-	 * @var \Syscodes\Components\Http\Loaders\Parameters $attributes
-	 */
-	public $attributes;
-
-	/**
-	 * The base URL.
-	 * 
-	 * @var string $baseUrl
-	 */
-	protected $baseUrl;
-
-	/**
-	 * Get the client ip.
-	 * 
-	 * @var mixed $clientIp
-	 */
-	protected $clientIp;
-
-	/**
-	 * Gets cookies ($_COOKIE).
-	 * 
-	 * @var \Syscodes\Components\Http\Loaders\Inputs $cookies
-	 */
-	public $cookies;
-
-	/**
-	 * Gets the string with format JSON.
-	 * 
-	 * @var string|resource|object|null $content
-	 */
-	protected $content;
-
-	/**
-	 * The default Locale this request.
-	 * 
-	 * @var string $defaultLocale
-	 */
-	protected $defaultLocale = 'en';
+    /**
+     * Get the http method parameter.
+     * 
+     * @var bool $httpMethodParameterOverride
+     */
+    protected static $httpMethodParameterOverride = false;
+
+    /**
+     * Holds the global active request instance.
+     *
+     * @var bool $requestURI
+     */
+    protected static $requestURI;
+
+    /**
+     * Get the custom parameters.
+     * 
+     * @var \Syscodes\Components\Http\Loaders\Parameters $attributes
+     */
+    public $attributes;
+
+    /**
+     * The base URL.
+     * 
+     * @var string $baseUrl
+     */
+    protected $baseUrl;
+
+    /**
+     * Get the client ip.
+     * 
+     * @var mixed $clientIp
+     */
+    protected $clientIp;
+
+    /**
+     * Gets cookies ($_COOKIE).
+     * 
+     * @var \Syscodes\Components\Http\Loaders\Inputs $cookies
+     */
+    public $cookies;
+
+    /**
+     * Gets the string with format JSON.
+     * 
+     * @var string|resource|object|null $content
+     */
+    protected $content;
+
+    /**
+     * The default Locale this request.
+     * 
+     * @var string $defaultLocale
+     */
+    protected $defaultLocale = 'en';
 	
-	/**
-	 * Gets files request ($_FILES).
-	 * 
-	 * @var \Syscodes\Components\Http\Loaders\Files $files
-	 */
-	public $files;
+    /**
+     * Gets files request ($_FILES).
+     * 
+     * @var \Syscodes\Components\Http\Loaders\Files $files
+     */
+    public $files;
 	
-	/**
-	 * Get the headers request ($_SERVER).
-	 * 
-	 * @var \Syscodes\Components\Http\Loaders\Headers $headers
-	 */
-	public $headers;
-
-	/**
-	 * The current language of the application.
-	 * 
-	 * @var string $languages
-	 */
-	protected $languages;
+    /**
+     * Get the headers request ($_SERVER).
+     * 
+     * @var \Syscodes\Components\Http\Loaders\Headers $headers
+     */
+    public $headers;
+
+    /**
+     * The current language of the application.
+     * 
+     * @var string $languages
+     */
+    protected $languages;
 	
-	/**
-	 * Get the locale.
-	 * 
-	 * @var string $locale
-	 */
-	protected $locale;
+    /**
+     * Get the locale.
+     * 
+     * @var string $locale
+     */
+    protected $locale;
 	
-	/** 
-	 * The method name.
-	 * 
-	 * @var string $method
-	 */
-	protected $method;
-
-	/**
-	 * Query string parameters ($_GET).
-	 * 
-	 * @var \Syscodes\Components\Http\Loaders\Parameters $query
-	 */
-	public $query;
-
-	/**
-	 * Request body parameters ($_POST).
-	 * 
-	 * @var \Syscodes\Components\Http\Loaders\Parameters $request
-	 */
-	public $request;
-
-	/**
-	 * The detected uri and server variables ($_SERVER).
-	 * 
-	 * @var \Syscodes\Components\Http\Loaders\Server $server
-	 */
-	public $server;
-
-	/** 
-	 * List of routes uri.
-	 *
-	 * @var \Syscodes\Components\Http\URI $uri 
-	 */
-	public $uri;
-
-	/**
-	 * Stores the valid locale codes.
-	 * 
-	 * @var array $validLocales
-	 */
-	protected $validLocales = [];
-
-	/**
-	 * Constructor. Create new the Request class.
-	 * 
-	 * @param  array  $query
-	 * @param  array  $request
-	 * @param  array  $attributes
-	 * @param  array  $cookies
-	 * @param  array  $files
-	 * @param  array  $server
-	 * @param  string|resource|null $content  
-	 * 
-	 * @return void
-	 */
-	public function __construct(
-		array $query = [],
-		array $request = [],
-		array $attributes = [],
-		array $cookies = [],
-		array $files = [],
-		array $server = [],
-		$content = null
-	) {
-		$this->initialize($query, $request, $attributes, $cookies, $files, $server, $content);
+    /** 
+     * The method name.
+     * 
+     * @var string $method
+     */
+    protected $method;
+
+    /**
+     * Query string parameters ($_GET).
+     * 
+     * @var \Syscodes\Components\Http\Loaders\Parameters $query
+     */
+    public $query;
+
+    /**
+     * Request body parameters ($_POST).
+     * 
+     * @var \Syscodes\Components\Http\Loaders\Parameters $request
+     */
+    public $request;
+
+    /**
+     * The detected uri and server variables ($_SERVER).
+     * 
+     * @var \Syscodes\Components\Http\Loaders\Server $server
+     */
+    public $server;
+
+    /** 
+     * List of routes uri.
+     *
+     * @var \Syscodes\Components\Http\URI $uri 
+     */
+    public $uri;
+
+    /**
+     * Stores the valid locale codes.
+     * 
+     * @var array $validLocales
+     */
+    protected $validLocales = [];
+
+    /**
+     * Constructor. Create new the Request class.
+     * 
+     * @param  array  $query
+     * @param  array  $request
+     * @param  array  $attributes
+     * @param  array  $cookies
+     * @param  array  $files
+     * @param  array  $server
+     * @param  string|resource|null $content  
+     * 
+     * @return void
+     */
+    public function __construct(
+        array $query = [],
+        array $request = [],
+        array $attributes = [],
+        array $cookies = [],
+        array $files = [],
+        array $server = [],
+        $content = null
+    ) {
+        $this->initialize($query, $request, $attributes, $cookies, $files, $server, $content);
 		
-		$this->detectLocale();
-	}
+        $this->detectLocale();
+    }
 
-	/**
+    /**
      * Enables support for the _method request parameter to determine the intended HTTP method.
      * 
      * @return void
@@ -201,361 +201,361 @@ 
         self::$httpMethodParameterOverride = true;
     }
 	
-	/**
-	 * Checks whether support for the _method request parameter is enabled.
-	 * 
-	 * @return bool
-	 */
-	public static function getHttpMethodParameterOverride(): bool
-	{
-		return self::$httpMethodParameterOverride;
-	}
-
-	/**
-	 * Creates an Syscodes request from of the Request class instance.
-	 * 
-	 * @param  \Syscodes\Components\Http\Request  $request
-	 * 
-	 * @return static
-	 */
-	public static function createFromRequest($request): static
-	{
-		$newRequest = (new static)->duplicate(
-			$request->query->all(), $request->request->all(), $request->attributes->all(),
-			$request->cookies->all(), $request->files->all(), $request->server->all()
-		);
+    /**
+     * Checks whether support for the _method request parameter is enabled.
+     * 
+     * @return bool
+     */
+    public static function getHttpMethodParameterOverride(): bool
+    {
+        return self::$httpMethodParameterOverride;
+    }
+
+    /**
+     * Creates an Syscodes request from of the Request class instance.
+     * 
+     * @param  \Syscodes\Components\Http\Request  $request
+     * 
+     * @return static
+     */
+    public static function createFromRequest($request): static
+    {
+        $newRequest = (new static)->duplicate(
+            $request->query->all(), $request->request->all(), $request->attributes->all(),
+            $request->cookies->all(), $request->files->all(), $request->server->all()
+        );
 		
-		$newRequest->headers->replace($request->headers->all());
+        $newRequest->headers->replace($request->headers->all());
 		
-		$newRequest->content = $request->content;
+        $newRequest->content = $request->content;
 		
-		if ($newRequest->isJson()) {
-			$newRequest->request = $newRequest->json();
-		}
+        if ($newRequest->isJson()) {
+            $newRequest->request = $newRequest->json();
+        }
 		
-		return $newRequest;
-	}
-
-	/**
-	 * Creates a new request with value from PHP's super global.
-	 * 
-	 * @return static
-	 */
-	public static function createFromRequestGlobals(): static
-	{
-		$request = static::createFromRequestFactory($_GET, $_POST, [], $_COOKIE, $_FILES, $_SERVER);
-
-		if (Str::startsWith($request->headers->get('CONTENT_TYPE', ''), 'application/x-www-form-urlencoded')
-		    && in_array(strtoupper($request->server->get('REQUEST_METHOD', 'GET')), ['PUT', 'DELETE', 'PATCH'])) {
-			parse_str($request->getContent(), $data);
-			$request->request = new Inputs($data);
-		}
-
-		return $request;
-	}
-
-	/**
-	 * Creates a new request from a factory.
-	 * 
-	 * @param  array  $query
-	 * @param  array  $request
-	 * @param  array  $attributes
-	 * @param  array  $cookies
-	 * @param  array  $files
-	 * @param  array  $server
-	 * 
-	 * @return static
-	 */
-	private static function createFromRequestFactory(
-		array $query = [], 
-		array $request = [],
-		array $attributes = [] ,
-		array $cookies = [], 
-		array $files = [], 
-		array $server = []
-	): static {
-		if (self::$requestURI) {
-			$request = (self::$requestURI)($query, $request, [], $cookies, $files, $server);
-
-			if ( ! $request instanceof self) {
-				throw new LogicException('The Request active must return an instance of Syscodes\Components\Http\Request');
-			}
-
-			return $request;
-		}
-
-		return new static($query, $request, $attributes, $cookies, $files, $server);
-	}
-
-	/**
-	 * Returns the factory request currently being used.
-	 *
-	 * @param  \Syscodes\Components\Http\Request|callable|null  $request  
-	 *
-	 * @return void
-	 */
-	public static function setFactory(?callable $request): void
-	{
-		self::$requestURI = $request;
-	}
-
-	/**
-	 * Sets the parameters for this request.
-	 * 
-	 * @param  array  $query
-	 * @param  array  $request
-	 * @param  array  $attributes
-	 * @param  array  $cookies
-	 * @param  array  $files
-	 * @param  array  $server
-	 * 
-	 * @return void
-	 */
-	public function initialize(
-		array $query = [], 
-		array $request = [],
-		array $attributes = [],
-		array $cookies = [], 
-		array $files = [], 
-		array $server = [], 
-		$content = null
-	): void {
-		$this->query = new Inputs($query);
-		$this->request = new Inputs($request);
-		$this->attributes = new Parameters($attributes);
-		$this->cookies = new Inputs($cookies);
-		$this->files = new Files($files);
-		$this->server = new Server($server);
-		$this->headers = new Headers($this->server->all());
-
-		// Variables initialized
-		$this->uri = new URI;
-		$this->method = null;
-		$this->baseUrl = null;
-		$this->content = $content;
-		$this->pathInfo = null;
-		$this->languages = null;
-		$this->acceptableContentTypes = null;
-		$this->validLocales = config('app.supportedLocales');
-		$this->clientIp = new RequestClientIP($this->server->all());
-	}
-
-	/**
-	 * Clones a request and overrides some of its parameters.
-	 * 
-	 * @param  array|null  $query
-	 * @param  array|null  $request
-	 * @param  array|null  $attributes
-	 * @param  array|null  $cookies
-	 * @param  array|null  $files
-	 * @param  array|null  $server
-	 * 
-	 * @return static
-	 */
-	public function duplicate(
-		array $query = null, 
-		array $request = null,
-		array $attributes = null,
-		array $cookies = null,
-		array $files = null,
-		array $server = null
-	): static {
-		$duplicate = clone $this;
-
-		if (null !== $query) {
-			$duplicate->query = new Inputs($query);
-		}
-
-		if (null !== $request) {
-			$duplicate->request = new Inputs($request);
-		}
-
-		if (null !== $attributes) {
-			$duplicate->attributes = new Parameters($attributes);
-		}
-
-		if (null !== $cookies) {
-			$duplicate->cookies = new Inputs($cookies);
-		}
-
-		if (null !== $files) {
-			$duplicate->files = new Files($files);
-		}
-
-		if (null !== $server) {
-			$duplicate->server  = new Server($server);
-			$duplicate->headers = new Headers($duplicate->server->all());
-		}
-
-		$duplicate->uri = new URI;
-		$duplicate->locale = null;
-		$duplicate->method = null;
-		$duplicate->baseUrl = null;
-		$duplicate->pathInfo = null;
-		$duplicate->validLocales = config('app.supportedLocales');
-		$duplicate->clientIp = new RequestClientIP($duplicate->server->all());
-
-		return $duplicate;		
-	}
-
-	/**
-	 * Handles setting up the locale, auto-detecting of language.
-	 * 
-	 * @return void
-	 */
-	public function detectLocale(): void
-	{
-		$this->languages = $this->defaultLocale = config('app.locale');
-
-		$this->setLocale($this->validLocales[0]);
-	}
-
-	/**
-	 * Returns the default locale as set.
-	 * 
-	 * @return string
-	 */
-	public function getDefaultLocale(): string
-	{
-		return $this->defaultLocale;
-	}
-
-	/**
-	 * Gets the current locale, with a fallback to the default.
-	 * 
-	 * @return string 
-	 */
-	public function getLocale(): string
-	{
-		return $this->languages ?: $this->defaultLocale;
-	}
-
-	/**
-	 * Sets the locale string for this request.
-	 * 
-	 * @param  string  $locale
-	 * 
-	 * @return static
-	 */
-	public function setLocale(string $locale): static
-	{
-		if ( ! in_array($locale, $this->validLocales, true)) {
-			$locale = $this->defaultLocale;
-		}
+        return $newRequest;
+    }
+
+    /**
+     * Creates a new request with value from PHP's super global.
+     * 
+     * @return static
+     */
+    public static function createFromRequestGlobals(): static
+    {
+        $request = static::createFromRequestFactory($_GET, $_POST, [], $_COOKIE, $_FILES, $_SERVER);
+
+        if (Str::startsWith($request->headers->get('CONTENT_TYPE', ''), 'application/x-www-form-urlencoded')
+            && in_array(strtoupper($request->server->get('REQUEST_METHOD', 'GET')), ['PUT', 'DELETE', 'PATCH'])) {
+            parse_str($request->getContent(), $data);
+            $request->request = new Inputs($data);
+        }
+
+        return $request;
+    }
+
+    /**
+     * Creates a new request from a factory.
+     * 
+     * @param  array  $query
+     * @param  array  $request
+     * @param  array  $attributes
+     * @param  array  $cookies
+     * @param  array  $files
+     * @param  array  $server
+     * 
+     * @return static
+     */
+    private static function createFromRequestFactory(
+        array $query = [], 
+        array $request = [],
+        array $attributes = [] ,
+        array $cookies = [], 
+        array $files = [], 
+        array $server = []
+    ): static {
+        if (self::$requestURI) {
+            $request = (self::$requestURI)($query, $request, [], $cookies, $files, $server);
+
+            if ( ! $request instanceof self) {
+                throw new LogicException('The Request active must return an instance of Syscodes\Components\Http\Request');
+            }
+
+            return $request;
+        }
+
+        return new static($query, $request, $attributes, $cookies, $files, $server);
+    }
+
+    /**
+     * Returns the factory request currently being used.
+     *
+     * @param  \Syscodes\Components\Http\Request|callable|null  $request  
+     *
+     * @return void
+     */
+    public static function setFactory(?callable $request): void
+    {
+        self::$requestURI = $request;
+    }
+
+    /**
+     * Sets the parameters for this request.
+     * 
+     * @param  array  $query
+     * @param  array  $request
+     * @param  array  $attributes
+     * @param  array  $cookies
+     * @param  array  $files
+     * @param  array  $server
+     * 
+     * @return void
+     */
+    public function initialize(
+        array $query = [], 
+        array $request = [],
+        array $attributes = [],
+        array $cookies = [], 
+        array $files = [], 
+        array $server = [], 
+        $content = null
+    ): void {
+        $this->query = new Inputs($query);
+        $this->request = new Inputs($request);
+        $this->attributes = new Parameters($attributes);
+        $this->cookies = new Inputs($cookies);
+        $this->files = new Files($files);
+        $this->server = new Server($server);
+        $this->headers = new Headers($this->server->all());
+
+        // Variables initialized
+        $this->uri = new URI;
+        $this->method = null;
+        $this->baseUrl = null;
+        $this->content = $content;
+        $this->pathInfo = null;
+        $this->languages = null;
+        $this->acceptableContentTypes = null;
+        $this->validLocales = config('app.supportedLocales');
+        $this->clientIp = new RequestClientIP($this->server->all());
+    }
+
+    /**
+     * Clones a request and overrides some of its parameters.
+     * 
+     * @param  array|null  $query
+     * @param  array|null  $request
+     * @param  array|null  $attributes
+     * @param  array|null  $cookies
+     * @param  array|null  $files
+     * @param  array|null  $server
+     * 
+     * @return static
+     */
+    public function duplicate(
+        array $query = null, 
+        array $request = null,
+        array $attributes = null,
+        array $cookies = null,
+        array $files = null,
+        array $server = null
+    ): static {
+        $duplicate = clone $this;
+
+        if (null !== $query) {
+            $duplicate->query = new Inputs($query);
+        }
+
+        if (null !== $request) {
+            $duplicate->request = new Inputs($request);
+        }
+
+        if (null !== $attributes) {
+            $duplicate->attributes = new Parameters($attributes);
+        }
+
+        if (null !== $cookies) {
+            $duplicate->cookies = new Inputs($cookies);
+        }
+
+        if (null !== $files) {
+            $duplicate->files = new Files($files);
+        }
+
+        if (null !== $server) {
+            $duplicate->server  = new Server($server);
+            $duplicate->headers = new Headers($duplicate->server->all());
+        }
+
+        $duplicate->uri = new URI;
+        $duplicate->locale = null;
+        $duplicate->method = null;
+        $duplicate->baseUrl = null;
+        $duplicate->pathInfo = null;
+        $duplicate->validLocales = config('app.supportedLocales');
+        $duplicate->clientIp = new RequestClientIP($duplicate->server->all());
+
+        return $duplicate;		
+    }
+
+    /**
+     * Handles setting up the locale, auto-detecting of language.
+     * 
+     * @return void
+     */
+    public function detectLocale(): void
+    {
+        $this->languages = $this->defaultLocale = config('app.locale');
+
+        $this->setLocale($this->validLocales[0]);
+    }
+
+    /**
+     * Returns the default locale as set.
+     * 
+     * @return string
+     */
+    public function getDefaultLocale(): string
+    {
+        return $this->defaultLocale;
+    }
+
+    /**
+     * Gets the current locale, with a fallback to the default.
+     * 
+     * @return string 
+     */
+    public function getLocale(): string
+    {
+        return $this->languages ?: $this->defaultLocale;
+    }
+
+    /**
+     * Sets the locale string for this request.
+     * 
+     * @param  string  $locale
+     * 
+     * @return static
+     */
+    public function setLocale(string $locale): static
+    {
+        if ( ! in_array($locale, $this->validLocales, true)) {
+            $locale = $this->defaultLocale;
+        }
 		
-		$this->languages = $locale;
+        $this->languages = $locale;
 
-		Locale::setDefault($locale);
+        Locale::setDefault($locale);
 			
-		return $this;
-	}
-
-	/**
-	 * Returns the host name.
-	 * 
-	 * @return string
-	 */
-	public function getHost(): string
-	{
-		if ($forwardedHost = $this->server->get('HTTP_X_FORWARDED_HOST')) {
-			$host = $forwardedHost[0];
-		} elseif ( ! $host = $this->headers->get('HOST')) {
-			if ( ! $host = $this->server->get('SERVER_NAME')) {
-				$host = $this->server->get('REMOTE_ADDR', '');
-			}
-		}
-
-		$host = strtolower(preg_replace('/:\d+$/', '', trim(($host))));
+        return $this;
+    }
+
+    /**
+     * Returns the host name.
+     * 
+     * @return string
+     */
+    public function getHost(): string
+    {
+        if ($forwardedHost = $this->server->get('HTTP_X_FORWARDED_HOST')) {
+            $host = $forwardedHost[0];
+        } elseif ( ! $host = $this->headers->get('HOST')) {
+            if ( ! $host = $this->server->get('SERVER_NAME')) {
+                $host = $this->server->get('REMOTE_ADDR', '');
+            }
+        }
+
+        $host = strtolower(preg_replace('/:\d+$/', '', trim(($host))));
 		
-		return $this->uri->setHost($host);
-	}
-
-	/**
-	 * Returns the port on which the request is made.
-	 * 
-	 * @return int
-	 */
-	public function getPort(): int
-	{
-		if ( ! $this->server->get('HTTP_HOST')) {
-			return $this->server->get('SERVER_PORT');
-		}
+        return $this->uri->setHost($host);
+    }
+
+    /**
+     * Returns the port on which the request is made.
+     * 
+     * @return int
+     */
+    public function getPort(): int
+    {
+        if ( ! $this->server->get('HTTP_HOST')) {
+            return $this->server->get('SERVER_PORT');
+        }
 		
-		return 'https' === $this->getScheme() ? $this->uri->setPort(443) : $this->uri->setPort(80);
-	}
-
-	/**
-	 * Gets the request's scheme.
-	 * 
-	 * @return string
-	 */
-	public function getScheme(): string
-	{
-		return $this->secure() ? $this->uri->setScheme('https') : $this->uri->setScheme('http');
-	}
-
-	/**
-	 * Get the user.
-	 * 
-	 * @return string|null
-	 */
-	public function getUser(): ?string
-	{
-		$user = $this->uri->setUser(
-			$this->headers->get('PHP_AUTH_USER')
-		);
-
-		return $user;
-	}
-
-	/**
-	 * Get the password.
-	 * 
-	 * @return string|null
-	 */
-	public function getPassword(): ?string
-	{
-		$password = $this->uri->setPassword(
-			$this->headers->get('PHP_AUTH_PW')
-		);
-
-		return $password;
-	}
-
-	/**
-	 * Gets the user info.
-	 * 
-	 * @return string|null
-	 */
-	public function getUserInfo(): ?string
-	{
-		return $this->uri->getUserInfo();
-	}
-
-	/**
-	 * Returns the HTTP host being requested.
-	 * 
-	 * @return string
-	 */
-	public function getHttpHost(): string
-	{
-		$scheme = $this->getScheme();
-		$port   = $this->getPort();
-
-		if (('http' === $scheme && 80 === $port) || ('https' === $scheme && 443 === $port))	{
-			return $this->getHost();
-		}
-
-		return $this->getHost().':'.$port;
-	}
-
-	/**
-	 * Gets the scheme and HTTP host.
-	 * 
-	 * @return string
-	 */
-	public function getSchemeWithHttpHost(): string
-	{
-		return $this->getScheme().'://'.$this->getHttpHost();
-	}
+        return 'https' === $this->getScheme() ? $this->uri->setPort(443) : $this->uri->setPort(80);
+    }
+
+    /**
+     * Gets the request's scheme.
+     * 
+     * @return string
+     */
+    public function getScheme(): string
+    {
+        return $this->secure() ? $this->uri->setScheme('https') : $this->uri->setScheme('http');
+    }
+
+    /**
+     * Get the user.
+     * 
+     * @return string|null
+     */
+    public function getUser(): ?string
+    {
+        $user = $this->uri->setUser(
+            $this->headers->get('PHP_AUTH_USER')
+        );
+
+        return $user;
+    }
+
+    /**
+     * Get the password.
+     * 
+     * @return string|null
+     */
+    public function getPassword(): ?string
+    {
+        $password = $this->uri->setPassword(
+            $this->headers->get('PHP_AUTH_PW')
+        );
+
+        return $password;
+    }
+
+    /**
+     * Gets the user info.
+     * 
+     * @return string|null
+     */
+    public function getUserInfo(): ?string
+    {
+        return $this->uri->getUserInfo();
+    }
+
+    /**
+     * Returns the HTTP host being requested.
+     * 
+     * @return string
+     */
+    public function getHttpHost(): string
+    {
+        $scheme = $this->getScheme();
+        $port   = $this->getPort();
+
+        if (('http' === $scheme && 80 === $port) || ('https' === $scheme && 443 === $port))	{
+            return $this->getHost();
+        }
+
+        return $this->getHost().':'.$port;
+    }
+
+    /**
+     * Gets the scheme and HTTP host.
+     * 
+     * @return string
+     */
+    public function getSchemeWithHttpHost(): string
+    {
+        return $this->getScheme().'://'.$this->getHttpHost();
+    }
 }
\ No newline at end of file

Spacing +2 added lines, -2 removed lines

@@ -269,7 +269,7 @@ 
 	private static function createFromRequestFactory(
 		array $query = [], 
 		array $request = [],
-		array $attributes = [] ,
+		array $attributes = [],
 		array $cookies = [], 
 		array $files = [], 
 		array $server = []
@@ -542,7 +542,7 @@ 
 		$scheme = $this->getScheme();
 		$port   = $this->getPort();
 
-		if (('http' === $scheme && 80 === $port) || ('https' === $scheme && 443 === $port))	{
+		if (('http' === $scheme && 80 === $port) || ('https' === $scheme && 443 === $port)) {
 			return $this->getHost();
 		}