lenevor / syscodes

src/components/Routing/RouteAction.php

Spacing +2 added lines, -2 removed lines

@@ -76,7 +76,7 @@ 
      */
     protected static function usesAction($uri)
     {
-        return ['uses' => function () use ($uri) {
+        return ['uses' => function() use ($uri) {
             throw new LogicException(__('route.hasNoAction', ['uri' => $uri]));
         }];
     }
@@ -90,7 +90,7 @@ 
      */
     protected static function findClosureAction(array $action)
     {
-        return Arr::first($action, function ($value, $key) {
+        return Arr::first($action, function($value, $key) {
             return is_callable($value) && is_numeric($key);
         });
     }

src/components/Contracts/Routing/Routable.php

Indentation +82 added lines, -82 removed lines

@@ -31,94 +31,94 @@
  */
 interface Routable
 {
-	/**
-	 * Add a route for all posible methods.
-	 *
-	 * @param  string  $route
-	 * @param  \Closure|array|string  $action
-	 *
-	 * @return void
-	 */
-	public function any($route, $action);
+    /**
+     * Add a route for all posible methods.
+     *
+     * @param  string  $route
+     * @param  \Closure|array|string  $action
+     *
+     * @return void
+     */
+    public function any($route, $action);
 
-	/**
-	 * Add a route with delete method.
-	 *
-	 * @param  string  $route
-	 * @param  \Closure|array|string  $action
-	 *
-	 * @return void
-	 */
-	public function delete($route, $action);
+    /**
+     * Add a route with delete method.
+     *
+     * @param  string  $route
+     * @param  \Closure|array|string  $action
+     *
+     * @return void
+     */
+    public function delete($route, $action);
 
-	/**
-	 * Add a route with get method.
-	 * 
-	 * @param  string  $route
-	 * @param  \Closure|array|string  $action
-	 *
-	 * @return void
-	 */
-	public function get($route, $action);
+    /**
+     * Add a route with get method.
+     * 
+     * @param  string  $route
+     * @param  \Closure|array|string  $action
+     *
+     * @return void
+     */
+    public function get($route, $action);
 
-	/**
-	 * Add a route with head method.
-	 *
-	 * @param  string  $route
-	 * @param  \Closure|array|string  $action
-	 *
-	 * @return void
-	 */
-	public function head($route, $action);
+    /**
+     * Add a route with head method.
+     *
+     * @param  string  $route
+     * @param  \Closure|array|string  $action
+     *
+     * @return void
+     */
+    public function head($route, $action);
 
-	/**
-	 * Add a route with options method
-	 *
-	 * @param  string  $route
-	 * @param  \Closure|array|string  $action
-	 *
-	 * @return void
-	 */
-	public function options($route, $action);
+    /**
+     * Add a route with options method
+     *
+     * @param  string  $route
+     * @param  \Closure|array|string  $action
+     *
+     * @return void
+     */
+    public function options($route, $action);
 
-	/**
-	 * Add a route with patch method.
-	 *
-	 * @param  string  $route
-	 * @param  \Closure|array|string  $action
-	 *
-	 * @return void
-	 */
-	public function patch($route, $action);
+    /**
+     * Add a route with patch method.
+     *
+     * @param  string  $route
+     * @param  \Closure|array|string  $action
+     *
+     * @return void
+     */
+    public function patch($route, $action);
 
-	/**
-	 * Add a route with post method.
-	 *
-	 * @param  string  $route
-	 * @param  \Closure|array|string  $action
-	 *
-	 * @return void
-	 */
-	public function post($route, $action);
+    /**
+     * Add a route with post method.
+     *
+     * @param  string  $route
+     * @param  \Closure|array|string  $action
+     *
+     * @return void
+     */
+    public function post($route, $action);
 
-	/**
-	 * Add a route with put method.
-	 *
-	 * @param  string  $route
-	 * @param  \Closure|array|string  $action
-	 *
-	 * @return void
-	 */
-	public function put($route, $action);
+    /**
+     * Add a route with put method.
+     *
+     * @param  string  $route
+     * @param  \Closure|array|string  $action
+     *
+     * @return void
+     */
+    public function put($route, $action);
 
-	/**
-	 * Group a series of routes under a single URL segment. This is handy
-	 * for grouping items into an admin area.
-	 * 
-	 * @param  array  $attributes
-	 * @param  \Closure|string  $callback
-	 *
-	 * @return void
-	 */
-	public function group(array $attributes, $parameters);
+    /**
+     * Group a series of routes under a single URL segment. This is handy
+     * for grouping items into an admin area.
+     * 
+     * @param  array  $attributes
+     * @param  \Closure|string  $callback
+     *
+     * @return void
+     */
+    public function group(array $attributes, $parameters);
 }
\ No newline at end of file

src/components/Contracts/Console/Application.php

Indentation +14 added lines, -14 removed lines

@@ -30,19 +30,19 @@
  */
 interface Application
 {
-	/**
-	 * Runs the current command discovered on the CLI.
-	 * 
-	 * @return void
-	 */	
-	public function run();
+    /**
+     * Runs the current command discovered on the CLI.
+     * 
+     * @return void
+     */	
+    public function run();
 	
-	/**
-	 * Displays basic information about the Console.
-	 * 
-	 * @return void
-	 * 
-	 * @uses   Version::RELEASE
-	 */ 
-	public function showHeader(); 
+    /**
+     * Displays basic information about the Console.
+     * 
+     * @return void
+     * 
+     * @uses   Version::RELEASE
+     */ 
+    public function showHeader(); 
 }
\ No newline at end of file

src/components/Contracts/View/Factory.php

Indentation +6 added lines, -6 removed lines

@@ -31,12 +31,12 @@
 interface Factory
 {
     /**
-	 * Check existance view file.
-	 * 
-	 * @param  string  $view
-	 *
-	 * @return bool
-	 */
+     * Check existance view file.
+     * 
+     * @param  string  $view
+     *
+     * @return bool
+     */
     public function viewExists($view);
 
     /**

src/components/Contracts/View/View.php

Indentation +24 added lines, -24 removed lines

@@ -32,29 +32,29 @@
  */
 interface View extends Renderable
 {
-	/**
-	 * Add a piece of data to the view.
-	 * 
-	 * @example  $view->assign($content, $data);
-	 * 
-	 * @param  string|array  $key
-	 * @param  mixed  $value
-	 * 
-	 * @return $this
-	 */
-	public function assign($key, $value = null);
+    /**
+     * Add a piece of data to the view.
+     * 
+     * @example  $view->assign($content, $data);
+     * 
+     * @param  string|array  $key
+     * @param  mixed  $value
+     * 
+     * @return $this
+     */
+    public function assign($key, $value = null);
 	
-	/**
-	 * Assigns a value by reference. The benefit of binding is that values can be altered
-	 * without re-setting them. It is also possible to bind variables before they have values.
-	 * Assigned values will be available as a variable within the view file:
-	 * 
-	 * @example  $view->bind('ref', $bar);
-	 * 
-	 * @param  string  $key  Variable name
-	 * @param  mixed  $value  Referenced variable
-	 * 
-	 * @return $this
-	 */
-	public function bind($key, & $value);
+    /**
+     * Assigns a value by reference. The benefit of binding is that values can be altered
+     * without re-setting them. It is also possible to bind variables before they have values.
+     * Assigned values will be available as a variable within the view file:
+     * 
+     * @example  $view->bind('ref', $bar);
+     * 
+     * @param  string  $key  Variable name
+     * @param  mixed  $value  Referenced variable
+     * 
+     * @return $this
+     */
+    public function bind($key, & $value);
 }
\ No newline at end of file

src/components/Contracts/Debug/Handler.php

Indentation +76 added lines, -76 removed lines

@@ -32,88 +32,88 @@
  */
 interface Handler
 {
-	const ERROR_HANDLER     = "HandleError";
-	const EXCEPTION_HANDLER = "handleException";
-	const SHUTDOWN_HANDLER  = "handleShutdown"; 
+    const ERROR_HANDLER     = "HandleError";
+    const EXCEPTION_HANDLER = "handleException";
+    const SHUTDOWN_HANDLER  = "handleShutdown"; 
 	
-	/**
-	 * Catches any uncaught errors and exceptions, including most Fatal errors. Will log the 
-	 * error, display it if display_errors is on, and fire an event that allows custom actions 
-	 * to be taken at this point.
-	 *
-	 * @param  \Throwable  $exception
-	 *
-	 * @return string
-	 */
-	public function handleException(Throwable $exception);
+    /**
+     * Catches any uncaught errors and exceptions, including most Fatal errors. Will log the 
+     * error, display it if display_errors is on, and fire an event that allows custom actions 
+     * to be taken at this point.
+     *
+     * @param  \Throwable  $exception
+     *
+     * @return string
+     */
+    public function handleException(Throwable $exception);
 	
-	/**
-	 * Pushes a handler to the end of the stack.
-	 * 
-	 * @param  string|callable  $handler
-	 * 
-	 * @return \Syscodes\Contracts\Debug\Handler
-	 */
-	public function pushHandler($handler);
+    /**
+     * Pushes a handler to the end of the stack.
+     * 
+     * @param  string|callable  $handler
+     * 
+     * @return \Syscodes\Contracts\Debug\Handler
+     */
+    public function pushHandler($handler);
 	
-	/**
-	 * Unregisters all handlers registered by this Debug instance.
-	 * 
-	 * @return void
-	 */
-	public function off();
+    /**
+     * Unregisters all handlers registered by this Debug instance.
+     * 
+     * @return void
+     */
+    public function off();
 	
-	/**
-	 * Registers this instance as an error handler.
-	 * 
-	 * @return void
-	 */
-	public function on();
+    /**
+     * Registers this instance as an error handler.
+     * 
+     * @return void
+     */
+    public function on();
 	
-	/**
-	 * Lenevor Exception push output directly to the client it the data  
-	 * if they are true, but if it is false, the output will be returned 
-	 * by exception.
-	 * 
-	 * @param  bool|int  $send
-	 *
-	 * @return bool
-	 */
-	public function writeToOutput($send = null);
+    /**
+     * Lenevor Exception push output directly to the client it the data  
+     * if they are true, but if it is false, the output will be returned 
+     * by exception.
+     * 
+     * @param  bool|int  $send
+     *
+     * @return bool
+     */
+    public function writeToOutput($send = null);
 	
-	/**
-	 * Error handler
-	 *
-	 * This will catch the php native error and treat it as a exception which will 
-	 * provide a full back trace on all errors.
-	 *
-	 * @param  int  $level
-	 * @param  string  $message
-	 * @param  string|null  $file
-	 * @param  int|null  $line
-	 *
-	 * @throws \ErrorException
-	 */
-	public function handleError(int $level, string $message, string $file = null, int $line = null);
+    /**
+     * Error handler
+     *
+     * This will catch the php native error and treat it as a exception which will 
+     * provide a full back trace on all errors.
+     *
+     * @param  int  $level
+     * @param  string  $message
+     * @param  string|null  $file
+     * @param  int|null  $line
+     *
+     * @throws \ErrorException
+     */
+    public function handleError(int $level, string $message, string $file = null, int $line = null);
 	
-	/**
-	 * Lenevor Exception will by default send HTTP code 500, but you may wish
-	 * to use 502, 503, or another 5xx family code.
-	 * 
-	 * @param  bool|int  $code
-	 * 
-	 * @return int|false
-	 * 
-	 * @throws \InvalidArgumentException
-	 */
-	public function sendHttpCode($code = null);
+    /**
+     * Lenevor Exception will by default send HTTP code 500, but you may wish
+     * to use 502, 503, or another 5xx family code.
+     * 
+     * @param  bool|int  $code
+     * 
+     * @return int|false
+     * 
+     * @throws \InvalidArgumentException
+     */
+    public function sendHttpCode($code = null);
 	
-	/**
-	 * This will catch errors that are generated at the shutdown level of execution.
-	 *
-	 * @return void
-	 *
-	 * @throws \ErrorException
-	 */
-	public function handleShutdown();
+    /**
+     * This will catch errors that are generated at the shutdown level of execution.
+     *
+     * @return void
+     *
+     * @throws \ErrorException
+     */
+    public function handleShutdown();
 }
\ No newline at end of file

src/components/Contracts/Config/Configure.php

Indentation +46 added lines, -46 removed lines

@@ -30,54 +30,54 @@
  */
 interface Configure
 {
-	/**
-	 * Determine if the given configuration value exists.
-	 * 
-	 * @param  string  $key
-	 * 
-	 * @return bool
-	 */
-	public function has(string $key);
+    /**
+     * Determine if the given configuration value exists.
+     * 
+     * @param  string  $key
+     * 
+     * @return bool
+     */
+    public function has(string $key);
 
-	/**
-	 * Deletes a (dot notated) config item.
-	 * 
-	 * @param  string  $key  A (dot notated) config key
-	 * 
-	 * @return array|bool
-	 * 
-	 * @uses   \Syscodes\Support\Arr
-	 */	
-	public function erase(string $key);
+    /**
+     * Deletes a (dot notated) config item.
+     * 
+     * @param  string  $key  A (dot notated) config key
+     * 
+     * @return array|bool
+     * 
+     * @uses   \Syscodes\Support\Arr
+     */	
+    public function erase(string $key);
 
-	/**
-	 * Returns a (dot notated) config setting.
-	 *
-	 * @param  string  $key  The dot-notated key or array of keys
-	 * @param  mixed  $default  The default value
-	 *
-	 * @return mixed
-	 *
-	 * @uses    \Syscodes\Support\Arr
-	 */
-	public function get(string $key, $default = null);
+    /**
+     * Returns a (dot notated) config setting.
+     *
+     * @param  string  $key  The dot-notated key or array of keys
+     * @param  mixed  $default  The default value
+     *
+     * @return mixed
+     *
+     * @uses    \Syscodes\Support\Arr
+     */
+    public function get(string $key, $default = null);
 	
-	/**
-	 * Sets a value in the config array.
-	 *
-	 * @param  string  $key  The dot-notated key or array of keys
-	 * @param  mixed  $value  The default value
-	 *
-	 * @return mixed
-	 *
-	 * @uses  \Syscodes\Support\Arr
-	 */
-	public function set(string $key, $value);
+    /**
+     * Sets a value in the config array.
+     *
+     * @param  string  $key  The dot-notated key or array of keys
+     * @param  mixed  $value  The default value
+     *
+     * @return mixed
+     *
+     * @uses  \Syscodes\Support\Arr
+     */
+    public function set(string $key, $value);
 
-	/**
-	 * Get all of the configuration items for the application.
-	 * 
-	 * @return array
-	 */
-	public function all();
+    /**
+     * Get all of the configuration items for the application.
+     * 
+     * @return array
+     */
+    public function all();
 }
\ No newline at end of file

src/components/Contracts/Container/Container.php

Indentation +23 added lines, -23 removed lines

@@ -66,13 +66,13 @@ 
      */
     public function extend($id, Closure $closure);
 
-     /**
-     * Marks a callable as being a factory service.
-     * 
-     * @param  string  $id
-     * 
-     * @return \Closure
-     */
+        /**
+         * Marks a callable as being a factory service.
+         * 
+         * @param  string  $id
+         * 
+         * @return \Closure
+         */
     public function factory($id);
 
     /**
@@ -82,14 +82,14 @@ 
      */
     public function getBindings();
 
-     /**
-     * Register an existing instance as singleton in the container.
-     *
-     * @param  string  $id
-     * @param  mixed  $instance
-     * 
-     * @return mixed
-     */
+        /**
+         * Register an existing instance as singleton in the container.
+         *
+         * @param  string  $id
+         * @param  mixed  $instance
+         * 
+         * @return mixed
+         */
     public function instance($id, $instance);
 
     /**
@@ -121,13 +121,13 @@ 
      */
     public function set($id, string $value);
 
-     /**
-     * Register a singleton binding in the container.
-     * 
-     * @param  string  $id
-     * @param  \Closure|string|null  $value
-     * 
-     * @return void
-     */
+        /**
+         * Register a singleton binding in the container.
+         * 
+         * @param  string  $id
+         * @param  \Closure|string|null  $value
+         * 
+         * @return void
+         */
     public function singleton($id, $value = null);
 }
\ No newline at end of file

src/components/Http/Request.php

Spacing +1 added lines, -1 removed lines

@@ -875,7 +875,7 @@
 
 		foreach ($this->cookies as $key => $value)
 		{
-			$cookies[]= "{$key} = {$value}";
+			$cookies[] = "{$key} = {$value}";
 		}
 
 		if ( ! empty($cookies))

Indentation +850 added lines, -850 removed lines

@@ -39,868 +39,868 @@
  */
 class Request
 {
-	/**
-	 * Holds the global active request instance.
-	 *
-	 * @var bool $requestURI
-	 */
-	protected static $requestURI;
-
-	/**
-	 * The base URL.
-	 * 
-	 * @var string $baseUrl
-	 */
-	protected $baseUrl;
-
-	/**
-	 * Gets cookies ($_COOKIE).
-	 * 
-	 * @var string $cookies
-	 */
-	public $cookies;
-
-	/**
-	 * Gets the string with format JSON.
-	 * 
-	 * @var string|resource|null $content
-	 */
-	protected $content;
-
-	/**
-	 * The default Locale this request.
-	 * 
-	 * @var string $defaultLocale
-	 */
-	protected $defaultLocale = 'en';
+    /**
+     * Holds the global active request instance.
+     *
+     * @var bool $requestURI
+     */
+    protected static $requestURI;
+
+    /**
+     * The base URL.
+     * 
+     * @var string $baseUrl
+     */
+    protected $baseUrl;
+
+    /**
+     * Gets cookies ($_COOKIE).
+     * 
+     * @var string $cookies
+     */
+    public $cookies;
+
+    /**
+     * Gets the string with format JSON.
+     * 
+     * @var string|resource|null $content
+     */
+    protected $content;
+
+    /**
+     * The default Locale this request.
+     * 
+     * @var string $defaultLocale
+     */
+    protected $defaultLocale = 'en';
 	
-	/**
-	 * Gets files request ($_FILES).
-	 * 
-	 * @var string $files
-	 */
-	public $files;
-
-	/**
-	 * The detected uri and server variables.
-	 * 
-	 * @var string $http
-	 */
-	protected $http;
-
-	/**
-	 * The decoded JSON content for the request.
-	 * 
-	 * @var \Syscodes\Http\Contributors\Parameters|null $json
-	 */
-	protected $json;
-
-	/**
-	 * The current language of the application.
-	 * 
-	 * @var string $languages
-	 */
-	protected $languages;
+    /**
+     * Gets files request ($_FILES).
+     * 
+     * @var string $files
+     */
+    public $files;
+
+    /**
+     * The detected uri and server variables.
+     * 
+     * @var string $http
+     */
+    protected $http;
+
+    /**
+     * The decoded JSON content for the request.
+     * 
+     * @var \Syscodes\Http\Contributors\Parameters|null $json
+     */
+    protected $json;
+
+    /**
+     * The current language of the application.
+     * 
+     * @var string $languages
+     */
+    protected $languages;
 	
-	/** 
-	 * The method name.
-	 * 
-	 * @var string $method
-	 */
-	protected $method;
-
-	/**
-	 * The path info of URL.
-	 * 
-	 * @var string $pathInfo
-	 */
-	protected $pathInfo;
-
-	/**
-	 * Request body parameters ($_POST).
-	 * 
-	 * @var \Syscodes\Http\Contributors\Parameters $request
-	 */
-	public $request;
-
-	/**
-	 * Get request URI.
-	 * 
-	 * @var string $requestToURI
-	 */
-	protected $requestToURI;
-
-	/**
-	 * The detected uri and server variables ($_FILES).
-	 * 
-	 * @var array $server
-	 */
-	public $server = [];
-
-	/** 
-	 * List of routes uri.
-	 *
-	 * @var string|array $uri 
-	 */
-	public $uri;
-
-	/**
-	 * Stores the valid locale codes.
-	 * 
-	 * @var array $validLocales
-	 */
-	protected $validLocales = [];
-
-	/**
-	 * Constructor: Create new the Request class.
-	 * 
-	 * @param  array  $request
-	 * @param  array  $cookies
-	 * @param  array  $files
-	 * @param  array  $server
-	 * @param  string|resource|null $content  (null by default)
-	 * 
-	 * @return void
-	 */
-	public function __construct(array $request = [], array $cookies = [], array $files = [], array $server = [], $content = null)
-	{
-		static::$requestURI = $this;
+    /** 
+     * The method name.
+     * 
+     * @var string $method
+     */
+    protected $method;
+
+    /**
+     * The path info of URL.
+     * 
+     * @var string $pathInfo
+     */
+    protected $pathInfo;
+
+    /**
+     * Request body parameters ($_POST).
+     * 
+     * @var \Syscodes\Http\Contributors\Parameters $request
+     */
+    public $request;
+
+    /**
+     * Get request URI.
+     * 
+     * @var string $requestToURI
+     */
+    protected $requestToURI;
+
+    /**
+     * The detected uri and server variables ($_FILES).
+     * 
+     * @var array $server
+     */
+    public $server = [];
+
+    /** 
+     * List of routes uri.
+     *
+     * @var string|array $uri 
+     */
+    public $uri;
+
+    /**
+     * Stores the valid locale codes.
+     * 
+     * @var array $validLocales
+     */
+    protected $validLocales = [];
+
+    /**
+     * Constructor: Create new the Request class.
+     * 
+     * @param  array  $request
+     * @param  array  $cookies
+     * @param  array  $files
+     * @param  array  $server
+     * @param  string|resource|null $content  (null by default)
+     * 
+     * @return void
+     */
+    public function __construct(array $request = [], array $cookies = [], array $files = [], array $server = [], $content = null)
+    {
+        static::$requestURI = $this;
 		
-		$this->initialize($request, $cookies, $files, $server, $content);
-
-		$this->detectURI(config('app.uriProtocol'), config('app.baseUrl'));
-
-		$this->detectLocale();
-	}
-
-	/**
-	 * Sets the parameters for this request.
-	 * 
-	 * @param  array  $request
-	 * @param  array  $cookies
-	 * @param  array  $files
-	 * @param  array  $server
-	 * 
-	 * @return void
-	 */
-	public function initialize(array $request = [], array $cookies = [], array $files = [], array $server = [], $content = null)
-	{
-		$this->request      = new Parameters($request);
-		$this->cookies      = new Inputs($cookies);
-		$this->files        = new Files($files);
-		$this->server       = new Server($server);
-		$this->headers      = new Headers($this->server->all());
-
-		$this->uri          = new URI;
-		$this->http         = new Http;
-		$this->method       = null;
-		$this->baseUrl      = null;
-		$this->content      = $content;
-		$this->pathInfo     = null;
-		$this->languages    = null;
-		$this->validLocales = config('app.supportedLocales');
-	}
-
-	/**
-	 * Create a new Syscodes HTTP request from server variables.
-	 * 
-	 * @return static
-	 */
-	public static function capture()
-	{
-		return static::createFromRequest(static::createFromRequestGlobals());
-	}
-
-	/**
-	 * Creates an Syscodes request from of the Request class instance.
-	 * 
-	 * @param  \Syscodes\Http\Request  $request
-	 * 
-	 * @return static
-	 */
-	public static function createFromRequest($request)
-	{
-		$newRequest = (new static)->duplicate(
-			$request->request->all(), $request->cookies->all(), 
-			$request->files->all(), $request->server->all()
-		);
-
-		$newRequest->content = $request->content;
-
-		return $newRequest;
-	}
-
-	/**
-	 * Creates a new request with value from PHP's super global.
-	 * 
-	 * @return static
-	 */
-	public static function createFromRequestGlobals()
-	{
-		$request = static::createFromRequestFactory($_POST, $_COOKIE, $_FILES, $_SERVER);
-
-		return $request;
-	}
-
-	/**
-	 * Creates a new request from a factory.
-	 * 
-	 * @param  array  $request
-	 * @param  array  $cookies
-	 * @param  array  $files
-	 * @param  array  $server
-	 * 
-	 * @return static
-	 */
-	protected static function createFromRequestFactory(array $request = [], array $cookies = [], array $files = [], array $server = [])
-	{
-		if (self::$requestURI) {
-			$request = (self::$requestURI)($request, $cookies, $files, $server);
-
-			if ( ! $request instanceof self) {
-				throw new LogicException('The Request active must return an instance of Syscodes\Http\Request');
-			}
-
-			return $request;
-		}
-
-		return new static($request, $cookies, $files, $server);
-	}
-
-	/**
-	 * Clones a request and overrides some of its parameters.
-	 * 
-	 * @param  array  $request
-	 * @param  array  $cookies
-	 * @param  array  $files
-	 * @param  array  $server
-	 * 
-	 * @return static
-	 */
-	public function duplicate(array $request = [], array $cookies = [], array $files = [], array $server = [])
-	{
-		$duplicate = clone $this;
-
-		if (null !== $request) {
-			$duplicate->request = new Parameters($request);
-		}
-
-		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->http         = new Http;
-		$duplicate->locale       = null;
-		$duplicate->method       = null;
-		$duplicate->baseUrl      = null;
-		$duplicate->pathInfo     = null;
-		$duplicate->validLocales = config('app.supportedLocales');
-
-		return $duplicate;		
-	}
-
-	/**
-	 * Returns the active request currently being used.
-	 *
-	 * @param  \Syscodes\Http\Request|bool|null  $request  Overwrite current request 
-	 *                                                     before returning, false prevents 
-	 *                                                     overwrite
-	 *
-	 * @return \Syscodes\Http\Request
-	 */
-	public static function active($request = false)
-	{
-		if ($request !== false) {
-			static::$requestURI = $request;
-		}
-
-		return static::$requestURI;
-	}
-
-	/**
-	 * 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)
-	{
-		if ($request = static::active()) {
-			return $request->uri->getSegment($index, $default);
-		}
-
-		return null;
-	}
-
-	/**
-	 * Returns all segments in an array. For total of segments
-	 * used the function PHP count().
-	 *
-	 * @return array
-	 */
-	public function segments()
-	{
-		if ($request = static::active()) {
-			return $request->uri->getSegments();
-		}
-
-		return null;
-	}
-
-	/**
-	 * Returns the total number of segment.
-	 *
-	 * @return int|null  
-	 */
-	public function totalSegments()
-	{
-		if ($request = static::active()) {
-			return $request->uri->getTotalSegments();
-		}
-
-		return null;
-	}
-
-	/**
-	 * Detects and returns the current URI based on a number of different server variables.
-	 * 
-	 * @param  string  $protocol
-	 * @param  string  $baseUrl
-	 * 
-	 * @return string
-	 */
-	protected function detectURI(string $protocol, string $baseUrl)
-	{
-		$this->uri->setPath($this->http->detectPath($protocol));
-
-		$baseUrl = ! empty($baseUrl) ? rtrim($baseUrl, '/ ').'/' : $baseUrl;
-
-		if ( ! empty($baseUrl)) {
-			$this->uri->setScheme(parse_url($baseUrl, PHP_URL_SCHEME));
-			$this->uri->setHost(parse_url($baseUrl, PHP_URL_HOST));
-			$this->uri->setPort(parse_url($baseUrl, PHP_URL_PORT));
-		} else {
-			if ( ! $this->http->isCli()) {
-				exit('You have an empty or invalid base URL. The baseURL value must be set in config/app.php, or through the .env file.');
-			}
-		}
-	}
-
-	/**
-	 * Handles setting up the locale, auto-detecting of language.
-	 * 
-	 * @return void
-	 */
-	public function detectLocale()
-	{
-		$this->languages = $this->defaultLocale = config('app.locale');
-
-		$this->setLocale($this->validLocales);
-	}
-
-	/**
-	 * Returns the default locale as set.
-	 * 
-	 * @return string
-	 */
-	public function getDefaultLocale()
-	{
-		return $this->defaultLocale;
-	}
-
-	/**
-	 * Gets the current locale, with a fallback to the default.
-	 * 
-	 * @return string 
-	 */
-	public function getLocale()
-	{
-		return $this->languages ?: $this->defaultLocale;
-	}
-
-	/**
-	 * Sets the locale string for this request.
-	 * 
-	 * @param  string  $locale
-	 * 
-	 * @return \Syscodes\Http\Request
-	 */
-	public function setLocale($locale)
-	{
-		if ( ! in_array($locale, $this->validLocales)) {
-			$locale = $this->defaultLocale;
-		}
+        $this->initialize($request, $cookies, $files, $server, $content);
+
+        $this->detectURI(config('app.uriProtocol'), config('app.baseUrl'));
+
+        $this->detectLocale();
+    }
+
+    /**
+     * Sets the parameters for this request.
+     * 
+     * @param  array  $request
+     * @param  array  $cookies
+     * @param  array  $files
+     * @param  array  $server
+     * 
+     * @return void
+     */
+    public function initialize(array $request = [], array $cookies = [], array $files = [], array $server = [], $content = null)
+    {
+        $this->request      = new Parameters($request);
+        $this->cookies      = new Inputs($cookies);
+        $this->files        = new Files($files);
+        $this->server       = new Server($server);
+        $this->headers      = new Headers($this->server->all());
+
+        $this->uri          = new URI;
+        $this->http         = new Http;
+        $this->method       = null;
+        $this->baseUrl      = null;
+        $this->content      = $content;
+        $this->pathInfo     = null;
+        $this->languages    = null;
+        $this->validLocales = config('app.supportedLocales');
+    }
+
+    /**
+     * Create a new Syscodes HTTP request from server variables.
+     * 
+     * @return static
+     */
+    public static function capture()
+    {
+        return static::createFromRequest(static::createFromRequestGlobals());
+    }
+
+    /**
+     * Creates an Syscodes request from of the Request class instance.
+     * 
+     * @param  \Syscodes\Http\Request  $request
+     * 
+     * @return static
+     */
+    public static function createFromRequest($request)
+    {
+        $newRequest = (new static)->duplicate(
+            $request->request->all(), $request->cookies->all(), 
+            $request->files->all(), $request->server->all()
+        );
+
+        $newRequest->content = $request->content;
+
+        return $newRequest;
+    }
+
+    /**
+     * Creates a new request with value from PHP's super global.
+     * 
+     * @return static
+     */
+    public static function createFromRequestGlobals()
+    {
+        $request = static::createFromRequestFactory($_POST, $_COOKIE, $_FILES, $_SERVER);
+
+        return $request;
+    }
+
+    /**
+     * Creates a new request from a factory.
+     * 
+     * @param  array  $request
+     * @param  array  $cookies
+     * @param  array  $files
+     * @param  array  $server
+     * 
+     * @return static
+     */
+    protected static function createFromRequestFactory(array $request = [], array $cookies = [], array $files = [], array $server = [])
+    {
+        if (self::$requestURI) {
+            $request = (self::$requestURI)($request, $cookies, $files, $server);
+
+            if ( ! $request instanceof self) {
+                throw new LogicException('The Request active must return an instance of Syscodes\Http\Request');
+            }
+
+            return $request;
+        }
+
+        return new static($request, $cookies, $files, $server);
+    }
+
+    /**
+     * Clones a request and overrides some of its parameters.
+     * 
+     * @param  array  $request
+     * @param  array  $cookies
+     * @param  array  $files
+     * @param  array  $server
+     * 
+     * @return static
+     */
+    public function duplicate(array $request = [], array $cookies = [], array $files = [], array $server = [])
+    {
+        $duplicate = clone $this;
+
+        if (null !== $request) {
+            $duplicate->request = new Parameters($request);
+        }
+
+        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->http         = new Http;
+        $duplicate->locale       = null;
+        $duplicate->method       = null;
+        $duplicate->baseUrl      = null;
+        $duplicate->pathInfo     = null;
+        $duplicate->validLocales = config('app.supportedLocales');
+
+        return $duplicate;		
+    }
+
+    /**
+     * Returns the active request currently being used.
+     *
+     * @param  \Syscodes\Http\Request|bool|null  $request  Overwrite current request 
+     *                                                     before returning, false prevents 
+     *                                                     overwrite
+     *
+     * @return \Syscodes\Http\Request
+     */
+    public static function active($request = false)
+    {
+        if ($request !== false) {
+            static::$requestURI = $request;
+        }
+
+        return static::$requestURI;
+    }
+
+    /**
+     * 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)
+    {
+        if ($request = static::active()) {
+            return $request->uri->getSegment($index, $default);
+        }
+
+        return null;
+    }
+
+    /**
+     * Returns all segments in an array. For total of segments
+     * used the function PHP count().
+     *
+     * @return array
+     */
+    public function segments()
+    {
+        if ($request = static::active()) {
+            return $request->uri->getSegments();
+        }
+
+        return null;
+    }
+
+    /**
+     * Returns the total number of segment.
+     *
+     * @return int|null  
+     */
+    public function totalSegments()
+    {
+        if ($request = static::active()) {
+            return $request->uri->getTotalSegments();
+        }
+
+        return null;
+    }
+
+    /**
+     * Detects and returns the current URI based on a number of different server variables.
+     * 
+     * @param  string  $protocol
+     * @param  string  $baseUrl
+     * 
+     * @return string
+     */
+    protected function detectURI(string $protocol, string $baseUrl)
+    {
+        $this->uri->setPath($this->http->detectPath($protocol));
+
+        $baseUrl = ! empty($baseUrl) ? rtrim($baseUrl, '/ ').'/' : $baseUrl;
+
+        if ( ! empty($baseUrl)) {
+            $this->uri->setScheme(parse_url($baseUrl, PHP_URL_SCHEME));
+            $this->uri->setHost(parse_url($baseUrl, PHP_URL_HOST));
+            $this->uri->setPort(parse_url($baseUrl, PHP_URL_PORT));
+        } else {
+            if ( ! $this->http->isCli()) {
+                exit('You have an empty or invalid base URL. The baseURL value must be set in config/app.php, or through the .env file.');
+            }
+        }
+    }
+
+    /**
+     * Handles setting up the locale, auto-detecting of language.
+     * 
+     * @return void
+     */
+    public function detectLocale()
+    {
+        $this->languages = $this->defaultLocale = config('app.locale');
+
+        $this->setLocale($this->validLocales);
+    }
+
+    /**
+     * Returns the default locale as set.
+     * 
+     * @return string
+     */
+    public function getDefaultLocale()
+    {
+        return $this->defaultLocale;
+    }
+
+    /**
+     * Gets the current locale, with a fallback to the default.
+     * 
+     * @return string 
+     */
+    public function getLocale()
+    {
+        return $this->languages ?: $this->defaultLocale;
+    }
+
+    /**
+     * Sets the locale string for this request.
+     * 
+     * @param  string  $locale
+     * 
+     * @return \Syscodes\Http\Request
+     */
+    public function setLocale($locale)
+    {
+        if ( ! in_array($locale, $this->validLocales)) {
+            $locale = $this->defaultLocale;
+        }
 		
-		$this->languages = $locale;
-
-		try {
-		    if (class_exists('Locale', false)) {
-				Locale::setDefault($locale);
-			}
-		} catch (Exception $exception) {}
-
-		return $this;
-	}
-
-	/**
-	 * Returns the full request string.
-	 *
-	 * @return string|null  The Request string
-	 */
-	public function get() 
-	{
-		if ($request = static::active()) {
-			return $request->uri->get();
-		}
-
-		return null;
-	}
-
-	/**
-	 * Get the JSON payload for the request.
-	 * 
-	 * @param  string|null  $key  (null by default)
-	 * @param  mixed  $default  (null by default)
-	 * 
-	 * @return \Syscodes\Http\Contributors\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\Http\Contributors\Parameters  $json
-	 * 
-	 * @return $this
-	 */
-	public function setJson($json)
-	{
-		$this->json = $json;
-
-		return $this;
-	}
-
-	/**
-	 * Returns whether this is an AJAX request or not.
-	 *
-	 * @return bool
-	 */
-	public function isXmlHttpRequest()
-	{
-		return ! empty($this->server->get('HTTP_X_REQUESTED_WITH')) && 
-				strtolower($this->server->get('HTTP_X_REQUESTED_WITH')) === 'xmlhttprequest';
-	}
-
-	/**
-	 * Returns the input method used (GET, POST, DELETE, etc.).
-	 *
-	 * @return string
-	 * 
-	 * @throws \LogicException  
-	 */
-	public function getmethod()
-	{
-		if (null !== $this->method) {
-			return $this->method;
-		}
+        $this->languages = $locale;
+
+        try {
+            if (class_exists('Locale', false)) {
+                Locale::setDefault($locale);
+            }
+        } catch (Exception $exception) {}
+
+        return $this;
+    }
+
+    /**
+     * Returns the full request string.
+     *
+     * @return string|null  The Request string
+     */
+    public function get() 
+    {
+        if ($request = static::active()) {
+            return $request->uri->get();
+        }
+
+        return null;
+    }
+
+    /**
+     * Get the JSON payload for the request.
+     * 
+     * @param  string|null  $key  (null by default)
+     * @param  mixed  $default  (null by default)
+     * 
+     * @return \Syscodes\Http\Contributors\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\Http\Contributors\Parameters  $json
+     * 
+     * @return $this
+     */
+    public function setJson($json)
+    {
+        $this->json = $json;
+
+        return $this;
+    }
+
+    /**
+     * Returns whether this is an AJAX request or not.
+     *
+     * @return bool
+     */
+    public function isXmlHttpRequest()
+    {
+        return ! empty($this->server->get('HTTP_X_REQUESTED_WITH')) && 
+                strtolower($this->server->get('HTTP_X_REQUESTED_WITH')) === 'xmlhttprequest';
+    }
+
+    /**
+     * Returns the input method used (GET, POST, DELETE, etc.).
+     *
+     * @return string
+     * 
+     * @throws \LogicException  
+     */
+    public function getmethod()
+    {
+        if (null !== $this->method) {
+            return $this->method;
+        }
 		
-		$method = strtoupper($this->server->get('REQUEST_METHOD', 'GET'));
+        $method = strtoupper($this->server->get('REQUEST_METHOD', 'GET'));
 		
-		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));
-		}
-
-		return $this->method = $method;
-	}
-
-	/**
-	 * Sets the request method.
-	 *
-	 * @param  string  $method  
-	 *
-	 * @return string
-	 */
-	public function setMethod(string $method) 
-	{
-		$this->method = null;
-
-		$this->server->set('REQUEST_METHOD', $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 string
+     */
+    public function setMethod(string $method) 
+    {
+        $this->method = null;
+
+        $this->server->set('REQUEST_METHOD', $method);
+    }
 	
-	/**
-	 * Determine if the current request URI matches a pattern.
-	 * 
-	 * @param  mixed  ...$patterns
-	 * 
-	 * @return bool
-	 */
-	public function is(...$patterns)
-	{
-		$path = $this->decodedPath();
+    /**
+     * Determine if the current request URI matches a pattern.
+     * 
+     * @param  mixed  ...$patterns
+     * 
+     * @return bool
+     */
+    public function is(...$patterns)
+    {
+        $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)
-	{
-		return $this->route() && $this->route()->is(...$patterns);
-	}
-
-	/**
-	 * Get the route handling the request.
-	 * 
-	 * @param  string|null  $param  (null by default)
-	 * @param  mixed  $default  (null by default)
-	 * 
-	 * @return \Syscodes\Routing\Route|object|string|null
-	 */
-	public function route($param = null, $default = null)
-	{
-		$route = $this->getRoute();
-
-		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()
-	{
-		return rawurldecode($this->path());
-	}
-
-	/**
-	 * Get the current path info for the request.
-	 * 
-	 * @return string
-	 */
-	public function path()
-	{
-		$path = trim($this->getPathInfo(), '/');
-
-		return $path == '' ? '/' : $path;
-	}
-
-	/**
-	 * Retunrs the request body content.
-	 * 
-	 * @return string
-	 */
-	public function getContent()
-	{
-		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()
-	{
-		if (null === $this->pathInfo)
-		{
-			$this->pathInfo = $this->http->parsePathInfo();
-		}
-
-		return $this->pathInfo;
-	}
-
-	/**
-	 * Returns the root URL from which this request is executed.
-	 * 
-	 * @return string
-	 */
-	public function getBaseUrl()
-	{
-		if (null === $this->baseUrl)
-		{
-			$this->baseUrl = $this->http->parseBaseUrl();
-		}
-
-		return $this->baseUrl;
-	}
-
-	/**
-	 * Returns the requested URI.
-	 * 
-	 * @return string
-	 */
-	public function getRequestUri()
-	{
-		if (null === $this->requestToUri) {
-			$this->requestToUri = $this->http->parseRequestUri();
-		}
-
-		return $this->requestToUri;
-	}
+        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)
+    {
+        return $this->route() && $this->route()->is(...$patterns);
+    }
+
+    /**
+     * Get the route handling the request.
+     * 
+     * @param  string|null  $param  (null by default)
+     * @param  mixed  $default  (null by default)
+     * 
+     * @return \Syscodes\Routing\Route|object|string|null
+     */
+    public function route($param = null, $default = null)
+    {
+        $route = $this->getRoute();
+
+        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()
+    {
+        return rawurldecode($this->path());
+    }
+
+    /**
+     * Get the current path info for the request.
+     * 
+     * @return string
+     */
+    public function path()
+    {
+        $path = trim($this->getPathInfo(), '/');
+
+        return $path == '' ? '/' : $path;
+    }
+
+    /**
+     * Retunrs the request body content.
+     * 
+     * @return string
+     */
+    public function getContent()
+    {
+        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()
+    {
+        if (null === $this->pathInfo)
+        {
+            $this->pathInfo = $this->http->parsePathInfo();
+        }
+
+        return $this->pathInfo;
+    }
+
+    /**
+     * Returns the root URL from which this request is executed.
+     * 
+     * @return string
+     */
+    public function getBaseUrl()
+    {
+        if (null === $this->baseUrl)
+        {
+            $this->baseUrl = $this->http->parseBaseUrl();
+        }
+
+        return $this->baseUrl;
+    }
+
+    /**
+     * Returns the requested URI.
+     * 
+     * @return string
+     */
+    public function getRequestUri()
+    {
+        if (null === $this->requestToUri) {
+            $this->requestToUri = $this->http->parseRequestUri();
+        }
+
+        return $this->requestToUri;
+    }
 	
-	/**
-	 * Gets the request's scheme.
-	 * 
-	 * @return string
-	 */
-	public function getScheme()
-	{
-		return $this->secure() ? $this->uri->setScheme('https') : $this->uri->setScheme('http');
-	}
-
-	/**
-	 * Returns the host name.
-	 * 
-	 * @return void
-	 */
-	public function getHost()
-	{
-		if ($forwardedHost = $this->server->get('HTTP_X_FORWARDED_HOST')) {
-			$host = $forawardedHost[0];
-		} elseif ( ! $host = $this->headers->get('HOST')) {
-			if ( ! $host = $this->server->get('SERVER_NAME')) {
-				$host = $this->server->get('REMOTE_ADDR', '');
-			}
-		}
-
-		$host = $_SERVER['SERVER_NAME'];
-
-		$host = strtolower(preg_replace('/:\d+$/', '', trim(($host))));
+    /**
+     * Gets the request's scheme.
+     * 
+     * @return string
+     */
+    public function getScheme()
+    {
+        return $this->secure() ? $this->uri->setScheme('https') : $this->uri->setScheme('http');
+    }
+
+    /**
+     * Returns the host name.
+     * 
+     * @return void
+     */
+    public function getHost()
+    {
+        if ($forwardedHost = $this->server->get('HTTP_X_FORWARDED_HOST')) {
+            $host = $forawardedHost[0];
+        } elseif ( ! $host = $this->headers->get('HOST')) {
+            if ( ! $host = $this->server->get('SERVER_NAME')) {
+                $host = $this->server->get('REMOTE_ADDR', '');
+            }
+        }
+
+        $host = $_SERVER['SERVER_NAME'];
+
+        $host = strtolower(preg_replace('/:\d+$/', '', trim(($host))));
 		
-		return $host;
-	}
-
-	/**
-	 * Returns the port on which the request is made.
-	 * 
-	 * @return int
-	 */
-	public function getPort()
-	{
-		if ( ! $this->server->get('HTTP_HOST')) 
-		{
-			return $this->server->get('SERVER_PORT');
-		}
+        return $host;
+    }
+
+    /**
+     * Returns the port on which the request is made.
+     * 
+     * @return int
+     */
+    public function getPort()
+    {
+        if ( ! $this->server->get('HTTP_HOST')) 
+        {
+            return $this->server->get('SERVER_PORT');
+        }
 		
-		return 'https' === $this->getScheme() ? $this->uri->setPort(443) : $this->uri->setPort(80);
-	}
-
-	/**
-	 * Returns the HTTP host being requested.
-	 * 
-	 * @return string
-	 */
-	public function getHttpHost()
-	{
-		$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()
-	{
-		return $this->getScheme().'://'.$this->getHttpHost();
-	}
-
-	/**
-	 * Get the root URL for the application.
-	 * 
-	 * @return string
-	 */
-	public function root()
-	{
-		return rtrim($this->getSchemeWithHttpHost().$this->getBaseUrl(), '/');
-	}
-
-	/**
-	 * Get the URL for the request.
-	 * 
-	 * @return string
-	 */
-	public function url()
-	{
-		return trim(preg_replace('/\?.*/', '', $this->get()), '/');
-	}
-
-	/**
-	 * Returns the referer.
-	 * 
-	 * @param  string  $default
-	 * 
-	 * @return string
-	 */
-	public function referer(string $default = '')
-	{
-		return $this->server->get('HTTP_REFERER', $default);
-	}
+        return 'https' === $this->getScheme() ? $this->uri->setPort(443) : $this->uri->setPort(80);
+    }
+
+    /**
+     * Returns the HTTP host being requested.
+     * 
+     * @return string
+     */
+    public function getHttpHost()
+    {
+        $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()
+    {
+        return $this->getScheme().'://'.$this->getHttpHost();
+    }
+
+    /**
+     * Get the root URL for the application.
+     * 
+     * @return string
+     */
+    public function root()
+    {
+        return rtrim($this->getSchemeWithHttpHost().$this->getBaseUrl(), '/');
+    }
+
+    /**
+     * Get the URL for the request.
+     * 
+     * @return string
+     */
+    public function url()
+    {
+        return trim(preg_replace('/\?.*/', '', $this->get()), '/');
+    }
+
+    /**
+     * Returns the referer.
+     * 
+     * @param  string  $default
+     * 
+     * @return string
+     */
+    public function referer(string $default = '')
+    {
+        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()
-	{
-		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)
-	{
-		return $this->server->get('HTTP_USER_AGENT', $default);
-	}
-
-	/**
-	 * Get the route resolver.
-	 * 
-	 * @return \Syscodes\Routing\Router
-	 */
-	public function getRoute()
-	{
-		return app('router');
-	}
-
-	/**
-	 * Get an element from the request.
-	 * 
-	 * @return string[]
-	 */
-	public function __get($key)
-	{
-		$all = $this->server->all();
-
-		if (array_key_exists($key, $all)) {
-			return $all[$key];
-		} else {
-			return $key;
-		}
-	}
-
-	/**
-	 * Returns the Request as an HTTP string.
-	 * 
-	 * @return string
-	 */
-	public function __toString()
-	{
-		try
-		{
-			$content = $this->getContent();
-		}
-		catch (LogicException $e)
-		{
-			if (PHP_VERSION_ID > 70400)
-			{
-				throw $e;
-			}
-
-			return trigger_error($e, E_USER_ERROR);
-		}
-
-		$cookieHeader = '';
-		$cookies      = [];
-
-		foreach ($this->cookies as $key => $value)
-		{
-			$cookies[]= "{$key} = {$value}";
-		}
-
-		if ( ! empty($cookies))
-		{
-			$cookieHeader = 'Cookie: '.implode('; ', $cookies)."\r\n";
-		}
+    /**
+     * Attempts to detect if the current connection is secure through 
+     * over HTTPS protocol.
+     * 
+     * @return bool
+     */
+    public function secure()
+    {
+        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)
+    {
+        return $this->server->get('HTTP_USER_AGENT', $default);
+    }
+
+    /**
+     * Get the route resolver.
+     * 
+     * @return \Syscodes\Routing\Router
+     */
+    public function getRoute()
+    {
+        return app('router');
+    }
+
+    /**
+     * Get an element from the request.
+     * 
+     * @return string[]
+     */
+    public function __get($key)
+    {
+        $all = $this->server->all();
+
+        if (array_key_exists($key, $all)) {
+            return $all[$key];
+        } else {
+            return $key;
+        }
+    }
+
+    /**
+     * Returns the Request as an HTTP string.
+     * 
+     * @return string
+     */
+    public function __toString()
+    {
+        try
+        {
+            $content = $this->getContent();
+        }
+        catch (LogicException $e)
+        {
+            if (PHP_VERSION_ID > 70400)
+            {
+                throw $e;
+            }
+
+            return trigger_error($e, E_USER_ERROR);
+        }
+
+        $cookieHeader = '';
+        $cookies      = [];
+
+        foreach ($this->cookies as $key => $value)
+        {
+            $cookies[]= "{$key} = {$value}";
+        }
+
+        if ( ! empty($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;
-	}
-
-	/**
-	 * Clones the current request.
-	 * 
-	 * @return void
-	 */
-	public function __clone()
-	{
-		$this->request = clone $this->request;
-		$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;
+    }
+
+    /**
+     * Clones the current request.
+     * 
+     * @return void
+     */
+    public function __clone()
+    {
+        $this->request = clone $this->request;
+        $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

Braces +1 added lines, -2 removed lines

@@ -860,8 +860,7 @@
 		try
 		{
 			$content = $this->getContent();
-		}
-		catch (LogicException $e)
+		} catch (LogicException $e)
 		{
 			if (PHP_VERSION_ID > 70400)
 			{