lenevor / syscodes

src/components/Routing/Router.php

Indentation +657 added lines, -657 removed lines

@@ -43,691 +43,691 @@
  */
 class Router implements Routable
 {
-	use Concerns\RouteMap,
-	    Macroable {
-		    __call as macroCall;
-	    }
-
-	/**
-	 * The registered route value binders.
-	 * 
-	 * @var array $binders
-	 */
-	protected $binders = [];
-
-	/**
-	 * The container instance used by the router.
-	 * 
-	 * @var \Syscodes\Components\Contracts\Container\Container $container
-	 */
-	protected $container;
-
-	/**
-	 * Variable of group route.
-	 *  
-	 * @var array $groupStack
-	 */
-	protected $groupStack = [];
-
-	/**
-	 * Middleware for function of filters
-	 *  
-	 * @var array $middleware
-	 */
-	protected $middleware = [];
+    use Concerns\RouteMap,
+        Macroable {
+            __call as macroCall;
+        }
+
+    /**
+     * The registered route value binders.
+     * 
+     * @var array $binders
+     */
+    protected $binders = [];
+
+    /**
+     * The container instance used by the router.
+     * 
+     * @var \Syscodes\Components\Contracts\Container\Container $container
+     */
+    protected $container;
+
+    /**
+     * Variable of group route.
+     *  
+     * @var array $groupStack
+     */
+    protected $groupStack = [];
+
+    /**
+     * Middleware for function of filters
+     *  
+     * @var array $middleware
+     */
+    protected $middleware = [];
 	
-	/**
-	 * All of the middleware groups.
-	 * 
-	 * @var array $middlewareGroups
-	 */
-	protected $middlewareGroups = [];
+    /**
+     * All of the middleware groups.
+     * 
+     * @var array $middlewareGroups
+     */
+    protected $middlewareGroups = [];
 	
-	/**
-	 * The priority-sorted list of middleware.
-	 * 
-	 * @var array $middlewarePriority
-	 */
-	public $middlewarePriority = [];
+    /**
+     * The priority-sorted list of middleware.
+     * 
+     * @var array $middlewarePriority
+     */
+    public $middlewarePriority = [];
 	
-	/**
-	 * The globally available parameter patterns.
-	 * 
-	 * @var array $patterns
-	 */
-	protected $patterns = [];
-
-	/**
-	 * Resolve the given route.
-	 * 
-	 * @var \Syscodes\Components\Routing\Resolver\RouteResolver $resolves
-	 */
-	protected $resolves;
-
-	/**
-	 * The Resource instance.
-	 * 
-	 * @var \Syscodes\Components\Routing\Resources\ResourceRegister $resources
-	 */
-	protected $resources;
-
-	/** 
-	 * The route collection instance. 
-	 * 
-	 * @var \Syscodes\Components\Routing\Collections\RouteCollection $routes
-	 */
-	protected $routes;
-
-	/**
-	 * Constructor. Create a new Router instance.
-	 *
-	 * @param  \Syscodes\Components\Contracts\Container\Container|null  $container
-	 * 
-	 * @return void
-	 */
-	public function __construct(Container $container = null)
-	{
-		$this->routes    = new RouteCollection;
-		$this->container = $container ?: new Container;
-		$this->resolves  = new RouteResolver($this, $this->routes, $this->container);
-	}
-
-	/**
-	 * Get the prefix from the group on the stack.
-	 *
-	 * @return string
-	 */
-	public function getGroupPrefix(): string
-	{
-		if ($this->hasGroupStack()) {
-			$last = end($this->groupStack);
-
-			return $last['prefix'] ?? '';
-		}
-
-		return '';
-	}
-
-	/**
-	 * Group a series of routes under a single URL segment. This is handy
-	 * for grouping items into an admin area, like:
-	 *
-	 *   Example:
-	 *      // Creates route: /admin show the word 'User'
-	 *      Route::group(['prefix' => 'admin'], function() {	 
-	 *
-	 *          Route::get('/user', function() {
-	 *	            echo 'Hello world..!';
-	 *          });
-	 *
-	 *      }); /admin/user
-	 *
-	 * @param  array  $attributes
-	 * @param  \Closure|array|string  $callback
-	 *
-	 * @return void
-	 */
-	public function group(array $attributes, $routes): void
-	{
-		foreach (Arr::wrap($routes) as $groupRoutes) {
-			$this->updateGroupStack($attributes);
+    /**
+     * The globally available parameter patterns.
+     * 
+     * @var array $patterns
+     */
+    protected $patterns = [];
+
+    /**
+     * Resolve the given route.
+     * 
+     * @var \Syscodes\Components\Routing\Resolver\RouteResolver $resolves
+     */
+    protected $resolves;
+
+    /**
+     * The Resource instance.
+     * 
+     * @var \Syscodes\Components\Routing\Resources\ResourceRegister $resources
+     */
+    protected $resources;
+
+    /** 
+     * The route collection instance. 
+     * 
+     * @var \Syscodes\Components\Routing\Collections\RouteCollection $routes
+     */
+    protected $routes;
+
+    /**
+     * Constructor. Create a new Router instance.
+     *
+     * @param  \Syscodes\Components\Contracts\Container\Container|null  $container
+     * 
+     * @return void
+     */
+    public function __construct(Container $container = null)
+    {
+        $this->routes    = new RouteCollection;
+        $this->container = $container ?: new Container;
+        $this->resolves  = new RouteResolver($this, $this->routes, $this->container);
+    }
+
+    /**
+     * Get the prefix from the group on the stack.
+     *
+     * @return string
+     */
+    public function getGroupPrefix(): string
+    {
+        if ($this->hasGroupStack()) {
+            $last = end($this->groupStack);
+
+            return $last['prefix'] ?? '';
+        }
+
+        return '';
+    }
+
+    /**
+     * Group a series of routes under a single URL segment. This is handy
+     * for grouping items into an admin area, like:
+     *
+     *   Example:
+     *      // Creates route: /admin show the word 'User'
+     *      Route::group(['prefix' => 'admin'], function() {	 
+     *
+     *          Route::get('/user', function() {
+     *	            echo 'Hello world..!';
+     *          });
+     *
+     *      }); /admin/user
+     *
+     * @param  array  $attributes
+     * @param  \Closure|array|string  $callback
+     *
+     * @return void
+     */
+    public function group(array $attributes, $routes): void
+    {
+        foreach (Arr::wrap($routes) as $groupRoutes) {
+            $this->updateGroupStack($attributes);
 	
-			$this->loadRoutes($groupRoutes);
+            $this->loadRoutes($groupRoutes);
 	
-			array_pop($this->groupStack);			
-		}
-	}
-
-	/**
-	 * Update the group stack with the given attributes.
-	 * 
-	 * @param  array  $attributes
-	 * 
-	 * @return void
-	 */
-	protected function updateGroupStack(array $attributes): void
-	{
-		if ($this->hasGroupStack()) {
-			$attributes = $this->mergeLastGroup($attributes);
-		}
-
-		$this->groupStack[] = $attributes;
-	}
-
-	/**
-	 * Merge the given group attributes.
-	 * 
-	 * @param  array  $new
-	 * @param  bool  $existsPrefix
-	 * 
-	 * @return array
-	 */
-	public function mergeLastGroup($new, bool $existsPrefix = true): array
-	{
-		return RouteGroup::mergeGroup($new, end($this->groupStack), $existsPrefix);
-	}
+            array_pop($this->groupStack);			
+        }
+    }
+
+    /**
+     * Update the group stack with the given attributes.
+     * 
+     * @param  array  $attributes
+     * 
+     * @return void
+     */
+    protected function updateGroupStack(array $attributes): void
+    {
+        if ($this->hasGroupStack()) {
+            $attributes = $this->mergeLastGroup($attributes);
+        }
+
+        $this->groupStack[] = $attributes;
+    }
+
+    /**
+     * Merge the given group attributes.
+     * 
+     * @param  array  $new
+     * @param  bool  $existsPrefix
+     * 
+     * @return array
+     */
+    public function mergeLastGroup($new, bool $existsPrefix = true): array
+    {
+        return RouteGroup::mergeGroup($new, end($this->groupStack), $existsPrefix);
+    }
 	
-	/**
-	 * Load the provided routes.
-	 * 
-	 * @param  \Closure|string  $callback
-	 * 
-	 * @return void
-	 */
-	protected function loadRoutes($callback): void
-	{
-		if ($callback instanceof Closure) {
-			$callback($this);
-		} else {
-			(new RouteFileRegister($this))->register($callback);
-		}
-	}
-
-	/**
-	 * Add a route to the underlying route collection. 
-	 *
-	 * @param  array|string  $method
-	 * @param  string  $route
-	 * @param  mixed  $action
-	 *
-	 * @return \Syscodes\Components\Routing\Route
-	 */
-	public function addRoute($method, $route, $action)
-	{
-		return $this->routes->add($this->map($method, $route, $action));
-	}
+    /**
+     * Load the provided routes.
+     * 
+     * @param  \Closure|string  $callback
+     * 
+     * @return void
+     */
+    protected function loadRoutes($callback): void
+    {
+        if ($callback instanceof Closure) {
+            $callback($this);
+        } else {
+            (new RouteFileRegister($this))->register($callback);
+        }
+    }
+
+    /**
+     * Add a route to the underlying route collection. 
+     *
+     * @param  array|string  $method
+     * @param  string  $route
+     * @param  mixed  $action
+     *
+     * @return \Syscodes\Components\Routing\Route
+     */
+    public function addRoute($method, $route, $action)
+    {
+        return $this->routes->add($this->map($method, $route, $action));
+    }
 	
-	/**
-	 * Register a new fallback route with the router.
-	 * 
-	 * @param  array|string|callable|null  $action
-	 * 
-	 * @return \Syscodes\Components\Routing\Route
-	 */
-	public function fallback($action)
-	{
-		$placeholder = 'fallbackPlaceholder';
+    /**
+     * Register a new fallback route with the router.
+     * 
+     * @param  array|string|callable|null  $action
+     * 
+     * @return \Syscodes\Components\Routing\Route
+     */
+    public function fallback($action)
+    {
+        $placeholder = 'fallbackPlaceholder';
 		
-		return $this->addRoute('GET', "{{$placeholder}}", $action)
-		            ->where($placeholder, '.*')
-		            ->fallback();
-	}
-
-	/**
-	 * Create a redirect from one URI to another.
-	 * 
-	 * @param  string  $uri
-	 * @param  string  $destination
-	 * @param  int  $status
-	 * 
-	 * @return \Syscodes\Components\Routing\Route
-	 */
-	public function redirect($uri, $destination, $status = 302)
-	{
-		return $this->any($uri, '\Syscodes\Components\Routing\Controllers\RedirectController')
-		            ->defaults('destination', $destination)
-		            ->defaults('status', $status);
-	}
+        return $this->addRoute('GET', "{{$placeholder}}", $action)
+                    ->where($placeholder, '.*')
+                    ->fallback();
+    }
+
+    /**
+     * Create a redirect from one URI to another.
+     * 
+     * @param  string  $uri
+     * @param  string  $destination
+     * @param  int  $status
+     * 
+     * @return \Syscodes\Components\Routing\Route
+     */
+    public function redirect($uri, $destination, $status = 302)
+    {
+        return $this->any($uri, '\Syscodes\Components\Routing\Controllers\RedirectController')
+                    ->defaults('destination', $destination)
+                    ->defaults('status', $status);
+    }
 	
-	/**
-	 * Create a permanent redirect from one URI to another.
-	 * 
-	 * @param  string  $uri
-	 * @param  string  $destination
-	 * 
-	 * @return \Syscodes\Components\Routing\Route
-	 */
-	public function permanentRedirect($uri, $destination)
-	{
-		return $this->redirect($uri, $destination, 301);
-	}
-
-	/**
-	 * Register a new route that returns a view.
-	 * 
-	 * @param  string  $uri
-	 * @param  string  $view
-	 * @param  array  $data
-	 * @param  int|array  $status
-	 * @param  array  $headers
-	 * 
-	 * @return \Syscodes\Components\Routing\Route
-	 */
-	public function view($uri, $view, $data = [], $status = 200, array $headers = [])
-	{
-		return $this->match(['GET', 'HEAD'], $uri, '\Syscodes\Components\Routing\Controllers\ViewController')
-		            ->setDefaults([
-		                'view' => $view,
-		                'data' => $data,
-		                'status' => is_array($status) ? 200 : $status,
-		                'headers' => is_array($status) ? $status : $headers,
-		            ]);
-	}
-
-	/**
-	 * Add new route to routes array.
-	 *
-	 * @param  array|string  $method
-	 * @param  string  $route
-	 * @param  mixed  $action
-	 *
-	 * @return \Syscodes\Components\Routing\Route
-	 * 
-	 * @throws \InvalidArgumentException
-	 */
-	public function map($method, $route, $action): Route
-	{
-		if ($this->actionReferencesController($action)) {
-			$action = $this->convertToControllerAction($action);
-		}
-
-		$route = $this->newRoute(
-		              $method,
-		              $this->prefix($route),
-		              $action
-		         );
-
-		if ($this->hasGroupStack()) {
-			$this->mergeGroupAttributesIntoRoute($route);			
-		}
-
-		$this->addWhereClausesToRoute($route);
+    /**
+     * Create a permanent redirect from one URI to another.
+     * 
+     * @param  string  $uri
+     * @param  string  $destination
+     * 
+     * @return \Syscodes\Components\Routing\Route
+     */
+    public function permanentRedirect($uri, $destination)
+    {
+        return $this->redirect($uri, $destination, 301);
+    }
+
+    /**
+     * Register a new route that returns a view.
+     * 
+     * @param  string  $uri
+     * @param  string  $view
+     * @param  array  $data
+     * @param  int|array  $status
+     * @param  array  $headers
+     * 
+     * @return \Syscodes\Components\Routing\Route
+     */
+    public function view($uri, $view, $data = [], $status = 200, array $headers = [])
+    {
+        return $this->match(['GET', 'HEAD'], $uri, '\Syscodes\Components\Routing\Controllers\ViewController')
+                    ->setDefaults([
+                        'view' => $view,
+                        'data' => $data,
+                        'status' => is_array($status) ? 200 : $status,
+                        'headers' => is_array($status) ? $status : $headers,
+                    ]);
+    }
+
+    /**
+     * Add new route to routes array.
+     *
+     * @param  array|string  $method
+     * @param  string  $route
+     * @param  mixed  $action
+     *
+     * @return \Syscodes\Components\Routing\Route
+     * 
+     * @throws \InvalidArgumentException
+     */
+    public function map($method, $route, $action): Route
+    {
+        if ($this->actionReferencesController($action)) {
+            $action = $this->convertToControllerAction($action);
+        }
+
+        $route = $this->newRoute(
+                        $method,
+                        $this->prefix($route),
+                        $action
+                    );
+
+        if ($this->hasGroupStack()) {
+            $this->mergeGroupAttributesIntoRoute($route);			
+        }
+
+        $this->addWhereClausesToRoute($route);
 		
-		return $route;
-	}
+        return $route;
+    }
 	
-	/**
-	 * Determine if the action is routing to a controller.
-	 * 
-	 * @param  array  $action
-	 * 
-	 * @return bool
-	 */
-	protected function actionReferencesController($action): bool
-	{
-		if ( ! $action instanceof Closure) {
-			return is_string($action) || (isset($action['uses']) && is_string($action['uses']));
-		}
+    /**
+     * Determine if the action is routing to a controller.
+     * 
+     * @param  array  $action
+     * 
+     * @return bool
+     */
+    protected function actionReferencesController($action): bool
+    {
+        if ( ! $action instanceof Closure) {
+            return is_string($action) || (isset($action['uses']) && is_string($action['uses']));
+        }
 		
-		return false;
-	}
+        return false;
+    }
 	
-	/**
-	 * Add a controller based route action to the action array.
-	 * 
-	 * @param  array|string  $action
-	 * 
-	 * @return array
-	 */
-	protected function convertToControllerAction($action): array
-	{
-		if (is_string($action)) {
-			$action = ['uses' => $action];
-		}
+    /**
+     * Add a controller based route action to the action array.
+     * 
+     * @param  array|string  $action
+     * 
+     * @return array
+     */
+    protected function convertToControllerAction($action): array
+    {
+        if (is_string($action)) {
+            $action = ['uses' => $action];
+        }
 		
-		if ($this->hasGroupStack()) {
-			$action['uses'] = $this->prependGroupController($action['uses']);
-			$action['uses'] = $this->prependGroupNamespace($action['uses']);
-		}
+        if ($this->hasGroupStack()) {
+            $action['uses'] = $this->prependGroupController($action['uses']);
+            $action['uses'] = $this->prependGroupNamespace($action['uses']);
+        }
 		
-		$action['controller'] = $action['uses'];
+        $action['controller'] = $action['uses'];
 		
-		return $action;
-	}
+        return $action;
+    }
 	
-	/**
-	 * Prepend the last group namespaces onto the use clause.
-	 * 
-	 * @param  string  $class
-	 * 
-	 * @return string
-	 */
-	protected function prependGroupNamespace($class): string
-	{
-		$group = end($this->groupStack);
+    /**
+     * Prepend the last group namespaces onto the use clause.
+     * 
+     * @param  string  $class
+     * 
+     * @return string
+     */
+    protected function prependGroupNamespace($class): string
+    {
+        $group = end($this->groupStack);
 		
-		return isset($group['namespace']) && ! Str::startsWith($class, '\\') && ! Str::startsWith($class, $group['namespace']) 
-		            ? $group['namespace'].'\\'.$class 
-					: $class;
-	}
+        return isset($group['namespace']) && ! Str::startsWith($class, '\\') && ! Str::startsWith($class, $group['namespace']) 
+                    ? $group['namespace'].'\\'.$class 
+                    : $class;
+    }
 	
-	/**
-	 * Prepend the last group controller onto the use clause.
-	 * 
-	 * @param  string  $class
-	 * 
-	 * @return string
-	 */
-	protected function prependGroupController($class): string
-	{
-		$group = end($this->groupStack);
+    /**
+     * Prepend the last group controller onto the use clause.
+     * 
+     * @param  string  $class
+     * 
+     * @return string
+     */
+    protected function prependGroupController($class): string
+    {
+        $group = end($this->groupStack);
 		
-		if ( ! isset($group['controller'])) {
-			return $class;
-		}
+        if ( ! isset($group['controller'])) {
+            return $class;
+        }
 		
-		if (class_exists($class)) {
-			return $class;
-		}
+        if (class_exists($class)) {
+            return $class;
+        }
 		
-		if (Str::contains($class, '@')) {
-			return $class;
-		}
+        if (Str::contains($class, '@')) {
+            return $class;
+        }
 		
-		return $group['controller'].'@'.$class;
-	}
-
-	/**
-	 * Create a new Route object.
-	 * 
-	 * @param  array|string  $method
-	 * @param  string  $uri
-	 * @param  mixed  $action
-	 * 
-	 * @return \Syscodes\Components\Routing\Route
-	 */
-	public function newRoute($method, $uri, $action): route
-	{
-		return take(new Route($method, $uri, $action))
-		                ->setContainer($this->container);
-	}
+        return $group['controller'].'@'.$class;
+    }
+
+    /**
+     * Create a new Route object.
+     * 
+     * @param  array|string  $method
+     * @param  string  $uri
+     * @param  mixed  $action
+     * 
+     * @return \Syscodes\Components\Routing\Route
+     */
+    public function newRoute($method, $uri, $action): route
+    {
+        return take(new Route($method, $uri, $action))
+                        ->setContainer($this->container);
+    }
 	
-	/**
-	 * Determine if the router currently has a group stack.
-	 * 
-	 * @return bool
-	 */
-	public function hasGroupStack(): bool
-	{
-		return ! empty($this->groupStack);
-	}
+    /**
+     * Determine if the router currently has a group stack.
+     * 
+     * @return bool
+     */
+    public function hasGroupStack(): bool
+    {
+        return ! empty($this->groupStack);
+    }
 	
-	/**
-	 * Merge the group stack with the controller action.
-	 * 
-	 * @param  \Syscpde\Routing\Route  $route
-	 * 
-	 * @return void
-	 */
-	protected function mergeGroupAttributesIntoRoute($route): void
-	{
-		$action = $this->mergeLastGroup(
-			$route->getAction(),
-			$existsPrefix = false
-		);
+    /**
+     * Merge the group stack with the controller action.
+     * 
+     * @param  \Syscpde\Routing\Route  $route
+     * 
+     * @return void
+     */
+    protected function mergeGroupAttributesIntoRoute($route): void
+    {
+        $action = $this->mergeLastGroup(
+            $route->getAction(),
+            $existsPrefix = false
+        );
 		
-		$route->setAction($action);
-	}
+        $route->setAction($action);
+    }
 	
-	/**
-	 * Add the necessary where clauses to the route based on its initial registration.
-	 * 
-	 * @param  \Syscodes\Components\Routing\Route  $route
-	 * 
-	 * @return \Syscodes\Components\Routing\Route
-	 */
-	protected function addWhereClausesToRoute($route): Route
-	{
-		$route->where(array_merge(
-			$this->patterns, Arr::get($route->getAction(), 'where', [])
-		));
-
-		return $route;
-	}
-
-	/**
-	 * Add a prefix to the route URI.
-	 *
-	 * @param  string  $uri
-	 *
-	 * @return string
-	 */
-	protected function prefix($uri): string
-	{
-		return trim(trim($this->getGroupPrefix(), '/').'/'.trim($uri, '/'), '/') ?: '/';
-	}
-
-	/**
-	 * Set a global where pattern on all routes.
-	 * 
-	 * @param  string  $name
-	 * @param  string  $pattern
-	 * 
-	 * @return void
-	 */
-	public function pattern($name, $pattern): void
-	{
-		$this->patterns[$name] = $pattern;
-	}
-
-	/**
-	 * Set a group of global where patterns on all routes.
-	 * 
-	 * @param  array  $patterns
-	 * 
-	 * @return void
-	 */
-	public function patterns($patterns): void
-	{
-		foreach ($patterns as $key => $pattern) {
-			$this->patterns[$key] = $pattern;
-		}
-	}
-
-	/**
-	 * Get a Resource instance.
-	 * 
-	 * @return \Syscodes\Components\Routing\ResourceRegister
-	 */
-	public function getResource()
-	{
-		if (isset($this->resources)) {
-			return $this->resources;
-		}
-
-		return $this->resources = new ResourceRegister($this);
-	}
-
-	/**
-	 * Dispatches the given url and call the method that belongs to the route.
-	 *
-	 * @param  \Syscodes\Components\Http\Request  $request
-	 *
-	 * @return mixed
-	 */
-	public function dispatch(Request $request)
-	{
-		return $this->resolves->resolve($request);
-	}
-
-	/**
-	 * Gather the middleware for the given route.
-	 * 
-	 * @param  \Syscodes\Components\Routing\Route  $route
-	 * 
-	 * @return array
-	 */
-	public function gatherRouteMiddleware(Route $route): array
-	{
-		$middleware = array_map(
-		                    fn ($name) => MiddlewareResolver::resolve($name, $this->middleware, $this->middlewareGroups),
-		                    $route->gatherMiddleware()
-		              );
+    /**
+     * Add the necessary where clauses to the route based on its initial registration.
+     * 
+     * @param  \Syscodes\Components\Routing\Route  $route
+     * 
+     * @return \Syscodes\Components\Routing\Route
+     */
+    protected function addWhereClausesToRoute($route): Route
+    {
+        $route->where(array_merge(
+            $this->patterns, Arr::get($route->getAction(), 'where', [])
+        ));
+
+        return $route;
+    }
+
+    /**
+     * Add a prefix to the route URI.
+     *
+     * @param  string  $uri
+     *
+     * @return string
+     */
+    protected function prefix($uri): string
+    {
+        return trim(trim($this->getGroupPrefix(), '/').'/'.trim($uri, '/'), '/') ?: '/';
+    }
+
+    /**
+     * Set a global where pattern on all routes.
+     * 
+     * @param  string  $name
+     * @param  string  $pattern
+     * 
+     * @return void
+     */
+    public function pattern($name, $pattern): void
+    {
+        $this->patterns[$name] = $pattern;
+    }
+
+    /**
+     * Set a group of global where patterns on all routes.
+     * 
+     * @param  array  $patterns
+     * 
+     * @return void
+     */
+    public function patterns($patterns): void
+    {
+        foreach ($patterns as $key => $pattern) {
+            $this->patterns[$key] = $pattern;
+        }
+    }
+
+    /**
+     * Get a Resource instance.
+     * 
+     * @return \Syscodes\Components\Routing\ResourceRegister
+     */
+    public function getResource()
+    {
+        if (isset($this->resources)) {
+            return $this->resources;
+        }
+
+        return $this->resources = new ResourceRegister($this);
+    }
+
+    /**
+     * Dispatches the given url and call the method that belongs to the route.
+     *
+     * @param  \Syscodes\Components\Http\Request  $request
+     *
+     * @return mixed
+     */
+    public function dispatch(Request $request)
+    {
+        return $this->resolves->resolve($request);
+    }
+
+    /**
+     * Gather the middleware for the given route.
+     * 
+     * @param  \Syscodes\Components\Routing\Route  $route
+     * 
+     * @return array
+     */
+    public function gatherRouteMiddleware(Route $route): array
+    {
+        $middleware = array_map(
+                            fn ($name) => MiddlewareResolver::resolve($name, $this->middleware, $this->middlewareGroups),
+                            $route->gatherMiddleware()
+                        );
 		
-		return Arr::flatten($middleware);
-	}
-
-	/**
-	 * Get all of the defined middleware
-	 * 
-	 * @return array
-	 */
-	public function getMiddleware(): array
-	{
-		return $this->middleware;
-	}
-
-	/**
-	 * Register a short-hand name for a middleware.
-	 * 
-	 * @param  string  $name
-	 * @param  string  $class
-	 * 
-	 * @return static
-	 */
-	public function aliasMiddleware($name, $class): static
-	{
-		$this->middleware[$name] = $class;
-
-		return $this;
-	}
-
-	/**
-	 * Register a group of middleware.
-	 * 
-	 * @param  string  $name
-	 * @param  array  $middleware
-	 * 
-	 * @return static
-	 */
-	public function middlewareGroup($name, array $middleware): static
-	{
-		$this->middlewareGroups[$name] = $middleware;
-
-		return $this;
-	}
-
-	/**
-	 * Check if a route with the given name exists.
-	 * 
-	 * @param  string  $name
-	 * 
-	 * @return bool
-	 */
-	public function has($name): bool
-	{
-		$names = is_array($name) ? $name : func_get_args();
-
-		foreach ($names as $value) {
-			if ( ! $this->routes->hasNamedRoute($value)) {
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	/**
-	 * Determine if the current route matches a pattern.
-	 * 
-	 * @param  mixed  ...$patterns
-	 * 
-	 * @return bool
-	 */
-	public function is(...$patterns): bool
-	{
-		return $this->currentRouteNamed(...$patterns);
-	}
-
-	/**
-	 * Determine if the current route matches a pattern.
-	 * 
-	 * @param  mixed  ...$patterns
-	 * 
-	 * @return bool
-	 */
-	public function currentRouteNamed(...$patterns): bool
-	{
-		return $this->resolves->current() && $this->resolves->current()->named(...$patterns);
-	}
-
-	/**
-	 * Register an array of resource controllers.
-	 * 
-	 * @param  array  $resources
-	 * @param  array  $options
-	 * 
-	 * @return void
-	 */
-	public function resources(array $resources, array $options = []): void
-	{
-		foreach ($resources as $name => $controller) {
-			$this->resource($name, $controller, $options);
-		}
-	}
-
-	/**
-	 * Route a resource to a controller.
-	 * 
-	 * @param  string  $name
-	 * @param  string  $controller
-	 * @param  array  $options
-	 * 
-	 * @return \Syscodes\Components\Routing\Resources\AwaitingResourceRegistration
-	 */
-	public function resource($name, $controller, array $options = []) 
-	{
-		if ($this->container) {
-			$register = $this->container->make(ResourceRegister::class);
-		} else {
-			$register = new ResourceRegister($this);
-		}
-
-		return new AwaitingResourceRegistration(
-			$register, $name, $controller, $options
-		);
-	}
-
-	/**
-	 * Get the route collection.
-	 *
-	 * @return array   
-	 */
-	public function getRoutes()
-	{
-		return $this->routes;
-	}
-
-	/**
-	 * Get or set the verbs used in the resource URIs.
-	 * 
-	 * @param  array  $verbs
-	 * 
-	 * @return array|null
-	 */
-	public function resourceVerbs(array $verbs = [])
-	{
-		ResourceRegister::verbs($verbs);
-	}
+        return Arr::flatten($middleware);
+    }
+
+    /**
+     * Get all of the defined middleware
+     * 
+     * @return array
+     */
+    public function getMiddleware(): array
+    {
+        return $this->middleware;
+    }
+
+    /**
+     * Register a short-hand name for a middleware.
+     * 
+     * @param  string  $name
+     * @param  string  $class
+     * 
+     * @return static
+     */
+    public function aliasMiddleware($name, $class): static
+    {
+        $this->middleware[$name] = $class;
+
+        return $this;
+    }
+
+    /**
+     * Register a group of middleware.
+     * 
+     * @param  string  $name
+     * @param  array  $middleware
+     * 
+     * @return static
+     */
+    public function middlewareGroup($name, array $middleware): static
+    {
+        $this->middlewareGroups[$name] = $middleware;
+
+        return $this;
+    }
+
+    /**
+     * Check if a route with the given name exists.
+     * 
+     * @param  string  $name
+     * 
+     * @return bool
+     */
+    public function has($name): bool
+    {
+        $names = is_array($name) ? $name : func_get_args();
+
+        foreach ($names as $value) {
+            if ( ! $this->routes->hasNamedRoute($value)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Determine if the current route matches a pattern.
+     * 
+     * @param  mixed  ...$patterns
+     * 
+     * @return bool
+     */
+    public function is(...$patterns): bool
+    {
+        return $this->currentRouteNamed(...$patterns);
+    }
+
+    /**
+     * Determine if the current route matches a pattern.
+     * 
+     * @param  mixed  ...$patterns
+     * 
+     * @return bool
+     */
+    public function currentRouteNamed(...$patterns): bool
+    {
+        return $this->resolves->current() && $this->resolves->current()->named(...$patterns);
+    }
+
+    /**
+     * Register an array of resource controllers.
+     * 
+     * @param  array  $resources
+     * @param  array  $options
+     * 
+     * @return void
+     */
+    public function resources(array $resources, array $options = []): void
+    {
+        foreach ($resources as $name => $controller) {
+            $this->resource($name, $controller, $options);
+        }
+    }
+
+    /**
+     * Route a resource to a controller.
+     * 
+     * @param  string  $name
+     * @param  string  $controller
+     * @param  array  $options
+     * 
+     * @return \Syscodes\Components\Routing\Resources\AwaitingResourceRegistration
+     */
+    public function resource($name, $controller, array $options = []) 
+    {
+        if ($this->container) {
+            $register = $this->container->make(ResourceRegister::class);
+        } else {
+            $register = new ResourceRegister($this);
+        }
+
+        return new AwaitingResourceRegistration(
+            $register, $name, $controller, $options
+        );
+    }
+
+    /**
+     * Get the route collection.
+     *
+     * @return array   
+     */
+    public function getRoutes()
+    {
+        return $this->routes;
+    }
+
+    /**
+     * Get or set the verbs used in the resource URIs.
+     * 
+     * @param  array  $verbs
+     * 
+     * @return array|null
+     */
+    public function resourceVerbs(array $verbs = [])
+    {
+        ResourceRegister::verbs($verbs);
+    }
 	
-	/**
-	 * Remove any duplicate middleware from the given array.
-	 * 
-	 * @param  array  $middleware
-	 * 
-	 * @return array
-	 */
-	public static function uniqueMiddleware(array $middleware): array
-	{
-		return array_unique($middleware, SORT_REGULAR);
-	}
-
-	/**
-	 * Magic method.
-	 * 
-	 * Dynamically handle calls into the router instance.
-	 * 
-	 * @param  string  $method
-	 * @param  array  $parameters
-	 * 
-	 * @return mixed
-	 */
-	public function __call($method, $parameters)
-	{
-		if (static::hasMacro($method)) {
-			return $this->macroCall($method, $parameters);
-		}
+    /**
+     * Remove any duplicate middleware from the given array.
+     * 
+     * @param  array  $middleware
+     * 
+     * @return array
+     */
+    public static function uniqueMiddleware(array $middleware): array
+    {
+        return array_unique($middleware, SORT_REGULAR);
+    }
+
+    /**
+     * Magic method.
+     * 
+     * Dynamically handle calls into the router instance.
+     * 
+     * @param  string  $method
+     * @param  array  $parameters
+     * 
+     * @return mixed
+     */
+    public function __call($method, $parameters)
+    {
+        if (static::hasMacro($method)) {
+            return $this->macroCall($method, $parameters);
+        }
 		
-		return (new RouteRegister($this))->attribute($method, $parameters[0]);
-	}
+        return (new RouteRegister($this))->attribute($method, $parameters[0]);
+    }
 }
\ No newline at end of file

src/components/Routing/Route.php

Indentation +837 added lines, -837 removed lines

@@ -43,857 +43,857 @@
  */
 class Route 
 {
-	use Concerns\RouteCondition,
-	    Concerns\RouteDependencyResolver;
-
-	/**
-	 * The validators used by the routes.
-	 * 
-	 * @var array $validators
-	 */
-	public static $validators;
+    use Concerns\RouteCondition,
+        Concerns\RouteDependencyResolver;
+
+    /**
+     * The validators used by the routes.
+     * 
+     * @var array $validators
+     */
+    public static $validators;
 	
-	/**
-	 * Action that the route will use when called.
-	 *
-	 * @var \Closure|string|array $action
-	 */
-	public $action;
-
-	/**
-	 * The compiled version of the route.
-	 * 
-	 * @var \Syscodes\Bundles\ApplicationBundle\Routing\RouteCompiler|string $compiled
-	 */
-	public $compiled;
-
-	/**
-	 * The computed gathered middleware.
-	 * 
-	 * @var array|null $computedMiddleware
-	 */
-	public $computedMiddleware;
-
-	/**
-	 * The container instance used by the route.
-	 * 
-	 * @var \Syscodes\Components\Container\Container $container
-	 */
-	protected $container;
-
-	/**
-	 * The controller instance.
-	 * 
-	 * @var string $controller
-	 */
-	public $controller;
-
-	/**
-	 * The default values for the route.
-	 * 
-	 * @var array $defaults
-	 */
-	public $defaults = [];
-
-	/**
-	 * Indicates whether the route is a fallback route.
-	 * 
-	 * @var bool $fallback
-	 */
-	protected $fallback = false;
-
-	/**
-	 * Variable of HTTP method.
-	 *  
-	 * @var array|string $method
-	 */
-	public $method;
-
-	/**
-	 * The array of matched parameters.
-	 * 
-	 * @var array $parameters
-	 */
-	public $parameters = [];
-
-	/**
-	 * The parameter names for the route.
-	 * 
-	 * @var string|null $parameterNames
-	 */
-	public $parameterNames;
-
-	/**
-	 * The URI pattern the route responds to.
-	 *
-	 * @var string $uri
-	 */
-	public $uri;
-
-	/**
-	 * Contains the arguments of the current route.
-	 *
-	 * @var array $where
-	 */
-	public $wheres = [];
-
-	/**
-	 * Constructor. Initialize route.
-	 *
-	 * @param  array|string  $method  
-	 * @param  string  $uri  
-	 * @param  \Closure|array  $action  
-	 *
-	 * @return void
-	 */
-	public function __construct($method, $uri, $action)
-	{
-		$this->uri = $uri;
-
-		// Set the method
-		$this->method = $this->parseMethod($method);
-
-		// Set the action
-		$this->action = Arr::except($this->parseAction($action), ['prefix']);
+    /**
+     * Action that the route will use when called.
+     *
+     * @var \Closure|string|array $action
+     */
+    public $action;
+
+    /**
+     * The compiled version of the route.
+     * 
+     * @var \Syscodes\Bundles\ApplicationBundle\Routing\RouteCompiler|string $compiled
+     */
+    public $compiled;
+
+    /**
+     * The computed gathered middleware.
+     * 
+     * @var array|null $computedMiddleware
+     */
+    public $computedMiddleware;
+
+    /**
+     * The container instance used by the route.
+     * 
+     * @var \Syscodes\Components\Container\Container $container
+     */
+    protected $container;
+
+    /**
+     * The controller instance.
+     * 
+     * @var string $controller
+     */
+    public $controller;
+
+    /**
+     * The default values for the route.
+     * 
+     * @var array $defaults
+     */
+    public $defaults = [];
+
+    /**
+     * Indicates whether the route is a fallback route.
+     * 
+     * @var bool $fallback
+     */
+    protected $fallback = false;
+
+    /**
+     * Variable of HTTP method.
+     *  
+     * @var array|string $method
+     */
+    public $method;
+
+    /**
+     * The array of matched parameters.
+     * 
+     * @var array $parameters
+     */
+    public $parameters = [];
+
+    /**
+     * The parameter names for the route.
+     * 
+     * @var string|null $parameterNames
+     */
+    public $parameterNames;
+
+    /**
+     * The URI pattern the route responds to.
+     *
+     * @var string $uri
+     */
+    public $uri;
+
+    /**
+     * Contains the arguments of the current route.
+     *
+     * @var array $where
+     */
+    public $wheres = [];
+
+    /**
+     * Constructor. Initialize route.
+     *
+     * @param  array|string  $method  
+     * @param  string  $uri  
+     * @param  \Closure|array  $action  
+     *
+     * @return void
+     */
+    public function __construct($method, $uri, $action)
+    {
+        $this->uri = $uri;
+
+        // Set the method
+        $this->method = $this->parseMethod($method);
+
+        // Set the action
+        $this->action = Arr::except($this->parseAction($action), ['prefix']);
 		
-		if (in_array('GET', $this->method) && ! in_array('HEAD', $this->method)) {
-			$this->method[] = 'HEAD';
-		}
-
-		$this->prefix(is_array($action) ? Arr::get($action, 'prefix') : '');
-	}
-
-	/**
-	 * Get the controller instance for the route.
-	 * 
-	 * @return mixed
-	 */
-	public function getController()
-	{
-		if ( ! $this->controller) {
-			$class = $this->parseControllerCallback()[0];
+        if (in_array('GET', $this->method) && ! in_array('HEAD', $this->method)) {
+            $this->method[] = 'HEAD';
+        }
+
+        $this->prefix(is_array($action) ? Arr::get($action, 'prefix') : '');
+    }
+
+    /**
+     * Get the controller instance for the route.
+     * 
+     * @return mixed
+     */
+    public function getController()
+    {
+        if ( ! $this->controller) {
+            $class = $this->parseControllerCallback()[0];
  
-			$this->controller = $this->container->make(ltrim($class, '\\'));
-		}
-
-		return $this->controller;
-	}
-
-	/**
-	 * Get the controller method used for the route.
-	 * 
-	 * @return string
-	 */
-	public function getControllerMethod(): string
-	{
-		return $this->parseControllerCallback()[1];
-	}
-
-	/**
-	 * Get or set the domain for the route.
-	 * 
-	 * @param  string|null  $domain  
-	 * 
-	 * @return mixed
-	 */
-	public function domain($domain = null)
-	{
-		if (is_null($domain)) {
-			return $this->getDomain();
-		}
+            $this->controller = $this->container->make(ltrim($class, '\\'));
+        }
+
+        return $this->controller;
+    }
+
+    /**
+     * Get the controller method used for the route.
+     * 
+     * @return string
+     */
+    public function getControllerMethod(): string
+    {
+        return $this->parseControllerCallback()[1];
+    }
+
+    /**
+     * Get or set the domain for the route.
+     * 
+     * @param  string|null  $domain  
+     * 
+     * @return mixed
+     */
+    public function domain($domain = null)
+    {
+        if (is_null($domain)) {
+            return $this->getDomain();
+        }
 		
-		$parsed = RouteUri::parse($domain);
-
-		$this->action['domain'] = $parsed->uri;
-
-		return $this;
-	}
-
-	/**
-	 * Get the domain defined for the route.
-	 * 
-	 * @return string|null
-	 */
-	public function getDomain()
-	{
-		return isset($this->action['domain'])
-				? str_replace(['http://', 'https://'], '', $this->action['domain'])
-				: null;
-	}
-
-	/**
-	 * Parse the controller.
-	 * 
-	 * @return array
-	 */
-	public function parseControllerCallback(): array
-	{
-		return Str::parseCallback($this->action['uses']);
-	}
+        $parsed = RouteUri::parse($domain);
+
+        $this->action['domain'] = $parsed->uri;
+
+        return $this;
+    }
+
+    /**
+     * Get the domain defined for the route.
+     * 
+     * @return string|null
+     */
+    public function getDomain()
+    {
+        return isset($this->action['domain'])
+                ? str_replace(['http://', 'https://'], '', $this->action['domain'])
+                : null;
+    }
+
+    /**
+     * Parse the controller.
+     * 
+     * @return array
+     */
+    public function parseControllerCallback(): array
+    {
+        return Str::parseCallback($this->action['uses']);
+    }
 	
-	/**
-	 * Checks whether the route's action is a controller.
-	 * 
-	 * @return bool
-	 */
-	public function isControllerAction(): bool
-	{
-		return is_string($this->action['uses']);
-	}
-
-	/**
-	 * Get the dispatcher for the route's controller.
-	 * 
-	 * @return \Syscodes\Components\Routing\ControllerDispatcher
-	 */
-	private function controllerDispatcher(): ControllerDispatcher
-	{
-		return new ControllerDispatcher($this->container);
-	}
+    /**
+     * Checks whether the route's action is a controller.
+     * 
+     * @return bool
+     */
+    public function isControllerAction(): bool
+    {
+        return is_string($this->action['uses']);
+    }
+
+    /**
+     * Get the dispatcher for the route's controller.
+     * 
+     * @return \Syscodes\Components\Routing\ControllerDispatcher
+     */
+    private function controllerDispatcher(): ControllerDispatcher
+    {
+        return new ControllerDispatcher($this->container);
+    }
 	
-	/**
-	 * Run the route action and return the response.
-	 * 
-	 * @return mixed
-	 */
-	public function runResolver()
-	{
-		$this->container = $this->container ?: new Container;
-
-		try {
-			if ($this->isControllerAction()) {
-				return $this->runResolverController();
-			}
-
-			return $this->runResolverCallable();
-		} catch (HttpResponseException $e) {
-			return $e->getResponse();
-		}
-	}
-
-	/**
-	 * Run the route action and return the response.
-	 *  
-	 * @return mixed
-	 */
-	protected function runResolverCallable()
-	{
-		$callable = $this->action['uses'];
-
-		return $callable(...array_values($this->resolveMethodDependencies(
-			$this->parametersWithouNulls(), new ReflectionFunction($callable)
-		)));
-	}
-
-	/**
-	 * Run the route action and return the response.
-	 * 
-	 * @return mixed
-	 */
-	protected function runResolverController()
-	{
-		return $this->controllerDispatcher()->dispatch($this, $this->getController(), $this->getControllerMethod());
-	}
-
-	/**
-	 * Determine if the route matches a given request.
-	 * 
-	 * @param  \Syscodes\Components\Http\Request  $request
-	 * @param  bool  $method
-	 * 
-	 * @return bool
-	 */
-	public function matches(Request $request, bool $method = true): bool
-	{
-		$this->compileRoute();
-
-		foreach (self::getValidators() as $validator) {
-			if ($method && $validator instanceof MethodValidator) {
-				continue;
-			}
-
-			if ( ! $validator->matches($this, $request)) {
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	/**
-	 * Get the route validators for the instance.
-	 * 
-	 * @return array
-	 */
-	public function getValidators(): array
-	{
-		if (isset(static::$validators)) {
-			return static::$validators;
-		}
-
-		return static::$validators = [
-			new HostValidator, new MethodValidator,
-			new SchemeValidator, new UriValidator
-		];
-	}
-
-	/**
-	 * Parse the route action.
-	 *
-	 * @param  \callable|array|null  $action
-	 *
-	 * @return array
-	 *
-	 * @throws \InvalidArgumentException
-	 */
-	protected function parseAction($action): array
-	{
-		if ( ! (is_object($action) && ($action instanceof Closure)) && ($action === null || $action === '')) {
-			throw new InvalidArgumentException(__('route.actionClosureOrFunction'));
-		}
-
-		return RouteAction::parse($this->uri, $action);
-	}
-
-	/**
-	 * Set the method of the current route.
-	 *
-	 * @param  array  $method
-	 *
-	 * @return array
-	 * 
-	 * @throws \InvalidArgumentException
-	 */
-	public function parseMethod($method): array
-	{
-		if ($method === null || empty($method)) {
-			throw new InvalidArgumentException(__('route.methodNotProvided'));			
-		}
-
-		foreach ((array) $method as $httpMethod) {
-			if ( ! in_array($httpMethod, ['GET', 'POST', 'PUT', 'DELETE', 'PATCH', 'OPTIONS', 'HEAD', 'ANY'])) {
-				throw new InvalidArgumentException(__('route.methodNotAllowed'));				
-			}
-		}
-
-	    return array_map('strtoupper', (array) $method);
-	}
-
-	/**
-	 * Set the URI that the route responds to.
-	 *
-	 * @param  string|null  $uri
-	 *
-	 * @return static
-	 *
-	 * @throws  \InvalidArgumentException
-	 */
-	public function setUri($uri): static
-	{
-		if ($uri === null) {
-			throw new InvalidArgumentException(__('route.uriNotProvided'));
-		}	
-
-		$this->uri = $this->parseUri($uri);
-
-		return $this;
-	}
+    /**
+     * Run the route action and return the response.
+     * 
+     * @return mixed
+     */
+    public function runResolver()
+    {
+        $this->container = $this->container ?: new Container;
+
+        try {
+            if ($this->isControllerAction()) {
+                return $this->runResolverController();
+            }
+
+            return $this->runResolverCallable();
+        } catch (HttpResponseException $e) {
+            return $e->getResponse();
+        }
+    }
+
+    /**
+     * Run the route action and return the response.
+     *  
+     * @return mixed
+     */
+    protected function runResolverCallable()
+    {
+        $callable = $this->action['uses'];
+
+        return $callable(...array_values($this->resolveMethodDependencies(
+            $this->parametersWithouNulls(), new ReflectionFunction($callable)
+        )));
+    }
+
+    /**
+     * Run the route action and return the response.
+     * 
+     * @return mixed
+     */
+    protected function runResolverController()
+    {
+        return $this->controllerDispatcher()->dispatch($this, $this->getController(), $this->getControllerMethod());
+    }
+
+    /**
+     * Determine if the route matches a given request.
+     * 
+     * @param  \Syscodes\Components\Http\Request  $request
+     * @param  bool  $method
+     * 
+     * @return bool
+     */
+    public function matches(Request $request, bool $method = true): bool
+    {
+        $this->compileRoute();
+
+        foreach (self::getValidators() as $validator) {
+            if ($method && $validator instanceof MethodValidator) {
+                continue;
+            }
+
+            if ( ! $validator->matches($this, $request)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Get the route validators for the instance.
+     * 
+     * @return array
+     */
+    public function getValidators(): array
+    {
+        if (isset(static::$validators)) {
+            return static::$validators;
+        }
+
+        return static::$validators = [
+            new HostValidator, new MethodValidator,
+            new SchemeValidator, new UriValidator
+        ];
+    }
+
+    /**
+     * Parse the route action.
+     *
+     * @param  \callable|array|null  $action
+     *
+     * @return array
+     *
+     * @throws \InvalidArgumentException
+     */
+    protected function parseAction($action): array
+    {
+        if ( ! (is_object($action) && ($action instanceof Closure)) && ($action === null || $action === '')) {
+            throw new InvalidArgumentException(__('route.actionClosureOrFunction'));
+        }
+
+        return RouteAction::parse($this->uri, $action);
+    }
+
+    /**
+     * Set the method of the current route.
+     *
+     * @param  array  $method
+     *
+     * @return array
+     * 
+     * @throws \InvalidArgumentException
+     */
+    public function parseMethod($method): array
+    {
+        if ($method === null || empty($method)) {
+            throw new InvalidArgumentException(__('route.methodNotProvided'));			
+        }
+
+        foreach ((array) $method as $httpMethod) {
+            if ( ! in_array($httpMethod, ['GET', 'POST', 'PUT', 'DELETE', 'PATCH', 'OPTIONS', 'HEAD', 'ANY'])) {
+                throw new InvalidArgumentException(__('route.methodNotAllowed'));				
+            }
+        }
+
+        return array_map('strtoupper', (array) $method);
+    }
+
+    /**
+     * Set the URI that the route responds to.
+     *
+     * @param  string|null  $uri
+     *
+     * @return static
+     *
+     * @throws  \InvalidArgumentException
+     */
+    public function setUri($uri): static
+    {
+        if ($uri === null) {
+            throw new InvalidArgumentException(__('route.uriNotProvided'));
+        }	
+
+        $this->uri = $this->parseUri($uri);
+
+        return $this;
+    }
 	
-	/**
-	 * Parse the route URI and normalize.
-	 * 
-	 * @param  string  $uri
-	 * 
-	 * @return string
-	 */
-	protected function parseUri($uri): string
-	{
-		return take(RouteUri::parse($uri), fn ($uri) => $uri)->uri;
-	}
-
-	/**
-	 * Add a prefix to the route URI.
-	 * 
-	 * @param  string  $prefix
-	 * 
-	 * @return static
-	 */
-	public function prefix($prefix): static
-	{
-		if ( ! empty($newPrefix = trim(rtrim($prefix, '/').'/'.ltrim($this->action['prefix'] ?? '', '/'), '/'))) {
-			$this->action['prefix'] = $newPrefix;
-		}
+    /**
+     * Parse the route URI and normalize.
+     * 
+     * @param  string  $uri
+     * 
+     * @return string
+     */
+    protected function parseUri($uri): string
+    {
+        return take(RouteUri::parse($uri), fn ($uri) => $uri)->uri;
+    }
+
+    /**
+     * Add a prefix to the route URI.
+     * 
+     * @param  string  $prefix
+     * 
+     * @return static
+     */
+    public function prefix($prefix): static
+    {
+        if ( ! empty($newPrefix = trim(rtrim($prefix, '/').'/'.ltrim($this->action['prefix'] ?? '', '/'), '/'))) {
+            $this->action['prefix'] = $newPrefix;
+        }
 		
-		$uri = rtrim($prefix, '/').'/'.ltrim($this->uri, '/');
+        $uri = rtrim($prefix, '/').'/'.ltrim($this->uri, '/');
 		
-		return $this->setUri($uri !== '/' ? trim($uri, '/') : $uri);
-	}
-
-	/**
-	 * Set the action array for the route.
-	 * 
-	 * @param  array  $action
-	 * 
-	 * @return mixed
-	 */
-	public function setAction(array $action)
-	{
-		$this->action = $action;
-
-		if (isset($this->action['domain'])) {
-			$this->domain($this->action['domain']);
-		}
+        return $this->setUri($uri !== '/' ? trim($uri, '/') : $uri);
+    }
+
+    /**
+     * Set the action array for the route.
+     * 
+     * @param  array  $action
+     * 
+     * @return mixed
+     */
+    public function setAction(array $action)
+    {
+        $this->action = $action;
+
+        if (isset($this->action['domain'])) {
+            $this->domain($this->action['domain']);
+        }
 		
-		return $this;
-	}
-
-	/**
-	 * Set the name.
-	 *
-	 * @param  string  $name
-	 *
-	 * @return static
-	 */
-	public function name($name): static
-	{
-		$this->action['as'] = isset($this->action['as']) ? $this->action['as'].$name : $name;
-
-		return $this;
-	}
-
-	/**
-	 * Determine whether the route's name matches the given patterns.
-	 * 
-	 * @param  mixed  ...$patterns
-	 * 
-	 * @return bool
-	 */
-	public function named(...$patterns): bool
-	{
-		if (is_null($routeName = $this->getName())) {
-			return false;
-		}
-
-		foreach ($patterns as $pattern) {
-			if (Str::is($pattern, $routeName)) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Set a default value for the route.
-	 * 
-	 * @param  string  $key
-	 * @param  mixed   $value
-	 * 
-	 * @return static
-	 */
-	public function defaults($key, $value): static
-	{
-		$this->defaults[$key] = $value;
-
-		return $this;
-	}
-
-	/**
-	 * Set a default values for the route.
-	 * 
-	 * @param  array  $defaults
-	 * 
-	 * @return static
-	 */
-	public function setDefaults(array $defaults): static
-	{
-		$this->defaults = $defaults;
-
-		return $this;
-	}
-
-	/**
-	 * Set the flag of fallback mode on the route.
-	 * 
-	 * @return static
-	 */
-	public function fallback(): static
-	{
-		$this->fallback = true;
-
-		return $this;
-	}
-
-	/**
-	 * Set the facllback value.
-	 * 
-	 * @param  bool  $fallback
-	 * 
-	 * @return static
-	 */
-	public function setFallback(bool $fallback): static
-	{
-		$this->fallback = $fallback;
-
-		return $this;
-	}
-
-	/**
-	 * Set the where.
-	 *
-	 * @param  array|string  $name
-	 * @param  string|null  $expression  
-	 *
-	 * @return static
-	 */
-	public function where($name, string $expression = null): static
-	{
-		$wheres = is_array($name) ? $name : [$name => $expression];
+        return $this;
+    }
+
+    /**
+     * Set the name.
+     *
+     * @param  string  $name
+     *
+     * @return static
+     */
+    public function name($name): static
+    {
+        $this->action['as'] = isset($this->action['as']) ? $this->action['as'].$name : $name;
+
+        return $this;
+    }
+
+    /**
+     * Determine whether the route's name matches the given patterns.
+     * 
+     * @param  mixed  ...$patterns
+     * 
+     * @return bool
+     */
+    public function named(...$patterns): bool
+    {
+        if (is_null($routeName = $this->getName())) {
+            return false;
+        }
+
+        foreach ($patterns as $pattern) {
+            if (Str::is($pattern, $routeName)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Set a default value for the route.
+     * 
+     * @param  string  $key
+     * @param  mixed   $value
+     * 
+     * @return static
+     */
+    public function defaults($key, $value): static
+    {
+        $this->defaults[$key] = $value;
+
+        return $this;
+    }
+
+    /**
+     * Set a default values for the route.
+     * 
+     * @param  array  $defaults
+     * 
+     * @return static
+     */
+    public function setDefaults(array $defaults): static
+    {
+        $this->defaults = $defaults;
+
+        return $this;
+    }
+
+    /**
+     * Set the flag of fallback mode on the route.
+     * 
+     * @return static
+     */
+    public function fallback(): static
+    {
+        $this->fallback = true;
+
+        return $this;
+    }
+
+    /**
+     * Set the facllback value.
+     * 
+     * @param  bool  $fallback
+     * 
+     * @return static
+     */
+    public function setFallback(bool $fallback): static
+    {
+        $this->fallback = $fallback;
+
+        return $this;
+    }
+
+    /**
+     * Set the where.
+     *
+     * @param  array|string  $name
+     * @param  string|null  $expression  
+     *
+     * @return static
+     */
+    public function where($name, string $expression = null): static
+    {
+        $wheres = is_array($name) ? $name : [$name => $expression];
 		
-		foreach ($wheres as $name => $expression) {
-			$this->wheres[$name] = $expression;
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Set the where when have a variable assign.
-	 * 
-	 * @param  string  $key
-	 * 
-	 * @return string|null
-	 */
-	public function setPattern(string $key): ?string
-	{
-		return $this->wheres[$key] ?? null;
-	}
-
-	/**
-	 * Bind the route to a given request for execution.
-	 * 
-	 * @param  \Syscodes\Components\Http\Request  $request
-	 * 
-	 * @return static
-	 */
-	public function bind(Request $request): static
-	{
-		$this->compileRoute();
+        foreach ($wheres as $name => $expression) {
+            $this->wheres[$name] = $expression;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Set the where when have a variable assign.
+     * 
+     * @param  string  $key
+     * 
+     * @return string|null
+     */
+    public function setPattern(string $key): ?string
+    {
+        return $this->wheres[$key] ?? null;
+    }
+
+    /**
+     * Bind the route to a given request for execution.
+     * 
+     * @param  \Syscodes\Components\Http\Request  $request
+     * 
+     * @return static
+     */
+    public function bind(Request $request): static
+    {
+        $this->compileRoute();
 		
-		$this->parameters = (new RouteParameter($this))->parameters($request);
-
-		return $this;
-	}
-
-	/**
-	 * Compile into a Route Compile instance.
-	 * 
-	 * @return \Syscodes\Bundles\ApplicationBundle\Routing\RouteCompiler
-	 */
-	protected function compileRoute()
-	{
-		if ( ! $this->compiled) {
-			$this->compiled = $this->toBundleRoute()->compile();
-		}
-
-		return $this->compiled;
-	}
-
-	/**
-	 * Get all of the parameter names for the route.
-	 * 
-	 * @return array
-	 */
-	public function parameterNames(): array
-	{
-		if (isset($this->parameterNames)) {
-			return $this->parameterNames;
-		}
-
-		return $this->parameterNames = $this->compileParameterNames();
-	}
-
-	/**
-	 * Get the parameter names for the route.
-	 * 
-	 * @return array
-	 */
-	protected function compileParameterNames(): array
-	{
-		preg_match_all('~\{(.*?)\}~', $this->getDomain().$this->getUri(), $matches);
-
-		return array_map(fn ($match) => trim($match, '?'), $matches[1]);
-	}
-
-	/**
-	 * Get a given parameter from the route.
-	 * 
-	 * @param  string  $name
-	 * @param  mixed  $default  
-	 * 
-	 * @return mixed
-	 */
-	public function parameter($name, $default = null)
-	{
-		return Arr::get($this->parameters(), $name, $default);
-	}
-
-	/**
-	 * Set a parameter to the given value.
-	 * 
-	 * @param  string  $name
-	 * @param  mixed  $value
-	 * 
-	 * @return void
-	 */
-	public function setParameter($name, $value): void
-	{
-		$this->parameters();
-
-		$this->parameters[$name] = $value;
-	}
-
-	/**
-	 * Get the key / value list of parameters without null values.
-	 * 
-	 * @return array
-	 */
-	public function parametersWithouNulls(): array
-	{
-		return array_filter($this->parameters(), fn ($parameter) => ! is_null($parameter));
-	}
-
-	/**
-	 * Get the key / value list of parameters for the route.
-	 * 
-	 * @return array
-	 */
-	public function parameters(): array
-	{
-		if (isset($this->parameters)) {
-			return $this->parameters;
-		}
-
-		throw new LogicException('The route is not bound');
-	}
-
-	/**
-	 * Get all middleware, including the ones from the controller.
-	 * 
-	 * @return array
-	 */
-	public function gatherMiddleware(): array
-	{
-		if ( ! is_null($this->computedMiddleware)) {
-			return $this->computedMiddleware;
-		}
-
-		$this->computedMiddleware = [];
-
-		return $this->computedMiddleware = Router::uniqueMiddleware(array_merge(
-			$this->middleware(),
-			$this->controllerMiddleware()
-		));
-	}
-
-	/**
-	 * Get or set the middlewares attached to the route.
-	 * 
-	 * @param  array|string|null  $middleware
-	 * 
-	 * @return array|static
-	 */
-	public function middleware($middleware = null)
-	{
-		if (is_null($middleware)) {
-			return $this->getMiddleware();
-		}
-
-		if (is_string($middleware)) {
-			$middleware = func_get_args();
-		}
-
-		foreach ($middleware as $index => $value) {
-			$middleware[$index] = (string) $value;
-		}
-
-		$this->action['middleware'] = array_merge(
-			$this->getMiddleware(),
-			$middleware
-		);
-
-		return $this;
-	}
-
-	/**
-	 * Get the middlewares attached to the route.
-	 * 
-	 * @return array
-	 */
-	protected function getMiddleware(): array
-	{
-		return (array) ($this->action['middleware'] ?? []);
-	}
-
-	/**
-	 * Get the middleware for the route's controller.
-	 * 
-	 * @return array
-	 */
-	public function controllerMiddleware(): array
-	{
-		if ( ! $this->isControllerAction()) {
-			return [];
-		}
-
-		return $this->controllerDispatcher()->getMiddleware(
-			$this->getController(),
-			$this->getControllerMethod()
-		);
-	}
-
-	/**
-	 * Determine if the route only responds to HTTP requests.
-	 * 
-	 * @return bool
-	 */
-	public function httpOnly(): bool
-	{
-		return in_array('http', $this->action, true);
-	}
-
-	/**
-	 * Determine if the route only responds to HTTPS requests.
-	 * 
-	 * @return bool
-	 */
-	public function httpsOnly(): bool
-	{
-		return $this->secure();
-	}
-
-	/**
-	 * Determine if the route only responds to HTTPS requests.
-	 * 
-	 * @return bool
-	 */
-	public function secure(): bool
-	{
-		return in_array('https', $this->action, true);
-	}
+        $this->parameters = (new RouteParameter($this))->parameters($request);
+
+        return $this;
+    }
+
+    /**
+     * Compile into a Route Compile instance.
+     * 
+     * @return \Syscodes\Bundles\ApplicationBundle\Routing\RouteCompiler
+     */
+    protected function compileRoute()
+    {
+        if ( ! $this->compiled) {
+            $this->compiled = $this->toBundleRoute()->compile();
+        }
+
+        return $this->compiled;
+    }
+
+    /**
+     * Get all of the parameter names for the route.
+     * 
+     * @return array
+     */
+    public function parameterNames(): array
+    {
+        if (isset($this->parameterNames)) {
+            return $this->parameterNames;
+        }
+
+        return $this->parameterNames = $this->compileParameterNames();
+    }
+
+    /**
+     * Get the parameter names for the route.
+     * 
+     * @return array
+     */
+    protected function compileParameterNames(): array
+    {
+        preg_match_all('~\{(.*?)\}~', $this->getDomain().$this->getUri(), $matches);
+
+        return array_map(fn ($match) => trim($match, '?'), $matches[1]);
+    }
+
+    /**
+     * Get a given parameter from the route.
+     * 
+     * @param  string  $name
+     * @param  mixed  $default  
+     * 
+     * @return mixed
+     */
+    public function parameter($name, $default = null)
+    {
+        return Arr::get($this->parameters(), $name, $default);
+    }
+
+    /**
+     * Set a parameter to the given value.
+     * 
+     * @param  string  $name
+     * @param  mixed  $value
+     * 
+     * @return void
+     */
+    public function setParameter($name, $value): void
+    {
+        $this->parameters();
+
+        $this->parameters[$name] = $value;
+    }
+
+    /**
+     * Get the key / value list of parameters without null values.
+     * 
+     * @return array
+     */
+    public function parametersWithouNulls(): array
+    {
+        return array_filter($this->parameters(), fn ($parameter) => ! is_null($parameter));
+    }
+
+    /**
+     * Get the key / value list of parameters for the route.
+     * 
+     * @return array
+     */
+    public function parameters(): array
+    {
+        if (isset($this->parameters)) {
+            return $this->parameters;
+        }
+
+        throw new LogicException('The route is not bound');
+    }
+
+    /**
+     * Get all middleware, including the ones from the controller.
+     * 
+     * @return array
+     */
+    public function gatherMiddleware(): array
+    {
+        if ( ! is_null($this->computedMiddleware)) {
+            return $this->computedMiddleware;
+        }
+
+        $this->computedMiddleware = [];
+
+        return $this->computedMiddleware = Router::uniqueMiddleware(array_merge(
+            $this->middleware(),
+            $this->controllerMiddleware()
+        ));
+    }
+
+    /**
+     * Get or set the middlewares attached to the route.
+     * 
+     * @param  array|string|null  $middleware
+     * 
+     * @return array|static
+     */
+    public function middleware($middleware = null)
+    {
+        if (is_null($middleware)) {
+            return $this->getMiddleware();
+        }
+
+        if (is_string($middleware)) {
+            $middleware = func_get_args();
+        }
+
+        foreach ($middleware as $index => $value) {
+            $middleware[$index] = (string) $value;
+        }
+
+        $this->action['middleware'] = array_merge(
+            $this->getMiddleware(),
+            $middleware
+        );
+
+        return $this;
+    }
+
+    /**
+     * Get the middlewares attached to the route.
+     * 
+     * @return array
+     */
+    protected function getMiddleware(): array
+    {
+        return (array) ($this->action['middleware'] ?? []);
+    }
+
+    /**
+     * Get the middleware for the route's controller.
+     * 
+     * @return array
+     */
+    public function controllerMiddleware(): array
+    {
+        if ( ! $this->isControllerAction()) {
+            return [];
+        }
+
+        return $this->controllerDispatcher()->getMiddleware(
+            $this->getController(),
+            $this->getControllerMethod()
+        );
+    }
+
+    /**
+     * Determine if the route only responds to HTTP requests.
+     * 
+     * @return bool
+     */
+    public function httpOnly(): bool
+    {
+        return in_array('http', $this->action, true);
+    }
+
+    /**
+     * Determine if the route only responds to HTTPS requests.
+     * 
+     * @return bool
+     */
+    public function httpsOnly(): bool
+    {
+        return $this->secure();
+    }
+
+    /**
+     * Determine if the route only responds to HTTPS requests.
+     * 
+     * @return bool
+     */
+    public function secure(): bool
+    {
+        return in_array('https', $this->action, true);
+    }
 	
-	/**
-	 * Convert the route to a bundle route.
-	 * 
-	 * @return \Syscodes\Bundles\ApplicationBundle\Routing\Route
-	 */
-	public function toBundleRoute()
-	{
-		return new BundleRoute(
-		            preg_replace('~\{(\w+?)\?\}~', '{$1}', $this->getUri()),
-		            $this->getOptionalParameterNames(),
-		            $this->getPatterns(),
-		            $this->getDomain() ?: ''
-		       );
-	}
+    /**
+     * Convert the route to a bundle route.
+     * 
+     * @return \Syscodes\Bundles\ApplicationBundle\Routing\Route
+     */
+    public function toBundleRoute()
+    {
+        return new BundleRoute(
+                    preg_replace('~\{(\w+?)\?\}~', '{$1}', $this->getUri()),
+                    $this->getOptionalParameterNames(),
+                    $this->getPatterns(),
+                    $this->getDomain() ?: ''
+                );
+    }
 	
-	/**
-	 * Get the optional parameter names for the route.
-	 * 
-	 * @return array
-	 */
-	protected function getOptionalParameterNames(): array
-	{
-		preg_match_all('~\{(\w+?)\?\}~', $this->getUri(), $matches);
+    /**
+     * Get the optional parameter names for the route.
+     * 
+     * @return array
+     */
+    protected function getOptionalParameterNames(): array
+    {
+        preg_match_all('~\{(\w+?)\?\}~', $this->getUri(), $matches);
 		
-		return isset($matches[1]) ? array_fill_keys($matches[1], null) : [];
-	}
-
-	/**
-	 * Get the action of the current route.
-	 *
-	 * @return \Closure|string|array
-	 */
-	public function getAction()
-	{
-		return $this->action;
-	}
+        return isset($matches[1]) ? array_fill_keys($matches[1], null) : [];
+    }
+
+    /**
+     * Get the action of the current route.
+     *
+     * @return \Closure|string|array
+     */
+    public function getAction()
+    {
+        return $this->action;
+    }
 	
-	/**
-	 * Get the compiled version of the route.
-	 * 
-	 * @return \Syscodes\Bundles\ApplicationBundle\Routing\CompiledRoute
-	 */
-	public function getCompiled()
-	{
-		return $this->compiled;
-	}
-
-	/**
-	 * Get the URI associated with the route.
-	 *
-	 * @return string
-	 */
-	public function getUri(): string
-	{
-		return $this->uri;
-	}
-
-	/**
-	 * Get the patterns of the current route.
-	 *
-	 * @return array
-	 */
-	public function getPatterns(): array
-	{
-		return $this->wheres;
-	}
-
-	/**
-	 * Get the request method of the current route.
-	 *
-	 * @return array|string
-	 */
-	public function getMethod(): array|string
-	{
-		return $this->method;
-	}
-
-	/**
-	 * Get the url of the current route.
-	 *
-	 * @return string|null
-	 */
-	public function getName(): ?string
-	{
-		return $this->action['as'] ?? null;
-	}
-
-	/**
-	 * Set the container instance on the route.
-	 * 
-	 * @param  \Syscodes\Components\Container\Container  $container
-	 * 
-	 * @return static
-	 */
-	public function setContainer(Container $container): static
-	{
-		$this->container = $container;
-
-		return $this;
-	}
-
-	/**
-	 * Magic method.
-	 * 
-	 * Dynamically access route parameters.
-	 * 
-	 * @param  string  $key
-	 * 
-	 * @return mixed
-	 */
-	public function __get($key)
-	{
-		return $this->parameter($key);
-	}
+    /**
+     * Get the compiled version of the route.
+     * 
+     * @return \Syscodes\Bundles\ApplicationBundle\Routing\CompiledRoute
+     */
+    public function getCompiled()
+    {
+        return $this->compiled;
+    }
+
+    /**
+     * Get the URI associated with the route.
+     *
+     * @return string
+     */
+    public function getUri(): string
+    {
+        return $this->uri;
+    }
+
+    /**
+     * Get the patterns of the current route.
+     *
+     * @return array
+     */
+    public function getPatterns(): array
+    {
+        return $this->wheres;
+    }
+
+    /**
+     * Get the request method of the current route.
+     *
+     * @return array|string
+     */
+    public function getMethod(): array|string
+    {
+        return $this->method;
+    }
+
+    /**
+     * Get the url of the current route.
+     *
+     * @return string|null
+     */
+    public function getName(): ?string
+    {
+        return $this->action['as'] ?? null;
+    }
+
+    /**
+     * Set the container instance on the route.
+     * 
+     * @param  \Syscodes\Components\Container\Container  $container
+     * 
+     * @return static
+     */
+    public function setContainer(Container $container): static
+    {
+        $this->container = $container;
+
+        return $this;
+    }
+
+    /**
+     * Magic method.
+     * 
+     * Dynamically access route parameters.
+     * 
+     * @param  string  $key
+     * 
+     * @return mixed
+     */
+    public function __get($key)
+    {
+        return $this->parameter($key);
+    }
 }
\ No newline at end of file

src/components/Http/Loaders/Parameters.php

Indentation +145 added lines, -145 removed lines

@@ -34,160 +34,160 @@
  */
 class Parameters implements IteratorAggregate, Countable
 {
-	/**
-	 * 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;
-	}
-
-	/**
-	 * Returns the parameters.
-	 * 
-	 * @param  string|null  $key
-	 * 
-	 * @return array
-	 */
-	public function all(string $key = null): array
-	{
-		if (null === $key) {
-			return $this->parameters;
-		}
-
-		if ( ! is_array($value = $this->parameters[$key] ?? [])) {
-			throw new BadRequestException(
-				sprintf('Unexpected value for parameter "%s", got "%s"', $key, get_debug_type($value))
-			);
-		}
-
-		return $value;
-	}
-
-	/**
-	 * Returns the parameter keys.
-	 * 
-	 * @return array
-	 */
-	public function keys(): array
-	{
-		return array_keys($this->parameters);
-	}
-
-	/**
-	 * Replaces the current parameters.
-	 * 
-	 * @param  array  $parameters
-	 * 
-	 * @return void
-	 */
-	public function replace(array $parameters = []): void
-	{
-		$this->parameters = $parameters;
-	}
-
-	/**
-	 * Adds parameters.
-	 * 
-	 * @param  array  $parameters
-	 * 
-	 * @return void
-	 */
-	public function add(array $parameters = []): void
-	{
-		$this->parameters = array_replace($this->parameters, $parameters);
-	}
-
-	/**
-	 * Get a parameter array item.
-	 *
-	 * @param  string  $key
-	 * @param  mixed  $default  
-	 *
-	 * @return mixed
-	 */
-	public function get(string $key, mixed $default = null): mixed
-	{
-		return $this->has($key) ? $this->parameters[$key] : $default;
-	}
-
-	/**
-	 * Check if a parameter array item exists.
-	 *
-	 * @param  string  $key
-	 *
-	 * @return bool
-	 */
-	public function has(string $key): bool
-	{
-		return Arr::exists($this->parameters, $key);
-	}
-
-	/**
-	 * Set a parameter array item.
-	 *
-	 * @param  string  $key
-	 * @param  string  $value 
-	 *
-	 * @return void
-	 */
-	public function set(string $key, $value): void
-	{
-		$this->parameters[$key] = $value;
-	}
-
-	/**
-	 * Remove a parameter array item.
-	 *
-	 * @param  string  $key 
-	 *
-	 * @return void
-	 */
-	public function remove(string $key): void
-	{
-		unset($this->parameters[$key]);
-	}
-
-	/*
+    /**
+     * 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;
+    }
+
+    /**
+     * Returns the parameters.
+     * 
+     * @param  string|null  $key
+     * 
+     * @return array
+     */
+    public function all(string $key = null): array
+    {
+        if (null === $key) {
+            return $this->parameters;
+        }
+
+        if ( ! is_array($value = $this->parameters[$key] ?? [])) {
+            throw new BadRequestException(
+                sprintf('Unexpected value for parameter "%s", got "%s"', $key, get_debug_type($value))
+            );
+        }
+
+        return $value;
+    }
+
+    /**
+     * Returns the parameter keys.
+     * 
+     * @return array
+     */
+    public function keys(): array
+    {
+        return array_keys($this->parameters);
+    }
+
+    /**
+     * Replaces the current parameters.
+     * 
+     * @param  array  $parameters
+     * 
+     * @return void
+     */
+    public function replace(array $parameters = []): void
+    {
+        $this->parameters = $parameters;
+    }
+
+    /**
+     * Adds parameters.
+     * 
+     * @param  array  $parameters
+     * 
+     * @return void
+     */
+    public function add(array $parameters = []): void
+    {
+        $this->parameters = array_replace($this->parameters, $parameters);
+    }
+
+    /**
+     * Get a parameter array item.
+     *
+     * @param  string  $key
+     * @param  mixed  $default  
+     *
+     * @return mixed
+     */
+    public function get(string $key, mixed $default = null): mixed
+    {
+        return $this->has($key) ? $this->parameters[$key] : $default;
+    }
+
+    /**
+     * Check if a parameter array item exists.
+     *
+     * @param  string  $key
+     *
+     * @return bool
+     */
+    public function has(string $key): bool
+    {
+        return Arr::exists($this->parameters, $key);
+    }
+
+    /**
+     * Set a parameter array item.
+     *
+     * @param  string  $key
+     * @param  string  $value 
+     *
+     * @return void
+     */
+    public function set(string $key, $value): void
+    {
+        $this->parameters[$key] = $value;
+    }
+
+    /**
+     * Remove a parameter array item.
+     *
+     * @param  string  $key 
+     *
+     * @return void
+     */
+    public function remove(string $key): void
+    {
+        unset($this->parameters[$key]);
+    }
+
+    /*
 	|-----------------------------------------------------------------
 	| IteratorAggregate Method
 	|-----------------------------------------------------------------
 	*/
 	
-	/**
-	 * Retrieve an external iterator.
-	 * 
-	 * @return \ArrayIterator
-	 */
-	public function getIterator(): Traversable
-	{
-		return new ArrayIterator($this->parameters);
-	}
+    /**
+     * Retrieve an external iterator.
+     * 
+     * @return \ArrayIterator
+     */
+    public function getIterator(): Traversable
+    {
+        return new ArrayIterator($this->parameters);
+    }
 	
-	/*
+    /*
 	|-----------------------------------------------------------------
 	| Countable Method
 	|-----------------------------------------------------------------
 	*/
 	
-	/**
-	 * Returns the number of parameters.
-	 * 
-	 * @return int The number of parameters
-	 */
-	public function count(): int
-	{
-		return count($this->parameters);
-	}
+    /**
+     * Returns the number of parameters.
+     * 
+     * @return int The number of parameters
+     */
+    public function count(): int
+    {
+        return count($this->parameters);
+    }
 }
\ No newline at end of file

src/components/Http/Loaders/Inputs.php

Indentation +59 added lines, -59 removed lines

@@ -30,70 +30,70 @@
  */
 final class Inputs extends Parameters
 {
-	/**
-	 * Replaces the current parameters.
-	 * 
-	 * @param  array  $parameters
-	 * 
-	 * @return void
-	 */
-	public function replace(array $inputs = []): void
-	{
-		$this->parameters = [];
-		$this->add($inputs);
-	}
+    /**
+     * Replaces the current parameters.
+     * 
+     * @param  array  $parameters
+     * 
+     * @return void
+     */
+    public function replace(array $inputs = []): void
+    {
+        $this->parameters = [];
+        $this->add($inputs);
+    }
 	
-	/**
-	 * Adds parameters.
-	 * 
-	 * @param  array  $parameters
-	 * 
-	 * @return void
-	 */
-	public function add(array $inputs = []): void
-	{
-		foreach ($inputs as $input => $file) {
-			$this->set($input, $file);
-		}
-	}
+    /**
+     * Adds parameters.
+     * 
+     * @param  array  $parameters
+     * 
+     * @return void
+     */
+    public function add(array $inputs = []): void
+    {
+        foreach ($inputs as $input => $file) {
+            $this->set($input, $file);
+        }
+    }
 	
-	/**
-	 * Gets a string input value by name.
-	 * 
-	 * @param  string  $key
-	 * @param  mixed  $default  
-	 * 
-	 * @return string|int|float|bool|null
-	 */
-	public function get(string $key, mixed $default = null): string|int|float|bool|null
-	{
-		if (null !== $default && ! is_scalar($default) && ! method_exists($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__));
-		}
+    /**
+     * Gets a string input value by name.
+     * 
+     * @param  string  $key
+     * @param  mixed  $default  
+     * 
+     * @return string|int|float|bool|null
+     */
+    public function get(string $key, mixed $default = null): string|int|float|bool|null
+    {
+        if (null !== $default && ! is_scalar($default) && ! method_exists($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__));
+        }
 		
-		$value = parent::get($key, $this);
+        $value = parent::get($key, $this);
 		
-		if (null !== $value && $this !== $value && ! is_scalar($value) && ! method_exists($value, '__toString')) {
-			throw new BadRequestHttpException(sprintf('Retrieving a non-string value from "%s()" is deprecated, and will throw a exception in Syscodes, use "%s::all($key)" instead', __METHOD__, __CLASS__));
-		}
+        if (null !== $value && $this !== $value && ! is_scalar($value) && ! method_exists($value, '__toString')) {
+            throw new BadRequestHttpException(sprintf('Retrieving a non-string value from "%s()" is deprecated, and will throw a exception in Syscodes, use "%s::all($key)" instead', __METHOD__, __CLASS__));
+        }
 		
-		return $this === $value ? $default : $value;
-	}
+        return $this === $value ? $default : $value;
+    }
 	
-	/**
-	 * Sets an input by name.
-	 * 
-	 * @param  string  $key
-	 * @param  mixed  $value
-	 * 
-	 * @return void
-	 */
-	public function set(string $key, mixed $value): void
-	{
-		if (null !== $value && ! is_scalar($value) && ! is_array($value) && ! method_exists($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__));
-		}
+    /**
+     * Sets an input by name.
+     * 
+     * @param  string  $key
+     * @param  mixed  $value
+     * 
+     * @return void
+     */
+    public function set(string $key, mixed $value): void
+    {
+        if (null !== $value && ! is_scalar($value) && ! is_array($value) && ! method_exists($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

Spacing +1 added lines, -1 removed lines

@@ -65,7 +65,7 @@
 	 * 
 	 * @return string|int|float|bool|null
 	 */
-	public function get(string $key, mixed $default = null): string|int|float|bool|null
+	public function get(string $key, mixed $default = null): string | int | float | bool | null
 	{
 		if (null !== $default && ! is_scalar($default) && ! method_exists($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__));

src/components/Http/Loaders/Files.php

Indentation +20 added lines, -20 removed lines

@@ -40,29 +40,29 @@
     }
 
     /**
-	 * Replaces the current parameters.
-	 * 
-	 * @param  array  $parameters
-	 * 
-	 * @return void
-	 */
-	public function replace(array $files = []): void
-	{
-		$this->parameters = [];
+     * Replaces the current parameters.
+     * 
+     * @param  array  $parameters
+     * 
+     * @return void
+     */
+    public function replace(array $files = []): void
+    {
+        $this->parameters = [];
         $this->add($files);
-	}
+    }
 
-	/**
-	 * Adds parameters.
-	 * 
-	 * @param  array  $parameters
-	 * 
-	 * @return void
-	 */
-	public function add(array $files = []): void
-	{
+    /**
+     * Adds parameters.
+     * 
+     * @param  array  $parameters
+     * 
+     * @return void
+     */
+    public function add(array $files = []): void
+    {
         foreach ($files as $key => $file) {
             $this->set($key, $file);
         }
-	}
+    }
 }
\ No newline at end of file

src/components/Http/Loaders/Headers.php

Indentation +227 added lines, -227 removed lines

@@ -35,266 +35,266 @@
  */
 class Headers implements IteratorAggregate, Countable
 {
-	protected const STRING_UPPER = '_ABCDEFGHIJKLMNOPQRSTUVWXYZ';
-	protected const STRING_LOWER = '-abcdefghijklmnopqrstuvwxyz';
+    protected const STRING_UPPER = '_ABCDEFGHIJKLMNOPQRSTUVWXYZ';
+    protected const STRING_LOWER = '-abcdefghijklmnopqrstuvwxyz';
 
-	/**
-	 * 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.
-	 * 
-	 * @param  string|null  $key  The name of the headers
-	 * 
-	 * @return array
-	 */
-	public function all(string $key = null): array
-	{
-		if (null !== $key) {
-			return $this->headers[strtr($key, self::STRING_UPPER, self::STRING_LOWER)] ?? [];
-		}
+    /**
+     * Returns all the headers.
+     * 
+     * @param  string|null  $key  The name of the headers
+     * 
+     * @return array
+     */
+    public function all(string $key = null): array
+    {
+        if (null !== $key) {
+            return $this->headers[strtr($key, self::STRING_UPPER, self::STRING_LOWER)] ?? [];
+        }
 
-		return $this->headers;
-	}
+        return $this->headers;
+    }
 	
-	/**
-	 * Returns the parameter keys.
-	 * 
-	 * @return array An array of parameter keys
-	 */
-	public function keys(): array
-	{
-		return array_keys($this->all());
-	}
+    /**
+     * Returns the parameter keys.
+     * 
+     * @return array An array of parameter keys
+     */
+    public function keys(): array
+    {
+        return array_keys($this->all());
+    }
 	
-	/**
-	 * Replaces the current HTTP headers by a new set.
-	 * 
-	 * @param  array  $headers
-	 * 
-	 * @return void
-	 */
-	public function replace(array $headers = []): void
-	{
-		$this->headers = [];
-		$this->add($headers);
-	}
+    /**
+     * Replaces the current HTTP headers by a new set.
+     * 
+     * @param  array  $headers
+     * 
+     * @return void
+     */
+    public function replace(array $headers = []): void
+    {
+        $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);
+        }
+    }
 	
-	/**
-	 * Gets a header value by name.
-	 *
-	 * @param  string  $key  The header name, or null for all headers
-	 * @param  string|null  $default  The default value
-	 *
-	 * @return mixed
-	 */
-	public function get(string $key, string $default = null): ?string
-	{
-		$headers = $this->all($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
+     *
+     * @return mixed
+     */
+    public function get(string $key, string $default = null): ?string
+    {
+        $headers = $this->all($key);
 		
-		if ( ! $headers) {
-			return $default;
-		}
+        if ( ! $headers) {
+            return $default;
+        }
 		
-		if (null === $headers[0]) {
-			return null;
-		}
+        if (null === $headers[0]) {
+            return null;
+        }
 		
-		return (string) $headers[0];
-	}
+        return (string) $headers[0];
+    }
 
-	/**
-	 * Sets a header by name.
-	 * 
-	 * @param  string  $key  The header name
-	 * @param  string|string[]|null  $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 void
-	 */
-	public function set(string $key, $values, bool $replace = true): void
-	{
-		$key = strtr($key, self::STRING_UPPER, self::STRING_LOWER);
+    /**
+     * Sets a header by name.
+     * 
+     * @param  string  $key  The header name
+     * @param  string|string[]|null  $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 void
+     */
+    public function set(string $key, $values, bool $replace = true): void
+    {
+        $key = strtr($key, self::STRING_UPPER, self::STRING_LOWER);
 
-		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;
+            }
+        }
 		
-		if ('cache-control' === $key) {
-			$this->cacheControl = $this->parseCacheControl(implode(', ', $this->headers[$key]));
-		}
-	}
+        if ('cache-control' === $key) {
+            $this->cacheControl = $this->parseCacheControl(implode(', ', $this->headers[$key]));
+        }
+    }
 
-	/**
-	 * 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(string $key): bool
-	{
-		return array_key_exists(strtr($key, self::STRING_UPPER, self::STRING_LOWER), $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(string $key): bool
+    {
+        return array_key_exists(strtr($key, self::STRING_UPPER, self::STRING_LOWER), $this->all());
+    }
 
-	/**
-	 * Removes a header.
-	 * 
-	 * @param  string  $name  The header name
-	 * 
-	 * @return mixed
-	 */
-	public function remove(string $key)
-	{
-		$key = strtr($key, self::STRING_UPPER, self::STRING_LOWER);
+    /**
+     * Removes a header.
+     * 
+     * @param  string  $name  The header name
+     * 
+     * @return mixed
+     */
+    public function remove(string $key)
+    {
+        $key = strtr($key, self::STRING_UPPER, self::STRING_LOWER);
 
-		unset($this->headers[$key]);
+        unset($this->headers[$key]);
 
-		if ('cache-control' === $key) {
-			$this->cacheControl = [];
-		}
-	}
+        if ('cache-control' === $key) {
+            $this->cacheControl = [];
+        }
+    }
 	
-	/**
-	 * Returns the HTTP header value converted to a date.
-	 * 
-	 * @param  string  $key
-	 * @param  DateTime|null  $default
-	 * 
-	 * @throws \RuntimeException When the HTTP header is not parseable
-	 */
-	public function getDate(string $key, DateTime $default = null): ?DateTimeInterface
-	{
-		if (null === $value = $this->get($key)) {
-			return $default;
-		}
+    /**
+     * Returns the HTTP header value converted to a date.
+     * 
+     * @param  string  $key
+     * @param  DateTime|null  $default
+     * 
+     * @throws \RuntimeException When the HTTP header is not parseable
+     */
+    public function getDate(string $key, DateTime $default = null): ?DateTimeInterface
+    {
+        if (null === $value = $this->get($key)) {
+            return $default;
+        }
 		
-		if (false === $date = DateTime::createFromFormat(DATE_RFC2822, $value)) {
-			throw new RuntimeException(sprintf('The "%s" HTTP header is not parseable (%s).', $key, $value));
-		}
+        if (false === $date = DateTime::createFromFormat(DATE_RFC2822, $value)) {
+            throw new RuntimeException(sprintf('The "%s" HTTP header is not parseable (%s).', $key, $value));
+        }
 		
-		return $date;
-	}
+        return $date;
+    }
 	
-	/**
-	 * Returns an iterator for headers.
-	 * 
-	 * @return \ArrayIterator An \ArrayIterator instance
-	 */
-	public function getIterator(): Traversable
-	{
-		return new ArrayIterator($this->headers);
-	}
+    /**
+     * Returns an iterator for headers.
+     * 
+     * @return \ArrayIterator An \ArrayIterator instance
+     */
+    public function getIterator(): Traversable
+    {
+        return new ArrayIterator($this->headers);
+    }
 	
-	/**
-	 * Returns the number of headers.
-	 * 
-	 * @return int The number of headers
-	 */
-	public function count(): int
-	{
-		return count($this->headers);
-	}
+    /**
+     * Returns the number of headers.
+     * 
+     * @return int The number of headers
+     */
+    public function count(): int
+    {
+        return count($this->headers);
+    }
 	
-	/**
-	 * Parses a Cache-Control HTTP header.
-	 * 
-	 * @param string $header The value of the Cache-Control HTTP header
-	 * 
-	 * @return array An array representing the attribute values
-	 */
-	protected function parseCacheControl($header): array
-	{
-		$cacheControl = [];
+    /**
+     * Parses a Cache-Control HTTP header.
+     * 
+     * @param string $header The value of the Cache-Control HTTP header
+     * 
+     * @return array An array representing the attribute values
+     */
+    protected function parseCacheControl($header): array
+    {
+        $cacheControl = [];
 		
-		preg_match_all('~([a-zA-Z][a-zA-Z_-]*)\s*(?:=(?:"([^"]*)"|([^ \t",;]*)))?~', $header, $matches, PREG_SET_ORDER);
+        preg_match_all('~([a-zA-Z][a-zA-Z_-]*)\s*(?:=(?:"([^"]*)"|([^ \t",;]*)))?~', $header, $matches, PREG_SET_ORDER);
 		
-		foreach ($matches as $match) {
-			$cacheControl[strtolower($match[1])] = isset($match[3]) ? $match[3] : (isset($match[2]) ? $match[2] : true);
-		}
+        foreach ($matches as $match) {
+            $cacheControl[strtolower($match[1])] = isset($match[3]) ? $match[3] : (isset($match[2]) ? $match[2] : true);
+        }
 		
-		return $cacheControl;
-	}
+        return $cacheControl;
+    }
 	
-	/**
-	 * Magic method.
-	 * 
-	 * Returns the headers as a string.
-	 * 
-	 * @return string The headers
-	 */
-	public function __toString(): string
-	{
-		if ( ! $headers = $this->all()) {
-			return '';
-		}
+    /**
+     * Magic method.
+     * 
+     * Returns the headers as a string.
+     * 
+     * @return string The headers
+     */
+    public function __toString(): string
+    {
+        if ( ! $headers = $this->all()) {
+            return '';
+        }
 		
-		ksort($headers);
+        ksort($headers);
 		
-		$max     = max(array_map('strlen', array_keys($headers))) + 1;
-		$content = '';
+        $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/Response.php

Indentation +185 added lines, -185 removed lines

@@ -34,199 +34,199 @@
  */
 class Response
 {
-	use HttpResponse,
+    use HttpResponse,
         HttpStatusCode;
 
-	/**
-	 * 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->headers = new ResponseHeaders($headers);
+    /**
+     * 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->headers = new ResponseHeaders($headers);
 		
-		$this->setContent($content);
-		$this->setStatusCode($status);
-		$this->setProtocolVersion('1.0');
-	}
-
-	/**
-	 * 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 = []): static
-	{
-		return new static($content, $status, $headers);
-	}
-
-	/**
-	 * Gets the current response content.
-	 * 
-	 * @return string
-	 */
-	public function getContent(): string
-	{
-		return $this->content;
-	}
-
-	/**
-	 * Sends the headers if they haven't already been sent. 
-	 * Returns whether they were sent or not.
-	 *
-	 * @return static
-	 */
-	public function sendHeaders(): static
-	{
-		// Have the headers already been sent?
-		if (headers_sent()) {
-			return $this;
-		}
-
-		// Headers
-		foreach ($this->headers->allPreserveCaseWithoutCookies() as $name => $values) {
-			$replace = 0 === strcasecmp($name, 'Content-Type');
-
-			foreach ($values as $value) {
-				header($name.': '. $value, $replace, $this->statusCode);
-			}
-		}
+        $this->setContent($content);
+        $this->setStatusCode($status);
+        $this->setProtocolVersion('1.0');
+    }
+
+    /**
+     * 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 = []): static
+    {
+        return new static($content, $status, $headers);
+    }
+
+    /**
+     * Gets the current response content.
+     * 
+     * @return string
+     */
+    public function getContent(): string
+    {
+        return $this->content;
+    }
+
+    /**
+     * Sends the headers if they haven't already been sent. 
+     * Returns whether they were sent or not.
+     *
+     * @return static
+     */
+    public function sendHeaders(): static
+    {
+        // Have the headers already been sent?
+        if (headers_sent()) {
+            return $this;
+        }
+
+        // Headers
+        foreach ($this->headers->allPreserveCaseWithoutCookies() as $name => $values) {
+            $replace = 0 === strcasecmp($name, 'Content-Type');
+
+            foreach ($values as $value) {
+                header($name.': '. $value, $replace, $this->statusCode);
+            }
+        }
 		
-		// Cookies
-		foreach ($this->headers->getCookies() as $cookie) {
-		 	header('Set-Cookie: '.$cookie, false, $this->statusCode);
-		}
+        // Cookies
+        foreach ($this->headers->getCookies() as $cookie) {
+                header('Set-Cookie: '.$cookie, false, $this->statusCode);
+        }
 		
-		// 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->statusCode, $this->statusText));
-		} else {
-			header(sprintf('HTTP/%s %s %s', $this->version, $this->statusCode, $this->statusText), true, $this->statusCode);
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Sends content for the current web response.
-	 * 
-	 * @return static
-	 */
-	public function sendContent(): static
-	{
-		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  static
-	 */
-	public function send($sendHeader = false): static
-	{
-		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 static
-	 */
-	public function setContent($content): static
-	{
-		if (null !== $content && ! is_string($content) && ! is_numeric($content) &&
-			! is_bool($content) && ! is_object($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();
-		}
+        // 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->statusCode, $this->statusText));
+        } else {
+            header(sprintf('HTTP/%s %s %s', $this->version, $this->statusCode, $this->statusText), true, $this->statusCode);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Sends content for the current web response.
+     * 
+     * @return static
+     */
+    public function sendContent(): static
+    {
+        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  static
+     */
+    public function send($sendHeader = false): static
+    {
+        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 static
+     */
+    public function setContent($content): static
+    {
+        if (null !== $content && ! is_string($content) && ! is_numeric($content) &&
+            ! is_bool($content) && ! is_object($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\Components\Http\Request  $request
-	 * 
-	 * @return static
-	 */
-	public function prepare($request): static
-	{
-		$headers = $this->headers;
-
-		if ($this->isInformational() || $this->isEmpty()) {
-			$this->setContent(null);
-			$headers->remove('Content-Type');
-			$headers->remove('Content-Length');
-		}
+        $this->content = $content ?? '';
+
+        return $this;
+    }
+
+    /**
+     * Prepares the Response before it is sent to the client.
+     * 
+     * @param  \Syscodes\Components\Http\Request  $request
+     * 
+     * @return static
+     */
+    public function prepare($request): static
+    {
+        $headers = $this->headers;
+
+        if ($this->isInformational() || $this->isEmpty()) {
+            $this->setContent(null);
+            $headers->remove('Content-Type');
+            $headers->remove('Content-Length');
+        }
 		
-		// Fix protocol
-		if ('HTTP/1.0' != $request->server->get('SERVER_PROTOCOL')) {
-			$this->setProtocolVersion('1.1');
-		}
+        // Fix protocol
+        if ('HTTP/1.0' != $request->server->get('SERVER_PROTOCOL')) {
+            $this->setProtocolVersion('1.1');
+        }
 
-		return $this;
-	}
+        return $this;
+    }
 	
-	/**
-	 * Magic method.
-	 * 
-	 * Returns the Response as an HTTP string.
-	 * 
-	 * @return string
-	 */
-	public function __toString(): string
-	{
-		return sprintf('HTTP/%s %s %s', $this->version, $this->statusCode, $this->statusText)."\r\n".
-			$this->headers."\r\n".
-			$this->getContent();
-	}
+    /**
+     * Magic method.
+     * 
+     * Returns the Response as an HTTP string.
+     * 
+     * @return string
+     */
+    public function __toString(): string
+    {
+        return sprintf('HTTP/%s %s %s', $this->version, $this->statusCode, $this->statusText)."\r\n".
+            $this->headers."\r\n".
+            $this->getContent();
+    }
 	
-	/**
-	 * Magic method.
-	 * 
-	 * Clone the current Response instance.
-	 * 
-	 * @return void
-	 */
-	public function __clone()
-	{
-		$this->headers = clone $this->headers;
-	}
+    /**
+     * Magic method.
+     * 
+     * Clone the current Response instance.
+     * 
+     * @return void
+     */
+    public function __clone()
+    {
+        $this->headers = clone $this->headers;
+    }
 }
\ No newline at end of file

src/components/Http/URI.php

Indentation +493 added lines, -493 removed lines

@@ -31,499 +31,499 @@
  */
 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';
-
-	/**
-	 * 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';
+
+    /**
+     * 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\Components\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 static
-	 * 
-	 * @throws \Syscodes\Components\Http\Exceptions\HttpURIException
-	 */
-	public function setUri(string $uri = null): static
-	{
-		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(): string
-	{
-		return '/'.ltrim($this->path, '/');
-	}
-
-	/**
-	 * Sets of URI string.
-	 * 
-	 * @param  string  $uri
-	 * 
-	 * @return static
-	 */
-	public function set(string $uri): static
-	{
-		$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(): string
-	{
-		return (is_null($this->path) ? '' : $this->path);
-	}
-
-	/**
-	 * Sets the path portion of the URI.
-	 * 
-	 * @param  string  $uri
-	 *
-	 * @return array
-	 */
-	public function setPath(string $uri): array
-	{
-		$this->path = $this->filterPath($uri);
-
-		$tempPath = trim($this->path, '/');
-
-		return $this->filterSegments($tempPath);
-	} 
-
-	/**
-	 * Encodes any dangerous characters.
-	 * 
-	 * @param  string  $uri
-	 * 
-	 * @return string
-	 */
-	protected function filterPath(string $uri): string
-	{
-		return urldecode($uri);
-	}
-
-	/**
-	 * Filter the segments of path.
-	 * 
-	 * @param  string  $uri
-	 * 
-	 * @return string[]
-	 */
-	protected function filterSegments(string $uri): array
-	{
-		return ($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): mixed
-	{
-		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(): array
-	{
-		$segments = $this->setPath(Request::decodedPath());
-
-		return array_values(array_filter($segments, fn ($value) => $value != ''));
-	}
-
-	/**
-	 * Returns the total number of segment.
-	 *
-	 * @return int  
-	 */
-	public function getTotalSegments(): int
-	{
-		return count($this->getSegments());
-	}
-
-	/**
-	 * Retrieve the scheme component of the URI.
-	 * 
-	 * @return string
-	 */
-	public function getScheme(): string
-	{
-		return $this->scheme;
-	}
-
-	/**
-	 * Sets the scheme for this URI.
-	 * 
-	 * @param  string  $str
-	 * 
-	 * @return string
-	 */
-	public function setScheme(string $str): string
-	{
-		$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;
-		$pass = $this->password;
-
-		if ($this->showPassword === true && ! empty($pass)) {
-			$user .= ":$pass";
-		}
-
-		return $user;
-	}
-
-	/**
-	 * Sets the user portion of the URI.
-	 * 
-	 * @param  string  $user
-	 * 
-	 * @return string|null
-	 */
-	public function setUser($user): string
-	{
-		$this->user = trim($user);
-
-		return $this->user;
-	}
-
-	/**
-	 * Sets the password portion of the URI.
-	 * 
-	 * @param  string  $password
-	 * 
-	 * @return string|null
-	 */
-	public function setPassword($password): string
-	{
-		$this->password = trim($password);
-
-		return $this->password;
-	}
-
-	/**
-	 * Temporarily sets the URI to show a password in userInfo.
-	 * 
-	 * @param  boolean  $option  
-	 * 
-	 * @return static
-	 */
-	public function showPassword(bool $option = true): static
-	{
-		$this->showPassword = $option;
-
-		return $this;
-	}
-
-	/**
-	 * Retrieve the authority component of the URI.
-	 * 
-	 * @param  boolean  $ignore  
-	 * 
-	 * @return string
-	 */
-	public function getAuthority(bool $ignore = false): string
-	{
-		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 static
-	 */
-	public function setAuthority(string $str): static
-	{
-		$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(): string
-	{
-		return $this->host;
-	}
-
-	/**
-	 * Sets the host name to use.
-	 * 
-	 * @param  string  $str
-	 * 
-	 * @return string
-	 */
-	public function setHost(string $str): string
-	{
-		$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): string
-	{
-		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(): string
-	{
-		return is_null($this->fragment) ? '' : $this->fragment;
-	}
-
-	/**
-	 * Sets the fragment portion of the URI.
-	 * 
-	 * @param  string  $str
-	 * 
-	 * @return string
-	 */
-	public function setFragment(string $str): string
-	{
-		$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'];
-		}
-	}
-
-	/**
-	 * Magic method.
-	 * 
-	 * Returns the URI string.
-	 *
-	 * @return string
-	 */
-	public function __toString(): string
-	{
-		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\Components\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 static
+     * 
+     * @throws \Syscodes\Components\Http\Exceptions\HttpURIException
+     */
+    public function setUri(string $uri = null): static
+    {
+        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(): string
+    {
+        return '/'.ltrim($this->path, '/');
+    }
+
+    /**
+     * Sets of URI string.
+     * 
+     * @param  string  $uri
+     * 
+     * @return static
+     */
+    public function set(string $uri): static
+    {
+        $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(): string
+    {
+        return (is_null($this->path) ? '' : $this->path);
+    }
+
+    /**
+     * Sets the path portion of the URI.
+     * 
+     * @param  string  $uri
+     *
+     * @return array
+     */
+    public function setPath(string $uri): array
+    {
+        $this->path = $this->filterPath($uri);
+
+        $tempPath = trim($this->path, '/');
+
+        return $this->filterSegments($tempPath);
+    } 
+
+    /**
+     * Encodes any dangerous characters.
+     * 
+     * @param  string  $uri
+     * 
+     * @return string
+     */
+    protected function filterPath(string $uri): string
+    {
+        return urldecode($uri);
+    }
+
+    /**
+     * Filter the segments of path.
+     * 
+     * @param  string  $uri
+     * 
+     * @return string[]
+     */
+    protected function filterSegments(string $uri): array
+    {
+        return ($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): mixed
+    {
+        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(): array
+    {
+        $segments = $this->setPath(Request::decodedPath());
+
+        return array_values(array_filter($segments, fn ($value) => $value != ''));
+    }
+
+    /**
+     * Returns the total number of segment.
+     *
+     * @return int  
+     */
+    public function getTotalSegments(): int
+    {
+        return count($this->getSegments());
+    }
+
+    /**
+     * Retrieve the scheme component of the URI.
+     * 
+     * @return string
+     */
+    public function getScheme(): string
+    {
+        return $this->scheme;
+    }
+
+    /**
+     * Sets the scheme for this URI.
+     * 
+     * @param  string  $str
+     * 
+     * @return string
+     */
+    public function setScheme(string $str): string
+    {
+        $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;
+        $pass = $this->password;
+
+        if ($this->showPassword === true && ! empty($pass)) {
+            $user .= ":$pass";
+        }
+
+        return $user;
+    }
+
+    /**
+     * Sets the user portion of the URI.
+     * 
+     * @param  string  $user
+     * 
+     * @return string|null
+     */
+    public function setUser($user): string
+    {
+        $this->user = trim($user);
+
+        return $this->user;
+    }
+
+    /**
+     * Sets the password portion of the URI.
+     * 
+     * @param  string  $password
+     * 
+     * @return string|null
+     */
+    public function setPassword($password): string
+    {
+        $this->password = trim($password);
+
+        return $this->password;
+    }
+
+    /**
+     * Temporarily sets the URI to show a password in userInfo.
+     * 
+     * @param  boolean  $option  
+     * 
+     * @return static
+     */
+    public function showPassword(bool $option = true): static
+    {
+        $this->showPassword = $option;
+
+        return $this;
+    }
+
+    /**
+     * Retrieve the authority component of the URI.
+     * 
+     * @param  boolean  $ignore  
+     * 
+     * @return string
+     */
+    public function getAuthority(bool $ignore = false): string
+    {
+        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 static
+     */
+    public function setAuthority(string $str): static
+    {
+        $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(): string
+    {
+        return $this->host;
+    }
+
+    /**
+     * Sets the host name to use.
+     * 
+     * @param  string  $str
+     * 
+     * @return string
+     */
+    public function setHost(string $str): string
+    {
+        $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): string
+    {
+        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(): string
+    {
+        return is_null($this->fragment) ? '' : $this->fragment;
+    }
+
+    /**
+     * Sets the fragment portion of the URI.
+     * 
+     * @param  string  $str
+     * 
+     * @return string
+     */
+    public function setFragment(string $str): string
+    {
+        $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'];
+        }
+    }
+
+    /**
+     * Magic method.
+     * 
+     * Returns the URI string.
+     *
+     * @return string
+     */
+    public function __toString(): string
+    {
+        return (string) $this->getPath();
+    }
 }
\ No newline at end of file

src/components/Http/Request.php

Indentation +1020 added lines, -1020 removed lines

@@ -48,560 +48,560 @@ 
  */
 class Request
 {
-	use HttpRequest,
-	    HttpResources,
-	    CanBePrecognitive,	    
-	    InteractsWithInput,
-	    InteractsWithContentTypes;
-
-	/**
-	 * Get the acceptable of content types.
-	 * 
-	 * @var string[] $acceptableContenTypes
-	 */
-	protected $acceptableContentTypes;
-
-	/**
-	 * Get the custom parameters.
-	 * 
-	 * @var \Syscodes\Components\Http\Loaders\Parameters $attributes
-	 */
-	public $attributes;
-
-	/**
-	 * The base URL.
-	 * 
-	 * @var string $baseUrl
-	 */
-	protected $baseUrl;
-
-	/**
-	 * Get the client ip.
-	 * 
-	 * @var mixed $clientIp
-	 */
-	protected $clientIp;
-
-	/**
-	 * Gets cookies ($_COOKIE).
-	 * 
-	 * @var \Syscodes\Components\Http\Loaders\Inputs $cookies
-	 */
-	public $cookies;
-
-	/**
-	 * Gets the string with format JSON.
-	 * 
-	 * @var string|resource|object|null $content
-	 */
-	protected $content;
-
-	/**
-	 * The default Locale this request.
-	 * 
-	 * @var string $defaultLocale
-	 */
-	protected $defaultLocale = 'en';
+    use HttpRequest,
+        HttpResources,
+        CanBePrecognitive,	    
+        InteractsWithInput,
+        InteractsWithContentTypes;
+
+    /**
+     * Get the acceptable of content types.
+     * 
+     * @var string[] $acceptableContenTypes
+     */
+    protected $acceptableContentTypes;
+
+    /**
+     * Get the custom parameters.
+     * 
+     * @var \Syscodes\Components\Http\Loaders\Parameters $attributes
+     */
+    public $attributes;
+
+    /**
+     * The base URL.
+     * 
+     * @var string $baseUrl
+     */
+    protected $baseUrl;
+
+    /**
+     * Get the client ip.
+     * 
+     * @var mixed $clientIp
+     */
+    protected $clientIp;
+
+    /**
+     * Gets cookies ($_COOKIE).
+     * 
+     * @var \Syscodes\Components\Http\Loaders\Inputs $cookies
+     */
+    public $cookies;
+
+    /**
+     * Gets the string with format JSON.
+     * 
+     * @var string|resource|object|null $content
+     */
+    protected $content;
+
+    /**
+     * The default Locale this request.
+     * 
+     * @var string $defaultLocale
+     */
+    protected $defaultLocale = 'en';
 	
-	/**
-	 * Gets files request ($_FILES).
-	 * 
-	 * @var \Syscodes\Components\Http\Loaders\Files $files
-	 */
-	public $files;
+    /**
+     * Gets files request ($_FILES).
+     * 
+     * @var \Syscodes\Components\Http\Loaders\Files $files
+     */
+    public $files;
 	
-	/**
-	 * Get the headers request ($_SERVER).
-	 * 
-	 * @var \Syscodes\Components\Http\Loaders\Headers $headers
-	 */
-	public $headers;
-
-	/**
-	 * The decoded JSON content for the request.
-	 * 
-	 * @var \Syscodes\Components\Http\Loaders\Parameters|null $json
-	 */
-	protected $json;
-
-	/**
-	 * The current language of the application.
-	 * 
-	 * @var string $languages
-	 */
-	protected $languages;
+    /**
+     * Get the headers request ($_SERVER).
+     * 
+     * @var \Syscodes\Components\Http\Loaders\Headers $headers
+     */
+    public $headers;
+
+    /**
+     * The decoded JSON content for the request.
+     * 
+     * @var \Syscodes\Components\Http\Loaders\Parameters|null $json
+     */
+    protected $json;
+
+    /**
+     * The current language of the application.
+     * 
+     * @var string $languages
+     */
+    protected $languages;
 	
-	/**
-	 * Get the locale.
-	 * 
-	 * @var string $locale
-	 */
-	protected $locale;
+    /**
+     * Get the locale.
+     * 
+     * @var string $locale
+     */
+    protected $locale;
 	
-	/** 
-	 * The method name.
-	 * 
-	 * @var string $method
-	 */
-	protected $method;
-
-	/**
-	 * The path info of URL.
-	 * 
-	 * @var string $pathInfo
-	 */
-	protected $pathInfo;
-
-	/**
-	 * Query string parameters ($_GET).
-	 * 
-	 * @var \Syscodes\Components\Http\Loaders\Parameters $query
-	 */
-	public $query;
-
-	/**
-	 * Request body parameters ($_POST).
-	 * 
-	 * @var \Syscodes\Components\Http\Loaders\Parameters $request
-	 */
-	public $request;
-
-	/**
-	 * Get request URI.
-	 * 
-	 * @var string $requestToUri
-	 */
-	protected $requestToUri;
-
-	/**
-	 * Get the route resolver callback.
-	 * 
-	 * @var \Closure $routeResolver
-	 */
-	protected $routeResolver;
-
-	/**
-	 * The Session implementation.
-	 * 
-	 * @var \Syscodes\Components\Contracts\Session\Session $session
-	 */
-	protected $session;
-
-	/**
-	 * The detected uri and server variables ($_SERVER).
-	 * 
-	 * @var \Syscodes\Components\Http\Loaders\Server $server
-	 */
-	public $server;
-
-	/** 
-	 * List of routes uri.
-	 *
-	 * @var \Syscodes\Components\Http\URI $uri 
-	 */
-	public $uri;
-
-	/**
-	 * Stores the valid locale codes.
-	 * 
-	 * @var array $validLocales
-	 */
-	protected $validLocales = [];
-
-	/**
-	 * Constructor: Create new the Request class.
-	 * 
-	 * @param  array  $query
-	 * @param  array  $request
-	 * @param  array  $attributes
-	 * @param  array  $cookies
-	 * @param  array  $files
-	 * @param  array  $server
-	 * @param  string|resource|null $content  
-	 * 
-	 * @return void
-	 */
-	public function __construct(
-		array $query = [],
-		array $request = [],
-		array $attributes = [],
-		array $cookies = [],
-		array $files = [],
-		array $server = [],
-		$content = null
-	) {
-		$this->initialize($query, $request, $attributes, $cookies, $files, $server, $content);
+    /** 
+     * The method name.
+     * 
+     * @var string $method
+     */
+    protected $method;
+
+    /**
+     * The path info of URL.
+     * 
+     * @var string $pathInfo
+     */
+    protected $pathInfo;
+
+    /**
+     * Query string parameters ($_GET).
+     * 
+     * @var \Syscodes\Components\Http\Loaders\Parameters $query
+     */
+    public $query;
+
+    /**
+     * Request body parameters ($_POST).
+     * 
+     * @var \Syscodes\Components\Http\Loaders\Parameters $request
+     */
+    public $request;
+
+    /**
+     * Get request URI.
+     * 
+     * @var string $requestToUri
+     */
+    protected $requestToUri;
+
+    /**
+     * Get the route resolver callback.
+     * 
+     * @var \Closure $routeResolver
+     */
+    protected $routeResolver;
+
+    /**
+     * The Session implementation.
+     * 
+     * @var \Syscodes\Components\Contracts\Session\Session $session
+     */
+    protected $session;
+
+    /**
+     * The detected uri and server variables ($_SERVER).
+     * 
+     * @var \Syscodes\Components\Http\Loaders\Server $server
+     */
+    public $server;
+
+    /** 
+     * List of routes uri.
+     *
+     * @var \Syscodes\Components\Http\URI $uri 
+     */
+    public $uri;
+
+    /**
+     * Stores the valid locale codes.
+     * 
+     * @var array $validLocales
+     */
+    protected $validLocales = [];
+
+    /**
+     * Constructor: Create new the Request class.
+     * 
+     * @param  array  $query
+     * @param  array  $request
+     * @param  array  $attributes
+     * @param  array  $cookies
+     * @param  array  $files
+     * @param  array  $server
+     * @param  string|resource|null $content  
+     * 
+     * @return void
+     */
+    public function __construct(
+        array $query = [],
+        array $request = [],
+        array $attributes = [],
+        array $cookies = [],
+        array $files = [],
+        array $server = [],
+        $content = null
+    ) {
+        $this->initialize($query, $request, $attributes, $cookies, $files, $server, $content);
 		
-		$this->detectLocale();
-	}
-
-	/**
-	 * Sets the parameters for this request.
-	 * 
-	 * @param  array  $query
-	 * @param  array  $request
-	 * @param  array  $attributes
-	 * @param  array  $cookies
-	 * @param  array  $files
-	 * @param  array  $server
-	 * 
-	 * @return void
-	 */
-	public function initialize(
-		array $query = [], 
-		array $request = [],
-		array $attributes = [],
-		array $cookies = [], 
-		array $files = [], 
-		array $server = [], 
-		$content = null
-	): void {
-		$this->query = new Inputs($query);
-		$this->request = new Inputs($request);
-		$this->attributes = new Parameters($attributes);
-		$this->cookies = new Inputs($cookies);
-		$this->files = new Files($files);
-		$this->server = new Server($server);
-		$this->headers = new Headers($this->server->all());
-
-		// Variables initialized
-		$this->uri = new URI;
-		$this->method = null;
-		$this->baseUrl = null;
-		$this->content = $content;
-		$this->pathInfo = null;
-		$this->languages = null;
-		$this->acceptableContentTypes = null;
-		$this->validLocales = config('app.supportedLocales');
-		$this->clientIp = new RequestClientIP($this->server->all());
-	}
-
-	/**
-	 * Clones a request and overrides some of its parameters.
-	 * 
-	 * @param  array|null  $query
-	 * @param  array|null  $request
-	 * @param  array|null  $attributes
-	 * @param  array|null  $cookies
-	 * @param  array|null  $files
-	 * @param  array|null  $server
-	 * 
-	 * @return static
-	 */
-	public function duplicate(
-		array $query = null, 
-		array $request = null,
-		array $attributes = null,
-		array $cookies = null,
-		array $files = null,
-		array $server = null
-	): static {
-		$duplicate = clone $this;
-
-		if (null !== $query) {
-			$duplicate->query = new Inputs($query);
-		}
-
-		if (null !== $request) {
-			$duplicate->request = new Inputs($request);
-		}
-
-		if (null !== $attributes) {
-			$duplicate->attributes = new Parameters($attributes);
-		}
-
-		if (null !== $cookies) {
-			$duplicate->cookies = new Inputs($cookies);
-		}
-
-		if (null !== $files) {
-			$duplicate->files = new Files($files);
-		}
-
-		if (null !== $server) {
-			$duplicate->server  = new Server($server);
-			$duplicate->headers = new Headers($duplicate->server->all());
-		}
-
-		$duplicate->uri = new URI;
-		$duplicate->locale = null;
-		$duplicate->method = null;
-		$duplicate->baseUrl = null;
-		$duplicate->pathInfo = null;
-		$duplicate->validLocales = config('app.supportedLocales');
-		$duplicate->clientIp = new RequestClientIP($duplicate->server->all());
-
-		return $duplicate;		
-	}
-
-	/**
-	 * Returns the desired segment, or $default if it does not exist.
-	 *
-	 * @param  int  $index  The segment number (1-based index)
-	 * @param  mixed  $default  Default value to return
-	 *
-	 * @return string
-	 */
-	public function segment($index, $default = null)
-	{
-		return $this->uri->getSegment($index, $default);
-	}
-
-	/**
-	 * Returns all segments in an array. For total of segments
-	 * used the function PHP count().
-	 *
-	 * @return array|null
-	 */
-	public function segments()
-	{
-		return $this->uri->getSegments();
-	}
-
-	/**
-	 * Returns the total number of segment.
-	 *
-	 * @return int|null  
-	 */
-	public function totalSegments()
-	{
-		return $this->uri->getTotalSegments();
-	}
-
-	/**
-	 * Handles setting up the locale, auto-detecting of language.
-	 * 
-	 * @return void
-	 */
-	public function detectLocale(): void
-	{
-		$this->languages = $this->defaultLocale = config('app.locale');
-
-		$this->setLocale($this->validLocales[0]);
-	}
-
-	/**
-	 * Returns the default locale as set.
-	 * 
-	 * @return string
-	 */
-	public function getDefaultLocale(): string
-	{
-		return $this->defaultLocale;
-	}
-
-	/**
-	 * Gets the current locale, with a fallback to the default.
-	 * 
-	 * @return string 
-	 */
-	public function getLocale(): string
-	{
-		return $this->languages ?: $this->defaultLocale;
-	}
-
-	/**
-	 * Sets the locale string for this request.
-	 * 
-	 * @param  string  $locale
-	 * 
-	 * @return self
-	 */
-	public function setLocale(string $locale): self
-	{
-		if ( ! in_array($locale, $this->validLocales, true)) {
-			$locale = $this->defaultLocale;
-		}
+        $this->detectLocale();
+    }
+
+    /**
+     * Sets the parameters for this request.
+     * 
+     * @param  array  $query
+     * @param  array  $request
+     * @param  array  $attributes
+     * @param  array  $cookies
+     * @param  array  $files
+     * @param  array  $server
+     * 
+     * @return void
+     */
+    public function initialize(
+        array $query = [], 
+        array $request = [],
+        array $attributes = [],
+        array $cookies = [], 
+        array $files = [], 
+        array $server = [], 
+        $content = null
+    ): void {
+        $this->query = new Inputs($query);
+        $this->request = new Inputs($request);
+        $this->attributes = new Parameters($attributes);
+        $this->cookies = new Inputs($cookies);
+        $this->files = new Files($files);
+        $this->server = new Server($server);
+        $this->headers = new Headers($this->server->all());
+
+        // Variables initialized
+        $this->uri = new URI;
+        $this->method = null;
+        $this->baseUrl = null;
+        $this->content = $content;
+        $this->pathInfo = null;
+        $this->languages = null;
+        $this->acceptableContentTypes = null;
+        $this->validLocales = config('app.supportedLocales');
+        $this->clientIp = new RequestClientIP($this->server->all());
+    }
+
+    /**
+     * Clones a request and overrides some of its parameters.
+     * 
+     * @param  array|null  $query
+     * @param  array|null  $request
+     * @param  array|null  $attributes
+     * @param  array|null  $cookies
+     * @param  array|null  $files
+     * @param  array|null  $server
+     * 
+     * @return static
+     */
+    public function duplicate(
+        array $query = null, 
+        array $request = null,
+        array $attributes = null,
+        array $cookies = null,
+        array $files = null,
+        array $server = null
+    ): static {
+        $duplicate = clone $this;
+
+        if (null !== $query) {
+            $duplicate->query = new Inputs($query);
+        }
+
+        if (null !== $request) {
+            $duplicate->request = new Inputs($request);
+        }
+
+        if (null !== $attributes) {
+            $duplicate->attributes = new Parameters($attributes);
+        }
+
+        if (null !== $cookies) {
+            $duplicate->cookies = new Inputs($cookies);
+        }
+
+        if (null !== $files) {
+            $duplicate->files = new Files($files);
+        }
+
+        if (null !== $server) {
+            $duplicate->server  = new Server($server);
+            $duplicate->headers = new Headers($duplicate->server->all());
+        }
+
+        $duplicate->uri = new URI;
+        $duplicate->locale = null;
+        $duplicate->method = null;
+        $duplicate->baseUrl = null;
+        $duplicate->pathInfo = null;
+        $duplicate->validLocales = config('app.supportedLocales');
+        $duplicate->clientIp = new RequestClientIP($duplicate->server->all());
+
+        return $duplicate;		
+    }
+
+    /**
+     * Returns the desired segment, or $default if it does not exist.
+     *
+     * @param  int  $index  The segment number (1-based index)
+     * @param  mixed  $default  Default value to return
+     *
+     * @return string
+     */
+    public function segment($index, $default = null)
+    {
+        return $this->uri->getSegment($index, $default);
+    }
+
+    /**
+     * Returns all segments in an array. For total of segments
+     * used the function PHP count().
+     *
+     * @return array|null
+     */
+    public function segments()
+    {
+        return $this->uri->getSegments();
+    }
+
+    /**
+     * Returns the total number of segment.
+     *
+     * @return int|null  
+     */
+    public function totalSegments()
+    {
+        return $this->uri->getTotalSegments();
+    }
+
+    /**
+     * Handles setting up the locale, auto-detecting of language.
+     * 
+     * @return void
+     */
+    public function detectLocale(): void
+    {
+        $this->languages = $this->defaultLocale = config('app.locale');
+
+        $this->setLocale($this->validLocales[0]);
+    }
+
+    /**
+     * Returns the default locale as set.
+     * 
+     * @return string
+     */
+    public function getDefaultLocale(): string
+    {
+        return $this->defaultLocale;
+    }
+
+    /**
+     * Gets the current locale, with a fallback to the default.
+     * 
+     * @return string 
+     */
+    public function getLocale(): string
+    {
+        return $this->languages ?: $this->defaultLocale;
+    }
+
+    /**
+     * Sets the locale string for this request.
+     * 
+     * @param  string  $locale
+     * 
+     * @return self
+     */
+    public function setLocale(string $locale): self
+    {
+        if ( ! in_array($locale, $this->validLocales, true)) {
+            $locale = $this->defaultLocale;
+        }
 		
-		$this->languages = $locale;
+        $this->languages = $locale;
 
-		Locale::setDefault($locale);
+        Locale::setDefault($locale);
 			
-		return $this;
-	}
-
-	/**
-	 * Returns the full request string.
-	 * 
-	 * @param  string  $key
-	 * @param  mixed  $default
-	 *
-	 * @return mixed 
-	 */
-	public function get(string $key, $default = null) 
-	{
-		if ($this !== $result = $this->attributes->get($key, $this)) {
-			return $result;
-		}
-
-		if ($this->query->has($key)) {
-			return $this->query->all()[$key];
-		}
+        return $this;
+    }
+
+    /**
+     * Returns the full request string.
+     * 
+     * @param  string  $key
+     * @param  mixed  $default
+     *
+     * @return mixed 
+     */
+    public function get(string $key, $default = null) 
+    {
+        if ($this !== $result = $this->attributes->get($key, $this)) {
+            return $result;
+        }
+
+        if ($this->query->has($key)) {
+            return $this->query->all()[$key];
+        }
 		
-		if ($this->request->has($key)) {
-			return $this->request->all()[$key];
-		}
+        if ($this->request->has($key)) {
+            return $this->request->all()[$key];
+        }
 		
-		return $default;
-	}
-
-	/**
-	 * Gets the Session.
-	 * 
-	 * @return \Syscodes\Components\Http\Session\SessionInterface
-	 * 
-	 * @throws \Syscodes\Components\Http\Exceptions\SessionNotFoundException
-	 */
-	public function getSession()
-	{
-		$this->hasSession()
-		            ? new SessionDecorator($this->session())
-					: throw new SessionNotFoundException;
-	}
-
-	/**
-	 * Whether the request contains a Session object.
-	 * 
-	 * @return bool
-	 */
-	public function hasSession(): bool
-	{
-		return ! is_null($this->session);
-	}
-
-	/**
-	 * Get the session associated with the request.
-	 * 
-	 * @return \Syscodes\Components\Contracts\Session\Session
-	 * 
-	 * @throws RuntimeException
-	 */
-	public function session()
-	{
-		if ( ! $this->hasSession()) {
-			throw new RuntimeException('Session store not set on request');
-		}
+        return $default;
+    }
+
+    /**
+     * Gets the Session.
+     * 
+     * @return \Syscodes\Components\Http\Session\SessionInterface
+     * 
+     * @throws \Syscodes\Components\Http\Exceptions\SessionNotFoundException
+     */
+    public function getSession()
+    {
+        $this->hasSession()
+                    ? new SessionDecorator($this->session())
+                    : throw new SessionNotFoundException;
+    }
+
+    /**
+     * Whether the request contains a Session object.
+     * 
+     * @return bool
+     */
+    public function hasSession(): bool
+    {
+        return ! is_null($this->session);
+    }
+
+    /**
+     * Get the session associated with the request.
+     * 
+     * @return \Syscodes\Components\Contracts\Session\Session
+     * 
+     * @throws RuntimeException
+     */
+    public function session()
+    {
+        if ( ! $this->hasSession()) {
+            throw new RuntimeException('Session store not set on request');
+        }
 		
-		return $this->session;
-	}
+        return $this->session;
+    }
 	
-	/**
-	 * Set the session instance on the request.
-	 * 
-	 * @param  \Syscodes\Components\Contracts\Session\Session  $session
-	 * 
-	 * @return void
-	 */
-	public function setSession($session): void
-	{
-		$this->session = $session;
-	}
-
-	/**
-	 * Get the JSON payload for the request.
-	 * 
-	 * @param  string|null  $key  
-	 * @param  mixed  $default  
-	 * 
-	 * @return \Syscodes\Components\Http\Utilities\Parameters|mixed
-	 */
-	public function json($key = null, $default = null)
-	{
-		if ( ! isset($this->json)) {
-			$this->json = new Parameters((array) json_decode($this->getContent(), true));
-		}
-
-		if (is_null($key)) {
-			return $this->json;
-		}
-
-		return Arr::get($this->json->all(), $key, $default);
-	}
-
-	/**
-	 * Set the JSON payload for the request.
-	 * 
-	 * @param  \Syscodes\Components\Http\Utilities\Parameters  $json
-	 * 
-	 * @return static
-	 */
-	public function setJson($json): static
-	{
-		$this->json = $json;
-
-		return $this;
-	}
+    /**
+     * Set the session instance on the request.
+     * 
+     * @param  \Syscodes\Components\Contracts\Session\Session  $session
+     * 
+     * @return void
+     */
+    public function setSession($session): void
+    {
+        $this->session = $session;
+    }
+
+    /**
+     * Get the JSON payload for the request.
+     * 
+     * @param  string|null  $key  
+     * @param  mixed  $default  
+     * 
+     * @return \Syscodes\Components\Http\Utilities\Parameters|mixed
+     */
+    public function json($key = null, $default = null)
+    {
+        if ( ! isset($this->json)) {
+            $this->json = new Parameters((array) json_decode($this->getContent(), true));
+        }
+
+        if (is_null($key)) {
+            return $this->json;
+        }
+
+        return Arr::get($this->json->all(), $key, $default);
+    }
+
+    /**
+     * Set the JSON payload for the request.
+     * 
+     * @param  \Syscodes\Components\Http\Utilities\Parameters  $json
+     * 
+     * @return static
+     */
+    public function setJson($json): static
+    {
+        $this->json = $json;
+
+        return $this;
+    }
 	
-	/**
-	 * Gets a list of content types acceptable by the client browser in preferable order.
-	 * 
-	 * @return string[]
-	 */
-	public function getAcceptableContentTypes(): array
-	{
-		if (null !== $this->acceptableContentTypes) {
-			return $this->acceptableContentTypes;
-		}
+    /**
+     * Gets a list of content types acceptable by the client browser in preferable order.
+     * 
+     * @return string[]
+     */
+    public function getAcceptableContentTypes(): array
+    {
+        if (null !== $this->acceptableContentTypes) {
+            return $this->acceptableContentTypes;
+        }
 		
-		return $this->acceptableContentTypes = array_map('strval', [$this->headers->get('Accept')]);
-	}
-
-	/**
-	 * Returns whether this is an AJAX request or not.
-	 * Alias of isXmlHttpRequest().
-	 *
-	 * @return bool
-	 */
-	public function ajax(): bool
-	{
-		return $this->isXmlHttpRequest();
-	}
-
-	/**
-	 * Returns whether this is an AJAX request or not.
-	 *
-	 * @return bool
-	 */
-	public function isXmlHttpRequest(): bool
-	{
-		return ! empty($this->server->get('HTTP_X_REQUESTED_WITH')) && 
-				strtolower($this->server->get('HTTP_X_REQUESTED_WITH')) === 'xmlhttprequest';
-	}
+        return $this->acceptableContentTypes = array_map('strval', [$this->headers->get('Accept')]);
+    }
+
+    /**
+     * Returns whether this is an AJAX request or not.
+     * Alias of isXmlHttpRequest().
+     *
+     * @return bool
+     */
+    public function ajax(): bool
+    {
+        return $this->isXmlHttpRequest();
+    }
+
+    /**
+     * Returns whether this is an AJAX request or not.
+     *
+     * @return bool
+     */
+    public function isXmlHttpRequest(): bool
+    {
+        return ! empty($this->server->get('HTTP_X_REQUESTED_WITH')) && 
+                strtolower($this->server->get('HTTP_X_REQUESTED_WITH')) === 'xmlhttprequest';
+    }
 	
-	/**
-	 * Determine if the request is the result of a PJAX call.
-	 * 
-	 * @return bool
-	 */
-	public function pjax(): bool
-	{
-		return $this->headers->get('X-PJAX') == true;
-	}
+    /**
+     * Determine if the request is the result of a PJAX call.
+     * 
+     * @return bool
+     */
+    public function pjax(): bool
+    {
+        return $this->headers->get('X-PJAX') == true;
+    }
 	
-	/**
-	 * Determine if the request is the result of a prefetch call.
-	 * 
-	 * @return bool
-	 */
-	public function prefetch(): bool
-	{
-		return strcasecmp($this->server->get('HTTP_X_MOZ') ?? '', 'prefetch') === 0 ||
-		       strcasecmp($this->headers->get('Purpose') ?? '', 'prefetch') === 0;
-	}
-
-	/**
-	 * Checks if the method request is of specified type.
-	 * 
-	 * @param  string  $method
-	 * 
-	 * @return bool
-	 */
-	public function isMethod(string $method): bool
-	{
-		return $this->getMethod() === strtoupper($method);
-	}
-
-	/**
+    /**
+     * Determine if the request is the result of a prefetch call.
+     * 
+     * @return bool
+     */
+    public function prefetch(): bool
+    {
+        return strcasecmp($this->server->get('HTTP_X_MOZ') ?? '', 'prefetch') === 0 ||
+               strcasecmp($this->headers->get('Purpose') ?? '', 'prefetch') === 0;
+    }
+
+    /**
+     * Checks if the method request is of specified type.
+     * 
+     * @param  string  $method
+     * 
+     * @return bool
+     */
+    public function isMethod(string $method): bool
+    {
+        return $this->getMethod() === strtoupper($method);
+    }
+
+    /**
      * Alias of the request method.
      * 
      * @return string
@@ -611,509 +611,509 @@ 
         return $this->getMethod();
     }
 
-	/**
-	 * Returns the input method used (GET, POST, DELETE, etc.).
-	 *
-	 * @return string
-	 * 
-	 * @throws \LogicException  
-	 */
-	public function getmethod(): string
-	{
-		if (null !== $this->method) {
-			return $this->method;
-		}
+    /**
+     * Returns the input method used (GET, POST, DELETE, etc.).
+     *
+     * @return string
+     * 
+     * @throws \LogicException  
+     */
+    public function getmethod(): string
+    {
+        if (null !== $this->method) {
+            return $this->method;
+        }
 		
-		$this->method = strtoupper($this->server->get('REQUEST_METHOD', 'GET'));
+        $this->method = strtoupper($this->server->get('REQUEST_METHOD', 'GET'));
 		
-		if ('POST' !== $this->method) {
-			return $this->method;
-		}
+        if ('POST' !== $this->method) {
+            return $this->method;
+        }
 		
-		$method = $this->headers->get('X-HTTP-METHOD-OVERRIDE');
+        $method = $this->headers->get('X-HTTP-METHOD-OVERRIDE');
 		
-		if ( ! $method && self::$httpMethodParameterOverride) {
-			$method = $this->request->get('_method', $this->query->get('_method', 'POST'));
-		}
+        if ( ! $method && self::$httpMethodParameterOverride) {
+            $method = $this->request->get('_method', $this->query->get('_method', 'POST'));
+        }
 		
-		if ( ! is_string($method)) {
-			return $this->method;
-		}
+        if ( ! is_string($method)) {
+            return $this->method;
+        }
 		
-		$method = strtoupper($method);
+        $method = strtoupper($method);
 		
-		if (in_array($method, ['GET', 'HEAD', 'POST', 'PUT', 'DELETE', 'CONNECT', 'OPTIONS', 'PATCH', 'PURGE', 'TRACE'], true)) {
-			return $this->method = $method;
-		}
+        if (in_array($method, ['GET', 'HEAD', 'POST', 'PUT', 'DELETE', 'CONNECT', 'OPTIONS', 'PATCH', 'PURGE', 'TRACE'], true)) {
+            return $this->method = $method;
+        }
 		
-		if ( ! preg_match('/^[A-Z]++$/D', $method)) {
-			throw new LogicException(sprintf('Invalid method override "%s".', $method));
-		}
+        if ( ! preg_match('/^[A-Z]++$/D', $method)) {
+            throw new LogicException(sprintf('Invalid method override "%s".', $method));
+        }
 		
-		return $this->method = $method;
-	}
-
-	/**
-	 * Sets the request method.
-	 *
-	 * @param  string  $method  
-	 *
-	 * @return void
-	 */
-	public function setMethod(string $method): void
-	{
-		$this->method = null;
-
-		$this->server->set('REQUEST_METHOD', $method);
-	}
-
-	/**
-	 * Get the input source for the request.
-	 * 
-	 * @return \Syscodes\Components\Http\Utilities\Parameters
-	 */
-	public function getInputSource()
-	{
-		if ($this->isJson()) {
-			return $this->json();
-		}
-
-		return in_array($this->getMethod(), ['GET', 'HEAD']) ? $this->query : $this->request;
-	}
+        return $this->method = $method;
+    }
+
+    /**
+     * Sets the request method.
+     *
+     * @param  string  $method  
+     *
+     * @return void
+     */
+    public function setMethod(string $method): void
+    {
+        $this->method = null;
+
+        $this->server->set('REQUEST_METHOD', $method);
+    }
+
+    /**
+     * Get the input source for the request.
+     * 
+     * @return \Syscodes\Components\Http\Utilities\Parameters
+     */
+    public function getInputSource()
+    {
+        if ($this->isJson()) {
+            return $this->json();
+        }
+
+        return in_array($this->getMethod(), ['GET', 'HEAD']) ? $this->query : $this->request;
+    }
 	
-	/**
-	 * Determine if the current request URI matches a pattern.
-	 * 
-	 * @param  mixed  ...$patterns
-	 * 
-	 * @return bool
-	 */
-	public function is(...$patterns): bool
-	{
-		$path = $this->decodedPath();
+    /**
+     * Determine if the current request URI matches a pattern.
+     * 
+     * @param  mixed  ...$patterns
+     * 
+     * @return bool
+     */
+    public function is(...$patterns): bool
+    {
+        $path = $this->decodedPath();
 		
-		foreach ($patterns as $pattern) {
-			if (Str::is($pattern, $path)) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Determine if the route name matches a given pattern.
-	 * 
-	 * @param  mixed  ...$patterns
-	 * 
-	 * @return bool
-	 */
-	public function routeIs(...$patterns): bool
-	{
-		return $this->route() && $this->route()->is(...$patterns);
-	}
-
-	/**
-	 * Get the route handling the request.
-	 * 
-	 * @param  string|null  $param  
-	 * @param  mixed  $default  
-	 * 
-	 * @return \Syscodes\Components\Routing\Route|object|string|null
-	 */
-	public function route($param = null, $default = null)
-	{
-		$route = call_user_func($this->getRouteResolver());
-
-		if (is_null($route) || is_null($param)) {
-			return $route;
-		}
-
-		return $route->parameter($param, $default);
-	}
-
-	/**
-	 * Get the current decoded path info for the request.
-	 * 
-	 * @return string
-	 */
-	public function decodedPath(): string
-	{
-		return rawurldecode($this->path());
-	}
-
-	/**
-	 * Get the current path info for the request.
-	 * 
-	 * @return string
-	 */
-	public function path(): string
-	{
-		$path = trim($this->getPathInfo(), '/');
-
-		return $path == '' ? '/' : $path;
-	}
-
-	/**
-	 * Get the full URL for the request.
-	 * 
-	 * @return string
-	 */
-	public function fullUrl(): string
-	{
-		$query = $this->getQueryString();
+        foreach ($patterns as $pattern) {
+            if (Str::is($pattern, $path)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Determine if the route name matches a given pattern.
+     * 
+     * @param  mixed  ...$patterns
+     * 
+     * @return bool
+     */
+    public function routeIs(...$patterns): bool
+    {
+        return $this->route() && $this->route()->is(...$patterns);
+    }
+
+    /**
+     * Get the route handling the request.
+     * 
+     * @param  string|null  $param  
+     * @param  mixed  $default  
+     * 
+     * @return \Syscodes\Components\Routing\Route|object|string|null
+     */
+    public function route($param = null, $default = null)
+    {
+        $route = call_user_func($this->getRouteResolver());
+
+        if (is_null($route) || is_null($param)) {
+            return $route;
+        }
+
+        return $route->parameter($param, $default);
+    }
+
+    /**
+     * Get the current decoded path info for the request.
+     * 
+     * @return string
+     */
+    public function decodedPath(): string
+    {
+        return rawurldecode($this->path());
+    }
+
+    /**
+     * Get the current path info for the request.
+     * 
+     * @return string
+     */
+    public function path(): string
+    {
+        $path = trim($this->getPathInfo(), '/');
+
+        return $path == '' ? '/' : $path;
+    }
+
+    /**
+     * Get the full URL for the request.
+     * 
+     * @return string
+     */
+    public function fullUrl(): string
+    {
+        $query = $this->getQueryString();
 		
-		$question = $this->getBaseUrl().$this->getPathInfo() === '/' ? '/?' : '?';
+        $question = $this->getBaseUrl().$this->getPathInfo() === '/' ? '/?' : '?';
 		
-		return $query ? $this->url().$question.$query : $this->url();
-	}
+        return $query ? $this->url().$question.$query : $this->url();
+    }
 	
-	/**
-	 * Generates the normalized query string for the Request.
-	 * 
-	 * @return string
-	 */
-	public function getQueryString(): ?string
-	{
-		$queryString = RequestUtils::normalizedQueryString($this->server->get('QUERY_STRING'));
+    /**
+     * Generates the normalized query string for the Request.
+     * 
+     * @return string
+     */
+    public function getQueryString(): ?string
+    {
+        $queryString = RequestUtils::normalizedQueryString($this->server->get('QUERY_STRING'));
 		
-		return '' === $queryString ? null : $queryString;
-	}
-
-	/**
-	 * Retunrs the request body content.
-	 * 
-	 * @return string
-	 */
-	public function getContent(): string
-	{
-		if (null === $this->content || false === $this->content) {
-			$this->content = file_get_contents('php://input');
-		}
-
-		return $this->content;
-	}
-
-	/**
-	 * Returns the path being requested relative to the executed script. 
-	 * 
-	 * @return string
-	 */
-	public function getPathInfo(): string
-	{
-		if (null === $this->pathInfo) {
-			$this->pathInfo = $this->parsePathInfo();
-		}
-
-		return $this->pathInfo;
-	}
-
-	/**
-	 * Returns the root URL from which this request is executed.
-	 * 
-	 * @return string
-	 */
-	public function getBaseUrl(): string
-	{
-		if (null === $this->baseUrl) {
-			$this->baseUrl = $this->parseBaseUrl();
-		}
-
-		return $this->baseUrl;
-	}
-
-	/**
-	 * Returns the requested URI.
-	 * 
-	 * @return string
-	 */
-	public function getRequestUri(): string
-	{
-		if (null === $this->requestToUri) {
-			$this->requestToUri = $this->parseRequestUri();
-		}
-
-		return $this->requestToUri;
-	}
+        return '' === $queryString ? null : $queryString;
+    }
+
+    /**
+     * Retunrs the request body content.
+     * 
+     * @return string
+     */
+    public function getContent(): string
+    {
+        if (null === $this->content || false === $this->content) {
+            $this->content = file_get_contents('php://input');
+        }
+
+        return $this->content;
+    }
+
+    /**
+     * Returns the path being requested relative to the executed script. 
+     * 
+     * @return string
+     */
+    public function getPathInfo(): string
+    {
+        if (null === $this->pathInfo) {
+            $this->pathInfo = $this->parsePathInfo();
+        }
+
+        return $this->pathInfo;
+    }
+
+    /**
+     * Returns the root URL from which this request is executed.
+     * 
+     * @return string
+     */
+    public function getBaseUrl(): string
+    {
+        if (null === $this->baseUrl) {
+            $this->baseUrl = $this->parseBaseUrl();
+        }
+
+        return $this->baseUrl;
+    }
+
+    /**
+     * Returns the requested URI.
+     * 
+     * @return string
+     */
+    public function getRequestUri(): string
+    {
+        if (null === $this->requestToUri) {
+            $this->requestToUri = $this->parseRequestUri();
+        }
+
+        return $this->requestToUri;
+    }
 	
-	/**
-	 * Generates a normalized URI (URL) for the Request.
-	 * 
-	 * @return string
-	 */
-	public function getUri(): string
-	{
-		if (null !== $query = $this->getQueryString()) {
-			$query = '?'.$query;
-		}
+    /**
+     * Generates a normalized URI (URL) for the Request.
+     * 
+     * @return string
+     */
+    public function getUri(): string
+    {
+        if (null !== $query = $this->getQueryString()) {
+            $query = '?'.$query;
+        }
 	
-		return $this->getSchemeWithHttpHost().$this->getBaseUrl().$this->getPathInfo().$query;
-	}
+        return $this->getSchemeWithHttpHost().$this->getBaseUrl().$this->getPathInfo().$query;
+    }
 	
-	/**
-	 * Gets the request's scheme.
-	 * 
-	 * @return string
-	 */
-	public function getScheme(): string
-	{
-		return $this->secure() ? $this->uri->setScheme('https') : $this->uri->setScheme('http');
-	}
-
-	/**
-	 * Returns the host name.
-	 * 
-	 * @return string
-	 */
-	public function getHost(): string
-	{
-		if ($forwardedHost = $this->server->get('HTTP_X_FORWARDED_HOST')) {
-			$host = $forwardedHost[0];
-		} elseif ( ! $host = $this->headers->get('HOST')) {
-			if ( ! $host = $this->server->get('SERVER_NAME')) {
-				$host = $this->server->get('REMOTE_ADDR', '');
-			}
-		}
-
-		$host = strtolower(preg_replace('/:\d+$/', '', trim(($host))));
+    /**
+     * Gets the request's scheme.
+     * 
+     * @return string
+     */
+    public function getScheme(): string
+    {
+        return $this->secure() ? $this->uri->setScheme('https') : $this->uri->setScheme('http');
+    }
+
+    /**
+     * Returns the host name.
+     * 
+     * @return string
+     */
+    public function getHost(): string
+    {
+        if ($forwardedHost = $this->server->get('HTTP_X_FORWARDED_HOST')) {
+            $host = $forwardedHost[0];
+        } elseif ( ! $host = $this->headers->get('HOST')) {
+            if ( ! $host = $this->server->get('SERVER_NAME')) {
+                $host = $this->server->get('REMOTE_ADDR', '');
+            }
+        }
+
+        $host = strtolower(preg_replace('/:\d+$/', '', trim(($host))));
 		
-		return $this->uri->setHost($host);
-	}
-
-	/**
-	 * Returns the port on which the request is made.
-	 * 
-	 * @return int
-	 */
-	public function getPort(): int
-	{
-		if ( ! $this->server->get('HTTP_HOST')) {
-			return $this->server->get('SERVER_PORT');
-		}
+        return $this->uri->setHost($host);
+    }
+
+    /**
+     * Returns the port on which the request is made.
+     * 
+     * @return int
+     */
+    public function getPort(): int
+    {
+        if ( ! $this->server->get('HTTP_HOST')) {
+            return $this->server->get('SERVER_PORT');
+        }
 		
-		return 'https' === $this->getScheme() ? $this->uri->setPort(443) : $this->uri->setPort(80);
-	}
-
-	/**
-	 * Get the user.
-	 * 
-	 * @return string|null
-	 */
-	public function getUser(): ?string
-	{
-		$user = $this->uri->setUser(
-			$this->headers->get('PHP_AUTH_USER')
-		);
-
-		return $user;
-	}
-
-	/**
-	 * Get the password.
-	 * 
-	 * @return string|null
-	 */
-	public function getPassword(): ?string
-	{
-		$password = $this->uri->setPassword(
-			$this->headers->get('PHP_AUTH_PW')
-		);
-
-		return $password;
-	}
-
-	/**
-	 * Gets the user info.
-	 * 
-	 * @return string|null
-	 */
-	public function getUserInfo(): ?string
-	{
-		return $this->uri->getUserInfo();
-	}
-
-	/**
-	 * Returns the HTTP host being requested.
-	 * 
-	 * @return string
-	 */
-	public function getHttpHost(): string
-	{
-		$scheme = $this->getScheme();
-		$port   = $this->getPort();
-
-		if (('http' === $scheme && 80 === $port) || ('https' === $scheme && 443 === $port))	{
-			return $this->getHost();
-		}
-
-		return $this->getHost().':'.$port;
-	}
-
-	/**
-	 * Gets the scheme and HTTP host.
-	 * 
-	 * @return string
-	 */
-	public function getSchemeWithHttpHost(): string
-	{
-		return $this->getScheme().'://'.$this->getHttpHost();
-	}
-
-	/**
-	 * Get the root URL for the application.
-	 * 
-	 * @return string
-	 */
-	public function root(): string
-	{
-		return rtrim($this->getSchemeWithHttpHost().$this->getBaseUrl(), '/');
-	}
-
-	/**
-	 * Get the URL for the request.
-	 * 
-	 * @return string
-	 */
-	public function url(): string
-	{
-		// Changed $this->path() for $this->getUri()
-		return rtrim(preg_replace('/\?.*/', '', $this->getUri()), '/');
-	}
-
-	/**
-	 * Returns the referer.
-	 * 
-	 * @param  string  $default
-	 * 
-	 * @return string
-	 */
-	public function referer(string $default = ''): string
-	{
-		return $this->server->get('HTTP_REFERER', $default);
-	}
+        return 'https' === $this->getScheme() ? $this->uri->setPort(443) : $this->uri->setPort(80);
+    }
+
+    /**
+     * Get the user.
+     * 
+     * @return string|null
+     */
+    public function getUser(): ?string
+    {
+        $user = $this->uri->setUser(
+            $this->headers->get('PHP_AUTH_USER')
+        );
+
+        return $user;
+    }
+
+    /**
+     * Get the password.
+     * 
+     * @return string|null
+     */
+    public function getPassword(): ?string
+    {
+        $password = $this->uri->setPassword(
+            $this->headers->get('PHP_AUTH_PW')
+        );
+
+        return $password;
+    }
+
+    /**
+     * Gets the user info.
+     * 
+     * @return string|null
+     */
+    public function getUserInfo(): ?string
+    {
+        return $this->uri->getUserInfo();
+    }
+
+    /**
+     * Returns the HTTP host being requested.
+     * 
+     * @return string
+     */
+    public function getHttpHost(): string
+    {
+        $scheme = $this->getScheme();
+        $port   = $this->getPort();
+
+        if (('http' === $scheme && 80 === $port) || ('https' === $scheme && 443 === $port))	{
+            return $this->getHost();
+        }
+
+        return $this->getHost().':'.$port;
+    }
+
+    /**
+     * Gets the scheme and HTTP host.
+     * 
+     * @return string
+     */
+    public function getSchemeWithHttpHost(): string
+    {
+        return $this->getScheme().'://'.$this->getHttpHost();
+    }
+
+    /**
+     * Get the root URL for the application.
+     * 
+     * @return string
+     */
+    public function root(): string
+    {
+        return rtrim($this->getSchemeWithHttpHost().$this->getBaseUrl(), '/');
+    }
+
+    /**
+     * Get the URL for the request.
+     * 
+     * @return string
+     */
+    public function url(): string
+    {
+        // Changed $this->path() for $this->getUri()
+        return rtrim(preg_replace('/\?.*/', '', $this->getUri()), '/');
+    }
+
+    /**
+     * Returns the referer.
+     * 
+     * @param  string  $default
+     * 
+     * @return string
+     */
+    public function referer(string $default = ''): string
+    {
+        return $this->server->get('HTTP_REFERER', $default);
+    }
 	
-	/**
-	 * Attempts to detect if the current connection is secure through 
-	 * over HTTPS protocol.
-	 * 
-	 * @return bool
-	 */
-	public function secure(): bool
-	{
-		if ( ! empty($this->server->get('HTTPS')) && strtolower($this->server->get('HTTPS')) !== 'off') {
-			return true;
-		} elseif (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $this->server->get('HTTP_X_FORWARDED_PROTO') === 'https') {
-			return true;
-		} elseif ( ! empty($this->server->get('HTTP_FRONT_END_HTTPS')) && strtolower($this->server->get('HTTP_FRONT_END_HTTPS')) !== 'off') {
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Returns the user agent.
-	 *
-	 * @param  string|null  $default
-	 *
-	 * @return string
-	 */
-	public function userAgent(string $default = null): string
-	{
-		return $this->server->get('HTTP_USER_AGENT', $default);
-	}
+    /**
+     * Attempts to detect if the current connection is secure through 
+     * over HTTPS protocol.
+     * 
+     * @return bool
+     */
+    public function secure(): bool
+    {
+        if ( ! empty($this->server->get('HTTPS')) && strtolower($this->server->get('HTTPS')) !== 'off') {
+            return true;
+        } elseif (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $this->server->get('HTTP_X_FORWARDED_PROTO') === 'https') {
+            return true;
+        } elseif ( ! empty($this->server->get('HTTP_FRONT_END_HTTPS')) && strtolower($this->server->get('HTTP_FRONT_END_HTTPS')) !== 'off') {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Returns the user agent.
+     *
+     * @param  string|null  $default
+     *
+     * @return string
+     */
+    public function userAgent(string $default = null): string
+    {
+        return $this->server->get('HTTP_USER_AGENT', $default);
+    }
 	
-	/**
-	 * Get the client IP address.
-	 * 
-	 * @return string|null
-	 */
-	public function ip(): ?string
-	{
-		return $this->clientIp->getClientIp();
-	}
-
-	/**
-	 * Get the route resolver callback.
-	 * 
-	 * @return \Closure
-	 */
-	public function getRouteResolver(): Closure
-	{
-		return $this->routeResolver ?: function () {
-			//
-		};
-	}
-
-	/**
-	 * Set the route resolver callback.
-	 * 
-	 * @param  \Closure  $callback
-	 * 
-	 * @return static
-	 */
-	public function setRouteResolver(Closure $callback): static
-	{
-		$this->routeResolver = $callback;
-
-		return $this;
-	}
-
-	/**
-	 * Magic method.
-	 * 
-	 * Get an element from the request.
-	 * 
-	 * @return string[]
-	 */
-	public function __get($key)
-	{
-		return Arr::get($this->all(), $key, fn () => $this->route($key));
-	}
-
-	/**
-	 * Magic method.
-	 * 
-	 * Returns the Request as an HTTP string.
-	 * 
-	 * @return string
-	 */
-	public function __toString(): string
-	{
-		$content = $this->getContent();
-
-		$cookieHeader = '';
-		$cookies      = [];
-
-		foreach ($this->cookies as $key => $value) {
-			$cookies[]= is_array($value) ? http_build_query([$key => $value], '', '; ', PHP_QUERY_RFC3986) : "$key=$value";
-		}
-
-		if ($cookies) {
-			$cookieHeader = 'Cookie: '.implode('; ', $cookies)."\r\n";
-		}
+    /**
+     * Get the client IP address.
+     * 
+     * @return string|null
+     */
+    public function ip(): ?string
+    {
+        return $this->clientIp->getClientIp();
+    }
+
+    /**
+     * Get the route resolver callback.
+     * 
+     * @return \Closure
+     */
+    public function getRouteResolver(): Closure
+    {
+        return $this->routeResolver ?: function () {
+            //
+        };
+    }
+
+    /**
+     * Set the route resolver callback.
+     * 
+     * @param  \Closure  $callback
+     * 
+     * @return static
+     */
+    public function setRouteResolver(Closure $callback): static
+    {
+        $this->routeResolver = $callback;
+
+        return $this;
+    }
+
+    /**
+     * Magic method.
+     * 
+     * Get an element from the request.
+     * 
+     * @return string[]
+     */
+    public function __get($key)
+    {
+        return Arr::get($this->all(), $key, fn () => $this->route($key));
+    }
+
+    /**
+     * Magic method.
+     * 
+     * Returns the Request as an HTTP string.
+     * 
+     * @return string
+     */
+    public function __toString(): string
+    {
+        $content = $this->getContent();
+
+        $cookieHeader = '';
+        $cookies      = [];
+
+        foreach ($this->cookies as $key => $value) {
+            $cookies[]= is_array($value) ? http_build_query([$key => $value], '', '; ', PHP_QUERY_RFC3986) : "$key=$value";
+        }
+
+        if ($cookies) {
+            $cookieHeader = 'Cookie: '.implode('; ', $cookies)."\r\n";
+        }
 		
-		return sprintf('%s %s %s', $this->getMethod(), $this->getRequestUri(), $this->server->get('SERVER_PROTOCOL'))."\r\n".
-			$this->headers.
-			$cookieHeader."\r\n".
-			$content;
-	}
-
-	/**
-	 * Magic method.
-	 * 
-	 * Clones the current request.
-	 * 
-	 * @return void
-	 */
-	public function __clone()
-	{
-		$this->query      = clone $this->query;
-		$this->request    = clone $this->request;
-		$this->attributes = clone $this->attributes;
-		$this->cookies    = clone $this->cookies;
-		$this->files      = clone $this->files;
-		$this->server     = clone $this->server;
-		$this->headers    = clone $this->headers;
-	}
+        return sprintf('%s %s %s', $this->getMethod(), $this->getRequestUri(), $this->server->get('SERVER_PROTOCOL'))."\r\n".
+            $this->headers.
+            $cookieHeader."\r\n".
+            $content;
+    }
+
+    /**
+     * Magic method.
+     * 
+     * Clones the current request.
+     * 
+     * @return void
+     */
+    public function __clone()
+    {
+        $this->query      = clone $this->query;
+        $this->request    = clone $this->request;
+        $this->attributes = clone $this->attributes;
+        $this->cookies    = clone $this->cookies;
+        $this->files      = clone $this->files;
+        $this->server     = clone $this->server;
+        $this->headers    = clone $this->headers;
+    }
 }
\ No newline at end of file

Spacing +3 added lines, -3 removed lines

@@ -942,7 +942,7 @@ 
 		$scheme = $this->getScheme();
 		$port   = $this->getPort();
 
-		if (('http' === $scheme && 80 === $port) || ('https' === $scheme && 443 === $port))	{
+		if (('http' === $scheme && 80 === $port) || ('https' === $scheme && 443 === $port)) {
 			return $this->getHost();
 		}
 
@@ -1040,7 +1040,7 @@ 
 	 */
 	public function getRouteResolver(): Closure
 	{
-		return $this->routeResolver ?: function () {
+		return $this->routeResolver ?: function() {
 			//
 		};
 	}
@@ -1086,7 +1086,7 @@ 
 		$cookies      = [];
 
 		foreach ($this->cookies as $key => $value) {
-			$cookies[]= is_array($value) ? http_build_query([$key => $value], '', '; ', PHP_QUERY_RFC3986) : "$key=$value";
+			$cookies[] = is_array($value) ? http_build_query([$key => $value], '', '; ', PHP_QUERY_RFC3986) : "$key=$value";
 		}
 
 		if ($cookies) {