lenevor / syscodes

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();
 		}
 

src/components/Http/Request.php

Indentation +657 added lines, -657 removed lines

@@ -43,283 +43,283 @@ 
  */
 class Request
 {
-	use HttpRequest,
-	    HttpResources,
-	    CanBePrecognitive,	    
-	    InteractsWithInput,
-	    InteractsWithFlashData,
-	    InteractsWithContentTypes;
-
-	/**
-	 * Get the acceptable of content types.
-	 * 
-	 * @var string[] $acceptableContenTypes
-	 */
-	protected $acceptableContentTypes;
-
-	/**
-	 * The decoded JSON content for the request.
-	 * 
-	 * @var \Syscodes\Components\Http\Loaders\Parameters|null $json
-	 */
-	protected $json;
-
-	/**
-	 * The path info of URL.
-	 * 
-	 * @var string $pathInfo
-	 */
-	protected $pathInfo;
-
-	/**
-	 * Get request URI.
-	 * 
-	 * @var string $requestToUri
-	 */
-	protected $requestToUri;
-
-	/**
-	 * Get the route resolver callback.
-	 * 
-	 * @var \Closure $routeResolver
-	 */
-	protected $routeResolver;
-
-	/**
-	 * The Session implementation.
-	 * 
-	 * @var \Syscodes\Components\Contracts\Session\Session $session
-	 */
-	protected $session;
-
-	/**
-	 * Create a new Syscodes HTTP request from server variables.
-	 * 
-	 * @return static
-	 */
-	public static function capture(): static
-	{
-		static::enabledHttpMethodParameterOverride();
+    use HttpRequest,
+        HttpResources,
+        CanBePrecognitive,	    
+        InteractsWithInput,
+        InteractsWithFlashData,
+        InteractsWithContentTypes;
+
+    /**
+     * Get the acceptable of content types.
+     * 
+     * @var string[] $acceptableContenTypes
+     */
+    protected $acceptableContentTypes;
+
+    /**
+     * The decoded JSON content for the request.
+     * 
+     * @var \Syscodes\Components\Http\Loaders\Parameters|null $json
+     */
+    protected $json;
+
+    /**
+     * The path info of URL.
+     * 
+     * @var string $pathInfo
+     */
+    protected $pathInfo;
+
+    /**
+     * Get request URI.
+     * 
+     * @var string $requestToUri
+     */
+    protected $requestToUri;
+
+    /**
+     * Get the route resolver callback.
+     * 
+     * @var \Closure $routeResolver
+     */
+    protected $routeResolver;
+
+    /**
+     * The Session implementation.
+     * 
+     * @var \Syscodes\Components\Contracts\Session\Session $session
+     */
+    protected $session;
+
+    /**
+     * Create a new Syscodes HTTP request from server variables.
+     * 
+     * @return static
+     */
+    public static function capture(): static
+    {
+        static::enabledHttpMethodParameterOverride();
 		
-		return static::createFromRequest(static::createFromRequestGlobals());
-	}
-
-	/**
-	 * Returns the desired segment, or $default if it does not exist.
-	 *
-	 * @param  int  $index  The segment number (1-based index)
-	 * @param  mixed  $default  Default value to return
-	 *
-	 * @return string
-	 */
-	public function segment($index, $default = null)
-	{
-		return $this->uri->getSegment($index, $default);
-	}
-
-	/**
-	 * Returns all segments in an array. For total of segments
-	 * used the function PHP count().
-	 *
-	 * @return array|null
-	 */
-	public function segments()
-	{
-		return $this->uri->getSegments();
-	}
-
-	/**
-	 * Returns the total number of segment.
-	 *
-	 * @return int|null  
-	 */
-	public function totalSegments()
-	{
-		return $this->uri->getTotalSegments();
-	}
-
-	/**
-	 * Returns the full request string.
-	 * 
-	 * @param  string  $key
-	 * @param  mixed  $default
-	 *
-	 * @return mixed 
-	 */
-	public function get(string $key, $default = null) 
-	{
-		if ($this !== $result = $this->attributes->get($key, $this)) {
-			return $result;
-		}
-
-		if ($this->query->has($key)) {
-			return $this->query->all()[$key];
-		}
+        return static::createFromRequest(static::createFromRequestGlobals());
+    }
+
+    /**
+     * Returns the desired segment, or $default if it does not exist.
+     *
+     * @param  int  $index  The segment number (1-based index)
+     * @param  mixed  $default  Default value to return
+     *
+     * @return string
+     */
+    public function segment($index, $default = null)
+    {
+        return $this->uri->getSegment($index, $default);
+    }
+
+    /**
+     * Returns all segments in an array. For total of segments
+     * used the function PHP count().
+     *
+     * @return array|null
+     */
+    public function segments()
+    {
+        return $this->uri->getSegments();
+    }
+
+    /**
+     * Returns the total number of segment.
+     *
+     * @return int|null  
+     */
+    public function totalSegments()
+    {
+        return $this->uri->getTotalSegments();
+    }
+
+    /**
+     * Returns the full request string.
+     * 
+     * @param  string  $key
+     * @param  mixed  $default
+     *
+     * @return mixed 
+     */
+    public function get(string $key, $default = null) 
+    {
+        if ($this !== $result = $this->attributes->get($key, $this)) {
+            return $result;
+        }
+
+        if ($this->query->has($key)) {
+            return $this->query->all()[$key];
+        }
 		
-		if ($this->request->has($key)) {
-			return $this->request->all()[$key];
-		}
+        if ($this->request->has($key)) {
+            return $this->request->all()[$key];
+        }
 		
-		return $default;
-	}
-
-	/**
-	 * Gets the Session.
-	 * 
-	 * @return \Syscodes\Components\Http\Session\SessionInterface
-	 * 
-	 * @throws \Syscodes\Components\Http\Exceptions\SessionNotFoundException
-	 */
-	public function getSession()
-	{
-		$this->hasSession()
-		            ? new SessionDecorator($this->session())
-					: throw new SessionNotFoundException;
-	}
-
-	/**
-	 * Whether the request contains a Session object.
-	 * 
-	 * @return bool
-	 */
-	public function hasSession(): bool
-	{
-		return ! is_null($this->session);
-	}
-
-	/**
-	 * Get the session associated with the request.
-	 * 
-	 * @return \Syscodes\Components\Contracts\Session\Session
-	 * 
-	 * @throws RuntimeException
-	 */
-	public function session()
-	{
-		if ( ! $this->hasSession()) {
-			throw new RuntimeException('Session store not set on request');
-		}
+        return $default;
+    }
+
+    /**
+     * Gets the Session.
+     * 
+     * @return \Syscodes\Components\Http\Session\SessionInterface
+     * 
+     * @throws \Syscodes\Components\Http\Exceptions\SessionNotFoundException
+     */
+    public function getSession()
+    {
+        $this->hasSession()
+                    ? new SessionDecorator($this->session())
+                    : throw new SessionNotFoundException;
+    }
+
+    /**
+     * Whether the request contains a Session object.
+     * 
+     * @return bool
+     */
+    public function hasSession(): bool
+    {
+        return ! is_null($this->session);
+    }
+
+    /**
+     * Get the session associated with the request.
+     * 
+     * @return \Syscodes\Components\Contracts\Session\Session
+     * 
+     * @throws RuntimeException
+     */
+    public function session()
+    {
+        if ( ! $this->hasSession()) {
+            throw new RuntimeException('Session store not set on request');
+        }
 		
-		return $this->session;
-	}
+        return $this->session;
+    }
 	
-	/**
-	 * Set the session instance on the request.
-	 * 
-	 * @param  \Syscodes\Components\Contracts\Session\Session  $session
-	 * 
-	 * @return void
-	 */
-	public function setSession($session): void
-	{
-		$this->session = $session;
-	}
-
-	/**
-	 * Get the JSON payload for the request.
-	 * 
-	 * @param  string|null  $key  
-	 * @param  mixed  $default  
-	 * 
-	 * @return \Syscodes\Components\Http\Loaders\Parameters|mixed
-	 */
-	public function json($key = null, $default = null)
-	{
-		if ( ! isset($this->json)) {
-			$this->json = new Parameters((array) json_decode($this->getContent(), true));
-		}
-
-		if (is_null($key)) {
-			return $this->json;
-		}
-
-		return Arr::get($this->json->all(), $key, $default);
-	}
-
-	/**
-	 * Set the JSON payload for the request.
-	 * 
-	 * @param  \Syscodes\Components\Http\Loaders\Parameters  $json
-	 * 
-	 * @return static
-	 */
-	public function setJson($json): static
-	{
-		$this->json = $json;
-
-		return $this;
-	}
+    /**
+     * Set the session instance on the request.
+     * 
+     * @param  \Syscodes\Components\Contracts\Session\Session  $session
+     * 
+     * @return void
+     */
+    public function setSession($session): void
+    {
+        $this->session = $session;
+    }
+
+    /**
+     * Get the JSON payload for the request.
+     * 
+     * @param  string|null  $key  
+     * @param  mixed  $default  
+     * 
+     * @return \Syscodes\Components\Http\Loaders\Parameters|mixed
+     */
+    public function json($key = null, $default = null)
+    {
+        if ( ! isset($this->json)) {
+            $this->json = new Parameters((array) json_decode($this->getContent(), true));
+        }
+
+        if (is_null($key)) {
+            return $this->json;
+        }
+
+        return Arr::get($this->json->all(), $key, $default);
+    }
+
+    /**
+     * Set the JSON payload for the request.
+     * 
+     * @param  \Syscodes\Components\Http\Loaders\Parameters  $json
+     * 
+     * @return static
+     */
+    public function setJson($json): static
+    {
+        $this->json = $json;
+
+        return $this;
+    }
 	
-	/**
-	 * Gets a list of content types acceptable by the client browser in preferable order.
-	 * 
-	 * @return string[]
-	 */
-	public function getAcceptableContentTypes(): array
-	{
-		if (null !== $this->acceptableContentTypes) {
-			return $this->acceptableContentTypes;
-		}
+    /**
+     * Gets a list of content types acceptable by the client browser in preferable order.
+     * 
+     * @return string[]
+     */
+    public function getAcceptableContentTypes(): array
+    {
+        if (null !== $this->acceptableContentTypes) {
+            return $this->acceptableContentTypes;
+        }
 		
-		return $this->acceptableContentTypes = array_map('strval', [$this->headers->get('Accept')]);
-	}
-
-	/**
-	 * Returns whether this is an AJAX request or not.
-	 * Alias of isXmlHttpRequest().
-	 *
-	 * @return bool
-	 */
-	public function ajax(): bool
-	{
-		return $this->isXmlHttpRequest();
-	}
-
-	/**
-	 * Returns whether this is an AJAX request or not.
-	 *
-	 * @return bool
-	 */
-	public function isXmlHttpRequest(): bool
-	{
-		return ! empty($this->server->get('HTTP_X_REQUESTED_WITH')) && 
-				strtolower($this->server->get('HTTP_X_REQUESTED_WITH')) === 'xmlhttprequest';
-	}
+        return $this->acceptableContentTypes = array_map('strval', [$this->headers->get('Accept')]);
+    }
+
+    /**
+     * Returns whether this is an AJAX request or not.
+     * Alias of isXmlHttpRequest().
+     *
+     * @return bool
+     */
+    public function ajax(): bool
+    {
+        return $this->isXmlHttpRequest();
+    }
+
+    /**
+     * Returns whether this is an AJAX request or not.
+     *
+     * @return bool
+     */
+    public function isXmlHttpRequest(): bool
+    {
+        return ! empty($this->server->get('HTTP_X_REQUESTED_WITH')) && 
+                strtolower($this->server->get('HTTP_X_REQUESTED_WITH')) === 'xmlhttprequest';
+    }
 	
-	/**
-	 * Determine if the request is the result of a PJAX call.
-	 * 
-	 * @return bool
-	 */
-	public function pjax(): bool
-	{
-		return $this->headers->get('X-PJAX') == true;
-	}
+    /**
+     * Determine if the request is the result of a PJAX call.
+     * 
+     * @return bool
+     */
+    public function pjax(): bool
+    {
+        return $this->headers->get('X-PJAX') == true;
+    }
 	
-	/**
-	 * Determine if the request is the result of a prefetch call.
-	 * 
-	 * @return bool
-	 */
-	public function prefetch(): bool
-	{
-		return strcasecmp($this->server->get('HTTP_X_MOZ') ?? '', 'prefetch') === 0 ||
-		       strcasecmp($this->headers->get('Purpose') ?? '', 'prefetch') === 0;
-	}
-
-	/**
-	 * Checks if the method request is of specified type.
-	 * 
-	 * @param  string  $method
-	 * 
-	 * @return bool
-	 */
-	public function isMethod(string $method): bool
-	{
-		return $this->getMethod() === strtoupper($method);
-	}
-
-	/**
+    /**
+     * Determine if the request is the result of a prefetch call.
+     * 
+     * @return bool
+     */
+    public function prefetch(): bool
+    {
+        return strcasecmp($this->server->get('HTTP_X_MOZ') ?? '', 'prefetch') === 0 ||
+               strcasecmp($this->headers->get('Purpose') ?? '', 'prefetch') === 0;
+    }
+
+    /**
+     * Checks if the method request is of specified type.
+     * 
+     * @param  string  $method
+     * 
+     * @return bool
+     */
+    public function isMethod(string $method): bool
+    {
+        return $this->getMethod() === strtoupper($method);
+    }
+
+    /**
      * Alias of the request method.
      * 
      * @return string
@@ -329,414 +329,414 @@ 
         return $this->getMethod();
     }
 
-	/**
-	 * Returns the input method used (GET, POST, DELETE, etc.).
-	 *
-	 * @return string
-	 * 
-	 * @throws \LogicException  
-	 */
-	public function getmethod(): string
-	{
-		if (null !== $this->method) {
-			return $this->method;
-		}
+    /**
+     * Returns the input method used (GET, POST, DELETE, etc.).
+     *
+     * @return string
+     * 
+     * @throws \LogicException  
+     */
+    public function getmethod(): string
+    {
+        if (null !== $this->method) {
+            return $this->method;
+        }
 		
-		$this->method = strtoupper($this->server->get('REQUEST_METHOD', 'GET'));
+        $this->method = strtoupper($this->server->get('REQUEST_METHOD', 'GET'));
 		
-		if ('POST' !== $this->method) {
-			return $this->method;
-		}
+        if ('POST' !== $this->method) {
+            return $this->method;
+        }
 		
-		$method = $this->headers->get('X-HTTP-METHOD-OVERRIDE');
+        $method = $this->headers->get('X-HTTP-METHOD-OVERRIDE');
 		
-		if ( ! $method && self::$httpMethodParameterOverride) {
-			$method = $this->request->get('_method', $this->query->get('_method', 'POST'));
-		}
+        if ( ! $method && self::$httpMethodParameterOverride) {
+            $method = $this->request->get('_method', $this->query->get('_method', 'POST'));
+        }
 		
-		if ( ! is_string($method)) {
-			return $this->method;
-		}
+        if ( ! is_string($method)) {
+            return $this->method;
+        }
 		
-		$method = strtoupper($method);
+        $method = strtoupper($method);
 		
-		if (in_array($method, ['GET', 'HEAD', 'POST', 'PUT', 'DELETE', 'CONNECT', 'OPTIONS', 'PATCH', 'PURGE', 'TRACE'], true)) {
-			return $this->method = $method;
-		}
+        if (in_array($method, ['GET', 'HEAD', 'POST', 'PUT', 'DELETE', 'CONNECT', 'OPTIONS', 'PATCH', 'PURGE', 'TRACE'], true)) {
+            return $this->method = $method;
+        }
 		
-		if ( ! preg_match('/^[A-Z]++$/D', $method)) {
-			throw new LogicException(sprintf('Invalid method override "%s".', $method));
-		}
+        if ( ! preg_match('/^[A-Z]++$/D', $method)) {
+            throw new LogicException(sprintf('Invalid method override "%s".', $method));
+        }
 		
-		return $this->method = $method;
-	}
-
-	/**
-	 * Sets the request method.
-	 *
-	 * @param  string  $method  
-	 *
-	 * @return void
-	 */
-	public function setMethod(string $method): void
-	{
-		$this->method = null;
-
-		$this->server->set('REQUEST_METHOD', $method);
-	}
-
-	/**
-	 * Get the input source for the request.
-	 * 
-	 * @return \Syscodes\Components\Http\Loaders\Parameters
-	 */
-	public function getInputSource()
-	{
-		if ($this->isJson()) {
-			return $this->json();
-		}
-
-		return in_array($this->getMethod(), ['GET', 'HEAD']) ? $this->query : $this->request;
-	}
+        return $this->method = $method;
+    }
+
+    /**
+     * Sets the request method.
+     *
+     * @param  string  $method  
+     *
+     * @return void
+     */
+    public function setMethod(string $method): void
+    {
+        $this->method = null;
+
+        $this->server->set('REQUEST_METHOD', $method);
+    }
+
+    /**
+     * Get the input source for the request.
+     * 
+     * @return \Syscodes\Components\Http\Loaders\Parameters
+     */
+    public function getInputSource()
+    {
+        if ($this->isJson()) {
+            return $this->json();
+        }
+
+        return in_array($this->getMethod(), ['GET', 'HEAD']) ? $this->query : $this->request;
+    }
 	
-	/**
-	 * Determine if the current request URI matches a pattern.
-	 * 
-	 * @param  mixed  ...$patterns
-	 * 
-	 * @return bool
-	 */
-	public function is(...$patterns): bool
-	{
-		$path = $this->decodedPath();
+    /**
+     * Determine if the current request URI matches a pattern.
+     * 
+     * @param  mixed  ...$patterns
+     * 
+     * @return bool
+     */
+    public function is(...$patterns): bool
+    {
+        $path = $this->decodedPath();
 		
-		foreach ($patterns as $pattern) {
-			if (Str::is($pattern, $path)) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Determine if the route name matches a given pattern.
-	 * 
-	 * @param  mixed  ...$patterns
-	 * 
-	 * @return bool
-	 */
-	public function routeIs(...$patterns): bool
-	{
-		return $this->route() && $this->route()->is(...$patterns);
-	}
-
-	/**
-	 * Get the route handling the request.
-	 * 
-	 * @param  string|null  $param  
-	 * @param  mixed  $default  
-	 * 
-	 * @return \Syscodes\Components\Routing\Route|object|string|null
-	 */
-	public function route($param = null, $default = null)
-	{
-		$route = call_user_func($this->getRouteResolver());
-
-		if (is_null($route) || is_null($param)) {
-			return $route;
-		}
-
-		return $route->parameter($param, $default);
-	}
-
-	/**
-	 * Get the current decoded path info for the request.
-	 * 
-	 * @return string
-	 */
-	public function decodedPath(): string
-	{
-		return rawurldecode($this->path());
-	}
-
-	/**
-	 * Get the current path info for the request.
-	 * 
-	 * @return string
-	 */
-	public function path(): string
-	{
-		$path = trim($this->getPathInfo(), '/');
-
-		return $path == '' ? '/' : $path;
-	}
-
-	/**
-	 * Get the full URL for the request.
-	 * 
-	 * @return string
-	 */
-	public function fullUrl(): string
-	{
-		$query = $this->getQueryString();
+        foreach ($patterns as $pattern) {
+            if (Str::is($pattern, $path)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Determine if the route name matches a given pattern.
+     * 
+     * @param  mixed  ...$patterns
+     * 
+     * @return bool
+     */
+    public function routeIs(...$patterns): bool
+    {
+        return $this->route() && $this->route()->is(...$patterns);
+    }
+
+    /**
+     * Get the route handling the request.
+     * 
+     * @param  string|null  $param  
+     * @param  mixed  $default  
+     * 
+     * @return \Syscodes\Components\Routing\Route|object|string|null
+     */
+    public function route($param = null, $default = null)
+    {
+        $route = call_user_func($this->getRouteResolver());
+
+        if (is_null($route) || is_null($param)) {
+            return $route;
+        }
+
+        return $route->parameter($param, $default);
+    }
+
+    /**
+     * Get the current decoded path info for the request.
+     * 
+     * @return string
+     */
+    public function decodedPath(): string
+    {
+        return rawurldecode($this->path());
+    }
+
+    /**
+     * Get the current path info for the request.
+     * 
+     * @return string
+     */
+    public function path(): string
+    {
+        $path = trim($this->getPathInfo(), '/');
+
+        return $path == '' ? '/' : $path;
+    }
+
+    /**
+     * Get the full URL for the request.
+     * 
+     * @return string
+     */
+    public function fullUrl(): string
+    {
+        $query = $this->getQueryString();
 		
-		$question = $this->getBaseUrl().$this->getPathInfo() === '/' ? '/?' : '?';
+        $question = $this->getBaseUrl().$this->getPathInfo() === '/' ? '/?' : '?';
 		
-		return $query ? $this->url().$question.$query : $this->url();
-	}
+        return $query ? $this->url().$question.$query : $this->url();
+    }
 	
-	/**
-	 * Generates the normalized query string for the Request.
-	 * 
-	 * @return string
-	 */
-	public function getQueryString(): ?string
-	{
-		$queryString = RequestUtils::normalizedQueryString($this->server->get('QUERY_STRING'));
+    /**
+     * Generates the normalized query string for the Request.
+     * 
+     * @return string
+     */
+    public function getQueryString(): ?string
+    {
+        $queryString = RequestUtils::normalizedQueryString($this->server->get('QUERY_STRING'));
 		
-		return '' === $queryString ? null : $queryString;
-	}
-
-	/**
-	 * Retunrs the request body content.
-	 * 
-	 * @return string
-	 */
-	public function getContent(): string
-	{
-		if (null === $this->content || false === $this->content) {
-			$this->content = file_get_contents('php://input');
-		}
-
-		return $this->content;
-	}
-
-	/**
-	 * Returns the path being requested relative to the executed script. 
-	 * 
-	 * @return string
-	 */
-	public function getPathInfo(): string
-	{
-		if (null === $this->pathInfo) {
-			$this->pathInfo = $this->parsePathInfo();
-		}
-
-		return $this->pathInfo;
-	}
-
-	/**
-	 * Returns the root URL from which this request is executed.
-	 * 
-	 * @return string
-	 */
-	public function getBaseUrl(): string
-	{
-		if (null === $this->baseUrl) {
-			$this->baseUrl = $this->parseBaseUrl();
-		}
-
-		return $this->baseUrl;
-	}
-
-	/**
-	 * Returns the requested URI.
-	 * 
-	 * @return string
-	 */
-	public function getRequestUri(): string
-	{
-		if (null === $this->requestToUri) {
-			$this->requestToUri = $this->parseRequestUri();
-		}
-
-		return $this->requestToUri;
-	}
+        return '' === $queryString ? null : $queryString;
+    }
+
+    /**
+     * Retunrs the request body content.
+     * 
+     * @return string
+     */
+    public function getContent(): string
+    {
+        if (null === $this->content || false === $this->content) {
+            $this->content = file_get_contents('php://input');
+        }
+
+        return $this->content;
+    }
+
+    /**
+     * Returns the path being requested relative to the executed script. 
+     * 
+     * @return string
+     */
+    public function getPathInfo(): string
+    {
+        if (null === $this->pathInfo) {
+            $this->pathInfo = $this->parsePathInfo();
+        }
+
+        return $this->pathInfo;
+    }
+
+    /**
+     * Returns the root URL from which this request is executed.
+     * 
+     * @return string
+     */
+    public function getBaseUrl(): string
+    {
+        if (null === $this->baseUrl) {
+            $this->baseUrl = $this->parseBaseUrl();
+        }
+
+        return $this->baseUrl;
+    }
+
+    /**
+     * Returns the requested URI.
+     * 
+     * @return string
+     */
+    public function getRequestUri(): string
+    {
+        if (null === $this->requestToUri) {
+            $this->requestToUri = $this->parseRequestUri();
+        }
+
+        return $this->requestToUri;
+    }
 	
-	/**
-	 * Generates a normalized URI (URL) for the Request.
-	 * 
-	 * @return string
-	 */
-	public function getUri(): string
-	{
-		if (null !== $query = $this->getQueryString()) {
-			$query = '?'.$query;
-		}
+    /**
+     * Generates a normalized URI (URL) for the Request.
+     * 
+     * @return string
+     */
+    public function getUri(): string
+    {
+        if (null !== $query = $this->getQueryString()) {
+            $query = '?'.$query;
+        }
 	
-		return $this->getSchemeWithHttpHost().$this->getBaseUrl().$this->getPathInfo().$query;
-	}
-
-	/**
-	 * Get the root URL for the application.
-	 * 
-	 * @return string
-	 */
-	public function root(): string
-	{
-		return rtrim($this->getSchemeWithHttpHost().$this->getBaseUrl(), '/');
-	}
-
-	/**
-	 * Get the URL for the request.
-	 * 
-	 * @return string
-	 */
-	public function url(): string
-	{
-		// Changed $this->path() for $this->getUri()
-		return rtrim(preg_replace('/\?.*/', '', $this->getUri()), '/');
-	}
-
-	/**
-	 * Returns the referer.
-	 * 
-	 * @param  string  $default
-	 * 
-	 * @return string
-	 */
-	public function referer(string $default = ''): string
-	{
-		return $this->server->get('HTTP_REFERER', $default);
-	}
+        return $this->getSchemeWithHttpHost().$this->getBaseUrl().$this->getPathInfo().$query;
+    }
+
+    /**
+     * Get the root URL for the application.
+     * 
+     * @return string
+     */
+    public function root(): string
+    {
+        return rtrim($this->getSchemeWithHttpHost().$this->getBaseUrl(), '/');
+    }
+
+    /**
+     * Get the URL for the request.
+     * 
+     * @return string
+     */
+    public function url(): string
+    {
+        // Changed $this->path() for $this->getUri()
+        return rtrim(preg_replace('/\?.*/', '', $this->getUri()), '/');
+    }
+
+    /**
+     * Returns the referer.
+     * 
+     * @param  string  $default
+     * 
+     * @return string
+     */
+    public function referer(string $default = ''): string
+    {
+        return $this->server->get('HTTP_REFERER', $default);
+    }
 	
-	/**
-	 * Attempts to detect if the current connection is secure through 
-	 * over HTTPS protocol.
-	 * 
-	 * @return bool
-	 */
-	public function secure(): bool
-	{
-		if ( ! empty($this->server->get('HTTPS')) && strtolower($this->server->get('HTTPS')) !== 'off') {
-			return true;
-		} elseif (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $this->server->get('HTTP_X_FORWARDED_PROTO') === 'https') {
-			return true;
-		} elseif ( ! empty($this->server->get('HTTP_FRONT_END_HTTPS')) && strtolower($this->server->get('HTTP_FRONT_END_HTTPS')) !== 'off') {
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Returns the user agent.
-	 *
-	 * @param  string|null  $default
-	 *
-	 * @return string
-	 */
-	public function userAgent(string $default = null): string
-	{
-		return $this->server->get('HTTP_USER_AGENT', $default);
-	}
+    /**
+     * Attempts to detect if the current connection is secure through 
+     * over HTTPS protocol.
+     * 
+     * @return bool
+     */
+    public function secure(): bool
+    {
+        if ( ! empty($this->server->get('HTTPS')) && strtolower($this->server->get('HTTPS')) !== 'off') {
+            return true;
+        } elseif (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $this->server->get('HTTP_X_FORWARDED_PROTO') === 'https') {
+            return true;
+        } elseif ( ! empty($this->server->get('HTTP_FRONT_END_HTTPS')) && strtolower($this->server->get('HTTP_FRONT_END_HTTPS')) !== 'off') {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Returns the user agent.
+     *
+     * @param  string|null  $default
+     *
+     * @return string
+     */
+    public function userAgent(string $default = null): string
+    {
+        return $this->server->get('HTTP_USER_AGENT', $default);
+    }
 	
-	/**
-	 * Get the client IP address.
-	 * 
-	 * @return string|null
-	 */
-	public function ip(): ?string
-	{
-		return $this->clientIp->getClientIp();
-	}
-
-	/**
-	 * Get the route resolver callback.
-	 * 
-	 * @return \Closure
-	 */
-	public function getRouteResolver(): Closure
-	{
-		return $this->routeResolver ?: function () {
-			//
-		};
-	}
-
-	/**
-	 * Set the route resolver callback.
-	 * 
-	 * @param  \Closure  $callback
-	 * 
-	 * @return static
-	 */
-	public function setRouteResolver(Closure $callback): static
-	{
-		$this->routeResolver = $callback;
-
-		return $this;
-	}
+    /**
+     * Get the client IP address.
+     * 
+     * @return string|null
+     */
+    public function ip(): ?string
+    {
+        return $this->clientIp->getClientIp();
+    }
+
+    /**
+     * Get the route resolver callback.
+     * 
+     * @return \Closure
+     */
+    public function getRouteResolver(): Closure
+    {
+        return $this->routeResolver ?: function () {
+            //
+        };
+    }
+
+    /**
+     * Set the route resolver callback.
+     * 
+     * @param  \Closure  $callback
+     * 
+     * @return static
+     */
+    public function setRouteResolver(Closure $callback): static
+    {
+        $this->routeResolver = $callback;
+
+        return $this;
+    }
 	
-	/**
-	 * Magic method.
-	 * 
-	 * Check if an input element is set on the request.
-	 * 
-	 * @param  string  $key
-	 * 
-	 * @return bool
-	 */
-	public function __isset($key)
-	{
-		return ! is_null($this->__get($key));
-	}
-
-	/**
-	 * Magic method.
-	 * 
-	 * Get an element from the request.
-	 * 
-	 * @return string[]
-	 */
-	public function __get($key)
-	{
-		return Arr::get($this->all(), $key, fn () => $this->route($key));
-	}
-
-	/**
-	 * Magic method.
-	 * 
-	 * Returns the Request as an HTTP string.
-	 * 
-	 * @return string
-	 */
-	public function __toString(): string
-	{
-		$content = $this->getContent();
-
-		$cookieHeader = '';
-		$cookies      = [];
-
-		foreach ($this->cookies as $key => $value) {
-			$cookies[]= is_array($value) ? http_build_query([$key => $value], '', '; ', PHP_QUERY_RFC3986) : "$key=$value";
-		}
-
-		if ($cookies) {
-			$cookieHeader = 'Cookie: '.implode('; ', $cookies)."\r\n";
-		}
+    /**
+     * Magic method.
+     * 
+     * Check if an input element is set on the request.
+     * 
+     * @param  string  $key
+     * 
+     * @return bool
+     */
+    public function __isset($key)
+    {
+        return ! is_null($this->__get($key));
+    }
+
+    /**
+     * Magic method.
+     * 
+     * Get an element from the request.
+     * 
+     * @return string[]
+     */
+    public function __get($key)
+    {
+        return Arr::get($this->all(), $key, fn () => $this->route($key));
+    }
+
+    /**
+     * Magic method.
+     * 
+     * Returns the Request as an HTTP string.
+     * 
+     * @return string
+     */
+    public function __toString(): string
+    {
+        $content = $this->getContent();
+
+        $cookieHeader = '';
+        $cookies      = [];
+
+        foreach ($this->cookies as $key => $value) {
+            $cookies[]= is_array($value) ? http_build_query([$key => $value], '', '; ', PHP_QUERY_RFC3986) : "$key=$value";
+        }
+
+        if ($cookies) {
+            $cookieHeader = 'Cookie: '.implode('; ', $cookies)."\r\n";
+        }
 		
-		return sprintf('%s %s %s', $this->getMethod(), $this->getRequestUri(), $this->server->get('SERVER_PROTOCOL'))."\r\n".
-			$this->headers.
-			$cookieHeader."\r\n".
-			$content;
-	}
-
-	/**
-	 * Magic method.
-	 * 
-	 * Clones the current request.
-	 * 
-	 * @return void
-	 */
-	public function __clone()
-	{
-		$this->query      = clone $this->query;
-		$this->request    = clone $this->request;
-		$this->attributes = clone $this->attributes;
-		$this->cookies    = clone $this->cookies;
-		$this->files      = clone $this->files;
-		$this->server     = clone $this->server;
-		$this->headers    = clone $this->headers;
-	}
+        return sprintf('%s %s %s', $this->getMethod(), $this->getRequestUri(), $this->server->get('SERVER_PROTOCOL'))."\r\n".
+            $this->headers.
+            $cookieHeader."\r\n".
+            $content;
+    }
+
+    /**
+     * Magic method.
+     * 
+     * Clones the current request.
+     * 
+     * @return void
+     */
+    public function __clone()
+    {
+        $this->query      = clone $this->query;
+        $this->request    = clone $this->request;
+        $this->attributes = clone $this->attributes;
+        $this->cookies    = clone $this->cookies;
+        $this->files      = clone $this->files;
+        $this->server     = clone $this->server;
+        $this->headers    = clone $this->headers;
+    }
 }
\ No newline at end of file

Spacing +2 added lines, -2 removed lines

@@ -649,7 +649,7 @@ 
 	 */
 	public function getRouteResolver(): Closure
 	{
-		return $this->routeResolver ?: function () {
+		return $this->routeResolver ?: function() {
 			//
 		};
 	}
@@ -709,7 +709,7 @@ 
 		$cookies      = [];
 
 		foreach ($this->cookies as $key => $value) {
-			$cookies[]= is_array($value) ? http_build_query([$key => $value], '', '; ', PHP_QUERY_RFC3986) : "$key=$value";
+			$cookies[] = is_array($value) ? http_build_query([$key => $value], '', '; ', PHP_QUERY_RFC3986) : "$key=$value";
 		}
 
 		if ($cookies) {