lenevor / syscodes

src/components/Pipeline/Pipeline.php

Spacing +4 added lines, -4 removed lines

@@ -151,8 +151,8 @@ 
      */
     protected function call()
     {
-        return function ($stack, $pipe) {
-            return function ($passable) use ($stack, $pipe) {
+        return function($stack, $pipe) {
+            return function($passable) use ($stack, $pipe) {
                 try {
                     if (is_callable($pipe)) {
                         return $pipe($passable, $stack);
@@ -205,10 +205,10 @@ 
      */
     protected function prepareDestination(Closure $destination)
     {
-        return function ($passable) use ($destination) {
+        return function($passable) use ($destination) {
             try {
                 return $destination($passable);
-            } catch(Throwable $e)  {
+            } catch (Throwable $e) {
                 return $this->handleException($passable, $e);
             }
         };

src/components/Http/RedirectResponse.php

Indentation +7 added lines, -7 removed lines

@@ -99,13 +99,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/Response.php

Spacing +1 added lines, -1 removed lines

@@ -122,7 +122,7 @@
 			$replace = 0 === strcasecmp($name, 'Content-Type');
 
 			foreach ($values as $value) {
-				header($name.': '. $value, $replace, $this->status);
+				header($name.': '.$value, $replace, $this->status);
 			}
 		}
 

Indentation +286 added lines, -286 removed lines

@@ -39,297 +39,297 @@
  */
 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  
-	 * @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  
+     * @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  
-	 * @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  
+     * @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

src/components/Http/Request.php

Braces +1 added lines, -2 removed lines

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

Indentation +873 added lines, -873 removed lines

@@ -41,891 +41,891 @@
  */
 class Request
 {
-	/**
-	 * Holds the global active request instance.
-	 *
-	 * @var bool $requestURI
-	 */
-	protected static $requestURI;
-
-	/**
-	 * The base URL.
-	 * 
-	 * @var string $baseUrl
-	 */
-	protected $baseUrl;
-
-	/**
-	 * Gets cookies ($_COOKIE).
-	 * 
-	 * @var string $cookies
-	 */
-	public $cookies;
-
-	/**
-	 * Gets the string with format JSON.
-	 * 
-	 * @var string|resource|null $content
-	 */
-	protected $content;
-
-	/**
-	 * The default Locale this request.
-	 * 
-	 * @var string $defaultLocale
-	 */
-	protected $defaultLocale = 'en';
+    /**
+     * Holds the global active request instance.
+     *
+     * @var bool $requestURI
+     */
+    protected static $requestURI;
+
+    /**
+     * The base URL.
+     * 
+     * @var string $baseUrl
+     */
+    protected $baseUrl;
+
+    /**
+     * Gets cookies ($_COOKIE).
+     * 
+     * @var string $cookies
+     */
+    public $cookies;
+
+    /**
+     * Gets the string with format JSON.
+     * 
+     * @var string|resource|null $content
+     */
+    protected $content;
+
+    /**
+     * The default Locale this request.
+     * 
+     * @var string $defaultLocale
+     */
+    protected $defaultLocale = 'en';
 	
-	/**
-	 * Gets files request ($_FILES).
-	 * 
-	 * @var string $files
-	 */
-	public $files;
-
-	/**
-	 * The detected uri and server variables.
-	 * 
-	 * @var string $http
-	 */
-	protected $http;
-
-	/**
-	 * The decoded JSON content for the request.
-	 * 
-	 * @var \Syscodes\Http\Contributors\Parameters|null $json
-	 */
-	protected $json;
-
-	/**
-	 * The current language of the application.
-	 * 
-	 * @var string $languages
-	 */
-	protected $languages;
+    /**
+     * Gets files request ($_FILES).
+     * 
+     * @var string $files
+     */
+    public $files;
+
+    /**
+     * The detected uri and server variables.
+     * 
+     * @var string $http
+     */
+    protected $http;
+
+    /**
+     * The decoded JSON content for the request.
+     * 
+     * @var \Syscodes\Http\Contributors\Parameters|null $json
+     */
+    protected $json;
+
+    /**
+     * The current language of the application.
+     * 
+     * @var string $languages
+     */
+    protected $languages;
 	
-	/** 
-	 * The method name.
-	 * 
-	 * @var string $method
-	 */
-	protected $method;
-
-	/**
-	 * The path info of URL.
-	 * 
-	 * @var string $pathInfo
-	 */
-	protected $pathInfo;
-
-	/**
-	 * Request body parameters ($_POST).
-	 * 
-	 * @var \Syscodes\Http\Contributors\Parameters $request
-	 */
-	public $request;
-
-	/**
-	 * Get request URI.
-	 * 
-	 * @var string $requestToURI
-	 */
-	protected $requestToURI;
-
-	/**
-	 * Get the route resolver callback.
-	 * 
-	 * @var \Closure $routeResolver
-	 */
-	protected $routeResolver;
-
-	/**
-	 * 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  
-	 * 
-	 * @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;
+
+    /**
+     * Get the route resolver callback.
+     * 
+     * @var \Closure $routeResolver
+     */
+    protected $routeResolver;
+
+    /**
+     * 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  
+     * 
+     * @return void
+     */
+    public function __construct(array $request = [], array $cookies = [], array $files = [], array $server = [], $content = null)
+    {
+        static::$requestURI = $this;
 		
-		$this->initialize($request, $cookies, $files, $server, $content);
-
-		$this->detectURI(config('app.uriProtocol'), config('app.baseUrl'));
-
-		$this->detectLocale();
-	}
-
-	/**
-	 * Sets the parameters for this request.
-	 * 
-	 * @param  array  $request
-	 * @param  array  $cookies
-	 * @param  array  $files
-	 * @param  array  $server
-	 * 
-	 * @return void
-	 */
-	public function initialize(array $request = [], array $cookies = [], array $files = [], array $server = [], $content = null)
-	{
-		$this->request      = new Parameters($request);
-		$this->cookies      = new Inputs($cookies);
-		$this->files        = new Files($files);
-		$this->server       = new Server($server);
-		$this->headers      = new Headers($this->server->all());
-
-		$this->uri          = new URI;
-		$this->http         = new Http;
-		$this->method       = null;
-		$this->baseUrl      = null;
-		$this->content      = $content;
-		$this->pathInfo     = null;
-		$this->languages    = null;
-		$this->validLocales = config('app.supportedLocales');
-	}
-
-	/**
-	 * Create a new Syscodes HTTP request from server variables.
-	 * 
-	 * @return static
-	 */
-	public static function capture()
-	{
-		return static::createFromRequest(static::createFromRequestGlobals());
-	}
-
-	/**
-	 * Creates an Syscodes request from of the Request class instance.
-	 * 
-	 * @param  \Syscodes\Http\Request  $request
-	 * 
-	 * @return static
-	 */
-	public static function createFromRequest($request)
-	{
-		$newRequest = (new static)->duplicate(
-			$request->request->all(), $request->cookies->all(), 
-			$request->files->all(), $request->server->all()
-		);
-
-		$newRequest->content = $request->content;
-
-		return $newRequest;
-	}
-
-	/**
-	 * Creates a new request with value from PHP's super global.
-	 * 
-	 * @return static
-	 */
-	public static function createFromRequestGlobals()
-	{
-		$request = static::createFromRequestFactory($_POST, $_COOKIE, $_FILES, $_SERVER);
-
-		return $request;
-	}
-
-	/**
-	 * Creates a new request from a factory.
-	 * 
-	 * @param  array  $request
-	 * @param  array  $cookies
-	 * @param  array  $files
-	 * @param  array  $server
-	 * 
-	 * @return static
-	 */
-	protected static function createFromRequestFactory(array $request = [], array $cookies = [], array $files = [], array $server = [])
-	{
-		if (self::$requestURI) {
-			$request = (self::$requestURI)($request, $cookies, $files, $server);
-
-			if ( ! $request instanceof self) {
-				throw new LogicException('The Request active must return an instance of Syscodes\Http\Request');
-			}
-
-			return $request;
-		}
-
-		return new static($request, $cookies, $files, $server);
-	}
-
-	/**
-	 * Clones a request and overrides some of its parameters.
-	 * 
-	 * @param  array  $request
-	 * @param  array  $cookies
-	 * @param  array  $files
-	 * @param  array  $server
-	 * 
-	 * @return static
-	 */
-	public function duplicate(array $request = [], array $cookies = [], array $files = [], array $server = [])
-	{
-		$duplicate = clone $this;
-
-		if (null !== $request) {
-			$duplicate->request = new Parameters($request);
-		}
-
-		if (null !== $cookies) {
-			$duplicate->cookies = new Inputs($cookies);
-		}
-
-		if (null !== $files) {
-			$duplicate->files = new Files($files);
-		}
-
-		if (null !== $server) {
-			$duplicate->server  = new Server($server);
-			$duplicate->headers = new Headers($duplicate->server->all());
-		}
-
-		$duplicate->uri          = new URI;
-		$duplicate->http         = new Http;
-		$duplicate->locale       = null;
-		$duplicate->method       = null;
-		$duplicate->baseUrl      = null;
-		$duplicate->pathInfo     = null;
-		$duplicate->validLocales = config('app.supportedLocales');
-
-		return $duplicate;		
-	}
-
-	/**
-	 * Returns the active request currently being used.
-	 *
-	 * @param  \Syscodes\Http\Request|bool|null  $request  Overwrite current request 
-	 *                                                     before returning, false prevents 
-	 *                                                     overwrite
-	 *
-	 * @return \Syscodes\Http\Request
-	 */
-	public static function active($request = false)
-	{
-		if ($request !== false) {
-			static::$requestURI = $request;
-		}
-
-		return static::$requestURI;
-	}
-
-	/**
-	 * Returns the desired segment, or $default if it does not exist.
-	 *
-	 * @param  int  $index  The segment number (1-based index)
-	 * @param  mixed  $default  Default value to return
-	 *
-	 * @return  string
-	 */
-	public function segment($index, $default = null)
-	{
-		if ($request = static::active()) {
-			return $request->uri->getSegment($index, $default);
-		}
-
-		return null;
-	}
-
-	/**
-	 * Returns all segments in an array. For total of segments
-	 * used the function PHP count().
-	 *
-	 * @return array
-	 */
-	public function segments()
-	{
-		if ($request = static::active()) {
-			return $request->uri->getSegments();
-		}
-
-		return null;
-	}
-
-	/**
-	 * Returns the total number of segment.
-	 *
-	 * @return int|null  
-	 */
-	public function totalSegments()
-	{
-		if ($request = static::active()) {
-			return $request->uri->getTotalSegments();
-		}
-
-		return null;
-	}
-
-	/**
-	 * Detects and returns the current URI based on a number of different server variables.
-	 * 
-	 * @param  string  $protocol
-	 * @param  string  $baseUrl
-	 * 
-	 * @return string
-	 */
-	protected function detectURI(string $protocol, string $baseUrl)
-	{
-		$this->uri->setPath($this->http->detectPath($protocol));
-
-		$baseUrl = ! empty($baseUrl) ? rtrim($baseUrl, '/ ').'/' : $baseUrl;
-
-		if ( ! empty($baseUrl)) {
-			$this->uri->setScheme(parse_url($baseUrl, PHP_URL_SCHEME));
-			$this->uri->setHost(parse_url($baseUrl, PHP_URL_HOST));
-			$this->uri->setPort(parse_url($baseUrl, PHP_URL_PORT));
-		} else {
-			if ( ! $this->http->isCli()) {
-				exit('You have an empty or invalid base URL. The baseURL value must be set in config/app.php, or through the .env file.');
-			}
-		}
-	}
-
-	/**
-	 * Handles setting up the locale, auto-detecting of language.
-	 * 
-	 * @return void
-	 */
-	public function detectLocale()
-	{
-		$this->languages = $this->defaultLocale = config('app.locale');
-
-		$this->setLocale($this->validLocales);
-	}
-
-	/**
-	 * Returns the default locale as set.
-	 * 
-	 * @return string
-	 */
-	public function getDefaultLocale()
-	{
-		return $this->defaultLocale;
-	}
-
-	/**
-	 * Gets the current locale, with a fallback to the default.
-	 * 
-	 * @return string 
-	 */
-	public function getLocale()
-	{
-		return $this->languages ?: $this->defaultLocale;
-	}
-
-	/**
-	 * Sets the locale string for this request.
-	 * 
-	 * @param  string  $locale
-	 * 
-	 * @return \Syscodes\Http\Request
-	 */
-	public function setLocale($locale)
-	{
-		if ( ! in_array($locale, $this->validLocales)) {
-			$locale = $this->defaultLocale;
-		}
+        $this->initialize($request, $cookies, $files, $server, $content);
+
+        $this->detectURI(config('app.uriProtocol'), config('app.baseUrl'));
+
+        $this->detectLocale();
+    }
+
+    /**
+     * Sets the parameters for this request.
+     * 
+     * @param  array  $request
+     * @param  array  $cookies
+     * @param  array  $files
+     * @param  array  $server
+     * 
+     * @return void
+     */
+    public function initialize(array $request = [], array $cookies = [], array $files = [], array $server = [], $content = null)
+    {
+        $this->request      = new Parameters($request);
+        $this->cookies      = new Inputs($cookies);
+        $this->files        = new Files($files);
+        $this->server       = new Server($server);
+        $this->headers      = new Headers($this->server->all());
+
+        $this->uri          = new URI;
+        $this->http         = new Http;
+        $this->method       = null;
+        $this->baseUrl      = null;
+        $this->content      = $content;
+        $this->pathInfo     = null;
+        $this->languages    = null;
+        $this->validLocales = config('app.supportedLocales');
+    }
+
+    /**
+     * Create a new Syscodes HTTP request from server variables.
+     * 
+     * @return static
+     */
+    public static function capture()
+    {
+        return static::createFromRequest(static::createFromRequestGlobals());
+    }
+
+    /**
+     * Creates an Syscodes request from of the Request class instance.
+     * 
+     * @param  \Syscodes\Http\Request  $request
+     * 
+     * @return static
+     */
+    public static function createFromRequest($request)
+    {
+        $newRequest = (new static)->duplicate(
+            $request->request->all(), $request->cookies->all(), 
+            $request->files->all(), $request->server->all()
+        );
+
+        $newRequest->content = $request->content;
+
+        return $newRequest;
+    }
+
+    /**
+     * Creates a new request with value from PHP's super global.
+     * 
+     * @return static
+     */
+    public static function createFromRequestGlobals()
+    {
+        $request = static::createFromRequestFactory($_POST, $_COOKIE, $_FILES, $_SERVER);
+
+        return $request;
+    }
+
+    /**
+     * Creates a new request from a factory.
+     * 
+     * @param  array  $request
+     * @param  array  $cookies
+     * @param  array  $files
+     * @param  array  $server
+     * 
+     * @return static
+     */
+    protected static function createFromRequestFactory(array $request = [], array $cookies = [], array $files = [], array $server = [])
+    {
+        if (self::$requestURI) {
+            $request = (self::$requestURI)($request, $cookies, $files, $server);
+
+            if ( ! $request instanceof self) {
+                throw new LogicException('The Request active must return an instance of Syscodes\Http\Request');
+            }
+
+            return $request;
+        }
+
+        return new static($request, $cookies, $files, $server);
+    }
+
+    /**
+     * Clones a request and overrides some of its parameters.
+     * 
+     * @param  array  $request
+     * @param  array  $cookies
+     * @param  array  $files
+     * @param  array  $server
+     * 
+     * @return static
+     */
+    public function duplicate(array $request = [], array $cookies = [], array $files = [], array $server = [])
+    {
+        $duplicate = clone $this;
+
+        if (null !== $request) {
+            $duplicate->request = new Parameters($request);
+        }
+
+        if (null !== $cookies) {
+            $duplicate->cookies = new Inputs($cookies);
+        }
+
+        if (null !== $files) {
+            $duplicate->files = new Files($files);
+        }
+
+        if (null !== $server) {
+            $duplicate->server  = new Server($server);
+            $duplicate->headers = new Headers($duplicate->server->all());
+        }
+
+        $duplicate->uri          = new URI;
+        $duplicate->http         = new Http;
+        $duplicate->locale       = null;
+        $duplicate->method       = null;
+        $duplicate->baseUrl      = null;
+        $duplicate->pathInfo     = null;
+        $duplicate->validLocales = config('app.supportedLocales');
+
+        return $duplicate;		
+    }
+
+    /**
+     * Returns the active request currently being used.
+     *
+     * @param  \Syscodes\Http\Request|bool|null  $request  Overwrite current request 
+     *                                                     before returning, false prevents 
+     *                                                     overwrite
+     *
+     * @return \Syscodes\Http\Request
+     */
+    public static function active($request = false)
+    {
+        if ($request !== false) {
+            static::$requestURI = $request;
+        }
+
+        return static::$requestURI;
+    }
+
+    /**
+     * Returns the desired segment, or $default if it does not exist.
+     *
+     * @param  int  $index  The segment number (1-based index)
+     * @param  mixed  $default  Default value to return
+     *
+     * @return  string
+     */
+    public function segment($index, $default = null)
+    {
+        if ($request = static::active()) {
+            return $request->uri->getSegment($index, $default);
+        }
+
+        return null;
+    }
+
+    /**
+     * Returns all segments in an array. For total of segments
+     * used the function PHP count().
+     *
+     * @return array
+     */
+    public function segments()
+    {
+        if ($request = static::active()) {
+            return $request->uri->getSegments();
+        }
+
+        return null;
+    }
+
+    /**
+     * Returns the total number of segment.
+     *
+     * @return int|null  
+     */
+    public function totalSegments()
+    {
+        if ($request = static::active()) {
+            return $request->uri->getTotalSegments();
+        }
+
+        return null;
+    }
+
+    /**
+     * Detects and returns the current URI based on a number of different server variables.
+     * 
+     * @param  string  $protocol
+     * @param  string  $baseUrl
+     * 
+     * @return string
+     */
+    protected function detectURI(string $protocol, string $baseUrl)
+    {
+        $this->uri->setPath($this->http->detectPath($protocol));
+
+        $baseUrl = ! empty($baseUrl) ? rtrim($baseUrl, '/ ').'/' : $baseUrl;
+
+        if ( ! empty($baseUrl)) {
+            $this->uri->setScheme(parse_url($baseUrl, PHP_URL_SCHEME));
+            $this->uri->setHost(parse_url($baseUrl, PHP_URL_HOST));
+            $this->uri->setPort(parse_url($baseUrl, PHP_URL_PORT));
+        } else {
+            if ( ! $this->http->isCli()) {
+                exit('You have an empty or invalid base URL. The baseURL value must be set in config/app.php, or through the .env file.');
+            }
+        }
+    }
+
+    /**
+     * Handles setting up the locale, auto-detecting of language.
+     * 
+     * @return void
+     */
+    public function detectLocale()
+    {
+        $this->languages = $this->defaultLocale = config('app.locale');
+
+        $this->setLocale($this->validLocales);
+    }
+
+    /**
+     * Returns the default locale as set.
+     * 
+     * @return string
+     */
+    public function getDefaultLocale()
+    {
+        return $this->defaultLocale;
+    }
+
+    /**
+     * Gets the current locale, with a fallback to the default.
+     * 
+     * @return string 
+     */
+    public function getLocale()
+    {
+        return $this->languages ?: $this->defaultLocale;
+    }
+
+    /**
+     * Sets the locale string for this request.
+     * 
+     * @param  string  $locale
+     * 
+     * @return \Syscodes\Http\Request
+     */
+    public function setLocale($locale)
+    {
+        if ( ! in_array($locale, $this->validLocales)) {
+            $locale = $this->defaultLocale;
+        }
 		
-		$this->languages = $locale;
-
-		try {
-		    if (class_exists('Locale', false)) {
-				Locale::setDefault($locale);
-			}
-		} catch (Exception $exception) {}
-
-		return $this;
-	}
-
-	/**
-	 * Returns the full request string.
-	 *
-	 * @return string|null  The Request string
-	 */
-	public function get() 
-	{
-		if ($request = static::active()) {
-			return $request->uri->get();
-		}
-
-		return null;
-	}
-
-	/**
-	 * Get the JSON payload for the request.
-	 * 
-	 * @param  string|null  $key  
-	 * @param  mixed  $default  
-	 * 
-	 * @return \Syscodes\Http\Contributors\Parameters|mixed
-	 */
-	public function json($key = null, $default = null)
-	{
-		if ( ! isset($this->json)) {
-			$this->json = new Parameters((array) json_decode($this->getContent(), true));
-		}
-
-		if (is_null($key)) {
-			return $this->json;
-		}
-
-		return Arr::get($this->json->all(), $key, $default);
-	}
-
-	/**
-	 * Set the JSON payload for the request
-	 * 
-	 * @param  \Syscodes\Http\Contributors\Parameters  $json
-	 * 
-	 * @return $this
-	 */
-	public function setJson($json)
-	{
-		$this->json = $json;
-
-		return $this;
-	}
-
-	/**
-	 * Returns whether this is an AJAX request or not.
-	 *
-	 * @return bool
-	 */
-	public function isXmlHttpRequest()
-	{
-		return ! empty($this->server->get('HTTP_X_REQUESTED_WITH')) && 
-				strtolower($this->server->get('HTTP_X_REQUESTED_WITH')) === 'xmlhttprequest';
-	}
-
-	/**
-	 * Returns the input method used (GET, POST, DELETE, etc.).
-	 *
-	 * @return string
-	 * 
-	 * @throws \LogicException  
-	 */
-	public function getmethod()
-	{
-		if (null !== $this->method) {
-			return $this->method;
-		}
+        $this->languages = $locale;
+
+        try {
+            if (class_exists('Locale', false)) {
+                Locale::setDefault($locale);
+            }
+        } catch (Exception $exception) {}
+
+        return $this;
+    }
+
+    /**
+     * Returns the full request string.
+     *
+     * @return string|null  The Request string
+     */
+    public function get() 
+    {
+        if ($request = static::active()) {
+            return $request->uri->get();
+        }
+
+        return null;
+    }
+
+    /**
+     * Get the JSON payload for the request.
+     * 
+     * @param  string|null  $key  
+     * @param  mixed  $default  
+     * 
+     * @return \Syscodes\Http\Contributors\Parameters|mixed
+     */
+    public function json($key = null, $default = null)
+    {
+        if ( ! isset($this->json)) {
+            $this->json = new Parameters((array) json_decode($this->getContent(), true));
+        }
+
+        if (is_null($key)) {
+            return $this->json;
+        }
+
+        return Arr::get($this->json->all(), $key, $default);
+    }
+
+    /**
+     * Set the JSON payload for the request
+     * 
+     * @param  \Syscodes\Http\Contributors\Parameters  $json
+     * 
+     * @return $this
+     */
+    public function setJson($json)
+    {
+        $this->json = $json;
+
+        return $this;
+    }
+
+    /**
+     * Returns whether this is an AJAX request or not.
+     *
+     * @return bool
+     */
+    public function isXmlHttpRequest()
+    {
+        return ! empty($this->server->get('HTTP_X_REQUESTED_WITH')) && 
+                strtolower($this->server->get('HTTP_X_REQUESTED_WITH')) === 'xmlhttprequest';
+    }
+
+    /**
+     * Returns the input method used (GET, POST, DELETE, etc.).
+     *
+     * @return string
+     * 
+     * @throws \LogicException  
+     */
+    public function getmethod()
+    {
+        if (null !== $this->method) {
+            return $this->method;
+        }
 		
-		$method = strtoupper($this->server->get('REQUEST_METHOD', 'GET'));
+        $method = strtoupper($this->server->get('REQUEST_METHOD', 'GET'));
 		
-		if (in_array($method, ['GET', 'HEAD', 'POST', 'PUT', 'DELETE', 'CONNECT', 'OPTIONS', 'PATCH', 'PURGE', 'TRACE'], true)) {
-			return $this->method = $method;
-		}
+        if (in_array($method, ['GET', 'HEAD', 'POST', 'PUT', 'DELETE', 'CONNECT', 'OPTIONS', 'PATCH', 'PURGE', 'TRACE'], true)) {
+            return $this->method = $method;
+        }
 		
-		if ( ! preg_match('~^[A-Z]++$#~D', $method)) {
-			throw new logicException(sprintf('Invalid method override "%s"', $method));
-		}
-
-		return $this->method = $method;
-	}
-
-	/**
-	 * Sets the request method.
-	 *
-	 * @param  string  $method  
-	 *
-	 * @return string
-	 */
-	public function setMethod(string $method) 
-	{
-		$this->method = null;
-
-		$this->server->set('REQUEST_METHOD', $method);
-	}
+        if ( ! preg_match('~^[A-Z]++$#~D', $method)) {
+            throw new logicException(sprintf('Invalid method override "%s"', $method));
+        }
+
+        return $this->method = $method;
+    }
+
+    /**
+     * Sets the request method.
+     *
+     * @param  string  $method  
+     *
+     * @return string
+     */
+    public function setMethod(string $method) 
+    {
+        $this->method = null;
+
+        $this->server->set('REQUEST_METHOD', $method);
+    }
 	
-	/**
-	 * Determine if the current request URI matches a pattern.
-	 * 
-	 * @param  mixed  ...$patterns
-	 * 
-	 * @return bool
-	 */
-	public function is(...$patterns)
-	{
-		$path = $this->decodedPath();
+    /**
+     * Determine if the current request URI matches a pattern.
+     * 
+     * @param  mixed  ...$patterns
+     * 
+     * @return bool
+     */
+    public function is(...$patterns)
+    {
+        $path = $this->decodedPath();
 		
-		foreach ($patterns as $pattern) {
-			if (Str::is($pattern, $path)) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Determine if the route name matches a given pattern.
-	 * 
-	 * @param  mixed  ...$patterns
-	 * 
-	 * @return bool
-	 */
-	public function routeIs(...$patterns)
-	{
-		return $this->route() && $this->route()->is(...$patterns);
-	}
-
-	/**
-	 * Get the route handling the request.
-	 * 
-	 * @param  string|null  $param  
-	 * @param  mixed  $default  
-	 * 
-	 * @return \Syscodes\Routing\Route|object|string|null
-	 */
-	public function route($param = null, $default = null)
-	{
-		$route = call_user_func($this->getRouteResolver());
-
-		if (is_null($route) || is_null($param)) {
-			return $route;
-		}
-
-		return $route->parameter($param, $default);
-	}
-
-	/**
-	 * Get the current decoded path info for the request.
-	 * 
-	 * @return string
-	 */
-	public function decodedPath()
-	{
-		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  
+     * @param  mixed  $default  
+     * 
+     * @return \Syscodes\Routing\Route|object|string|null
+     */
+    public function route($param = null, $default = null)
+    {
+        $route = call_user_func($this->getRouteResolver());
+
+        if (is_null($route) || is_null($param)) {
+            return $route;
+        }
+
+        return $route->parameter($param, $default);
+    }
+
+    /**
+     * Get the current decoded path info for the request.
+     * 
+     * @return string
+     */
+    public function decodedPath()
+    {
+        return rawurldecode($this->path());
+    }
+
+    /**
+     * Get the current path info for the request.
+     * 
+     * @return string
+     */
+    public function path()
+    {
+        $path = trim($this->getPathInfo(), '/');
+
+        return $path == '' ? '/' : $path;
+    }
+
+    /**
+     * Retunrs the request body content.
+     * 
+     * @return string
+     */
+    public function getContent()
+    {
+        if (null === $this->content || false === $this->content)
+        {
+            $this->content = file_get_contents('php://input');
+        }
+
+        return $this->content;
+    }
+
+    /**
+     * Returns the path being requested relative to the executed script. 
+     * 
+     * @return string
+     */
+    public function getPathInfo()
+    {
+        if (null === $this->pathInfo)
+        {
+            $this->pathInfo = $this->http->parsePathInfo();
+        }
+
+        return $this->pathInfo;
+    }
+
+    /**
+     * Returns the root URL from which this request is executed.
+     * 
+     * @return string
+     */
+    public function getBaseUrl()
+    {
+        if (null === $this->baseUrl)
+        {
+            $this->baseUrl = $this->http->parseBaseUrl();
+        }
+
+        return $this->baseUrl;
+    }
+
+    /**
+     * Returns the requested URI.
+     * 
+     * @return string
+     */
+    public function getRequestUri()
+    {
+        if (null === $this->requestToUri) {
+            $this->requestToUri = $this->http->parseRequestUri();
+        }
+
+        return $this->requestToUri;
+    }
 	
-	/**
-	 * Gets the request's scheme.
-	 * 
-	 * @return string
-	 */
-	public function getScheme()
-	{
-		return $this->secure() ? $this->uri->setScheme('https') : $this->uri->setScheme('http');
-	}
-
-	/**
-	 * Returns the host name.
-	 * 
-	 * @return void
-	 */
-	public function getHost()
-	{
-		if ($forwardedHost = $this->server->get('HTTP_X_FORWARDED_HOST')) {
-			$host = $forawardedHost[0];
-		} elseif ( ! $host = $this->headers->get('HOST')) {
-			if ( ! $host = $this->server->get('SERVER_NAME')) {
-				$host = $this->server->get('REMOTE_ADDR', '');
-			}
-		}
-
-		$host = $_SERVER['SERVER_NAME'];
-
-		$host = strtolower(preg_replace('/:\d+$/', '', trim(($host))));
+    /**
+     * Gets the request's scheme.
+     * 
+     * @return string
+     */
+    public function getScheme()
+    {
+        return $this->secure() ? $this->uri->setScheme('https') : $this->uri->setScheme('http');
+    }
+
+    /**
+     * Returns the host name.
+     * 
+     * @return void
+     */
+    public function getHost()
+    {
+        if ($forwardedHost = $this->server->get('HTTP_X_FORWARDED_HOST')) {
+            $host = $forawardedHost[0];
+        } elseif ( ! $host = $this->headers->get('HOST')) {
+            if ( ! $host = $this->server->get('SERVER_NAME')) {
+                $host = $this->server->get('REMOTE_ADDR', '');
+            }
+        }
+
+        $host = $_SERVER['SERVER_NAME'];
+
+        $host = strtolower(preg_replace('/:\d+$/', '', trim(($host))));
 		
-		return $host;
-	}
-
-	/**
-	 * Returns the port on which the request is made.
-	 * 
-	 * @return int
-	 */
-	public function getPort()
-	{
-		if ( ! $this->server->get('HTTP_HOST')) 
-		{
-			return $this->server->get('SERVER_PORT');
-		}
+        return $host;
+    }
+
+    /**
+     * Returns the port on which the request is made.
+     * 
+     * @return int
+     */
+    public function getPort()
+    {
+        if ( ! $this->server->get('HTTP_HOST')) 
+        {
+            return $this->server->get('SERVER_PORT');
+        }
 		
-		return 'https' === $this->getScheme() ? $this->uri->setPort(443) : $this->uri->setPort(80);
-	}
-
-	/**
-	 * Returns the HTTP host being requested.
-	 * 
-	 * @return string
-	 */
-	public function getHttpHost()
-	{
-		$scheme = $this->getScheme();
-		$port   = $this->getPort();
-
-		if (('http' === $scheme && 80 === $port) || ('https' === $scheme && 443 === $port))		
-		{
-			return $this->getHost();
-		}
-
-		return $this->getHost().':'.$port;
-	}
-
-	/**
-	 * Gets the scheme and HTTP host.
-	 * 
-	 * @return string
-	 */
-	public function getSchemeWithHttpHost()
-	{
-		return $this->getScheme().'://'.$this->getHttpHost();
-	}
-
-	/**
-	 * Get the root URL for the application.
-	 * 
-	 * @return string
-	 */
-	public function root()
-	{
-		return rtrim($this->getSchemeWithHttpHost().$this->getBaseUrl(), '/');
-	}
-
-	/**
-	 * Get the URL for the request.
-	 * 
-	 * @return string
-	 */
-	public function url()
-	{
-		return trim(preg_replace('/\?.*/', '', $this->get()), '/');
-	}
-
-	/**
-	 * Returns the referer.
-	 * 
-	 * @param  string  $default
-	 * 
-	 * @return string
-	 */
-	public function referer(string $default = '')
-	{
-		return $this->server->get('HTTP_REFERER', $default);
-	}
+        return 'https' === $this->getScheme() ? $this->uri->setPort(443) : $this->uri->setPort(80);
+    }
+
+    /**
+     * Returns the HTTP host being requested.
+     * 
+     * @return string
+     */
+    public function getHttpHost()
+    {
+        $scheme = $this->getScheme();
+        $port   = $this->getPort();
+
+        if (('http' === $scheme && 80 === $port) || ('https' === $scheme && 443 === $port))		
+        {
+            return $this->getHost();
+        }
+
+        return $this->getHost().':'.$port;
+    }
+
+    /**
+     * Gets the scheme and HTTP host.
+     * 
+     * @return string
+     */
+    public function getSchemeWithHttpHost()
+    {
+        return $this->getScheme().'://'.$this->getHttpHost();
+    }
+
+    /**
+     * Get the root URL for the application.
+     * 
+     * @return string
+     */
+    public function root()
+    {
+        return rtrim($this->getSchemeWithHttpHost().$this->getBaseUrl(), '/');
+    }
+
+    /**
+     * Get the URL for the request.
+     * 
+     * @return string
+     */
+    public function url()
+    {
+        return trim(preg_replace('/\?.*/', '', $this->get()), '/');
+    }
+
+    /**
+     * Returns the referer.
+     * 
+     * @param  string  $default
+     * 
+     * @return string
+     */
+    public function referer(string $default = '')
+    {
+        return $this->server->get('HTTP_REFERER', $default);
+    }
 	
-	/**
-	 * Attempts to detect if the current connection is secure through 
-	 * over HTTPS protocol.
-	 * 
-	 * @return bool
-	 */
-	public function secure()
-	{
-		if ( ! empty($this->server->get('HTTPS')) && strtolower($this->server->get('HTTPS')) !== 'off') {
-			return true;
-		} elseif (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $this->server->get('HTTP_X_FORWARDED_PROTO') === 'https') {
-			return true;
-		} elseif ( ! empty($this->server->get('HTTP_FRONT_END_HTTPS')) && strtolower($this->server->get('HTTP_FRONT_END_HTTPS')) !== 'off') {
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Returns the user agent.
-	 *
-	 * @param  string|null  $default
-	 *
-	 * @return string
-	 */
-	public function userAgent(string $default = null)
-	{
-		return $this->server->get('HTTP_USER_AGENT', $default);
-	}
-
-	/**
-	 * Get the route resolver callback.
-	 * 
-	 * @return \Closure
-	 */
-	public function getRouteResolver()
-	{
-		return $this->routeResolver ?: function () {
-			//
-		};
-	}
-
-	/**
-	 * Set the route resolver callback.
-	 * 
-	 * @param  \Closure  $callback
-	 * 
-	 * @return $this
-	 */
-	public function setRouteResolver(Closure $callback)
-	{
-		$this->routeResolver = $callback;
-
-		return $this;
-	}
-
-	/**
-	 * 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 callback.
+     * 
+     * @return \Closure
+     */
+    public function getRouteResolver()
+    {
+        return $this->routeResolver ?: function () {
+            //
+        };
+    }
+
+    /**
+     * Set the route resolver callback.
+     * 
+     * @param  \Closure  $callback
+     * 
+     * @return $this
+     */
+    public function setRouteResolver(Closure $callback)
+    {
+        $this->routeResolver = $callback;
+
+        return $this;
+    }
+
+    /**
+     * 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 +2 added lines, -2 removed lines

@@ -840,7 +840,7 @@ 
 	 */
 	public function getRouteResolver()
 	{
-		return $this->routeResolver ?: function () {
+		return $this->routeResolver ?: function() {
 			//
 		};
 	}
@@ -901,7 +901,7 @@ 
 
 		foreach ($this->cookies as $key => $value)
 		{
-			$cookies[]= "{$key} = {$value}";
+			$cookies[] = "{$key} = {$value}";
 		}
 
 		if ( ! empty($cookies))

src/components/Http/Http.php

Spacing +2 added lines, -2 removed lines

@@ -113,7 +113,7 @@ 
 			$protocol = 'REQUEST_URI';
 		}
 
-		switch($protocol) {
+		switch ($protocol) {
 			case 'REQUEST_URI':
 				$path = $this->parseRequestUri();
 				break;
@@ -239,7 +239,7 @@ 
 			$last    = count($segs);
 			$baseUrl = '';
 			
-			do 	{
+			do {
 				$seg     = $segs[$index];
 				$baseUrl = '/'.$seg.$baseUrl;
 				++$index;

Indentation +253 added lines, -253 removed lines

@@ -31,265 +31,265 @@
  */
 class Http
 {
-	/**
-	 * 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);
-	}
+    /**
+     * 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

src/components/Http/Contributors/Files.php

Indentation +12 added lines, -12 removed lines

@@ -42,21 +42,21 @@
     }
 
     /**
-	 * {@inheritdoc}
-	 */
-	public function replace(array $files = [])
-	{
-		$this->parameters = [];
+     * {@inheritdoc}
+     */
+    public function replace(array $files = [])
+    {
+        $this->parameters = [];
         $this->add($files);
-	}
+    }
 
-	/**
-	 * {@inheritdoc}
-	 */
-	public function add(array $files = [])
-	{
+    /**
+     * {@inheritdoc}
+     */
+    public function add(array $files = [])
+    {
         foreach ($files as $key => $file) {
             $this->set($key, $file);
         }
-	}
+    }
 }
\ No newline at end of file

src/components/Debug/GDebug.php

Spacing +2 added lines, -2 removed lines

@@ -159,7 +159,7 @@ 
 					$this->system->endOutputBuffering();
 				}
 
-				if (Misc::sendHeaders() && $handlerContentType)	{
+				if (Misc::sendHeaders() && $handlerContentType) {
 					header("Content-Type: {$handlerContentType}");
 				}
 			}
@@ -314,7 +314,7 @@ 
 
 		if ( ! $handler instanceof MainHandler) {
 			throw new InvalidArgumentException(
-				"Argument to " . __METHOD__ . " must be a callable, or instance of ".
+				"Argument to ".__METHOD__." must be a callable, or instance of ".
 				"Syscodes\\Contracts\\Debug\\Handler"
 			);
 		}

Braces +1 added lines, -2 removed lines

@@ -142,8 +142,7 @@
 			}
 	
 			$Quit = $handlerResponse == MainHandler::QUIT && $this->allowQuit();
-		}
-		finally {
+		} finally {
 			// Returns the contents of the output buffer
 			$output = $this->system->CleanOutputBuffer();	
 		}

Indentation +387 added lines, -387 removed lines

@@ -41,406 +41,406 @@
  */
 class GDebug implements DebugContract
 {
-	/**
-	 * Allow Handlers to force the script to quit.
-	 * 
-	 * @var bool $allowQuit
-	 */
-	protected $allowQuit = true;
+    /**
+     * Allow Handlers to force the script to quit.
+     * 
+     * @var bool $allowQuit
+     */
+    protected $allowQuit = true;
 	
-	/**
-	 * Benchmark instance.
-	 * 
-	 * @var string $benchmark
-	 */
-	protected $benchmark;
-
-	/**
-	 * The handler stack.
-	 * 
-	 * @var array $handlerStack
-	 */
-	protected $handlerStack = [];
-
-	/**
-	 * The send Http code by default: 500 Internal Server Error.
-	 * 
-	 * @var bool $sendHttpCode
-	 */
-	protected $sendHttpCode = 500;
-
-	/**
-	 * The send output.
-	 * 
-	 * @var bool $sendOutput
-	 */
-	protected $sendOutput = true;
-
-	/**
-	 * The functions of system what control errors and exceptions.
-	 * 
-	 * @var string $system
-	 */
-	protected $system;
-
-	/**
-	 * In certain scenarios, like in shutdown handler, we can not throw exceptions.
-	 * 
-	 * @var bool $throwExceptions
-	 */
-	protected $throwExceptions = true;
-
-	/**
-	 * Constructor. The Debug class instance.
-	 * 
-	 * @param  \Syscodes\Debug\Util\System|null  $system
-	 * 
-	 * @return void
-	 */
-	public function __construct(System $system = null)
-	{
-		$this->system    = $system ?: new System;
-		$this->benchmark = new Benchmark;
-	}
-
-	/**
-	 * Catches any uncaught errors and exceptions, including most Fatal errors. Will log the 
-	 * error, display it if display_errors is on, and fire an event that allows custom actions 
-	 * to be taken at this point.
-	 *
-	 * @param  \Throwable  $exception
-	 *
-	 * @return string
-	 */
-	public function handleException(Throwable $exception)
-	{	
-		// The start benchmark
-		$this->benchmark->start('total_execution', LENEVOR_START);
-
-		$supervisor = $this->getSupervisor($exception);
-
-		// Start buffer
-		$this->system->startOutputBuferring();
-
-		$handlerResponse    = null;
-		$handlerContentType = null;
+    /**
+     * Benchmark instance.
+     * 
+     * @var string $benchmark
+     */
+    protected $benchmark;
+
+    /**
+     * The handler stack.
+     * 
+     * @var array $handlerStack
+     */
+    protected $handlerStack = [];
+
+    /**
+     * The send Http code by default: 500 Internal Server Error.
+     * 
+     * @var bool $sendHttpCode
+     */
+    protected $sendHttpCode = 500;
+
+    /**
+     * The send output.
+     * 
+     * @var bool $sendOutput
+     */
+    protected $sendOutput = true;
+
+    /**
+     * The functions of system what control errors and exceptions.
+     * 
+     * @var string $system
+     */
+    protected $system;
+
+    /**
+     * In certain scenarios, like in shutdown handler, we can not throw exceptions.
+     * 
+     * @var bool $throwExceptions
+     */
+    protected $throwExceptions = true;
+
+    /**
+     * Constructor. The Debug class instance.
+     * 
+     * @param  \Syscodes\Debug\Util\System|null  $system
+     * 
+     * @return void
+     */
+    public function __construct(System $system = null)
+    {
+        $this->system    = $system ?: new System;
+        $this->benchmark = new Benchmark;
+    }
+
+    /**
+     * Catches any uncaught errors and exceptions, including most Fatal errors. Will log the 
+     * error, display it if display_errors is on, and fire an event that allows custom actions 
+     * to be taken at this point.
+     *
+     * @param  \Throwable  $exception
+     *
+     * @return string
+     */
+    public function handleException(Throwable $exception)
+    {	
+        // The start benchmark
+        $this->benchmark->start('total_execution', LENEVOR_START);
+
+        $supervisor = $this->getSupervisor($exception);
+
+        // Start buffer
+        $this->system->startOutputBuferring();
+
+        $handlerResponse    = null;
+        $handlerContentType = null;
 		
-		try {
-			foreach ($this->handlerStack as $handler) {			
-				$handler->setDebug($this);
-				$handler->setException($exception);
-				$handler->setSupervisor($supervisor);
+        try {
+            foreach ($this->handlerStack as $handler) {			
+                $handler->setDebug($this);
+                $handler->setException($exception);
+                $handler->setSupervisor($supervisor);
 				
-				$handlerResponse = $handler->handle();
+                $handlerResponse = $handler->handle();
 	
-				// Collect the content type for possible sending in the headers
-				$handlerContentType = method_exists($handler, 'contentType') ? $handler->contentType() : null;
+                // Collect the content type for possible sending in the headers
+                $handlerContentType = method_exists($handler, 'contentType') ? $handler->contentType() : null;
 	
-				if (in_array($handlerResponse, [MainHandler::LAST_HANDLER, MainHandler::QUIT])) {
-					break;
-				}
-			}
+                if (in_array($handlerResponse, [MainHandler::LAST_HANDLER, MainHandler::QUIT])) {
+                    break;
+                }
+            }
 	
-			$Quit = $handlerResponse == MainHandler::QUIT && $this->allowQuit();
-		}
-		finally {
-			// Returns the contents of the output buffer
-			$output = $this->system->CleanOutputBuffer();	
-		}
-
-		// Returns the contents of the output buffer for loading time of page
-		$totalTime = $this->benchmark->getElapsedTime('total_execution');
-		$output    = str_replace('{elapsed_time}', $totalTime, $output);
-
-		if ($this->writeToOutput()) {
-			if ($Quit) {
-				while ($this->system->getOutputBufferLevel() > 0) {
-					// Cleanes the output buffer
-					$this->system->endOutputBuffering();
-				}
-
-				if (Misc::sendHeaders() && $handlerContentType)	{
-					header("Content-Type: {$handlerContentType}");
-				}
-			}
-
-			$this->writeToOutputBuffer($output);
-		}
-
-		if ($Quit) {
-			$this->system->flushOutputBuffer();
-			$this->system->stopException(1);
-		}
-
-		return $output;
-	}
-
-	/**
-	 * Allow Handlers to force the script to quit.
-	 * 
-	 * @param  bool|int|null  $exit
-	 * 
-	 * @return bool
-	 */
-	public function allowQuit($exit = null)
-	{
-		if (func_num_args() == 0) {
-			return $this->allowQuit;
-		}
-
-		return $this->allowQuit = (bool) $exit;
-	}
-
-	/**
-	 * Lenevor Exception push output directly to the client it the data  
-	 * if they are true, but if it is false, the output will be returned 
-	 * by exception.
-	 * 
-	 * @param  bool|int|null  $send
-	 *
-	 * @return bool
-	 */
-	public function writeToOutput($send = null)
-	{
-		if (func_num_args() == 0) {
-			return $this->sendOutput;
-		}
+            $Quit = $handlerResponse == MainHandler::QUIT && $this->allowQuit();
+        }
+        finally {
+            // Returns the contents of the output buffer
+            $output = $this->system->CleanOutputBuffer();	
+        }
+
+        // Returns the contents of the output buffer for loading time of page
+        $totalTime = $this->benchmark->getElapsedTime('total_execution');
+        $output    = str_replace('{elapsed_time}', $totalTime, $output);
+
+        if ($this->writeToOutput()) {
+            if ($Quit) {
+                while ($this->system->getOutputBufferLevel() > 0) {
+                    // Cleanes the output buffer
+                    $this->system->endOutputBuffering();
+                }
+
+                if (Misc::sendHeaders() && $handlerContentType)	{
+                    header("Content-Type: {$handlerContentType}");
+                }
+            }
+
+            $this->writeToOutputBuffer($output);
+        }
+
+        if ($Quit) {
+            $this->system->flushOutputBuffer();
+            $this->system->stopException(1);
+        }
+
+        return $output;
+    }
+
+    /**
+     * Allow Handlers to force the script to quit.
+     * 
+     * @param  bool|int|null  $exit
+     * 
+     * @return bool
+     */
+    public function allowQuit($exit = null)
+    {
+        if (func_num_args() == 0) {
+            return $this->allowQuit;
+        }
+
+        return $this->allowQuit = (bool) $exit;
+    }
+
+    /**
+     * Lenevor Exception push output directly to the client it the data  
+     * if they are true, but if it is false, the output will be returned 
+     * by exception.
+     * 
+     * @param  bool|int|null  $send
+     *
+     * @return bool
+     */
+    public function writeToOutput($send = null)
+    {
+        if (func_num_args() == 0) {
+            return $this->sendOutput;
+        }
 		
-		return $this->sendOutput = (bool) $send;
-	}
+        return $this->sendOutput = (bool) $send;
+    }
 	
-	/**
-	 * Generate output to the browser.
-	 * 
-	 * @param  string  $output
-	 * 
-	 * @return $this
-	 */
-	protected function writeToOutputBuffer($output)
-	{
-		if ($this->sendHttpCode() && Misc::sendHeaders()) {
-			$this->system->setHttpResponseCode($this->sendHttpCode());
-		}
+    /**
+     * Generate output to the browser.
+     * 
+     * @param  string  $output
+     * 
+     * @return $this
+     */
+    protected function writeToOutputBuffer($output)
+    {
+        if ($this->sendHttpCode() && Misc::sendHeaders()) {
+            $this->system->setHttpResponseCode($this->sendHttpCode());
+        }
 		
-		echo $output;
+        echo $output;
 		
-		return $this;
-	}
-
-	/**
-	 * Error handler
-	 *
-	 * This will catch the php native error and treat it as a exception which will 
-	 * provide a full back trace on all errors.
-	 *
-	 * @param  int  $level
-	 * @param  string  $message
-	 * @param  string|null  $file
-	 * @param  int|null  $line
-	 *
-	 * @throws \ErrorException
-	 */
-	public function handleError(int $level, string $message, string $file = null, int $line = null)
-	{
-		if ($level & $this->system->getErrorReportingLevel()) {
-			$exception = new ErrorException($message, $level, $level, $file, $line);
-
-			if ($this->throwExceptions) {
-				throw $exception;
-			} else {
-				$this->handleException($exception);
-			}
-
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Pushes a handler to the end of the stack.
-	 * 
-	 * @param  \Callable|\Syscodes\Contracts\Debug\Handler  $handler
-	 * 
-	 * @return \Syscodes\Contracts\Debug\Handler
-	 */
-	public function pushHandler($handler)
-	{
-		return $this->prependHandler($handler);
-	}
-
-	/**
-	 * Appends a handler to the end of the stack.
-	 * 
-	 * @param  \Callable|\Syscodes\Contracts\Debug\Handler  $handler
-	 * 
-	 * @return $this
-	 */
-	public function appendHandler($handler)
-	{
-		array_unshift($this->handlerStack, $this->resolveHandler($handler));
-
-		return $this;
-	}
-
-	/**
-	 * Prepends a handler to the start of the stack.
-	 * 
-	 * @param  \Callable|\Syscodes\Contracts\Debug\Handler  $handler
-	 * 
-	 * @return $this
-	 */
-	public function prependHandler($handler)
-	{
-		array_unshift($this->handlerStack, $this->resolveHandler($handler));
-
-		return $this;
-	}
-
-	/**
-	 * Create a CallbackHandler from callable and throw if handler is invalid.
-	 * 
-	 * @param  \Callable|\Syscodes\Contracts\Debug\Handler  $handler
-	 * 
-	 * @return \Syscodes\Contracts\Debug\Handler
-	 * 
-	 * @throws \InvalidArgumentException If argument is not callable or instance of \Syscodes\Contracts\Debug\Handler
-	 */
-	protected function resolveHandler($handler)
-	{
-		if (is_callable($handler)) {
-			$handler = new CallbackHandler($handler);
-		}
-
-		if ( ! $handler instanceof MainHandler) {
-			throw new InvalidArgumentException(
-				"Argument to " . __METHOD__ . " must be a callable, or instance of ".
-				"Syscodes\\Contracts\\Debug\\Handler"
-			);
-		}
-
-		return $handler;
-	}
-
-	/**
-	 * Returns an array with all handlers, in the order they were added to the stack.
-	 * 
-	 * @return array
-	 */
-	public function getHandlers()
-	{
-		return $this->handlerStack;
-	}
-
-	/**
-	 * Clears all handlers in the handlerStack, including the default PleasingPage handler.
-	 * 
-	 * @return $this
-	 */
-	public function clearHandlers()
-	{
-		$this->handlerStack = [];
-
-		return $this;
-	}
-
-	/**
-	 * Removes the last handler in the stack and returns it.
-	 * 
-	 * @return array|null
-	 */
-	public function popHandler()
-	{
-		return array_pop($this->handlerStack);
-	}
-
-	/**
-	 * Gets supervisor already specified.
-	 * 
-	 * @param  \Throwable  $exception
-	 * 
-	 * @return \Syscodes\Debug\Engine\Supervisor
-	 */
-	protected function getSupervisor(Throwable $exception)
-	{
-		return new Supervisor($exception);
-	}
-
-	/**
-	 * Unregisters all handlers registered by this Debug instance.
-	 * 
-	 * @return void
-	 */
-	public function off()
-	{
-		$this->system->restoreExceptionHandler();
-		$this->system->restoreErrorHandler();
-	}
+        return $this;
+    }
+
+    /**
+     * Error handler
+     *
+     * This will catch the php native error and treat it as a exception which will 
+     * provide a full back trace on all errors.
+     *
+     * @param  int  $level
+     * @param  string  $message
+     * @param  string|null  $file
+     * @param  int|null  $line
+     *
+     * @throws \ErrorException
+     */
+    public function handleError(int $level, string $message, string $file = null, int $line = null)
+    {
+        if ($level & $this->system->getErrorReportingLevel()) {
+            $exception = new ErrorException($message, $level, $level, $file, $line);
+
+            if ($this->throwExceptions) {
+                throw $exception;
+            } else {
+                $this->handleException($exception);
+            }
+
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Pushes a handler to the end of the stack.
+     * 
+     * @param  \Callable|\Syscodes\Contracts\Debug\Handler  $handler
+     * 
+     * @return \Syscodes\Contracts\Debug\Handler
+     */
+    public function pushHandler($handler)
+    {
+        return $this->prependHandler($handler);
+    }
+
+    /**
+     * Appends a handler to the end of the stack.
+     * 
+     * @param  \Callable|\Syscodes\Contracts\Debug\Handler  $handler
+     * 
+     * @return $this
+     */
+    public function appendHandler($handler)
+    {
+        array_unshift($this->handlerStack, $this->resolveHandler($handler));
+
+        return $this;
+    }
+
+    /**
+     * Prepends a handler to the start of the stack.
+     * 
+     * @param  \Callable|\Syscodes\Contracts\Debug\Handler  $handler
+     * 
+     * @return $this
+     */
+    public function prependHandler($handler)
+    {
+        array_unshift($this->handlerStack, $this->resolveHandler($handler));
+
+        return $this;
+    }
+
+    /**
+     * Create a CallbackHandler from callable and throw if handler is invalid.
+     * 
+     * @param  \Callable|\Syscodes\Contracts\Debug\Handler  $handler
+     * 
+     * @return \Syscodes\Contracts\Debug\Handler
+     * 
+     * @throws \InvalidArgumentException If argument is not callable or instance of \Syscodes\Contracts\Debug\Handler
+     */
+    protected function resolveHandler($handler)
+    {
+        if (is_callable($handler)) {
+            $handler = new CallbackHandler($handler);
+        }
+
+        if ( ! $handler instanceof MainHandler) {
+            throw new InvalidArgumentException(
+                "Argument to " . __METHOD__ . " must be a callable, or instance of ".
+                "Syscodes\\Contracts\\Debug\\Handler"
+            );
+        }
+
+        return $handler;
+    }
+
+    /**
+     * Returns an array with all handlers, in the order they were added to the stack.
+     * 
+     * @return array
+     */
+    public function getHandlers()
+    {
+        return $this->handlerStack;
+    }
+
+    /**
+     * Clears all handlers in the handlerStack, including the default PleasingPage handler.
+     * 
+     * @return $this
+     */
+    public function clearHandlers()
+    {
+        $this->handlerStack = [];
+
+        return $this;
+    }
+
+    /**
+     * Removes the last handler in the stack and returns it.
+     * 
+     * @return array|null
+     */
+    public function popHandler()
+    {
+        return array_pop($this->handlerStack);
+    }
+
+    /**
+     * Gets supervisor already specified.
+     * 
+     * @param  \Throwable  $exception
+     * 
+     * @return \Syscodes\Debug\Engine\Supervisor
+     */
+    protected function getSupervisor(Throwable $exception)
+    {
+        return new Supervisor($exception);
+    }
+
+    /**
+     * Unregisters all handlers registered by this Debug instance.
+     * 
+     * @return void
+     */
+    public function off()
+    {
+        $this->system->restoreExceptionHandler();
+        $this->system->restoreErrorHandler();
+    }
 	
-	/**
-	 * Registers this instance as an error handler.
-	 * 
-	 * @return void
-	 */
-	public function on() 
-	{
-		// Set the exception handler
-		$this->system->setExceptionHandler([$this, self::EXCEPTION_HANDLER]);
-		// Set the error handler
-		$this->system->setErrorHandler([$this, self::ERROR_HANDLER]);
-		// Set the handler for shutdown to catch Parse errors
-		$this->system->registerShutdownFunction([$this, self::SHUTDOWN_HANDLER]);
-	}
-
-	/**
-	 * Lenevor Exception will by default send HTTP code 500, but you may wish
-	 * to use 502, 503, or another 5xx family code.
-	 * 
-	 * @param  bool|int  $code
-	 * 
-	 * @return int|false
-	 * 
-	 * @throws \InvalidArgumentException
-	 */
-	public function sendHttpCode($code = null)
-	{
-		if (func_num_args() == 0) {
-			return $this->sendHttpCode;
-		}
+    /**
+     * Registers this instance as an error handler.
+     * 
+     * @return void
+     */
+    public function on() 
+    {
+        // Set the exception handler
+        $this->system->setExceptionHandler([$this, self::EXCEPTION_HANDLER]);
+        // Set the error handler
+        $this->system->setErrorHandler([$this, self::ERROR_HANDLER]);
+        // Set the handler for shutdown to catch Parse errors
+        $this->system->registerShutdownFunction([$this, self::SHUTDOWN_HANDLER]);
+    }
+
+    /**
+     * Lenevor Exception will by default send HTTP code 500, but you may wish
+     * to use 502, 503, or another 5xx family code.
+     * 
+     * @param  bool|int  $code
+     * 
+     * @return int|false
+     * 
+     * @throws \InvalidArgumentException
+     */
+    public function sendHttpCode($code = null)
+    {
+        if (func_num_args() == 0) {
+            return $this->sendHttpCode;
+        }
 		
-		if ( ! $code) {
-			return $this->sendHttpCode = false;
-		}
+        if ( ! $code) {
+            return $this->sendHttpCode = false;
+        }
 		
-		if ($code === true) {
-			$code = 500;
-		}
+        if ($code === true) {
+            $code = 500;
+        }
 		
-		if ($code < 400 || 600 <= $code) {
-			throw new InvalidArgumentException("Invalid status code {$code}, must be 4xx or 5xx");
-		}
+        if ($code < 400 || 600 <= $code) {
+            throw new InvalidArgumentException("Invalid status code {$code}, must be 4xx or 5xx");
+        }
 		
-		return $this->sendHttpCode = $code;
-	}
-
-	/**
-	 * This will catch errors that are generated at the shutdown level of execution.
-	 *
-	 * @return void
-	 *
-	 * @throws \ErrorException
-	 */
-	public function handleShutdown()
-	{
-		$this->throwExceptions = false;
-
-		$error = $this->system->getLastError();
-
-		// If we've got an error that hasn't been displayed, then convert
-		// it to an Exception and use the Exception handler to display it
-		// to the user
-		if ($error && Misc::isFatalError($error['type'])) {
-			$this->errorHandler($error['type'], $error['message'], $error['file'], $error['line']);
-		}
-	}
+        return $this->sendHttpCode = $code;
+    }
+
+    /**
+     * This will catch errors that are generated at the shutdown level of execution.
+     *
+     * @return void
+     *
+     * @throws \ErrorException
+     */
+    public function handleShutdown()
+    {
+        $this->throwExceptions = false;
+
+        $error = $this->system->getLastError();
+
+        // If we've got an error that hasn't been displayed, then convert
+        // it to an Exception and use the Exception handler to display it
+        // to the user
+        if ($error && Misc::isFatalError($error['type'])) {
+            $this->errorHandler($error['type'], $error['message'], $error['file'], $error['line']);
+        }
+    }
 }
\ No newline at end of file

src/components/Debug/ExceptionHandler.php

Spacing +3 added lines, -3 removed lines

@@ -159,7 +159,7 @@ 
 
         $caughtLength = $this->caughtLength = 0;
 
-        ob_start(function ($buffer) {
+        ob_start(function($buffer) {
             $this->caughtBuffer = $buffer;
 
             return '';            
@@ -168,7 +168,7 @@ 
         $this->sendPhpResponse($exception);
 
         if (isset($this->caughtBuffer[0])) {
-            ob_start(function ($buffer) {
+            ob_start(function($buffer) {
                 if ($this->caughtLength) {
                     $cleanBuffer = substr_replace($buffer, '', 0, $this->caughtLength);
 
@@ -458,7 +458,7 @@ 
         }
 
         if (is_string($frmt)) {
-            $index  = strpos($f = $frmt, '&', max(strrpos($f, '%f'), strrpos($f, '%l')) ?: strlen($f));
+            $index = strpos($f = $frmt, '&', max(strrpos($f, '%f'), strrpos($f, '%l')) ?: strlen($f));
             $frmt = [substr($f, 0, $index)] + preg_split('/&([^>]++)>/', substr($f, $index), -1, PREG_SPLIT_DELIM_CAPTURE);
 
             for ($index = 1; isset($frmt[$index]); ++$index) {

src/components/Debug/Exceptions/Handlers/PleasingPageHandler.php

Indentation +407 added lines, -407 removed lines

@@ -41,429 +41,429 @@
  */
 class PleasingPageHandler extends MainHandler
 {
-	/**
-	 * The brand main of handler.
-	 * 
-	 * @var string $brand
-	 */
-	protected $brand = 'Lenevor Debug';
-
-	/**
-	 * A string identifier for a known IDE/text editor, or a closure
-	 * that resolves a string that can be used to open a given file
-	 * in an editor.
-	 * 
-	 * @var mixed $editor
-	 */
-	protected $editor;
-
-	/**
-	 * A list of known editor strings.
-	 * 
-	 * @var array $editors
-	 */
-	protected $editors = [
-		"vscode"   => "vscode://file/%file:%line",
-		"sublime"  => "subl://open?url=file://%file&line=%line",
-		"phpstorm" => "phpstorm://open?file://%file&line=%line",
-		"textmate" => "txmt://open?url=file://%file&line=%line",
-		"atom"     => "atom://core/open/file?filename=%file&line=%line",
-	];
+    /**
+     * The brand main of handler.
+     * 
+     * @var string $brand
+     */
+    protected $brand = 'Lenevor Debug';
+
+    /**
+     * A string identifier for a known IDE/text editor, or a closure
+     * that resolves a string that can be used to open a given file
+     * in an editor.
+     * 
+     * @var mixed $editor
+     */
+    protected $editor;
+
+    /**
+     * A list of known editor strings.
+     * 
+     * @var array $editors
+     */
+    protected $editors = [
+        "vscode"   => "vscode://file/%file:%line",
+        "sublime"  => "subl://open?url=file://%file&line=%line",
+        "phpstorm" => "phpstorm://open?file://%file&line=%line",
+        "textmate" => "txmt://open?url=file://%file&line=%line",
+        "atom"     => "atom://core/open/file?filename=%file&line=%line",
+    ];
 	
-	/**
-	 * The page title main of handler.
-	 * 
-	 * @var string $pageTitle
-	 */
-	protected $pageTitle = 'Lenevor Debug! There was an error.';
+    /**
+     * The page title main of handler.
+     * 
+     * @var string $pageTitle
+     */
+    protected $pageTitle = 'Lenevor Debug! There was an error.';
 	
-	/**
-	 * Fast lookup cache for known resource locations.
-	 * 
-	 * @var array $resourceCache
-	 */
-	protected $resourceCache = [];
+    /**
+     * Fast lookup cache for known resource locations.
+     * 
+     * @var array $resourceCache
+     */
+    protected $resourceCache = [];
 	
-	/**
-	 * The path to the directory containing the html error template directories.
-	 * 
-	 * @var array $searchPaths
-	 */
-	protected $searchPaths = [];
-
-	/**
-	 * Gets the table of data.
-	 * 
-	 * @var array $tables
-	 */
-	protected $tables = [];
+    /**
+     * The path to the directory containing the html error template directories.
+     * 
+     * @var array $searchPaths
+     */
+    protected $searchPaths = [];
+
+    /**
+     * Gets the table of data.
+     * 
+     * @var array $tables
+     */
+    protected $tables = [];
 	
-	/**
-	 * The template handler system.
-	 * 
-	 * @var string $template
-	 */
-	protected $template;	
+    /**
+     * The template handler system.
+     * 
+     * @var string $template
+     */
+    protected $template;	
 	
-	/**
-	 * Constructor. The PleasingPageHandler class.
-	 * 
-	 * @return void
-	 */
-	public function __construct()
-	{
-		$this->template      = new TemplateHandler;
-		$this->searchPaths[] = dirname(__DIR__).DIRECTORY_SEPARATOR.'Resources';
-	}
-
-	/**
-	 * Adds an editor resolver, identified by a string name, and that may be a 
-	 * string path, or a callable resolver.
-	 * 
-	 * @param  string            $identifier
-	 * @param  string|\Callable  $resolver
-	 * 
-	 * @return void
-	 */
-	public function addEditor($identifier, $resolver)
-	{
-		$this->editors[$identifier] = $resolver;
-	}
-
-	/**
-	 * Adds an entry to the list of tables displayed in the template.
-	 * The expected data is a simple associative array. Any nested arrays
-	 * will be flattened with print_r.
-	 * 
-	 * @param  \Syscodes\Contracts\Debug\Table  $table
-	 * 
-	 * @return array
-	 */
-	public function addTables(Table $table)
-	{
-		$this->tables[] = $table;
-	}
+    /**
+     * Constructor. The PleasingPageHandler class.
+     * 
+     * @return void
+     */
+    public function __construct()
+    {
+        $this->template      = new TemplateHandler;
+        $this->searchPaths[] = dirname(__DIR__).DIRECTORY_SEPARATOR.'Resources';
+    }
+
+    /**
+     * Adds an editor resolver, identified by a string name, and that may be a 
+     * string path, or a callable resolver.
+     * 
+     * @param  string            $identifier
+     * @param  string|\Callable  $resolver
+     * 
+     * @return void
+     */
+    public function addEditor($identifier, $resolver)
+    {
+        $this->editors[$identifier] = $resolver;
+    }
+
+    /**
+     * Adds an entry to the list of tables displayed in the template.
+     * The expected data is a simple associative array. Any nested arrays
+     * will be flattened with print_r.
+     * 
+     * @param  \Syscodes\Contracts\Debug\Table  $table
+     * 
+     * @return array
+     */
+    public function addTables(Table $table)
+    {
+        $this->tables[] = $table;
+    }
 	
-	/**
-	 * Gathers the variables that will be made available to the view.
-	 * 
-	 * @return  array
-	 */
-	protected function collectionVars()
-	{
-		$supervisor = $this->getSupervisor();
-		$style      = file_get_contents($this->getResource('css/debug.base.css'));
-		$jscript    = file_get_contents($this->getResource('js/debug.base.js'));
-		$tables     = array_merge($this->getDefaultTables(), $this->tables);
+    /**
+     * Gathers the variables that will be made available to the view.
+     * 
+     * @return  array
+     */
+    protected function collectionVars()
+    {
+        $supervisor = $this->getSupervisor();
+        $style      = file_get_contents($this->getResource('css/debug.base.css'));
+        $jscript    = file_get_contents($this->getResource('js/debug.base.js'));
+        $tables     = array_merge($this->getDefaultTables(), $this->tables);
 		
-		return [ 
-			'class'             => explode('\\', $supervisor->getExceptionName()),
-			'stylesheet'        => preg_replace('#[\r\n\t ]+#', ' ', $style),
-			'javascript'        => preg_replace('#[\r\n\t ]+#', ' ', $jscript),
-			'header'            => $this->getResource('views/header.php'),
-			'sidebar'           => $this->getResource('views/sidebar.php'),
-			'frame_description' => $this->getResource('views/frame_description.php'),
-			'frame_list'        => $this->getResource('views/frame_list.php'),
-			'details_panel'     => $this->getResource('views/details_panel.php'),
-			'code_source'       => $this->getResource('views/code_source.php'),
-			'details_content'   => $this->getResource('views/details_content.php'),
-			'footer'            => $this->getResource('views/footer.php'),
-			'plain_exception'   => Formatter::formatExceptionAsPlainText($this->getSupervisor()),
-			'handler'           => $this,
-			'handlers'          => $this->getDebug()->getHandlers(),
-			'debug'             => $this->getDebug(),
-			'code'              => $this->getExceptionCode(),
-			'message'           => $supervisor->getExceptionMessage(),
-			'frames'            => $this->getExceptionFrames(),
-			'tables'            => $this->getProcessTables($tables),
-		];
-	}
+        return [ 
+            'class'             => explode('\\', $supervisor->getExceptionName()),
+            'stylesheet'        => preg_replace('#[\r\n\t ]+#', ' ', $style),
+            'javascript'        => preg_replace('#[\r\n\t ]+#', ' ', $jscript),
+            'header'            => $this->getResource('views/header.php'),
+            'sidebar'           => $this->getResource('views/sidebar.php'),
+            'frame_description' => $this->getResource('views/frame_description.php'),
+            'frame_list'        => $this->getResource('views/frame_list.php'),
+            'details_panel'     => $this->getResource('views/details_panel.php'),
+            'code_source'       => $this->getResource('views/code_source.php'),
+            'details_content'   => $this->getResource('views/details_content.php'),
+            'footer'            => $this->getResource('views/footer.php'),
+            'plain_exception'   => Formatter::formatExceptionAsPlainText($this->getSupervisor()),
+            'handler'           => $this,
+            'handlers'          => $this->getDebug()->getHandlers(),
+            'debug'             => $this->getDebug(),
+            'code'              => $this->getExceptionCode(),
+            'message'           => $supervisor->getExceptionMessage(),
+            'frames'            => $this->getExceptionFrames(),
+            'tables'            => $this->getProcessTables($tables),
+        ];
+    }
 	
-	/**
-	 * The way in which the data sender (usually the server) can tell the recipient
-	 * (the browser, in general) what type of data is being sent in this case, html format tagged.
-	 * 
-	 * @return string
-	 */
-	public function contentType()
-	{
-		return 'text/html;charset=UTF-8';
-	}
-
-	/**
-	 * Gets the brand of project.
-	 * 
-	 * @return string
-	 */
-	public function getBrand()
-	{
-		return $this->brand;
-	}
-
-	/**
-	 * Returns the default tables.
-	 * 
-	 * @return \Syscodes\Contracts\Debug\Table[]
-	 */
-	protected function getDefaultTables()
-	{
-		return [
-			new ArrayTable('GET Data', $_GET),
-			new ArrayTable('POST Data', $_POST),
-			new ArrayTable('Files', $_FILES),
-			new ArrayTable('Cookie', $_COOKIE),
-			new ArrayTable('Session', isset($_SESSION) ? $_SESSION : []),
-			new ArrayTable('Server/Request Data', $_SERVER),
-			new ArrayTable(__('exception.environmentVars'), $_ENV),
-		];
-	}
-
-	/**
-	 * Get the code of the exception that is currently being handled.
-	 * 
-	 * @return string
-	 */
-	protected function getExceptionCode()
-	{
-		$exception = $this->getException();
-		$code      = $exception->getCode();
-
-		if ($exception instanceof ErrorException) {
-			$code = Misc::translateErrorCode($exception->getSeverity());
-		}
-
-		return (string) $code;
-	}
-
-	/**
-	 * Get the stack trace frames of the exception that is currently being handled.
-	 * 
-	 * @return \Syscodes\Debug\Engine\Supervisor;
-	 */
-	protected function getExceptionFrames()
-	{
-		$frames = $this->getSupervisor()->getFrames();
+    /**
+     * The way in which the data sender (usually the server) can tell the recipient
+     * (the browser, in general) what type of data is being sent in this case, html format tagged.
+     * 
+     * @return string
+     */
+    public function contentType()
+    {
+        return 'text/html;charset=UTF-8';
+    }
+
+    /**
+     * Gets the brand of project.
+     * 
+     * @return string
+     */
+    public function getBrand()
+    {
+        return $this->brand;
+    }
+
+    /**
+     * Returns the default tables.
+     * 
+     * @return \Syscodes\Contracts\Debug\Table[]
+     */
+    protected function getDefaultTables()
+    {
+        return [
+            new ArrayTable('GET Data', $_GET),
+            new ArrayTable('POST Data', $_POST),
+            new ArrayTable('Files', $_FILES),
+            new ArrayTable('Cookie', $_COOKIE),
+            new ArrayTable('Session', isset($_SESSION) ? $_SESSION : []),
+            new ArrayTable('Server/Request Data', $_SERVER),
+            new ArrayTable(__('exception.environmentVars'), $_ENV),
+        ];
+    }
+
+    /**
+     * Get the code of the exception that is currently being handled.
+     * 
+     * @return string
+     */
+    protected function getExceptionCode()
+    {
+        $exception = $this->getException();
+        $code      = $exception->getCode();
+
+        if ($exception instanceof ErrorException) {
+            $code = Misc::translateErrorCode($exception->getSeverity());
+        }
+
+        return (string) $code;
+    }
+
+    /**
+     * Get the stack trace frames of the exception that is currently being handled.
+     * 
+     * @return \Syscodes\Debug\Engine\Supervisor;
+     */
+    protected function getExceptionFrames()
+    {
+        $frames = $this->getSupervisor()->getFrames();
 		
-		return $frames;
-	}
+        return $frames;
+    }
 	
-	/**
-	 * Gets the page title web.
-	 * 
-	 * @return string
-	 */
-	public function getPageTitle()
-	{
-		return $this->pageTitle;
-	}
-
-	/**
-	 * Processes an array of tables making sure everything is allright.
-	 * 
-	 * @param  \Syscodes\Contracts\Debug\Table[]  $tables
-	 * 
-	 * @return array
-	 */
-	protected function getProcessTables(array $tables)
-	{
-		$processTables = [];
-
-		foreach ($tables as $table) {
-			if ( ! $table instanceof Table) {
-				continue;
-			}
-
-			$label = $table->getLabel();
-
-			try {
-				$data = $table->getData();
-
-				if ( ! (is_array($data) || $data instanceof Traversable)) {
-					$data = [];
-				}
-			} catch (Exception $e) {
-				$data = [];
-			}
-
-			$processTables[$label] = $data;
-		}
-
-		return $processTables;
-	}
-
-	/**
-	 * Finds a resource, by its relative path, in all available search paths.
-	 *
-	 * @param  string  $resource
-	 * 
-	 * @return string
-	 * 
-	 * @throws \RuntimeException
-	 */
-	protected function getResource($resource)
-	{
-		if (isset($this->resourceCache[$resource])) {
-			return $this->resourceCache[$resource];
-		}
-
-		foreach ($this->searchPaths as $path) {
-			$fullPath = $path.DIRECTORY_SEPARATOR.$resource;
-
-			if (is_file($fullPath)) {
-				// Cache:
-				$this->resourceCache[$resource] = $fullPath;
-
-				return $fullPath;
-			}
-		}
-
-		throw new RuntimeException( 
-				"Could not find resource '{$resource}' in any resource paths.". 
-				"(searched: ".join(", ", $this->searchPaths).")");
-	}
+    /**
+     * Gets the page title web.
+     * 
+     * @return string
+     */
+    public function getPageTitle()
+    {
+        return $this->pageTitle;
+    }
+
+    /**
+     * Processes an array of tables making sure everything is allright.
+     * 
+     * @param  \Syscodes\Contracts\Debug\Table[]  $tables
+     * 
+     * @return array
+     */
+    protected function getProcessTables(array $tables)
+    {
+        $processTables = [];
+
+        foreach ($tables as $table) {
+            if ( ! $table instanceof Table) {
+                continue;
+            }
+
+            $label = $table->getLabel();
+
+            try {
+                $data = $table->getData();
+
+                if ( ! (is_array($data) || $data instanceof Traversable)) {
+                    $data = [];
+                }
+            } catch (Exception $e) {
+                $data = [];
+            }
+
+            $processTables[$label] = $data;
+        }
+
+        return $processTables;
+    }
+
+    /**
+     * Finds a resource, by its relative path, in all available search paths.
+     *
+     * @param  string  $resource
+     * 
+     * @return string
+     * 
+     * @throws \RuntimeException
+     */
+    protected function getResource($resource)
+    {
+        if (isset($this->resourceCache[$resource])) {
+            return $this->resourceCache[$resource];
+        }
+
+        foreach ($this->searchPaths as $path) {
+            $fullPath = $path.DIRECTORY_SEPARATOR.$resource;
+
+            if (is_file($fullPath)) {
+                // Cache:
+                $this->resourceCache[$resource] = $fullPath;
+
+                return $fullPath;
+            }
+        }
+
+        throw new RuntimeException( 
+                "Could not find resource '{$resource}' in any resource paths.". 
+                "(searched: ".join(", ", $this->searchPaths).")");
+    }
 	
-	/**
-	 * Given an exception and status code will display the error to the client.
-	 * 
-	 * @return int|null
-	 */
-	public function handle()
-	{	
-		$templatePath = $this->getResource('debug.layout.php');
-
-		$vars = $this->collectionVars();
+    /**
+     * Given an exception and status code will display the error to the client.
+     * 
+     * @return int|null
+     */
+    public function handle()
+    {	
+        $templatePath = $this->getResource('debug.layout.php');
+
+        $vars = $this->collectionVars();
 		
-		if (empty($vars['message'])) $vars['message'] = __('exception.noMessage');
+        if (empty($vars['message'])) $vars['message'] = __('exception.noMessage');
 		
-		$this->template->setVariables($vars);
-		$this->template->render($templatePath);
+        $this->template->setVariables($vars);
+        $this->template->render($templatePath);
 		
-		return MainHandler::QUIT;
-	}
-
-	/**
-	 * Set the editor to use to open referenced files, by a string identifier or callable
-	 * that will be executed for every file reference. Should return a string.
-	 * 
-	 * @example  $debug->setEditor(function($file, $line) { return "file:///{$file}"; });
-	 * @example  $debug->setEditor('vscode');
-	 * 
-	 * @param  string  $editor
-	 * 
-	 * @return void
-	 * 
-	 * @throws \InvalidArgumentException
-	 */
-	public function setEditor($editor)
-	{
-		if ( ! is_callable($editor) && ! isset($this->editors[$editor])) {
-			throw new InvalidArgumentException("Unknown editor identifier: [{$editor}]. Known editors: " .
-				implode(', ', array_keys($this->editors))
-			);
-		}
-
-		$this->editor = $editor;
-	}
-
-	/**
-	 * Given a string file path, and an integer file line,
-	 * executes the editor resolver and returns.
-	 * 
-	 * @param  string  $file
-	 * @param  int	   $line
-	 * 
-	 * @return string|bool
-	 * 
-	 * @throws \UnexpectedValueException
-	 */
-	public function getEditorAtHref($file, $line)
-	{
-		$editor = $this->getEditor($file, $line);
-
-		if (empty($editor))	{
-			return false;
-		}
-
-		if ( ! isset($editor['url']) || ! is_string($editor['url'])) {
-			throw new UnexpectedValueException(__METHOD__.'should always resolve to a string or a valid editor array');
-		}
-
-		$editor['url'] = str_replace("%file", rawurldecode($file), $editor['url']);
-		$editor['url'] = str_replace("%line", rawurldecode($line), $editor['url']);
-
-		return $editor['url'];
-	}
-
-	/**
-	 * The editor must be a valid callable function/closure.
-	 * 
-	 * @param  string  $file
-	 * @param  int	   $line
-	 * 
-	 * @return array
-	 */
-	protected function getEditor($file, $line)
-	{
-		if ( ! $this->editor || ( ! is_string($this->editor) && ! is_callable($this->editor))) {
-			return [];
-		}
-
-		if (is_string($this->editor) && isset($this->editors[$this->editor]) && ! is_callable($this->editors[$this->editor])) {
-			return ['url' => $this->editors[$this->editor]];
-		}
-
-		if (is_callable($this->editor) || (isset($this->editors[$this->editor]) && is_callable($this->editors[$this->editor]))) {
-			if (is_callable($this->editor)) {
-				$callback = call_user_func($this->editor, $filePath, $line);
-			} else {
-				$callback = call_user_func($this->editors[$this->editor], $filePath, $line);
-			}
-
-			if (empty($callback)) {
-				return [];
-			}
-
-			if (is_string($callback)) {
-				return ['url' => $callback];
-			}
+        return MainHandler::QUIT;
+    }
+
+    /**
+     * Set the editor to use to open referenced files, by a string identifier or callable
+     * that will be executed for every file reference. Should return a string.
+     * 
+     * @example  $debug->setEditor(function($file, $line) { return "file:///{$file}"; });
+     * @example  $debug->setEditor('vscode');
+     * 
+     * @param  string  $editor
+     * 
+     * @return void
+     * 
+     * @throws \InvalidArgumentException
+     */
+    public function setEditor($editor)
+    {
+        if ( ! is_callable($editor) && ! isset($this->editors[$editor])) {
+            throw new InvalidArgumentException("Unknown editor identifier: [{$editor}]. Known editors: " .
+                implode(', ', array_keys($this->editors))
+            );
+        }
+
+        $this->editor = $editor;
+    }
+
+    /**
+     * Given a string file path, and an integer file line,
+     * executes the editor resolver and returns.
+     * 
+     * @param  string  $file
+     * @param  int	   $line
+     * 
+     * @return string|bool
+     * 
+     * @throws \UnexpectedValueException
+     */
+    public function getEditorAtHref($file, $line)
+    {
+        $editor = $this->getEditor($file, $line);
+
+        if (empty($editor))	{
+            return false;
+        }
+
+        if ( ! isset($editor['url']) || ! is_string($editor['url'])) {
+            throw new UnexpectedValueException(__METHOD__.'should always resolve to a string or a valid editor array');
+        }
+
+        $editor['url'] = str_replace("%file", rawurldecode($file), $editor['url']);
+        $editor['url'] = str_replace("%line", rawurldecode($line), $editor['url']);
+
+        return $editor['url'];
+    }
+
+    /**
+     * The editor must be a valid callable function/closure.
+     * 
+     * @param  string  $file
+     * @param  int	   $line
+     * 
+     * @return array
+     */
+    protected function getEditor($file, $line)
+    {
+        if ( ! $this->editor || ( ! is_string($this->editor) && ! is_callable($this->editor))) {
+            return [];
+        }
+
+        if (is_string($this->editor) && isset($this->editors[$this->editor]) && ! is_callable($this->editors[$this->editor])) {
+            return ['url' => $this->editors[$this->editor]];
+        }
+
+        if (is_callable($this->editor) || (isset($this->editors[$this->editor]) && is_callable($this->editors[$this->editor]))) {
+            if (is_callable($this->editor)) {
+                $callback = call_user_func($this->editor, $filePath, $line);
+            } else {
+                $callback = call_user_func($this->editors[$this->editor], $filePath, $line);
+            }
+
+            if (empty($callback)) {
+                return [];
+            }
+
+            if (is_string($callback)) {
+                return ['url' => $callback];
+            }
 			
-			return ['url' => isset($callback['url']) ? $callback['url'] : $callback];
-		}
+            return ['url' => isset($callback['url']) ? $callback['url'] : $callback];
+        }
 		
-		return [];
-	}
-
-	/**
-	 * Registered the editor.
-	 * 
-	 * @return string
-	 */
-	public function getEditorcode()
-	{
-		return $this->editor;
-	}
+        return [];
+    }
+
+    /**
+     * Registered the editor.
+     * 
+     * @return string
+     */
+    public function getEditorcode()
+    {
+        return $this->editor;
+    }
 	
-	/**
-	 * Sets the brand of project.
-	 * 
-	 * @param  string  $brand
-	 * 
-	 * @return void
-	 */
-	public function setBrand($brand)
-	{
-		$this->brand = (string) $brand;
-	}
+    /**
+     * Sets the brand of project.
+     * 
+     * @param  string  $brand
+     * 
+     * @return void
+     */
+    public function setBrand($brand)
+    {
+        $this->brand = (string) $brand;
+    }
 	
-	/**
-	 * Sets the page title web.
-	 * 
-	 * @param  string  $title
-	 * 
-	 * @return void
-	 */
-	public function setPageTitle($title)
-	{
-		$this->pageTitle = (string) $title;
-	}
+    /**
+     * Sets the page title web.
+     * 
+     * @param  string  $title
+     * 
+     * @return void
+     */
+    public function setPageTitle($title)
+    {
+        $this->pageTitle = (string) $title;
+    }
 }
\ No newline at end of file

Spacing +2 added lines, -2 removed lines

@@ -357,7 +357,7 @@ 
 	public function setEditor($editor)
 	{
 		if ( ! is_callable($editor) && ! isset($this->editors[$editor])) {
-			throw new InvalidArgumentException("Unknown editor identifier: [{$editor}]. Known editors: " .
+			throw new InvalidArgumentException("Unknown editor identifier: [{$editor}]. Known editors: ".
 				implode(', ', array_keys($this->editors))
 			);
 		}
@@ -380,7 +380,7 @@ 
 	{
 		$editor = $this->getEditor($file, $line);
 
-		if (empty($editor))	{
+		if (empty($editor)) {
 			return false;
 		}
 

Braces +3 added lines, -1 removed lines

@@ -333,7 +333,9 @@
 
 		$vars = $this->collectionVars();
 		
-		if (empty($vars['message'])) $vars['message'] = __('exception.noMessage');
+		if (empty($vars['message'])) {
+		    $vars['message'] = __('exception.noMessage');
+		}
 		
 		$this->template->setVariables($vars);
 		$this->template->render($templatePath);