lenevor / syscodes

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/Response.php

Indentation +303 added lines, -303 removed lines

@@ -40,314 +40,314 @@
  */
 class Response extends Status 
 {
-	use ResponseTrait;
-
-	/**
-	 * Sets up the response with a content and a status code.
-	 *
-	 * @param  mixed  $content  The response content 
-	 * @param  int  $status  The response status  (200 by default)
-	 * @param  array  $headers  Array of HTTP headers for this response
-	 *
-	 * @return string
-	 */
-	public function __construct($content = '', int $status = 200, array $headers = [])
-	{
-		$this->setContent($content);
-		$this->setStatusCode($status);
+    use ResponseTrait;
+
+    /**
+     * Sets up the response with a content and a status code.
+     *
+     * @param  mixed  $content  The response content 
+     * @param  int  $status  The response status  (200 by default)
+     * @param  array  $headers  Array of HTTP headers for this response
+     *
+     * @return string
+     */
+    public function __construct($content = '', int $status = 200, array $headers = [])
+    {
+        $this->setContent($content);
+        $this->setStatusCode($status);
 		
-		$this->server  = new Server($_SERVER);
-		$this->headers = new Headers($headers);
-	}
-
-	/**
-	 * Creates an instance of the same response class for rendering contents to the content, 
-	 * status code and headers.
-	 *
-	 * @param  mixed  $content  The response content  
-	 * @param  int  $status  The HTTP response status for this response  (200 by default)
-	 * @param  array  $headers  Array of HTTP headers for this response
-	 *
-	 * @return static
-	 */
-	public static function render($content = '', $status = 200, $headers = [])
-	{
-		return new static($content, $status, $headers);
-	}
-
-	/**
-	 * Gets the current response content.
-	 * 
-	 * @return string
-	 */
-	public function getContent()
-	{
-		return $this->content;
-	}
-
-	/**
-	 * Gets the response status code.
-	 *
-	 * The status code is a 3-digit code to specify server response results to the browser.
-	 *
-	 * @return int
-	 *
-	 * @throws \BadMethodCallException
-	 */
-	public function getStatusCode()
-	{
-		if (empty($this->status))
-		{
-			throw new BadMethodCallException('HTTP Response is missing a status code.');
-		}
-
-		return $this->status;
-	}
-
-	/**
-	 * Sends the headers if they haven't already been sent. 
-	 * Returns whether they were sent or not.
-	 *
-	 * @return bool
-	 *
-	 * @uses   \Syscodes\Http\Http
-	 */
-	public function sendHeaders()
-	{
-		// Have the headers already been sent?
-		if (headers_sent())
-		{
-			return $this;
-		}
-
-		// Headers
-		foreach ($this->headers->allPreserveCase() as $name => $values) 
-		{
-			$replace = 0 === strcasecmp($name, 'Content-Type');
-
-			foreach ($values as $value)
-			{
-				header($name.': '. $value, $replace, $this->status);
-			}
-		}
-
-		// Status
-		if ( ! empty($_SERVER['FCGI_SERVER_VERSION']))
-		{
-			// Send the protocol/status line first, FCGI servers need different status header
-			header(sprintf('Status: %s %s', $this->status, $this->statusText));
-		}
-		else
-		{
-			$this->protocol = (string) $this->server->get('SERVER_PROTOCOL') ?: 'HTTP/1.1';
-			header(sprintf('%s %s %s', $this->protocol, $this->status, $this->statusText), true, $this->status);
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Sends content for the current web response.
-	 * 
-	 * @return $this
-	 */
-	public function sendContent()
-	{
-		echo $this->content;
-
-		return $this;
-	}
-
-	/**
-	 * Sends the response to the output buffer. Optionally, headers will be sent. 
-	 *
-	 * @param  bool  $sendHeader  Whether or not to send the defined HTTP headers
-	 *
-	 * @return $this
-	 */
-	public function send($sendHeader = false)
-	{
-		if ($sendHeader)
-		{
-			$this->sendHeaders();
-		}
-
-		if (null !== $this->content) 
-		{
-			$this->sendContent();
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Sends the content of the message to the browser.
-	 *
-	 * @param  mixed  $content  The response content
-	 *
-	 * @return $this
-	 */
-	public function setContent($content)
-	{
-		if ($content !== null && ! is_string($content) && ! is_numeric($content) && ! is_callable([$content, '__toString'])) 
-		{
-			throw new UnexpectedValueException(sprintf('The Response content must be a string or object implementing __toString(), "%s" given.', gettype($content)));
-		}
-
-		if ($content instanceof JsonSerializable || is_array($content))
-		{
-			$this->header('Content-Type', 'application/json');
-
-			$content = json_encode($content);
-		}
-		elseif ($content instanceof Renderable)
-		{
-			$content = $content->render();
-		}
+        $this->server  = new Server($_SERVER);
+        $this->headers = new Headers($headers);
+    }
+
+    /**
+     * Creates an instance of the same response class for rendering contents to the content, 
+     * status code and headers.
+     *
+     * @param  mixed  $content  The response content  
+     * @param  int  $status  The HTTP response status for this response  (200 by default)
+     * @param  array  $headers  Array of HTTP headers for this response
+     *
+     * @return static
+     */
+    public static function render($content = '', $status = 200, $headers = [])
+    {
+        return new static($content, $status, $headers);
+    }
+
+    /**
+     * Gets the current response content.
+     * 
+     * @return string
+     */
+    public function getContent()
+    {
+        return $this->content;
+    }
+
+    /**
+     * Gets the response status code.
+     *
+     * The status code is a 3-digit code to specify server response results to the browser.
+     *
+     * @return int
+     *
+     * @throws \BadMethodCallException
+     */
+    public function getStatusCode()
+    {
+        if (empty($this->status))
+        {
+            throw new BadMethodCallException('HTTP Response is missing a status code.');
+        }
+
+        return $this->status;
+    }
+
+    /**
+     * Sends the headers if they haven't already been sent. 
+     * Returns whether they were sent or not.
+     *
+     * @return bool
+     *
+     * @uses   \Syscodes\Http\Http
+     */
+    public function sendHeaders()
+    {
+        // Have the headers already been sent?
+        if (headers_sent())
+        {
+            return $this;
+        }
+
+        // Headers
+        foreach ($this->headers->allPreserveCase() as $name => $values) 
+        {
+            $replace = 0 === strcasecmp($name, 'Content-Type');
+
+            foreach ($values as $value)
+            {
+                header($name.': '. $value, $replace, $this->status);
+            }
+        }
+
+        // Status
+        if ( ! empty($_SERVER['FCGI_SERVER_VERSION']))
+        {
+            // Send the protocol/status line first, FCGI servers need different status header
+            header(sprintf('Status: %s %s', $this->status, $this->statusText));
+        }
+        else
+        {
+            $this->protocol = (string) $this->server->get('SERVER_PROTOCOL') ?: 'HTTP/1.1';
+            header(sprintf('%s %s %s', $this->protocol, $this->status, $this->statusText), true, $this->status);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Sends content for the current web response.
+     * 
+     * @return $this
+     */
+    public function sendContent()
+    {
+        echo $this->content;
+
+        return $this;
+    }
+
+    /**
+     * Sends the response to the output buffer. Optionally, headers will be sent. 
+     *
+     * @param  bool  $sendHeader  Whether or not to send the defined HTTP headers
+     *
+     * @return $this
+     */
+    public function send($sendHeader = false)
+    {
+        if ($sendHeader)
+        {
+            $this->sendHeaders();
+        }
+
+        if (null !== $this->content) 
+        {
+            $this->sendContent();
+        }
+
+        return $this;
+    }
+
+    /**
+     * Sends the content of the message to the browser.
+     *
+     * @param  mixed  $content  The response content
+     *
+     * @return $this
+     */
+    public function setContent($content)
+    {
+        if ($content !== null && ! is_string($content) && ! is_numeric($content) && ! is_callable([$content, '__toString'])) 
+        {
+            throw new UnexpectedValueException(sprintf('The Response content must be a string or object implementing __toString(), "%s" given.', gettype($content)));
+        }
+
+        if ($content instanceof JsonSerializable || is_array($content))
+        {
+            $this->header('Content-Type', 'application/json');
+
+            $content = json_encode($content);
+        }
+        elseif ($content instanceof Renderable)
+        {
+            $content = $content->render();
+        }
 		
-		$this->content = $content ?? '';
-
-		return $this;
-	}
-
-	/**
-	 * Prepares the Response before it is sent to the client.
-	 * 
-	 * @param  \Syscodes\Http\Request  $request
-	 * 
-	 * @return $this
-	 */
-	public function prepare($request)
-	{
-		$headers = $this->headers;
-
-		if ($this->isInformational() || $this->isEmpty()) 
-		{
-			$this->setContent(null);
-			$headers->remove('Content-Type');
-			$headers->remove('Content-Length');
-		}
-
-		return $this;
-	}
-
-	/**
-	* Sets the response status code.
-	*
-	* @param  int  $code  The status code
-	* @param  string|null  $text  The status text
-	*
-	* @return $this
-	*
-	* @throws \InvalidArgumentException
-	*/
-	public function setStatusCode(int $code, $text = null)
-	{
-		$this->status = $code; 
-
-		// Valid range?
-		if ($this->isInvalid())
-		{
-			throw new InvalidArgumentException(__('response.statusCodeNotValid', ['code' => $code]));			
-		}
-
-		// Check if you have an accepted status code if not shows to a message of unknown status
-		if (null === $text)
-		{
-			$this->statusText = isset($this->statusCodes[$code]) ? $this->statusCodes[$code] : __('response.UnknownStatus');
-
-			return $this;
-		}
-
-		if (false === $text)
-		{
-			$this->statusText = '';
-
-			return $this;
-		}
-
-		$this->statusText = $text;
-
-		return $this;
-	}
-
-	/**
-	 * Is response invalid?
-	 * 
-	 * @final
-	 * 
-	 * @return void
-	 */
-	public function isInvalid(): bool
-	{
-		return $this->status < 100 || $this->status >= 600;
-	}
-
-	/**
-	 * Is response informative?
-	 * 
-	 * @final
-	 * 
-	 * @return void
-	 */
-	public function isInformational()
-	{
-		return $this->status >= 100 && $this->status < 200;
-	}
+        $this->content = $content ?? '';
+
+        return $this;
+    }
+
+    /**
+     * Prepares the Response before it is sent to the client.
+     * 
+     * @param  \Syscodes\Http\Request  $request
+     * 
+     * @return $this
+     */
+    public function prepare($request)
+    {
+        $headers = $this->headers;
+
+        if ($this->isInformational() || $this->isEmpty()) 
+        {
+            $this->setContent(null);
+            $headers->remove('Content-Type');
+            $headers->remove('Content-Length');
+        }
+
+        return $this;
+    }
+
+    /**
+     * Sets the response status code.
+     *
+     * @param  int  $code  The status code
+     * @param  string|null  $text  The status text
+     *
+     * @return $this
+     *
+     * @throws \InvalidArgumentException
+     */
+    public function setStatusCode(int $code, $text = null)
+    {
+        $this->status = $code; 
+
+        // Valid range?
+        if ($this->isInvalid())
+        {
+            throw new InvalidArgumentException(__('response.statusCodeNotValid', ['code' => $code]));			
+        }
+
+        // Check if you have an accepted status code if not shows to a message of unknown status
+        if (null === $text)
+        {
+            $this->statusText = isset($this->statusCodes[$code]) ? $this->statusCodes[$code] : __('response.UnknownStatus');
+
+            return $this;
+        }
+
+        if (false === $text)
+        {
+            $this->statusText = '';
+
+            return $this;
+        }
+
+        $this->statusText = $text;
+
+        return $this;
+    }
+
+    /**
+     * Is response invalid?
+     * 
+     * @final
+     * 
+     * @return void
+     */
+    public function isInvalid(): bool
+    {
+        return $this->status < 100 || $this->status >= 600;
+    }
+
+    /**
+     * Is response informative?
+     * 
+     * @final
+     * 
+     * @return void
+     */
+    public function isInformational()
+    {
+        return $this->status >= 100 && $this->status < 200;
+    }
 	
-	/**
-	 * Is the response a redirect?
-	 * 
-	 * @final
-	 * 
-	 * @return void
-	 */
-	public function isRedirection()
-	{
-		return $this->status >= 300 && $this->status < 400;
-	}
+    /**
+     * Is the response a redirect?
+     * 
+     * @final
+     * 
+     * @return void
+     */
+    public function isRedirection()
+    {
+        return $this->status >= 300 && $this->status < 400;
+    }
 	
-	/**
-	 * Is the response empty?
-	 * 
-	 * @final
-	 * 
-	 * @return void
-	 */
-	public function isEmpty()
-	{
-		return in_array($this->status, [204, 304]);
-	}
+    /**
+     * Is the response empty?
+     * 
+     * @final
+     * 
+     * @return void
+     */
+    public function isEmpty()
+    {
+        return in_array($this->status, [204, 304]);
+    }
 	
-	/**
-	 * Is the response a redirect of some form?
-	 * 
-	 * @return bool
-	 */
-	public function isRedirect()
-	{
-		return in_array($this->status, [301, 302, 303, 307, 308]);
-	}
+    /**
+     * Is the response a redirect of some form?
+     * 
+     * @return bool
+     */
+    public function isRedirect()
+    {
+        return in_array($this->status, [301, 302, 303, 307, 308]);
+    }
 	
-	/**
-	 * Returns the Response as an HTTP string.
-	 * 
-	 * @return string
-	 */
-	public function __toString()
-	{
-		return sprintf('%s %s %s', $this->protocol, $this->status, $this->statusText)."\r\n".
-			$this->headers."\r\n".
-			$this->getContent();
-	}
+    /**
+     * Returns the Response as an HTTP string.
+     * 
+     * @return string
+     */
+    public function __toString()
+    {
+        return sprintf('%s %s %s', $this->protocol, $this->status, $this->statusText)."\r\n".
+            $this->headers."\r\n".
+            $this->getContent();
+    }
 	
-	/**
-	 * Clone the current Response instance.
-	 * 
-	 * @return void
-	 */
-	public function __clone()
-	{
-		$this->headers = clone $this->headers;
-	}
+    /**
+     * Clone the current Response instance.
+     * 
+     * @return void
+     */
+    public function __clone()
+    {
+        $this->headers = clone $this->headers;
+    }
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -127,7 +127,7 @@
 
 			foreach ($values as $value)
 			{
-				header($name.': '. $value, $replace, $this->status);
+				header($name.': '.$value, $replace, $this->status);
 			}
 		}
 

Braces +2 added lines, -4 removed lines

@@ -136,8 +136,7 @@ 
 		{
 			// Send the protocol/status line first, FCGI servers need different status header
 			header(sprintf('Status: %s %s', $this->status, $this->statusText));
-		}
-		else
+		} else
 		{
 			$this->protocol = (string) $this->server->get('SERVER_PROTOCOL') ?: 'HTTP/1.1';
 			header(sprintf('%s %s %s', $this->protocol, $this->status, $this->statusText), true, $this->status);
@@ -199,8 +198,7 @@ 
 			$this->header('Content-Type', 'application/json');
 
 			$content = json_encode($content);
-		}
-		elseif ($content instanceof Renderable)
+		} elseif ($content instanceof Renderable)
 		{
 			$content = $content->render();
 		}

src/components/Http/JsonResponse.php

Braces +3 added lines, -6 removed lines

@@ -142,16 +142,13 @@
         if ($data instanceof Jsonable)
         {
             $this->data = $data->toJson($this->jsonEncodingOptions);
-        }
-        elseif ($data instanceof JsonSerializable)
+        } elseif ($data instanceof JsonSerializable)
         {
             $this->data = json_encode($data->jsonSerialize(), $this->jsonEncodingOptions);
-        }
-        elseif ($data instanceof Arrayable)
+        } elseif ($data instanceof Arrayable)
         {
             $this->data = json_encode($data->toArray(), $this->jsonEncodingOptions);
-        }
-        else
+        } else
         {
             $this->data = json_encode($data, $this->jsonEncodingOptions);
         }

src/components/Http/Request.php

Indentation +849 added lines, -849 removed lines

@@ -40,866 +40,866 @@
  */
 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 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 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());
-
-		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());
+
+        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;
-	}
-
-	/**
-	 * A convenience method that grabs the raw input stream and decodes
-	 * the JSON into an array.
-	 * 
-	 * @param  bool  $assoc  (false by default)
-	 * @param  int  $depth  (512 by default)
-	 * @param  int  $options  (0 by default)
-	 * 
-	 * @return mixed
-	 */
-	public function getJSON(bool $assoc = false, int $depth = 512, int $options = 0)
-	{
-		return json_decode($this->content, $assoc, $depth, $options);
-	}
-
-	/**
-	 * 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;
+    }
+
+    /**
+     * A convenience method that grabs the raw input stream and decodes
+     * the JSON into an array.
+     * 
+     * @param  bool  $assoc  (false by default)
+     * @param  int  $depth  (512 by default)
+     * @param  int  $options  (0 by default)
+     * 
+     * @return mixed
+     */
+    public function getJSON(bool $assoc = false, int $depth = 512, int $options = 0)
+    {
+        return json_decode($this->content, $assoc, $depth, $options);
+    }
+
+    /**
+     * 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 ( ! $host = $this->server->get('SERVER_NAME'))
-		{
-			$host = $this->server->get('SERVER_ADDR', '');
-		}
-
-		$host = strtolower(preg_replace('/:\d+$/', '', $this->uri->setHost($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');
-		}
+    /**
+     * 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 ( ! $host = $this->server->get('SERVER_NAME'))
+        {
+            $host = $this->server->get('SERVER_ADDR', '');
+        }
+
+        $host = strtolower(preg_replace('/:\d+$/', '', $this->uri->setHost($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 '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();
-		$host   = $this->getHost();
-		$port   = $this->getPort();
-
-		if (('http' === $scheme && 80 === $port) || ('https' === $scheme && 443 === $port))		
-		{
-			return $host;
-		}
-
-		return $host.':'.$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();
+        $host   = $this->getHost();
+        $port   = $this->getPort();
+
+        if (('http' === $scheme && 80 === $port) || ('https' === $scheme && 443 === $port))		
+        {
+            return $host;
+        }
+
+        return $host.':'.$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

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))

Braces +6 added lines, -12 removed lines

@@ -392,8 +392,7 @@ 
 			$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 
+		} else 
 		{
 			if ( ! $this->http->isCli())
 			{
@@ -456,8 +455,7 @@ 
 			{
 				Locale::setDefault($locale);
 			}
-		}
-		catch (Exception $exception) {}
+		} catch (Exception $exception) {}
 
 		return $this;
 	}
@@ -795,12 +793,10 @@ 
 		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')
+		} 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')
+		} elseif ( ! empty($this->server->get('HTTP_FRONT_END_HTTPS')) && strtolower($this->server->get('HTTP_FRONT_END_HTTPS')) !== 'off')
 		{
 			return true;
 		}
@@ -842,8 +838,7 @@ 
 		if (array_key_exists($key, $all))
 		{
 			return $all[$key];
-		}
-		else
+		} else
 		{
 			return $key;
 		}
@@ -859,8 +854,7 @@ 
 		try
 		{
 			$content = $this->getContent();
-		}
-		catch (LogicException $e)
+		} catch (LogicException $e)
 		{
 			if (PHP_VERSION_ID > 70400)
 			{

src/components/Http/RedirectResponse.php

Indentation +7 added lines, -7 removed lines

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

src/components/Http/Exceptions/PostTooLargeHttpException.php

Indentation +29 added lines, -29 removed lines

@@ -34,35 +34,35 @@
  */
 class PostTooLargeHttpException extends HttpException
 {
-	/**
-	 * Get the HTTP status code.
-	 * 
-	 * @var int $code
-	 */
-	protected $code = 413;
+    /**
+     * Get the HTTP status code.
+     * 
+     * @var int $code
+     */
+    protected $code = 413;
 
-	/**
-	 * Initialize constructor. 
-	 * 
-	 * @param  string|null  $message  (null by default) 
-	 * @param  \Throwable|null  $previous  (null by default)
-	 * @param  int  $code  (0 by default)
-	 * @param  array  $headers
-	 * 
-	 * @return void
-	 */
-	public function __construct(
-		string $message = null, 
-		Throwable $previous = null, 
-		int $code = 0, 
-		array $headers = []
-	) {
+    /**
+     * Initialize constructor. 
+     * 
+     * @param  string|null  $message  (null by default) 
+     * @param  \Throwable|null  $previous  (null by default)
+     * @param  int  $code  (0 by default)
+     * @param  array  $headers
+     * 
+     * @return void
+     */
+    public function __construct(
+        string $message = null, 
+        Throwable $previous = null, 
+        int $code = 0, 
+        array $headers = []
+    ) {
         parent::__construct(
-			$this->code, 
-			$message, 
-			$previous, 
-			$headers, 
-			$code
-		);
-	}
+            $this->code, 
+            $message, 
+            $previous, 
+            $headers, 
+            $code
+        );
+    }
 }
\ No newline at end of file

src/components/Http/URI.php

Indentation +513 added lines, -513 removed lines

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

Spacing +1 added lines, -1 removed lines

@@ -258,7 +258,7 @@
 	 */
 	public function getSegments()
 	{
-		return array_values(array_filter($this->segments, function ($value) {
+		return array_values(array_filter($this->segments, function($value) {
 			return $value != '';
 		}));
 	}

Braces +1 added lines, -2 removed lines

@@ -496,8 +496,7 @@
 		if (isset($parts['scheme']))
 		{
 			$this->SetScheme(rtrim($parts['scheme'], ':/'));
-		}
-		else
+		} else
 		{
 			$this->setScheme('http');
 		}

src/components/Http/Http.php

Indentation +295 added lines, -295 removed lines

@@ -32,307 +32,307 @@
  */
 class Http
 {
-	/**
-	 * Determines if this request was made from the command line (CLI).
-	 * 
-	 * @return bool
-	 */
-	public function isCli()
-	{
-		return (PHP_SAPI === 'cli' || defined('STDIN'));
-	}
-
-	/**
-	 * Return's the protocol that the request was made with.
-	 *
-	 * @return string
-	 */
-	public function protocol()
-	{
-		if ($this->server('HTTPS') == 'on' ||
-			$this->server('HTTPS') == 1 ||
-			$this->server('SERVER_PORT') == 443 ||
-			(config('security.allow-x-headers', false) && $this->server('HTTP_X_FORWARDED_PROTO') == 'https') ||
-			(config('security.allow-x-headers', false) && $this->server('HTTP_X_FORWARDED_PORT') == 443))
-		{
-			return 'https';
-		}
-
-		return 'http';
-	}
-
-	/**
-	 * Fetch an item from the COOKIE array.
-	 *
-	 * @param  string  $index  The index key
-	 * @param  mixed  $default  The default value
-	 *
-	 * @return string|array
-	 */
-	public function cookie($index = null, $default = null)
-	{
-		return (func_num_args() === 0) ? $_COOKIE : Arr::get($_COOKIE, strtoupper($index), $default);
-	}
-
-	/**
-	 * Fetch an item from the FILE array.
-	 *
-	 * @param  string  $index  The index key
-	 * @param  mixed  $default  The default value
-	 *
-	 * @return string|array
-	 */
-	public function file($index = null, $default = null)
-	{
-		return (func_num_args() === 0) ? $_FILES : Arr::get($_FILES, strtoupper($index), $default);
-	}
-
-	/**
-	 * Fetch an item from the SERVER array.
-	 *
-	 * @param  string  $index  The index key
-	 * @param  mixed  $default  The default value
-	 *
-	 * @return string|array
-	 */
-	public function server($index = null, $default = null)
-	{
-		return (func_num_args() === 0) ? $_SERVER : Arr::get($_SERVER, strtoupper($index), $default);
-	}
+    /**
+     * Determines if this request was made from the command line (CLI).
+     * 
+     * @return bool
+     */
+    public function isCli()
+    {
+        return (PHP_SAPI === 'cli' || defined('STDIN'));
+    }
+
+    /**
+     * Return's the protocol that the request was made with.
+     *
+     * @return string
+     */
+    public function protocol()
+    {
+        if ($this->server('HTTPS') == 'on' ||
+            $this->server('HTTPS') == 1 ||
+            $this->server('SERVER_PORT') == 443 ||
+            (config('security.allow-x-headers', false) && $this->server('HTTP_X_FORWARDED_PROTO') == 'https') ||
+            (config('security.allow-x-headers', false) && $this->server('HTTP_X_FORWARDED_PORT') == 443))
+        {
+            return 'https';
+        }
+
+        return 'http';
+    }
+
+    /**
+     * Fetch an item from the COOKIE array.
+     *
+     * @param  string  $index  The index key
+     * @param  mixed  $default  The default value
+     *
+     * @return string|array
+     */
+    public function cookie($index = null, $default = null)
+    {
+        return (func_num_args() === 0) ? $_COOKIE : Arr::get($_COOKIE, strtoupper($index), $default);
+    }
+
+    /**
+     * Fetch an item from the FILE array.
+     *
+     * @param  string  $index  The index key
+     * @param  mixed  $default  The default value
+     *
+     * @return string|array
+     */
+    public function file($index = null, $default = null)
+    {
+        return (func_num_args() === 0) ? $_FILES : Arr::get($_FILES, strtoupper($index), $default);
+    }
+
+    /**
+     * Fetch an item from the SERVER array.
+     *
+     * @param  string  $index  The index key
+     * @param  mixed  $default  The default value
+     *
+     * @return string|array
+     */
+    public function server($index = null, $default = null)
+    {
+        return (func_num_args() === 0) ? $_SERVER : Arr::get($_SERVER, strtoupper($index), $default);
+    }
 	
-	/**
-	 * Gets the URI Protocol based setting, will attempt to detect the path 
-	 * portion of the current URI.
-	 * 
-	 * @param  string  $protocol
-	 * 
-	 * @return string
-	 */
-	public function detectPath(string $protocol = '') 
-	{
-		if (empty($protocol))
-		{
-			$protocol = 'REQUEST_URI';
-		}
-
-		switch($protocol)
-		{
-			case 'REQUEST_URI':
-				$path = $this->parseRequestUri();
-				break;
-			case 'QUERY_STRING':
-				$path = $this->parseQueryString();
-				break;
-			case 'PATH_INFO':
-			default:
-				$path = $this->server($protocol) ?? $this->parseRequestUri();
-				break;
-		}
-
-		return $path;
-	}
-
-	/**
-	 * Filters a value from the start of a string in this case the passed URI string.
-	 *
-	 * @return string
-	 */
-	protected function parseRequestUri()
-	{
-		if ( ! isset($_SERVER['REQUEST_URI'], $_SERVER['SCRIPT_NAME']))
-		{
-			return '';
-		}
-
-		$requestURI = $this->server('REQUEST_URI') ?? '/';
-		$components = parse_url($requestURI);
-		$query      = $components['query'] ?? '';
-		$uri        = $components['path'] ?? '';
-
-		// If the search value is at the start
-		if (isset($this->server('SCRIPT_NAME')[0]))
-		{
-			if (0 === strpos($uri, $this->server('SCRIPT_NAME')))
-			{
-				$uri = (string) substr($uri, strlen($this->server('SCRIPT_NAME')));
-			}
-			elseif (0 < strpos($uri, $this->server('SCRIPT_NAME')))
-			{
-				$uri = (string) substr($uri, strpos($uri, $this->server('SCRIPT_NAME')) + strlen($this->server('SCRIPT_NAME')));
-			}
-			elseif (0 === strpos($uri, dirname($this->server('SCRIPT_NAME'))))
-			{
-				$uri = (string) substr($uri, strlen(dirname($this->server('SCRIPT_NAME'))));
-			}
-		}
-
-		// This section ensures that even on servers that require the URI to contain 
-		// the query string (Nginx) is the correctly
-		if ('' === trim($uri, '/') && 0 === strncmp($query, '/', 1)) 
-		{
-			$query					 = explode('?', $query, 2);
-			$uri  					 = $query[0];
-			$_SERVER['QUERY_STRING'] = $query[1] ?? '';
-		}
-		else
-		{
-			$_SERVER['QUERY_STRING'] = $query;
-		}
-
-		// Parses the string into variables
-		parse_str($_SERVER['QUERY_STRING'], $_GET);
-
-		if ('/' === $uri || '' === $uri)
-		{
-			return '';
-		}
-
-		return $this->filterDecode($uri);
-	}
-
-	/**
-	 * Will parse QUERY_STRING and automatically detect the URI from it.
-	 * 
-	 * @return string
-	 */
-	protected function parseQueryString()
-	{
-		$uri = $_SERVER['QUERY_STRING'] ?? @getenv('QUERY_STRING');
-
-		if (trim($uri, '/') === '')
-		{
-			return '';
-		}
-		elseif (0 === strncmp($uri, '/', 1))
-		{
-			$uri    				 = explode('?', $uri, 2);
-			$_SERVER['QUERY_STRING'] = $uri[1] ?? '';
-			$uri    				 = $uri[0] ?? '';
-		}
-
-		parse_str($_SERVER['QUERY_STRING'], $_GET);
-
-		return $this->filterDecode($uri);
-	}
-
-	/**
-	 * Filters the uri string remove any malicious characters and inappropriate slashes.
-	 *
-	 * @param  string  $uri
-	 *
-	 * @return string
-	 */
-	protected function filterDecode($uri)
-	{
-		// Remove all characters except letters,
-		// digits and $-_.+!*'(),{}|\\^~[]`<>#%";/?:@&=.
-		$uri = filter_var(rawurldecode($uri), FILTER_SANITIZE_URL);
+    /**
+     * Gets the URI Protocol based setting, will attempt to detect the path 
+     * portion of the current URI.
+     * 
+     * @param  string  $protocol
+     * 
+     * @return string
+     */
+    public function detectPath(string $protocol = '') 
+    {
+        if (empty($protocol))
+        {
+            $protocol = 'REQUEST_URI';
+        }
+
+        switch($protocol)
+        {
+            case 'REQUEST_URI':
+                $path = $this->parseRequestUri();
+                break;
+            case 'QUERY_STRING':
+                $path = $this->parseQueryString();
+                break;
+            case 'PATH_INFO':
+            default:
+                $path = $this->server($protocol) ?? $this->parseRequestUri();
+                break;
+        }
+
+        return $path;
+    }
+
+    /**
+     * Filters a value from the start of a string in this case the passed URI string.
+     *
+     * @return string
+     */
+    protected function parseRequestUri()
+    {
+        if ( ! isset($_SERVER['REQUEST_URI'], $_SERVER['SCRIPT_NAME']))
+        {
+            return '';
+        }
+
+        $requestURI = $this->server('REQUEST_URI') ?? '/';
+        $components = parse_url($requestURI);
+        $query      = $components['query'] ?? '';
+        $uri        = $components['path'] ?? '';
+
+        // If the search value is at the start
+        if (isset($this->server('SCRIPT_NAME')[0]))
+        {
+            if (0 === strpos($uri, $this->server('SCRIPT_NAME')))
+            {
+                $uri = (string) substr($uri, strlen($this->server('SCRIPT_NAME')));
+            }
+            elseif (0 < strpos($uri, $this->server('SCRIPT_NAME')))
+            {
+                $uri = (string) substr($uri, strpos($uri, $this->server('SCRIPT_NAME')) + strlen($this->server('SCRIPT_NAME')));
+            }
+            elseif (0 === strpos($uri, dirname($this->server('SCRIPT_NAME'))))
+            {
+                $uri = (string) substr($uri, strlen(dirname($this->server('SCRIPT_NAME'))));
+            }
+        }
+
+        // This section ensures that even on servers that require the URI to contain 
+        // the query string (Nginx) is the correctly
+        if ('' === trim($uri, '/') && 0 === strncmp($query, '/', 1)) 
+        {
+            $query					 = explode('?', $query, 2);
+            $uri  					 = $query[0];
+            $_SERVER['QUERY_STRING'] = $query[1] ?? '';
+        }
+        else
+        {
+            $_SERVER['QUERY_STRING'] = $query;
+        }
+
+        // Parses the string into variables
+        parse_str($_SERVER['QUERY_STRING'], $_GET);
+
+        if ('/' === $uri || '' === $uri)
+        {
+            return '';
+        }
+
+        return $this->filterDecode($uri);
+    }
+
+    /**
+     * Will parse QUERY_STRING and automatically detect the URI from it.
+     * 
+     * @return string
+     */
+    protected function parseQueryString()
+    {
+        $uri = $_SERVER['QUERY_STRING'] ?? @getenv('QUERY_STRING');
+
+        if (trim($uri, '/') === '')
+        {
+            return '';
+        }
+        elseif (0 === strncmp($uri, '/', 1))
+        {
+            $uri    				 = explode('?', $uri, 2);
+            $_SERVER['QUERY_STRING'] = $uri[1] ?? '';
+            $uri    				 = $uri[0] ?? '';
+        }
+
+        parse_str($_SERVER['QUERY_STRING'], $_GET);
+
+        return $this->filterDecode($uri);
+    }
+
+    /**
+     * Filters the uri string remove any malicious characters and inappropriate slashes.
+     *
+     * @param  string  $uri
+     *
+     * @return string
+     */
+    protected function filterDecode($uri)
+    {
+        // Remove all characters except letters,
+        // digits and $-_.+!*'(),{}|\\^~[]`<>#%";/?:@&=.
+        $uri = filter_var(rawurldecode($uri), FILTER_SANITIZE_URL);
 		
-		// Return argument if not empty or return a single slash
-		return trim($uri, '/') ?: '/';
-	}
+        // Return argument if not empty or return a single slash
+        return trim($uri, '/') ?: '/';
+    }
 	
-	/**
-	 * Parse the base URL.
-	 * 
-	 * @return string
-	 */
-	public function parseBaseUrl() 
-	{
-		$filename = basename($this->server('SCRIPT_FILENAME'));
+    /**
+     * Parse the base URL.
+     * 
+     * @return string
+     */
+    public function parseBaseUrl() 
+    {
+        $filename = basename($this->server('SCRIPT_FILENAME'));
 		
-		if ($filename === basename($this->server('SCRIPT_NAME')))
-		{
-			$baseUrl = $this->server('SCRIPT_NAME');
-		}
-		elseif ($filename === basename($this->server('PHP_SELF')))
-		{
-			$baseUrl = $this->server('PHP_SELF');
-		}
-		elseif ($filename === basename($this->server('ORIG_SCRIPT_NAME')))
-		{
-			$baseUrl = $this->server('ORIG_SCRIPT_NAME');
-		}
-		else
-		{
-			$path    = $this->server('PHP_SELF', '');
-			$file    = $this->server('SCRIPT_FILENAME', '');
-			$segs    = explode('/', trim($file, '/'));
-			$segs    = array_reverse($segs);
-			$index   = 0;
-			$last    = count($segs);
-			$baseUrl = '';
+        if ($filename === basename($this->server('SCRIPT_NAME')))
+        {
+            $baseUrl = $this->server('SCRIPT_NAME');
+        }
+        elseif ($filename === basename($this->server('PHP_SELF')))
+        {
+            $baseUrl = $this->server('PHP_SELF');
+        }
+        elseif ($filename === basename($this->server('ORIG_SCRIPT_NAME')))
+        {
+            $baseUrl = $this->server('ORIG_SCRIPT_NAME');
+        }
+        else
+        {
+            $path    = $this->server('PHP_SELF', '');
+            $file    = $this->server('SCRIPT_FILENAME', '');
+            $segs    = explode('/', trim($file, '/'));
+            $segs    = array_reverse($segs);
+            $index   = 0;
+            $last    = count($segs);
+            $baseUrl = '';
 			
-			do
-			{
-				$seg     = $segs[$index];
-				$baseUrl = '/'.$seg.$baseUrl;
-				++$index;
-			} while ($last > $index && (false !== $pos = strpos($path, $baseUrl)) && 0 != $pos);
-		}
-
-		// Does the baseUrl have anything in common with the request_uri?
-		$requestUri = $this->parseRequestUri();
-
-		if ('' !== $requestUri && '/' !== $requestUri[0])
-		{
-			$requestUri = '/'.$requestUri;
-		}
-
-		$baseUrl = dirname($baseUrl);
-
-		if (empty($baseUrl) || false !== strpos(rawurldecode($requestUri), $baseUrl))
-		{
-			// no match whatsoever; set it blank
-			return '';
-		}
+            do
+            {
+                $seg     = $segs[$index];
+                $baseUrl = '/'.$seg.$baseUrl;
+                ++$index;
+            } while ($last > $index && (false !== $pos = strpos($path, $baseUrl)) && 0 != $pos);
+        }
+
+        // Does the baseUrl have anything in common with the request_uri?
+        $requestUri = $this->parseRequestUri();
+
+        if ('' !== $requestUri && '/' !== $requestUri[0])
+        {
+            $requestUri = '/'.$requestUri;
+        }
+
+        $baseUrl = dirname($baseUrl);
+
+        if (empty($baseUrl) || false !== strpos(rawurldecode($requestUri), $baseUrl))
+        {
+            // no match whatsoever; set it blank
+            return '';
+        }
 		
-		// If using mod_rewrite or ISAPI_Rewrite strip the script filename
-		// out of baseUrl. $pos !== 0 makes sure it is not matching a value
-		// from PATH_INFO or QUERY_STRING
-		if (strlen($requestUri) >= strlen($baseUrl) && (false !== $pos = strpos($requestUri, $baseUrl)) && 0 !== $pos)
-		{
-			$baseUrl = substr($requestUri, 0, $pos + strlen($baseUrl));
-		}
+        // If using mod_rewrite or ISAPI_Rewrite strip the script filename
+        // out of baseUrl. $pos !== 0 makes sure it is not matching a value
+        // from PATH_INFO or QUERY_STRING
+        if (strlen($requestUri) >= strlen($baseUrl) && (false !== $pos = strpos($requestUri, $baseUrl)) && 0 !== $pos)
+        {
+            $baseUrl = substr($requestUri, 0, $pos + strlen($baseUrl));
+        }
 		
-		return rtrim($baseUrl, '/'.DIRECTORY_SEPARATOR);
-	}
-
-	/**
-	 * Parse the path info.
-	 * 
-	 * @return string
-	 */
-	public function parsePathInfo()
-	{
-		if (null === ($requestUri = $this->parseRequestUri()))
-		{
-			return '/';
-		}
-
-		// Remove the query string from REQUEST_URI
-		if (false !== $pos = strpos($requestUri, '?'))
-		{
-			$requestUri = substr($requestUri, 0, $pos);
-		}
-
-		if ('' !== $requestUri && '/' !== $requestUri[0])
-		{
-			$requestUri = '/'.$requestUri;
-		}
-
-		if (null === ($baseUrl = $this->parseBaseUrl()))
-		{
-			return $requestUri;
-		}
-
-		$pathInfo = substr($requestUri, strlen($baseUrl));
-
-		if (false === $pathInfo && '' === $pathInfo)
-		{
-			return '/';
-		}
+        return rtrim($baseUrl, '/'.DIRECTORY_SEPARATOR);
+    }
+
+    /**
+     * Parse the path info.
+     * 
+     * @return string
+     */
+    public function parsePathInfo()
+    {
+        if (null === ($requestUri = $this->parseRequestUri()))
+        {
+            return '/';
+        }
+
+        // Remove the query string from REQUEST_URI
+        if (false !== $pos = strpos($requestUri, '?'))
+        {
+            $requestUri = substr($requestUri, 0, $pos);
+        }
+
+        if ('' !== $requestUri && '/' !== $requestUri[0])
+        {
+            $requestUri = '/'.$requestUri;
+        }
+
+        if (null === ($baseUrl = $this->parseBaseUrl()))
+        {
+            return $requestUri;
+        }
+
+        $pathInfo = substr($requestUri, strlen($baseUrl));
+
+        if (false === $pathInfo && '' === $pathInfo)
+        {
+            return '/';
+        }
 		
-		return (string) $pathInfo;
-	}
+        return (string) $pathInfo;
+    }
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -115,7 +115,7 @@
 			$protocol = 'REQUEST_URI';
 		}
 
-		switch($protocol)
+		switch ($protocol)
 		{
 			case 'REQUEST_URI':
 				$path = $this->parseRequestUri();

Braces +7 added lines, -14 removed lines

@@ -155,12 +155,10 @@ 
 			if (0 === strpos($uri, $this->server('SCRIPT_NAME')))
 			{
 				$uri = (string) substr($uri, strlen($this->server('SCRIPT_NAME')));
-			}
-			elseif (0 < strpos($uri, $this->server('SCRIPT_NAME')))
+			} elseif (0 < strpos($uri, $this->server('SCRIPT_NAME')))
 			{
 				$uri = (string) substr($uri, strpos($uri, $this->server('SCRIPT_NAME')) + strlen($this->server('SCRIPT_NAME')));
-			}
-			elseif (0 === strpos($uri, dirname($this->server('SCRIPT_NAME'))))
+			} elseif (0 === strpos($uri, dirname($this->server('SCRIPT_NAME'))))
 			{
 				$uri = (string) substr($uri, strlen(dirname($this->server('SCRIPT_NAME'))));
 			}
@@ -173,8 +171,7 @@ 
 			$query					 = explode('?', $query, 2);
 			$uri  					 = $query[0];
 			$_SERVER['QUERY_STRING'] = $query[1] ?? '';
-		}
-		else
+		} else
 		{
 			$_SERVER['QUERY_STRING'] = $query;
 		}
@@ -202,8 +199,7 @@ 
 		if (trim($uri, '/') === '')
 		{
 			return '';
-		}
-		elseif (0 === strncmp($uri, '/', 1))
+		} elseif (0 === strncmp($uri, '/', 1))
 		{
 			$uri    				 = explode('?', $uri, 2);
 			$_SERVER['QUERY_STRING'] = $uri[1] ?? '';
@@ -244,16 +240,13 @@ 
 		if ($filename === basename($this->server('SCRIPT_NAME')))
 		{
 			$baseUrl = $this->server('SCRIPT_NAME');
-		}
-		elseif ($filename === basename($this->server('PHP_SELF')))
+		} elseif ($filename === basename($this->server('PHP_SELF')))
 		{
 			$baseUrl = $this->server('PHP_SELF');
-		}
-		elseif ($filename === basename($this->server('ORIG_SCRIPT_NAME')))
+		} elseif ($filename === basename($this->server('ORIG_SCRIPT_NAME')))
 		{
 			$baseUrl = $this->server('ORIG_SCRIPT_NAME');
-		}
-		else
+		} else
 		{
 			$path    = $this->server('PHP_SELF', '');
 			$file    = $this->server('SCRIPT_FILENAME', '');