lenevor / syscodes

src/components/Http/Contributors/Parameters.php

Indentation +130 added lines, -130 removed lines

@@ -34,156 +34,156 @@
  */
 class Parameters implements IteratorAggregate, Countable
 {
-	/**
-	 * Array parameters from the Server global.
-	 *
-	 * @var array $parameters
-	 */
-	protected $parameters = [];
+    /**
+     * Array parameters from the Server global.
+     *
+     * @var array $parameters
+     */
+    protected $parameters = [];
 
-	/**
-	 * Parameter Object Constructor.
-	 *
-	 * @param  array  $parameters
-	 *
-	 * @return array
-	 */
-	public function __construct(array $parameters = [])
-	{
-		$this->parameters = $parameters;
-	}
+    /**
+     * Parameter Object Constructor.
+     *
+     * @param  array  $parameters
+     *
+     * @return array
+     */
+    public function __construct(array $parameters = [])
+    {
+        $this->parameters = $parameters;
+    }
 
-	/**
-	 * Returns the parameters.
-	 * 
-	 * @return array
-	 */
-	public function all()
-	{
-		return $this->parameters;
-	}
+    /**
+     * Returns the parameters.
+     * 
+     * @return array
+     */
+    public function all()
+    {
+        return $this->parameters;
+    }
 
-	/**
-	 * Returns the parameter keys.
-	 * 
-	 * @return array
-	 */
-	public function keys()
-	{
-		return array_keys($this->parameters);
-	}
+    /**
+     * Returns the parameter keys.
+     * 
+     * @return array
+     */
+    public function keys()
+    {
+        return array_keys($this->parameters);
+    }
 
-	/**
-	 * Replaces the current parameters.
-	 * 
-	 * @param  array  $parameters
-	 * 
-	 * @return array
-	 */
-	public function replace(array $parameters = [])
-	{
-		$this->parameters = $parameters;
-	}
+    /**
+     * Replaces the current parameters.
+     * 
+     * @param  array  $parameters
+     * 
+     * @return array
+     */
+    public function replace(array $parameters = [])
+    {
+        $this->parameters = $parameters;
+    }
 
-	/**
-	 * Adds parameters.
-	 * 
-	 * @param  array  $parameters
-	 * 
-	 * @return array
-	 */
-	public function add(array $parameters = [])
-	{
-		$this->parameters = array_replace($this->parameters, $parameters);
-	}
+    /**
+     * Adds parameters.
+     * 
+     * @param  array  $parameters
+     * 
+     * @return array
+     */
+    public function add(array $parameters = [])
+    {
+        $this->parameters = array_replace($this->parameters, $parameters);
+    }
 
-	/**
-	 * Get a parameter array item.
-	 *
-	 * @param  string  $key
-	 * @param  string|null  $default  
-	 *
-	 * @return mixed
-	 */
-	public function get($key, $default = null)
-	{
-		if ($this->has($key)) {
-			return $this->parameters[$key];
-		}
+    /**
+     * Get a parameter array item.
+     *
+     * @param  string  $key
+     * @param  string|null  $default  
+     *
+     * @return mixed
+     */
+    public function get($key, $default = null)
+    {
+        if ($this->has($key)) {
+            return $this->parameters[$key];
+        }
 
-		return $default;
-	}
+        return $default;
+    }
 
-	/**
-	 * Check if a parameter array item exists.
-	 *
-	 * @param  string  $key
-	 *
-	 * @return mixed
-	 */
-	public function has($key)
-	{
-		return Arr::exists($this->parameters, $key);
-	}
+    /**
+     * Check if a parameter array item exists.
+     *
+     * @param  string  $key
+     *
+     * @return mixed
+     */
+    public function has($key)
+    {
+        return Arr::exists($this->parameters, $key);
+    }
 
-	/**
-	 * Set a parameter array item.
-	 *
-	 * @param  string  $key
-	 * @param  string  $value 
-	 *
-	 * @return mixed
-	 */
-	public function set($key, $value)
-	{
-		$this->parameters[$key] = $value;
-	}
+    /**
+     * Set a parameter array item.
+     *
+     * @param  string  $key
+     * @param  string  $value 
+     *
+     * @return mixed
+     */
+    public function set($key, $value)
+    {
+        $this->parameters[$key] = $value;
+    }
 
-	/**
-	 * Remove a parameter array item.
-	 *
-	 * @param  string  $key 
-	 *
-	 * @return void
-	 */
-	public function remove($key)
-	{
-		if ($this->has($key)) {
-			unset($this->parameters[$key]);
-		}
-	}
+    /**
+     * Remove a parameter array item.
+     *
+     * @param  string  $key 
+     *
+     * @return void
+     */
+    public function remove($key)
+    {
+        if ($this->has($key)) {
+            unset($this->parameters[$key]);
+        }
+    }
 
-	/*
+    /*
 	|-----------------------------------------------------------------
 	| IteratorAggregate Method
 	|-----------------------------------------------------------------
 	*/
 	
-	/**
-	 * Retrieve an external iterator.
-	 * 
-	 * @see    \IteratorAggregate::getIterator
-	 * 
-	 * @return new \ArrayIterator
-	 */
-	public function getIterator()
-	{
-		return new ArrayIterator($this->parameters);
-	}
+    /**
+     * Retrieve an external iterator.
+     * 
+     * @see    \IteratorAggregate::getIterator
+     * 
+     * @return new \ArrayIterator
+     */
+    public function getIterator()
+    {
+        return new ArrayIterator($this->parameters);
+    }
 	
-	/*
+    /*
 	|-----------------------------------------------------------------
 	| Countable Method
 	|-----------------------------------------------------------------
 	*/
 	
-	/**
-	 * Returns the number of parameters.
-	 * 
-	 * @return int The number of parameters
-	 */
-	public function count()
-	{
-		return count($this->parameters);
-	}
+    /**
+     * Returns the number of parameters.
+     * 
+     * @return int The number of parameters
+     */
+    public function count()
+    {
+        return count($this->parameters);
+    }
 }
\ No newline at end of file

src/components/Http/Contributors/Inputs.php

Indentation +36 added lines, -36 removed lines

@@ -33,46 +33,46 @@ 
 final class Inputs extends Parameters
 {
     /**
-	 * {@inheritdoc}
-	 */
-	public function all(string $key = null)
-	{
-		return parent::all($key);
+     * {@inheritdoc}
+     */
+    public function all(string $key = null)
+    {
+        return parent::all($key);
     }
     
     /**
-	 * {@inheritdoc}
-	 */
-	public function replace(array $inputs = [])
-	{
-		$this->parameters = [];
+     * {@inheritdoc}
+     */
+    public function replace(array $inputs = [])
+    {
+        $this->parameters = [];
         $this->add($inputs);
-	}
+    }
 
-	/**
-	 * Adds input values.
+    /**
+     * Adds input values.
      * 
      * @param  array  $inputs
      * 
      * @return mixed
-	 */
-	public function add(array $inputs = [])
-	{
+     */
+    public function add(array $inputs = [])
+    {
         foreach ($inputs as $key => $file) {
             $this->set($key, $file);
         }
     }
     
     /**
-	 * Gets a string input value by name.
-	 *
-	 * @param  string  $key
-	 * @param  string|null  $default  
-	 *
-	 * @return string|null
-	 */
-	public function get($key, $default = null)
-	{
+     * Gets a string input value by name.
+     *
+     * @param  string  $key
+     * @param  string|null  $default  
+     *
+     * @return string|null
+     */
+    public function get($key, $default = null)
+    {
         if (null !== $default && ! is_scalar($default) && ! (is_object($default)) && ! method_exist($default, '__toString')) {
             throw new BadRequestHttpException(sprintf('Passing a non-string value as 2nd argument to "%s()" is deprecated, pass a string or null instead', __METHOD__));
         }
@@ -87,19 +87,19 @@ 
     }
     
     /**
-	 * Sets an input by name.
-	 *
-	 * @param  string  $key
-	 * @param  string|array|null  $value 
-	 *
-	 * @return mixed
-	 */
-	public function set($key, $value)
-	{
+     * Sets an input by name.
+     *
+     * @param  string  $key
+     * @param  string|array|null  $value 
+     *
+     * @return mixed
+     */
+    public function set($key, $value)
+    {
         if (null !== $value && ! is_scalar($value) && ! is_array($value) && ! method_exist($value, '__toString')) {
             throw new BadRequestHttpException(sprintf('Passing "%s" as a 2nd Argument to "%s()" is deprecated, pass a string, array, or null instead', get_debug_type($value), __METHOD__));
         }
 
-		$this->parameters[$key] = $value;
-	}
+        $this->parameters[$key] = $value;
+    }
 }
\ No newline at end of file

src/components/Http/Contributors/Headers.php

Indentation +201 added lines, -201 removed lines

@@ -33,236 +33,236 @@
  */
 class Headers implements IteratorAggregate, Countable
 {
-	/**
-	 * An array of HTTP headers.
-	 * 
-	 * @var array $herders
-	 */
-	protected $headers = [];
+    /**
+     * An array of HTTP headers.
+     * 
+     * @var array $herders
+     */
+    protected $headers = [];
 	
-	/**
-	 * Specifies the directives for the caching mechanisms in both
-	 * the requests and the responses.
-	 * 
-	 * @var array $cacheControl
-	 */
-	protected $cacheControl = [];
+    /**
+     * Specifies the directives for the caching mechanisms in both
+     * the requests and the responses.
+     * 
+     * @var array $cacheControl
+     */
+    protected $cacheControl = [];
 	
-	/**
-	 * Constructor. The Headers class instance.
-	 * 
-	 * @param  array  $headers
-	 * 
-	 * @return void
-	 */
-	public function __construct(array $headers = [])
-	{
-		foreach ($headers as $key => $values) {
-			$this->set($key, $values);
-		}
-	}
+    /**
+     * Constructor. The Headers class instance.
+     * 
+     * @param  array  $headers
+     * 
+     * @return void
+     */
+    public function __construct(array $headers = [])
+    {
+        foreach ($headers as $key => $values) {
+            $this->set($key, $values);
+        }
+    }
 	
-	/**
-	 * Returns all the headers.
-	 * 
-	 * @return array
-	 */
-	public function all()
-	{
-		return $this->headers;
-	}
+    /**
+     * Returns all the headers.
+     * 
+     * @return array
+     */
+    public function all()
+    {
+        return $this->headers;
+    }
 	
-	/**
-	 * Returns the parameter keys.
-	 * 
-	 * @return array An array of parameter keys
-	 */
-	public function keys()
-	{
-		return array_keys($this->all());
-	}
+    /**
+     * Returns the parameter keys.
+     * 
+     * @return array An array of parameter keys
+     */
+    public function keys()
+    {
+        return array_keys($this->all());
+    }
 	
-	/**
-	 * Replaces the current HTTP headers by a new set.
-	 * 
-	 * @param  array  $headers
-	 * 
-	 * @return void
-	 */
-	public function replace(array $headers = [])
-	{
-		$this->headers = [];
-		$this->add($headers);
-	}
+    /**
+     * Replaces the current HTTP headers by a new set.
+     * 
+     * @param  array  $headers
+     * 
+     * @return void
+     */
+    public function replace(array $headers = [])
+    {
+        $this->headers = [];
+        $this->add($headers);
+    }
 	
-	/**
-	 * Adds multiple header to the queue.
-	 * 
-	 * @param  array  $headers  The header name
-	 * 
-	 * @return mixed
-	 */
-	public function add(array $headers)
-	{
-		foreach ($headers as $key => $values) {
-			$this->set($key, $values);
-		}
+    /**
+     * Adds multiple header to the queue.
+     * 
+     * @param  array  $headers  The header name
+     * 
+     * @return mixed
+     */
+    public function add(array $headers)
+    {
+        foreach ($headers as $key => $values) {
+            $this->set($key, $values);
+        }
 		
-		return $this;
-	}
+        return $this;
+    }
 	
-	/**
-	 * Returns the headers, with original capitalizations.
-	 * 
-	 * @return array An array of headers
-	 */
-	public function allPreserveCase()
-	{
-		$headers = [];
+    /**
+     * Returns the headers, with original capitalizations.
+     * 
+     * @return array An array of headers
+     */
+    public function allPreserveCase()
+    {
+        $headers = [];
 		
-		foreach ($this->all() as $name => $value) {
-			$headers[$name] = $value;
-		}
+        foreach ($this->all() as $name => $value) {
+            $headers[$name] = $value;
+        }
 		
-		return $headers;
-	}
+        return $headers;
+    }
 	
-	/**
-	 * Gets a header value by name.
-	 *
-	 * @param  string  $key  The header name, or null for all headers
-	 * @param  string|null  $default  The default value
-	 * @param  bool  $option  Whether to return the option value or all header values
-	 *
-	 * @return mixed
-	 */
-	public function get($key, $default =  null, $option = true)
-	{
-		$key = str_replace('_', '-', strtolower($key));
+    /**
+     * Gets a header value by name.
+     *
+     * @param  string  $key  The header name, or null for all headers
+     * @param  string|null  $default  The default value
+     * @param  bool  $option  Whether to return the option value or all header values
+     *
+     * @return mixed
+     */
+    public function get($key, $default =  null, $option = true)
+    {
+        $key = str_replace('_', '-', strtolower($key));
 		
-		$headers = $this->all();
+        $headers = $this->all();
 		
-		if ( ! array_key_exists($key, $headers)) {
-			if (null === $default) {
-				return $option ? null : [];
-			}
+        if ( ! array_key_exists($key, $headers)) {
+            if (null === $default) {
+                return $option ? null : [];
+            }
 			
-			return $option ? $default : [$default];
-		}
+            return $option ? $default : [$default];
+        }
 		
-		if ($option) {
-			return count($headers[$key]) ? $headers[$key][0] : $default;
-		}
+        if ($option) {
+            return count($headers[$key]) ? $headers[$key][0] : $default;
+        }
 		
-		return $headers[$key];
-	}
+        return $headers[$key];
+    }
 
-	/**
-	 * Sets a header by name.
-	 * 
-	 * @param  string  $key  The header name
-	 * @param  string  $values  The value or an array of values
-	 * @param  bool  $replace  If you want to replace the value exists by the header, 
-	 * 					       it is not overwritten / overwritten when it is false
-	 *
-	 * @return $this
-	 */
-	public function set($key, $values, $replace = true)
-	{
-		$key = str_replace('_', '-', strtolower($key));
+    /**
+     * Sets a header by name.
+     * 
+     * @param  string  $key  The header name
+     * @param  string  $values  The value or an array of values
+     * @param  bool  $replace  If you want to replace the value exists by the header, 
+     * 					       it is not overwritten / overwritten when it is false
+     *
+     * @return $this
+     */
+    public function set($key, $values, $replace = true)
+    {
+        $key = str_replace('_', '-', strtolower($key));
 
-		if (is_array($values)) {
-			$values = array_values($values);
+        if (is_array($values)) {
+            $values = array_values($values);
 
-			if (true === $replace || ! isset($this->headers[$key])) {
-				$this->headers[$key] = $values;
-			} else {
-				$this->headers[$key] = array_merge($this->headers[$key], $values);
-			}
-		} else {
-			if (true === $replace || ! isset($this->headers[$key])) {
-				$this->headers[$key] = [$values];
-			} else {
-				$this->headers[$key][] = $values;
-			}
-		}
+            if (true === $replace || ! isset($this->headers[$key])) {
+                $this->headers[$key] = $values;
+            } else {
+                $this->headers[$key] = array_merge($this->headers[$key], $values);
+            }
+        } else {
+            if (true === $replace || ! isset($this->headers[$key])) {
+                $this->headers[$key] = [$values];
+            } else {
+                $this->headers[$key][] = $values;
+            }
+        }
 
-		return $this;
-	}
+        return $this;
+    }
 
-	/**
-	 * Returns true if the HTTP header is defined.
-	 * 
-	 * @param  string  $key  The HTTP header
-	 * 
-	 * @return bool  true if the parameter exists, false otherwise
-	 */
-	public function has($key)
-	{
-		return array_key_exists(str_replace('_', '-', strtolower($key)), $this->all());
-	}
+    /**
+     * Returns true if the HTTP header is defined.
+     * 
+     * @param  string  $key  The HTTP header
+     * 
+     * @return bool  true if the parameter exists, false otherwise
+     */
+    public function has($key)
+    {
+        return array_key_exists(str_replace('_', '-', strtolower($key)), $this->all());
+    }
 
-	/**
-	 * Removes a header.
-	 * 
-	 * @param  string  $name  The header name
-	 * 
-	 * @return mixed
-	 */
-	public function remove($key)
-	{
-		$key = str_replace('_', '-', strtolower($key));
+    /**
+     * Removes a header.
+     * 
+     * @param  string  $name  The header name
+     * 
+     * @return mixed
+     */
+    public function remove($key)
+    {
+        $key = str_replace('_', '-', strtolower($key));
 
-		unset($this->headers[$key]);
+        unset($this->headers[$key]);
 
-		if ('cache-control' === $key) {
-			$this->cacheControl = [];
-		}
-	}
+        if ('cache-control' === $key) {
+            $this->cacheControl = [];
+        }
+    }
 	
-	/**
-	 * Returns an iterator for headers.
-	 * 
-	 * @return \ArrayIterator An \ArrayIterator instance
-	 */
-	public function getIterator()
-	{
-		return new ArrayIterator($this->headers);
-	}
+    /**
+     * Returns an iterator for headers.
+     * 
+     * @return \ArrayIterator An \ArrayIterator instance
+     */
+    public function getIterator()
+    {
+        return new ArrayIterator($this->headers);
+    }
 	
-	/**
-	 * Returns the number of headers.
-	 * 
-	 * @return int The number of headers
-	 */
-	public function count()
-	{
-		return count($this->headers);
-	}
+    /**
+     * Returns the number of headers.
+     * 
+     * @return int The number of headers
+     */
+    public function count()
+    {
+        return count($this->headers);
+    }
 	
-	/**
-	 * Returns the headers as a string.
-	 * 
-	 * @return string The headers
-	 */
-	public function __toString()
-	{
-		if ( ! $headers = $this->all()) {
-			return '';
-		}
+    /**
+     * Returns the headers as a string.
+     * 
+     * @return string The headers
+     */
+    public function __toString()
+    {
+        if ( ! $headers = $this->all()) {
+            return '';
+        }
 		
-		ksort($headers);
-		$max     = max(array_map('strlen', array_keys($headers))) + 1;
-		$content = '';
+        ksort($headers);
+        $max     = max(array_map('strlen', array_keys($headers))) + 1;
+        $content = '';
 		
-		foreach ($headers as $name => $values) {
-			$name = ucwords($name, '-');
+        foreach ($headers as $name => $values) {
+            $name = ucwords($name, '-');
 			
-			foreach ($values as $value) {
-				$content .= sprintf("%-{$max}s %s\r\n", $name.':', $value);
-			}
-		}
+            foreach ($values as $value) {
+                $content .= sprintf("%-{$max}s %s\r\n", $name.':', $value);
+            }
+        }
 
-		return $content;
-	}
+        return $content;
+    }
 }
\ No newline at end of file

src/components/Http/Request.php

Indentation +850 added lines, -850 removed lines

@@ -40,868 +40,868 @@
  */
 class Request
 {
-	/**
-	 * Holds the global active request instance.
-	 *
-	 * @var bool $requestURI
-	 */
-	protected static $requestURI;
-
-	/**
-	 * The base URL.
-	 * 
-	 * @var string $baseUrl
-	 */
-	protected $baseUrl;
-
-	/**
-	 * Gets cookies ($_COOKIE).
-	 * 
-	 * @var string $cookies
-	 */
-	public $cookies;
-
-	/**
-	 * Gets the string with format JSON.
-	 * 
-	 * @var string|resource|null $content
-	 */
-	protected $content;
-
-	/**
-	 * The default Locale this request.
-	 * 
-	 * @var string $defaultLocale
-	 */
-	protected $defaultLocale = 'en';
+    /**
+     * Holds the global active request instance.
+     *
+     * @var bool $requestURI
+     */
+    protected static $requestURI;
+
+    /**
+     * The base URL.
+     * 
+     * @var string $baseUrl
+     */
+    protected $baseUrl;
+
+    /**
+     * Gets cookies ($_COOKIE).
+     * 
+     * @var string $cookies
+     */
+    public $cookies;
+
+    /**
+     * Gets the string with format JSON.
+     * 
+     * @var string|resource|null $content
+     */
+    protected $content;
+
+    /**
+     * The default Locale this request.
+     * 
+     * @var string $defaultLocale
+     */
+    protected $defaultLocale = 'en';
 	
-	/**
-	 * Gets files request ($_FILES).
-	 * 
-	 * @var string $files
-	 */
-	public $files;
-
-	/**
-	 * The detected uri and server variables.
-	 * 
-	 * @var string $http
-	 */
-	protected $http;
-
-	/**
-	 * The decoded JSON content for the request.
-	 * 
-	 * @var \Syscodes\Http\Contributors\Parameters|null $json
-	 */
-	protected $json;
-
-	/**
-	 * The current language of the application.
-	 * 
-	 * @var string $languages
-	 */
-	protected $languages;
+    /**
+     * Gets files request ($_FILES).
+     * 
+     * @var string $files
+     */
+    public $files;
+
+    /**
+     * The detected uri and server variables.
+     * 
+     * @var string $http
+     */
+    protected $http;
+
+    /**
+     * The decoded JSON content for the request.
+     * 
+     * @var \Syscodes\Http\Contributors\Parameters|null $json
+     */
+    protected $json;
+
+    /**
+     * The current language of the application.
+     * 
+     * @var string $languages
+     */
+    protected $languages;
 	
-	/** 
-	 * The method name.
-	 * 
-	 * @var string $method
-	 */
-	protected $method;
-
-	/**
-	 * The path info of URL.
-	 * 
-	 * @var string $pathInfo
-	 */
-	protected $pathInfo;
-
-	/**
-	 * Request body parameters ($_POST).
-	 * 
-	 * @var \Syscodes\Http\Contributors\Parameters $request
-	 */
-	public $request;
-
-	/**
-	 * Get request URI.
-	 * 
-	 * @var string $requestToURI
-	 */
-	protected $requestToURI;
-
-	/**
-	 * The detected uri and server variables ($_FILES).
-	 * 
-	 * @var array $server
-	 */
-	public $server = [];
-
-	/** 
-	 * List of routes uri.
-	 *
-	 * @var string|array $uri 
-	 */
-	public $uri;
-
-	/**
-	 * Stores the valid locale codes.
-	 * 
-	 * @var array $validLocales
-	 */
-	protected $validLocales = [];
-
-	/**
-	 * Constructor: Create new the Request class.
-	 * 
-	 * @param  array  $request
-	 * @param  array  $cookies
-	 * @param  array  $files
-	 * @param  array  $server
-	 * @param  string|resource|null $content  
-	 * 
-	 * @return void
-	 */
-	public function __construct(array $request = [], array $cookies = [], array $files = [], array $server = [], $content = null)
-	{
-		static::$requestURI = $this;
+    /** 
+     * The method name.
+     * 
+     * @var string $method
+     */
+    protected $method;
+
+    /**
+     * The path info of URL.
+     * 
+     * @var string $pathInfo
+     */
+    protected $pathInfo;
+
+    /**
+     * Request body parameters ($_POST).
+     * 
+     * @var \Syscodes\Http\Contributors\Parameters $request
+     */
+    public $request;
+
+    /**
+     * Get request URI.
+     * 
+     * @var string $requestToURI
+     */
+    protected $requestToURI;
+
+    /**
+     * The detected uri and server variables ($_FILES).
+     * 
+     * @var array $server
+     */
+    public $server = [];
+
+    /** 
+     * List of routes uri.
+     *
+     * @var string|array $uri 
+     */
+    public $uri;
+
+    /**
+     * Stores the valid locale codes.
+     * 
+     * @var array $validLocales
+     */
+    protected $validLocales = [];
+
+    /**
+     * Constructor: Create new the Request class.
+     * 
+     * @param  array  $request
+     * @param  array  $cookies
+     * @param  array  $files
+     * @param  array  $server
+     * @param  string|resource|null $content  
+     * 
+     * @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 = $this->getRoute();
-
-		if (is_null($route) || is_null($param)) {
-			return $route;
-		}
-
-		return $route->parameter($param, $default);
-	}
-
-	/**
-	 * Get the current decoded path info for the request.
-	 * 
-	 * @return string
-	 */
-	public function decodedPath()
-	{
-		return rawurldecode($this->path());
-	}
-
-	/**
-	 * Get the current path info for the request.
-	 * 
-	 * @return string
-	 */
-	public function path()
-	{
-		$path = trim($this->getPathInfo(), '/');
-
-		return $path == '' ? '/' : $path;
-	}
-
-	/**
-	 * Retunrs the request body content.
-	 * 
-	 * @return string
-	 */
-	public function getContent()
-	{
-		if (null === $this->content || false === $this->content)
-		{
-			$this->content = file_get_contents('php://input');
-		}
-
-		return $this->content;
-	}
-
-	/**
-	 * Returns the path being requested relative to the executed script. 
-	 * 
-	 * @return string
-	 */
-	public function getPathInfo()
-	{
-		if (null === $this->pathInfo)
-		{
-			$this->pathInfo = $this->http->parsePathInfo();
-		}
-
-		return $this->pathInfo;
-	}
-
-	/**
-	 * Returns the root URL from which this request is executed.
-	 * 
-	 * @return string
-	 */
-	public function getBaseUrl()
-	{
-		if (null === $this->baseUrl)
-		{
-			$this->baseUrl = $this->http->parseBaseUrl();
-		}
-
-		return $this->baseUrl;
-	}
-
-	/**
-	 * Returns the requested URI.
-	 * 
-	 * @return string
-	 */
-	public function getRequestUri()
-	{
-		if (null === $this->requestToUri) {
-			$this->requestToUri = $this->http->parseRequestUri();
-		}
-
-		return $this->requestToUri;
-	}
+        foreach ($patterns as $pattern) {
+            if (Str::is($pattern, $path)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Determine if the route name matches a given pattern.
+     * 
+     * @param  mixed  ...$patterns
+     * 
+     * @return bool
+     */
+    public function routeIs(...$patterns)
+    {
+        return $this->route() && $this->route()->is(...$patterns);
+    }
+
+    /**
+     * Get the route handling the request.
+     * 
+     * @param  string|null  $param  
+     * @param  mixed  $default  
+     * 
+     * @return \Syscodes\Routing\Route|object|string|null
+     */
+    public function route($param = null, $default = null)
+    {
+        $route = $this->getRoute();
+
+        if (is_null($route) || is_null($param)) {
+            return $route;
+        }
+
+        return $route->parameter($param, $default);
+    }
+
+    /**
+     * Get the current decoded path info for the request.
+     * 
+     * @return string
+     */
+    public function decodedPath()
+    {
+        return rawurldecode($this->path());
+    }
+
+    /**
+     * Get the current path info for the request.
+     * 
+     * @return string
+     */
+    public function path()
+    {
+        $path = trim($this->getPathInfo(), '/');
+
+        return $path == '' ? '/' : $path;
+    }
+
+    /**
+     * Retunrs the request body content.
+     * 
+     * @return string
+     */
+    public function getContent()
+    {
+        if (null === $this->content || false === $this->content)
+        {
+            $this->content = file_get_contents('php://input');
+        }
+
+        return $this->content;
+    }
+
+    /**
+     * Returns the path being requested relative to the executed script. 
+     * 
+     * @return string
+     */
+    public function getPathInfo()
+    {
+        if (null === $this->pathInfo)
+        {
+            $this->pathInfo = $this->http->parsePathInfo();
+        }
+
+        return $this->pathInfo;
+    }
+
+    /**
+     * Returns the root URL from which this request is executed.
+     * 
+     * @return string
+     */
+    public function getBaseUrl()
+    {
+        if (null === $this->baseUrl)
+        {
+            $this->baseUrl = $this->http->parseBaseUrl();
+        }
+
+        return $this->baseUrl;
+    }
+
+    /**
+     * Returns the requested URI.
+     * 
+     * @return string
+     */
+    public function getRequestUri()
+    {
+        if (null === $this->requestToUri) {
+            $this->requestToUri = $this->http->parseRequestUri();
+        }
+
+        return $this->requestToUri;
+    }
 	
-	/**
-	 * Gets the request's scheme.
-	 * 
-	 * @return string
-	 */
-	public function getScheme()
-	{
-		return $this->secure() ? $this->uri->setScheme('https') : $this->uri->setScheme('http');
-	}
-
-	/**
-	 * Returns the host name.
-	 * 
-	 * @return void
-	 */
-	public function getHost()
-	{
-		if ($forwardedHost = $this->server->get('HTTP_X_FORWARDED_HOST')) {
-			$host = $forawardedHost[0];
-		} elseif ( ! $host = $this->headers->get('HOST')) {
-			if ( ! $host = $this->server->get('SERVER_NAME')) {
-				$host = $this->server->get('REMOTE_ADDR', '');
-			}
-		}
-
-		$host = $_SERVER['SERVER_NAME'];
-
-		$host = strtolower(preg_replace('/:\d+$/', '', trim(($host))));
+    /**
+     * Gets the request's scheme.
+     * 
+     * @return string
+     */
+    public function getScheme()
+    {
+        return $this->secure() ? $this->uri->setScheme('https') : $this->uri->setScheme('http');
+    }
+
+    /**
+     * Returns the host name.
+     * 
+     * @return void
+     */
+    public function getHost()
+    {
+        if ($forwardedHost = $this->server->get('HTTP_X_FORWARDED_HOST')) {
+            $host = $forawardedHost[0];
+        } elseif ( ! $host = $this->headers->get('HOST')) {
+            if ( ! $host = $this->server->get('SERVER_NAME')) {
+                $host = $this->server->get('REMOTE_ADDR', '');
+            }
+        }
+
+        $host = $_SERVER['SERVER_NAME'];
+
+        $host = strtolower(preg_replace('/:\d+$/', '', trim(($host))));
 		
-		return $host;
-	}
-
-	/**
-	 * Returns the port on which the request is made.
-	 * 
-	 * @return int
-	 */
-	public function getPort()
-	{
-		if ( ! $this->server->get('HTTP_HOST')) 
-		{
-			return $this->server->get('SERVER_PORT');
-		}
+        return $host;
+    }
+
+    /**
+     * Returns the port on which the request is made.
+     * 
+     * @return int
+     */
+    public function getPort()
+    {
+        if ( ! $this->server->get('HTTP_HOST')) 
+        {
+            return $this->server->get('SERVER_PORT');
+        }
 		
-		return 'https' === $this->getScheme() ? $this->uri->setPort(443) : $this->uri->setPort(80);
-	}
-
-	/**
-	 * Returns the HTTP host being requested.
-	 * 
-	 * @return string
-	 */
-	public function getHttpHost()
-	{
-		$scheme = $this->getScheme();
-		$port   = $this->getPort();
-
-		if (('http' === $scheme && 80 === $port) || ('https' === $scheme && 443 === $port))		
-		{
-			return $this->getHost();
-		}
-
-		return $this->getHost().':'.$port;
-	}
-
-	/**
-	 * Gets the scheme and HTTP host.
-	 * 
-	 * @return string
-	 */
-	public function getSchemeWithHttpHost()
-	{
-		return $this->getScheme().'://'.$this->getHttpHost();
-	}
-
-	/**
-	 * Get the root URL for the application.
-	 * 
-	 * @return string
-	 */
-	public function root()
-	{
-		return rtrim($this->getSchemeWithHttpHost().$this->getBaseUrl(), '/');
-	}
-
-	/**
-	 * Get the URL for the request.
-	 * 
-	 * @return string
-	 */
-	public function url()
-	{
-		return trim(preg_replace('/\?.*/', '', $this->get()), '/');
-	}
-
-	/**
-	 * Returns the referer.
-	 * 
-	 * @param  string  $default
-	 * 
-	 * @return string
-	 */
-	public function referer(string $default = '')
-	{
-		return $this->server->get('HTTP_REFERER', $default);
-	}
+        return 'https' === $this->getScheme() ? $this->uri->setPort(443) : $this->uri->setPort(80);
+    }
+
+    /**
+     * Returns the HTTP host being requested.
+     * 
+     * @return string
+     */
+    public function getHttpHost()
+    {
+        $scheme = $this->getScheme();
+        $port   = $this->getPort();
+
+        if (('http' === $scheme && 80 === $port) || ('https' === $scheme && 443 === $port))		
+        {
+            return $this->getHost();
+        }
+
+        return $this->getHost().':'.$port;
+    }
+
+    /**
+     * Gets the scheme and HTTP host.
+     * 
+     * @return string
+     */
+    public function getSchemeWithHttpHost()
+    {
+        return $this->getScheme().'://'.$this->getHttpHost();
+    }
+
+    /**
+     * Get the root URL for the application.
+     * 
+     * @return string
+     */
+    public function root()
+    {
+        return rtrim($this->getSchemeWithHttpHost().$this->getBaseUrl(), '/');
+    }
+
+    /**
+     * Get the URL for the request.
+     * 
+     * @return string
+     */
+    public function url()
+    {
+        return trim(preg_replace('/\?.*/', '', $this->get()), '/');
+    }
+
+    /**
+     * Returns the referer.
+     * 
+     * @param  string  $default
+     * 
+     * @return string
+     */
+    public function referer(string $default = '')
+    {
+        return $this->server->get('HTTP_REFERER', $default);
+    }
 	
-	/**
-	 * Attempts to detect if the current connection is secure through 
-	 * over HTTPS protocol.
-	 * 
-	 * @return bool
-	 */
-	public function secure()
-	{
-		if ( ! empty($this->server->get('HTTPS')) && strtolower($this->server->get('HTTPS')) !== 'off') {
-			return true;
-		} elseif (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $this->server->get('HTTP_X_FORWARDED_PROTO') === 'https') {
-			return true;
-		} elseif ( ! empty($this->server->get('HTTP_FRONT_END_HTTPS')) && strtolower($this->server->get('HTTP_FRONT_END_HTTPS')) !== 'off') {
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Returns the user agent.
-	 *
-	 * @param  string|null  $default
-	 *
-	 * @return string
-	 */
-	public function userAgent(string $default = null)
-	{
-		return $this->server->get('HTTP_USER_AGENT', $default);
-	}
-
-	/**
-	 * Get the route resolver.
-	 * 
-	 * @return \Syscodes\Routing\Router
-	 */
-	public function getRoute()
-	{
-		return app('router');
-	}
-
-	/**
-	 * Get an element from the request.
-	 * 
-	 * @return string[]
-	 */
-	public function __get($key)
-	{
-		$all = $this->server->all();
-
-		if (array_key_exists($key, $all)) {
-			return $all[$key];
-		} else {
-			return $key;
-		}
-	}
-
-	/**
-	 * Returns the Request as an HTTP string.
-	 * 
-	 * @return string
-	 */
-	public function __toString()
-	{
-		try
-		{
-			$content = $this->getContent();
-		}
-		catch (LogicException $e)
-		{
-			if (PHP_VERSION_ID > 70400)
-			{
-				throw $e;
-			}
-
-			return trigger_error($e, E_USER_ERROR);
-		}
-
-		$cookieHeader = '';
-		$cookies      = [];
-
-		foreach ($this->cookies as $key => $value)
-		{
-			$cookies[]= "{$key} = {$value}";
-		}
-
-		if ( ! empty($cookies))
-		{
-			$cookieHeader = 'Cookie: '.implode('; ', $cookies)."\r\n";
-		}
+    /**
+     * Attempts to detect if the current connection is secure through 
+     * over HTTPS protocol.
+     * 
+     * @return bool
+     */
+    public function secure()
+    {
+        if ( ! empty($this->server->get('HTTPS')) && strtolower($this->server->get('HTTPS')) !== 'off') {
+            return true;
+        } elseif (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $this->server->get('HTTP_X_FORWARDED_PROTO') === 'https') {
+            return true;
+        } elseif ( ! empty($this->server->get('HTTP_FRONT_END_HTTPS')) && strtolower($this->server->get('HTTP_FRONT_END_HTTPS')) !== 'off') {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Returns the user agent.
+     *
+     * @param  string|null  $default
+     *
+     * @return string
+     */
+    public function userAgent(string $default = null)
+    {
+        return $this->server->get('HTTP_USER_AGENT', $default);
+    }
+
+    /**
+     * Get the route resolver.
+     * 
+     * @return \Syscodes\Routing\Router
+     */
+    public function getRoute()
+    {
+        return app('router');
+    }
+
+    /**
+     * Get an element from the request.
+     * 
+     * @return string[]
+     */
+    public function __get($key)
+    {
+        $all = $this->server->all();
+
+        if (array_key_exists($key, $all)) {
+            return $all[$key];
+        } else {
+            return $key;
+        }
+    }
+
+    /**
+     * Returns the Request as an HTTP string.
+     * 
+     * @return string
+     */
+    public function __toString()
+    {
+        try
+        {
+            $content = $this->getContent();
+        }
+        catch (LogicException $e)
+        {
+            if (PHP_VERSION_ID > 70400)
+            {
+                throw $e;
+            }
+
+            return trigger_error($e, E_USER_ERROR);
+        }
+
+        $cookieHeader = '';
+        $cookies      = [];
+
+        foreach ($this->cookies as $key => $value)
+        {
+            $cookies[]= "{$key} = {$value}";
+        }
+
+        if ( ! empty($cookies))
+        {
+            $cookieHeader = 'Cookie: '.implode('; ', $cookies)."\r\n";
+        }
 		
-		return sprintf('%s %s %s', $this->getMethod(), $this->getRequestUri(), $this->server->get('SERVER_PROTOCOL'))."\r\n".
-			$this->headers.
-			$cookieHeader."\r\n".
-			$content;
-	}
-
-	/**
-	 * Clones the current request.
-	 * 
-	 * @return void
-	 */
-	public function __clone()
-	{
-		$this->request = clone $this->request;
-		$this->cookies = clone $this->cookies;
-		$this->files   = clone $this->files;
-		$this->server  = clone $this->server;
-		$this->headers = clone $this->headers;
-	}
+        return sprintf('%s %s %s', $this->getMethod(), $this->getRequestUri(), $this->server->get('SERVER_PROTOCOL'))."\r\n".
+            $this->headers.
+            $cookieHeader."\r\n".
+            $content;
+    }
+
+    /**
+     * Clones the current request.
+     * 
+     * @return void
+     */
+    public function __clone()
+    {
+        $this->request = clone $this->request;
+        $this->cookies = clone $this->cookies;
+        $this->files   = clone $this->files;
+        $this->server  = clone $this->server;
+        $this->headers = clone $this->headers;
+    }
 }
\ No newline at end of file

src/components/Http/Response.php

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/Exceptions/PostTooLargeHttpException.php

Indentation +29 added lines, -29 removed lines

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

src/components/Http/URI.php

Indentation +491 added lines, -491 removed lines

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

src/components/View/Factory.php

Indentation +272 added lines, -272 removed lines

@@ -38,313 +38,313 @@
  */
 class Factory implements FactoryContract
 {
-	use Extensions,
-		Concerns\ManagesLayouts,
-		Concerns\ManagesComponents,
-		Concerns\ManagesTranslations;
+    use Extensions,
+        Concerns\ManagesLayouts,
+        Concerns\ManagesComponents,
+        Concerns\ManagesTranslations;
 	
-	/**
-	 * The IoC container instance.
-	 * 
-	 * @var \Syscodes\Contracts\Container\Container $container
-	 */
-	protected $container;
+    /**
+     * The IoC container instance.
+     * 
+     * @var \Syscodes\Contracts\Container\Container $container
+     */
+    protected $container;
 
-	/**
-	 * The engine implementation.
-	 * 
-	 * @var \Syscodes\View\Engines\EngineResolver $engines
-	 */
-	protected $engines;
+    /**
+     * The engine implementation.
+     * 
+     * @var \Syscodes\View\Engines\EngineResolver $engines
+     */
+    protected $engines;
 
-	/**
-	 * The event dispatcher instance.
-	 * 
-	 * @var \Syscodes\Contracts\Events\Dispatcher $events
-	 */
-	protected $events;
+    /**
+     * The event dispatcher instance.
+     * 
+     * @var \Syscodes\Contracts\Events\Dispatcher $events
+     */
+    protected $events;
 
-	/**
-	 * The view finder implementation.
-	 * 
-	 * @var \Syscodes\View\FileViewFinder $finder
-	 */
-	protected $finder;
+    /**
+     * The view finder implementation.
+     * 
+     * @var \Syscodes\View\FileViewFinder $finder
+     */
+    protected $finder;
 
-	/**
-	 * The number of active rendering operations.
-	 * 
-	 * @var int $renderCount
-	 */
-	protected $renderCount = 0;
+    /**
+     * The number of active rendering operations.
+     * 
+     * @var int $renderCount
+     */
+    protected $renderCount = 0;
 
-	/**
-	 * Array of shared data.
-	 * 
-	 * @var array $shared
-	 */
-	protected $shared = [];
+    /**
+     * Array of shared data.
+     * 
+     * @var array $shared
+     */
+    protected $shared = [];
 
-	/**
-	 * Constructor: Create a new Parser class instance.
-	 * 
-	 * @param  \Syscodes\View\Engines\EngineResolver  $engine
-	 * @param  \Syscodes\Contracts\View\ViewFinder  $finder
-	 * @param  \Syscodes\Contracts\Events\Dispatcher  $events
-	 *
-	 * @return void
-	 */
-	public function __construct(EngineResolver $engines, ViewFinder $finder, Dispatcher $events)
-	{
-		$this->finder  = $finder;
-		$this->engines = $engines;
-		$this->events  = $events;
+    /**
+     * Constructor: Create a new Parser class instance.
+     * 
+     * @param  \Syscodes\View\Engines\EngineResolver  $engine
+     * @param  \Syscodes\Contracts\View\ViewFinder  $finder
+     * @param  \Syscodes\Contracts\Events\Dispatcher  $events
+     *
+     * @return void
+     */
+    public function __construct(EngineResolver $engines, ViewFinder $finder, Dispatcher $events)
+    {
+        $this->finder  = $finder;
+        $this->engines = $engines;
+        $this->events  = $events;
 
-		$this->share('__env', $this);
-	}
+        $this->share('__env', $this);
+    }
 	
-	/**
-	 * Check existance view file.
-	 * 
-	 * @param  string  $view
-	 *
-	 * @return bool
-	 */
-	public function viewExists($view)
-	{
-		try {
-			$this->finder->find($view);
-		} catch(InvalidArgumentException $e) {
-			return false;
-		}
+    /**
+     * Check existance view file.
+     * 
+     * @param  string  $view
+     *
+     * @return bool
+     */
+    public function viewExists($view)
+    {
+        try {
+            $this->finder->find($view);
+        } catch(InvalidArgumentException $e) {
+            return false;
+        }
 
-		return true;
-	}
+        return true;
+    }
 	
-	/**
-	 * Global and local data are merged and extracted to create local variables within the view file.
-	 * Renders the view object to a string.
-	 *
-	 * @example $output = $view->make();
-	 *
-	 * @param  string  $view  View filename
-	 * @param  array  $data  Array of values
-	 *
-	 * @return string
-	 */
-	public function make($view, $data = []) 
-	{
-		$path = $this->finder->find(
-			$view = $this->normalizeName($view)
-		);
+    /**
+     * Global and local data are merged and extracted to create local variables within the view file.
+     * Renders the view object to a string.
+     *
+     * @example $output = $view->make();
+     *
+     * @param  string  $view  View filename
+     * @param  array  $data  Array of values
+     *
+     * @return string
+     */
+    public function make($view, $data = []) 
+    {
+        $path = $this->finder->find(
+            $view = $this->normalizeName($view)
+        );
 		
-		// Loader class instance.
-		return take($this->viewInstance($view, $path, $data), function ($view) {
-			$this->callCreator($view);
-		});
-	}
+        // Loader class instance.
+        return take($this->viewInstance($view, $path, $data), function ($view) {
+            $this->callCreator($view);
+        });
+    }
 
-	/**
-	 * Normalize a view name.
-	 * 
-	 * @param  string  $name
-	 * 
-	 * @return string
-	 */
-	protected function normalizeName($name)
+    /**
+     * Normalize a view name.
+     * 
+     * @param  string  $name
+     * 
+     * @return string
+     */
+    protected function normalizeName($name)
     {
-		return ViewName::normalize($name);
+        return ViewName::normalize($name);
     }
 
-	/**
-	 * Create a new view instance from the given arguments.
-	 * 
-	 * @param  string  $file  View filename
-	 * * @param  string  $path  Path filename
-	 * @param  array  $data  Array of values
-	 * 
-	 * @return \Syscodes\Contracts\View\View
-	 */
-	protected function viewInstance($view, $path, $data)
-	{
-		return new View($this, $this->getEngineFromPath($path), $view, $path, $data);
-	}
+    /**
+     * Create a new view instance from the given arguments.
+     * 
+     * @param  string  $file  View filename
+     * * @param  string  $path  Path filename
+     * @param  array  $data  Array of values
+     * 
+     * @return \Syscodes\Contracts\View\View
+     */
+    protected function viewInstance($view, $path, $data)
+    {
+        return new View($this, $this->getEngineFromPath($path), $view, $path, $data);
+    }
 	
-	/**
-	 * Get the appropriate view engine for the given path.
-	 * 
-	 * @param  string  $path
-	 * 
-	 * @return \Illuminate\Contracts\View\Engine
-	 * 
-	 * @throws \InvalidArgumentException
-	 */
-	public function getEngineFromPath($path)
-	{
-		if ( ! $extension = $this->getExtension($path)) {
-			throw new InvalidArgumentException("Unrecognized extension in file: {$path}");
-		}
+    /**
+     * Get the appropriate view engine for the given path.
+     * 
+     * @param  string  $path
+     * 
+     * @return \Illuminate\Contracts\View\Engine
+     * 
+     * @throws \InvalidArgumentException
+     */
+    public function getEngineFromPath($path)
+    {
+        if ( ! $extension = $this->getExtension($path)) {
+            throw new InvalidArgumentException("Unrecognized extension in file: {$path}");
+        }
 		
-		$engine = $this->extensions[$extension];
+        $engine = $this->extensions[$extension];
 		
-		return $this->engines->resolve($engine);
-	}
+        return $this->engines->resolve($engine);
+    }
 	
-	/**
-	 * Get the extension used by the view file.
-	 * 
-	 * @param  string  $path
-	 * 
-	 * @return string
-	 */
-	protected function getExtension($path)
-	{
-		$extensions = array_keys($this->extensions);
+    /**
+     * Get the extension used by the view file.
+     * 
+     * @param  string  $path
+     * 
+     * @return string
+     */
+    protected function getExtension($path)
+    {
+        $extensions = array_keys($this->extensions);
 		
-		return Arr::first($extensions, function($key, $value) use ($path) {
-			return Str::endsWith($path, '.'.$value);
-		});
-	}
+        return Arr::first($extensions, function($key, $value) use ($path) {
+            return Str::endsWith($path, '.'.$value);
+        });
+    }
 	
-	/**
-	 * Call the creator for a given view.
-	 * 
-	 * @param  \Syscodes\View\View  $view
-	 * 
-	 * @return void
-	 */
-	public function callCreator(View $view)
-	{
-		$this->events->dispatch('creating: '.$view->getView(), [$view]);
-	}
+    /**
+     * Call the creator for a given view.
+     * 
+     * @param  \Syscodes\View\View  $view
+     * 
+     * @return void
+     */
+    public function callCreator(View $view)
+    {
+        $this->events->dispatch('creating: '.$view->getView(), [$view]);
+    }
 	
-	/**
-	 * Get the extension to engine bindings.
-	 * 
-	 * @return array
-	 */
-	public function getExtensions()
-	{
-		return $this->extensions;
-	}
+    /**
+     * Get the extension to engine bindings.
+     * 
+     * @return array
+     */
+    public function getExtensions()
+    {
+        return $this->extensions;
+    }
 	
-	/**
-	 * Add a piece of shared data to the environment.
-	 * 
-	 * @param  array|string  $key
-	 * @param  mixed|null  $value  
-	 * 
-	 * @return mixed
-	 */
-	public function share($key, $value = null)
-	{
-		$keys = is_array($key) ? $key : [$key => $value];
+    /**
+     * Add a piece of shared data to the environment.
+     * 
+     * @param  array|string  $key
+     * @param  mixed|null  $value  
+     * 
+     * @return mixed
+     */
+    public function share($key, $value = null)
+    {
+        $keys = is_array($key) ? $key : [$key => $value];
 		
-		foreach ($keys as $key => $value) {
-			$this->shared[$key] = $value;
-		}
+        foreach ($keys as $key => $value) {
+            $this->shared[$key] = $value;
+        }
 		
-		return $value;
-	}
+        return $value;
+    }
 
-	/**
-	 * Replace the namespace hints for the given namespace.
-	 * 
-	 * @param  string  $namespace
-	 * @param  string|array  $hints
-	 * 
-	 * @return $this
-	 */
-	public function replaceNamespace($namespace, $hints)
-	{
-		$this->finder->replaceNamespace($namespace, $hints);
+    /**
+     * Replace the namespace hints for the given namespace.
+     * 
+     * @param  string  $namespace
+     * @param  string|array  $hints
+     * 
+     * @return $this
+     */
+    public function replaceNamespace($namespace, $hints)
+    {
+        $this->finder->replaceNamespace($namespace, $hints);
 
-		return $this;
-	}
+        return $this;
+    }
 
-	/**
-	 * Increment the rendering counter.
-	 * 
-	 * @return void
-	 */
-	public function increment()
-	{
-		return $this->renderCount++;
-	}
+    /**
+     * Increment the rendering counter.
+     * 
+     * @return void
+     */
+    public function increment()
+    {
+        return $this->renderCount++;
+    }
 
-	/**
-	 * Decrement the rendering counter.
-	 * 
-	 * @return void
-	 */
-	public function decrement()
-	{
-		return $this->renderCount--;
-	}
+    /**
+     * Decrement the rendering counter.
+     * 
+     * @return void
+     */
+    public function decrement()
+    {
+        return $this->renderCount--;
+    }
 
-	/**
-	 * Check if there are no active render operations.
-	 * 
-	 * @return bool
-	 */
-	public function doneRendering()
-	{
-		return $this->renderCount == 0;
-	}
+    /**
+     * Check if there are no active render operations.
+     * 
+     * @return bool
+     */
+    public function doneRendering()
+    {
+        return $this->renderCount == 0;
+    }
 
-	/**
-	 * Flush all of the parser state like sections.
-	 * 
-	 * @return void
-	 */
-	public function flushState()
-	{
-		$this->renderCount = 0;
+    /**
+     * Flush all of the parser state like sections.
+     * 
+     * @return void
+     */
+    public function flushState()
+    {
+        $this->renderCount = 0;
 
-		$this->flushSections();
-	}
+        $this->flushSections();
+    }
 
-	/**
-	 * Flush all of the section contents if done rendering.
-	 * 
-	 * @return void
-	 */
-	public function flushStateIfDoneRendering()
-	{
-		if ($this->doneRendering()) {
-			$this->flushState();
-		}
-	}
+    /**
+     * Flush all of the section contents if done rendering.
+     * 
+     * @return void
+     */
+    public function flushStateIfDoneRendering()
+    {
+        if ($this->doneRendering()) {
+            $this->flushState();
+        }
+    }
 
-	/**
-	 * Get all of the shared data for the environment.
-	 * 
-	 * @return void
-	 */
-	public function getShared()
-	{
-		return $this->shared;
-	}
+    /**
+     * Get all of the shared data for the environment.
+     * 
+     * @return void
+     */
+    public function getShared()
+    {
+        return $this->shared;
+    }
 
-	/**
-	 * Get the IoC container instance.
-	 * 
-	 * @return \Syscodes\Contracts\Container\Container
-	 */
-	public function getContainer()
-	{
-		return $this->container;
-	}
+    /**
+     * Get the IoC container instance.
+     * 
+     * @return \Syscodes\Contracts\Container\Container
+     */
+    public function getContainer()
+    {
+        return $this->container;
+    }
 
-	/**
-	 * Set the IoC container instance.
-	 * 
-	 * @param  \Syscodes\Contracts\Container\Container  $container
-	 * 
-	 * @return void
-	 */
-	public function setContainer($container)
-	{
-		$this->container = $container;
-	}
+    /**
+     * Set the IoC container instance.
+     * 
+     * @param  \Syscodes\Contracts\Container\Container  $container
+     * 
+     * @return void
+     */
+    public function setContainer($container)
+    {
+        $this->container = $container;
+    }
 }
\ No newline at end of file

src/components/View/Concerns/ManagesLayouts.php

Indentation +153 added lines, -153 removed lines

@@ -32,178 +32,178 @@
  */
 trait ManagesLayouts
 {	
-	/**
-	 * Started blocks.
-	 * 
-	 * @var array $sections
-	 */
-	protected $sections = [];
+    /**
+     * Started blocks.
+     * 
+     * @var array $sections
+     */
+    protected $sections = [];
 	
-	/**
-	 * The stack of in-progress sections.
-	 * 
-	 * @var array $sectionStack
-	 */
-	protected $sectionStack = [];
+    /**
+     * The stack of in-progress sections.
+     * 
+     * @var array $sectionStack
+     */
+    protected $sectionStack = [];
 	
-	/**
-	 * Starting section.
-	 * 
-	 * @param  string  $section
-	 * @param  string|null  $content  
-	 * 
-	 * @return array
-	 */
-	public function beginSection($section, $content = null)
-	{
-		if (null === $content) {
-			if (ob_start()) {
-				$this->sectionStack[] = $section;
-			}
-		} else {
-			$this->extendSection($section, $content instanceof View ? $content : e($content));
-		}
-	}
+    /**
+     * Starting section.
+     * 
+     * @param  string  $section
+     * @param  string|null  $content  
+     * 
+     * @return array
+     */
+    public function beginSection($section, $content = null)
+    {
+        if (null === $content) {
+            if (ob_start()) {
+                $this->sectionStack[] = $section;
+            }
+        } else {
+            $this->extendSection($section, $content instanceof View ? $content : e($content));
+        }
+    }
 	
-	/**
-	 * Append content to a given section.
-	 * 
-	 * @param  string  $section
-	 * @param  string  $content
-	 * 
-	 * @return void
-	 */
-	protected function extendSection($section, $content)
-	{
-		if (isset($this->sections[$section])) {
-			$content = str_replace(static::parent(), $content, $this->sections[$section]);
-		}
+    /**
+     * Append content to a given section.
+     * 
+     * @param  string  $section
+     * @param  string  $content
+     * 
+     * @return void
+     */
+    protected function extendSection($section, $content)
+    {
+        if (isset($this->sections[$section])) {
+            $content = str_replace(static::parent(), $content, $this->sections[$section]);
+        }
 		
-		$this->sections[$section] = $content;
-	}
+        $this->sections[$section] = $content;
+    }
 	
-	/**
-	 * Close and printing section.
-	 * 
-	 * @return string
-	 */
-	public function showSection()
-	{
-		if (empty($this->sectionStack)) {
-			return '';
-		}
+    /**
+     * Close and printing section.
+     * 
+     * @return string
+     */
+    public function showSection()
+    {
+        if (empty($this->sectionStack)) {
+            return '';
+        }
 		
-		return $this->giveContent($this->stopSection());
-	}
+        return $this->giveContent($this->stopSection());
+    }
 	
-	/**
-	 * Give sections the page view from the master page.
-	 * 
-	 * @param  string  $name
-	 * 
-	 * @return string
-	 */
-	public function giveContent($name, $default = '')
-	{
-		$sectionContent = $default instanceof View ? $default : e($default);
+    /**
+     * Give sections the page view from the master page.
+     * 
+     * @param  string  $name
+     * 
+     * @return string
+     */
+    public function giveContent($name, $default = '')
+    {
+        $sectionContent = $default instanceof View ? $default : e($default);
 		
-		if (isset($this->sections[$name])) {
-			$sectionContent = $this->sections[$name];
-		}
+        if (isset($this->sections[$name])) {
+            $sectionContent = $this->sections[$name];
+        }
 		
-		return str_replace(static::parent(), '', $sectionContent);
-	}
+        return str_replace(static::parent(), '', $sectionContent);
+    }
 	
-	/**
-	 * Closing section.
-	 * 
-	 * @param  bool  $overwrite  
-	 * 
-	 * @return mixed
-	 * 
-	 * @throws \InvalidArgumentException
-	 */
-	public function stopSection($overwrite = false)
-	{
-		if (empty($this->sectionStack)) {
-			throw new InvalidArgumentException('You cannot finish a section without first starting with one.');
-		}
+    /**
+     * Closing section.
+     * 
+     * @param  bool  $overwrite  
+     * 
+     * @return mixed
+     * 
+     * @throws \InvalidArgumentException
+     */
+    public function stopSection($overwrite = false)
+    {
+        if (empty($this->sectionStack)) {
+            throw new InvalidArgumentException('You cannot finish a section without first starting with one.');
+        }
 		
-		$last = array_pop($this->sectionStack);
+        $last = array_pop($this->sectionStack);
 		
-		if ($overwrite) { 
-			$this->sections[$last] = ob_get_clean();
-		} else {
-			$this->extendSection($last, ob_get_clean());
-		}
+        if ($overwrite) { 
+            $this->sections[$last] = ob_get_clean();
+        } else {
+            $this->extendSection($last, ob_get_clean());
+        }
 		
-		return $last;
-	}
+        return $last;
+    }
 	
-	/**
-	 * Stop injecting content into a section and append it.
-	 * 
-	 * @return string
-	 * 
-	 * @throws \InvalidArgumentException
-	 */
-	public function appendSection()
-	{
-		if (empty($this->sectionStack)) {
-			throw new InvalidArgumentException('You cannot finish a section without first starting with one.');
-		}
+    /**
+     * Stop injecting content into a section and append it.
+     * 
+     * @return string
+     * 
+     * @throws \InvalidArgumentException
+     */
+    public function appendSection()
+    {
+        if (empty($this->sectionStack)) {
+            throw new InvalidArgumentException('You cannot finish a section without first starting with one.');
+        }
 		
-		$last = array_pop($this->sectionStack);
+        $last = array_pop($this->sectionStack);
 		
-		if (isset($this->sections[$last])) {
-			$this->sections[$last] .= ob_get_clean();
-		} else {
-			$this->sections[$last] = ob_get_clean();
-		}
+        if (isset($this->sections[$last])) {
+            $this->sections[$last] .= ob_get_clean();
+        } else {
+            $this->sections[$last] = ob_get_clean();
+        }
 		
-		return $last;
-	}
+        return $last;
+    }
 	
-	/**
-	 * Check if section exists.
-	 * 
-	 * @param  string  $name
-	 * 
-	 * @return bool
-	 */
-	public function hasSection($name)
-	{
-		return array_key_exists($name, $this->sections);
-	}
+    /**
+     * Check if section exists.
+     * 
+     * @param  string  $name
+     * 
+     * @return bool
+     */
+    public function hasSection($name)
+    {
+        return array_key_exists($name, $this->sections);
+    }
 	
-	/**
-	 * Get the entire array of sections.
-	 * 
-	 * @return array
-	 */
-	public function getSections()
-	{
-		return $this->sections;
-	}
+    /**
+     * Get the entire array of sections.
+     * 
+     * @return array
+     */
+    public function getSections()
+    {
+        return $this->sections;
+    }
 	
-	/**
-	 * Replace the @parent directive to a placeholder.
-	 * 
-	 * @return string
-	 */
-	public static function parent()
-	{
-		return '@parent';
-	}
+    /**
+     * Replace the @parent directive to a placeholder.
+     * 
+     * @return string
+     */
+    public static function parent()
+    {
+        return '@parent';
+    }
 	
-	/**
-	 * Flush all of the section contents.
-	 * 
-	 * @return void
-	 */
-	public function flushSections()
-	{
-		$this->sections     = [];
-		$this->sectionStack = [];
-	}
+    /**
+     * Flush all of the section contents.
+     * 
+     * @return void
+     */
+    public function flushSections()
+    {
+        $this->sections     = [];
+        $this->sectionStack = [];
+    }
 }
\ No newline at end of file