lenevor / syscodes

src/components/Core/Http/Lenevor.php

Indentation +234 added lines, -234 removed lines

@@ -39,272 +39,272 @@
  */
 class Lenevor implements LenevorContract
 {
-	/**
-	 * The application implementation.
-	 * 
-	 * @var \Syscodes\Contracts\Core\Application $app
-	 */
-	protected $app;
+    /**
+     * The application implementation.
+     * 
+     * @var \Syscodes\Contracts\Core\Application $app
+     */
+    protected $app;
 	
-	/**
-	 * The bootstrap classes for the application.
-	 * 
-	 * @var array $bootstrappers
-	 */
-	protected $bootstrappers = [
-		\Syscodes\Core\Bootstrap\BootDetectEnvironment::class,
-		\Syscodes\Core\Bootstrap\BootConfiguration::class,
-		\Syscodes\Core\Bootstrap\BootHandleExceptions::class,
-		\Syscodes\Core\Bootstrap\BootRegisterFacades::class,
-		\Syscodes\Core\Bootstrap\BootRegisterProviders::class,
-		\Syscodes\Core\Bootstrap\BootProviders::class,
-	];
+    /**
+     * The bootstrap classes for the application.
+     * 
+     * @var array $bootstrappers
+     */
+    protected $bootstrappers = [
+        \Syscodes\Core\Bootstrap\BootDetectEnvironment::class,
+        \Syscodes\Core\Bootstrap\BootConfiguration::class,
+        \Syscodes\Core\Bootstrap\BootHandleExceptions::class,
+        \Syscodes\Core\Bootstrap\BootRegisterFacades::class,
+        \Syscodes\Core\Bootstrap\BootRegisterProviders::class,
+        \Syscodes\Core\Bootstrap\BootProviders::class,
+    ];
 
-	/**
-	 * Get the application's middleware.
-	 * 
-	 * @var array $middleware
-	 */
-	protected $middleware = [];
+    /**
+     * Get the application's middleware.
+     * 
+     * @var array $middleware
+     */
+    protected $middleware = [];
 
-	/**
-	 * Get the application's middleware groups.
-	 * 
-	 * @var array $middlewareGroups
-	 */
-	protected $middlewareGroups = [];
+    /**
+     * Get the application's middleware groups.
+     * 
+     * @var array $middlewareGroups
+     */
+    protected $middlewareGroups = [];
 
-	/**
-	 * The router instance.
-	 * 
-	 * @var \Syscodes\Routing\Router $router
-	 */
-	protected $router;
+    /**
+     * The router instance.
+     * 
+     * @var \Syscodes\Routing\Router $router
+     */
+    protected $router;
 
-	/**
-	 * Get the application's route middleware.
-	 * 
-	 * @var array $routeMiddleware
-	 */
-	protected $routeMiddleware = [];
+    /**
+     * Get the application's route middleware.
+     * 
+     * @var array $routeMiddleware
+     */
+    protected $routeMiddleware = [];
 
-	/**
-	 * Total app execution time.
-	 * 
-	 * @var float $totalTime
-	 */
-	protected $totalTime;
+    /**
+     * Total app execution time.
+     * 
+     * @var float $totalTime
+     */
+    protected $totalTime;
 
-	/**
-	 * Constructor. Lenevor class instance.
-	 * 
-	 * @param  \Syscodes\Contracts\Core\Application  $app
-	 * @param  \Syscodes\Routing\Router  $router
-	 * 
-	 * @return void
-	 */
-	public function __construct(Application $app, Router $router)
-	{
-		$this->app    = $app;
-		$this->router = $router;
+    /**
+     * Constructor. Lenevor class instance.
+     * 
+     * @param  \Syscodes\Contracts\Core\Application  $app
+     * @param  \Syscodes\Routing\Router  $router
+     * 
+     * @return void
+     */
+    public function __construct(Application $app, Router $router)
+    {
+        $this->app    = $app;
+        $this->router = $router;
 
-		$this->syncMiddlewareRoute();
-	}
+        $this->syncMiddlewareRoute();
+    }
 	 
-	/**
-	 * Initializes the framework, this can only be called once.
-	 * Launch the application.
-	 * 
-	 * @param  \Syscodes\http\Request  $request
-	 *
-	 * @return \Syscodes\Http\Response
-	 */
-	public function handle($request)
-	{
-		try {
-			$response = $this->sendRequestThroughRouter($request);
-		} catch (Throwable $e) {
-			$this->reportException($e);
+    /**
+     * Initializes the framework, this can only be called once.
+     * Launch the application.
+     * 
+     * @param  \Syscodes\http\Request  $request
+     *
+     * @return \Syscodes\Http\Response
+     */
+    public function handle($request)
+    {
+        try {
+            $response = $this->sendRequestThroughRouter($request);
+        } catch (Throwable $e) {
+            $this->reportException($e);
 
-			$response = $this->renderException($request, $e);
-		}		
+            $response = $this->renderException($request, $e);
+        }		
 
-		return $response;
-	}
+        return $response;
+    }
 
-	/**
-	 * Send the given request through the router.
-	 * 
-	 * @param  \Syscodes\Http\Request  $request
-	 * 
-	 * @return \Syscodes\Http\Response
-	 */
-	protected function sendRequestThroughRouter($request)
-	{
-		$this->app->instance('request', $request);  
+    /**
+     * Send the given request through the router.
+     * 
+     * @param  \Syscodes\Http\Request  $request
+     * 
+     * @return \Syscodes\Http\Response
+     */
+    protected function sendRequestThroughRouter($request)
+    {
+        $this->app->instance('request', $request);  
 
-		Facade::clearResolvedInstance('request');
+        Facade::clearResolvedInstance('request');
 
-		// Load configuration system
-		$this->bootstrap();
+        // Load configuration system
+        $this->bootstrap();
 
-		return (new Pipeline($this->app))
-				->send($request)
-				->through($this->app->skipGoingMiddleware() ? [] : $this->middleware)
-				->then($this->dispatchToRouter());
-	}
+        return (new Pipeline($this->app))
+                ->send($request)
+                ->through($this->app->skipGoingMiddleware() ? [] : $this->middleware)
+                ->then($this->dispatchToRouter());
+    }
 
-	/**
-	 * Bootstrap the application for HTTP requests.
-	 * 
-	 * @return void
-	 */
-	protected function bootstrap()
-	{		
-		if ( ! $this->app->hasBeenBootstrapped()) {
-			$this->app->bootstrapWith($this->bootstrappers());
-		}
-	}
+    /**
+     * Bootstrap the application for HTTP requests.
+     * 
+     * @return void
+     */
+    protected function bootstrap()
+    {		
+        if ( ! $this->app->hasBeenBootstrapped()) {
+            $this->app->bootstrapWith($this->bootstrappers());
+        }
+    }
 
-	/**
-	 * Get the bootstrap classes for the application.
-	 * 
-	 * @return array
-	 */
-	protected function bootstrappers()
-	{
-		return $this->bootstrappers;
-	}
+    /**
+     * Get the bootstrap classes for the application.
+     * 
+     * @return array
+     */
+    protected function bootstrappers()
+    {
+        return $this->bootstrappers;
+    }
 
-	/**
-	 * Sync the current state of the middleware to the router.
-	 * 
-	 * @return void
-	 */
-	protected function syncMiddlewareRoute()
-	{
-		foreach ($this->middlewareGroups as $key => $middleware) {
-			$this->router->middlewareGroup($key, $middleware);
-		}
+    /**
+     * Sync the current state of the middleware to the router.
+     * 
+     * @return void
+     */
+    protected function syncMiddlewareRoute()
+    {
+        foreach ($this->middlewareGroups as $key => $middleware) {
+            $this->router->middlewareGroup($key, $middleware);
+        }
 
-		foreach ($this->routeMiddleware as $key => $middleware) {
-			$this->router->aliasMiddleware($key, $middleware);
-		}
-	}
+        foreach ($this->routeMiddleware as $key => $middleware) {
+            $this->router->aliasMiddleware($key, $middleware);
+        }
+    }
 
-	/**
-	 * Get the dispatcher of routes.
-	 * 	  
-	 * @return \Closure
- 	 */
-	protected function dispatchToRouter()
-	{
-		return function ($request) {
-			$this->app->instance('request', $request);
+    /**
+     * Get the dispatcher of routes.
+     * 	  
+     * @return \Closure
+     */
+    protected function dispatchToRouter()
+    {
+        return function ($request) {
+            $this->app->instance('request', $request);
 
-			return $this->router->dispatch($request);
-		};
-	}
+            return $this->router->dispatch($request);
+        };
+    }
 
-	/**
-	 * Call the shutdown method on any terminable middleware.
-	 * 
-	 * @param  \Syscodes\Http\Request  $request
-	 * @param  \Syscodes\Http\Response  $response
-	 * 
-	 * @return void
-	 */
-	public function shutdown($request, $response)
-	{
-		$this->shutdownMiddleware($request, $response);
-	}
+    /**
+     * Call the shutdown method on any terminable middleware.
+     * 
+     * @param  \Syscodes\Http\Request  $request
+     * @param  \Syscodes\Http\Response  $response
+     * 
+     * @return void
+     */
+    public function shutdown($request, $response)
+    {
+        $this->shutdownMiddleware($request, $response);
+    }
 
-	/**
-	 * Call the terminate method on any terminable middleware.
-	 * 
-	 * @param  \Syscodes\Http\Request  $request
-	 * @param  \Syscodes\Http\Response  $response
-	 * 
-	 * @return void
-	 */
-	protected function shutdownMiddleware($request, $response)
-	{
-		$middlewares = $this->app->skipGoingMiddleware() ? [] : array_merge(
-			$this->gatherRouteMiddleware($request),
-			$this->middleware
-		);
+    /**
+     * Call the terminate method on any terminable middleware.
+     * 
+     * @param  \Syscodes\Http\Request  $request
+     * @param  \Syscodes\Http\Response  $response
+     * 
+     * @return void
+     */
+    protected function shutdownMiddleware($request, $response)
+    {
+        $middlewares = $this->app->skipGoingMiddleware() ? [] : array_merge(
+            $this->gatherRouteMiddleware($request),
+            $this->middleware
+        );
 
-		foreach ($middlewares as $middleware) {
-			if (! is_string($middleware)) {
-				continue;
-			}
+        foreach ($middlewares as $middleware) {
+            if (! is_string($middleware)) {
+                continue;
+            }
 			
-			[$name] = $this->parseMiddleware($middleware);
+            [$name] = $this->parseMiddleware($middleware);
 			
-			$instance = $this->app->make($name);
+            $instance = $this->app->make($name);
 			
-			if (method_exists($instance, 'shutdown')) {
-				$instance->shutdown($request, $response);
-			}
-		}
-	}
+            if (method_exists($instance, 'shutdown')) {
+                $instance->shutdown($request, $response);
+            }
+        }
+    }
 
-	/**
-	 * Gather the route middleware for the given request.
-	 * 
-	 * @param  \Syscodes\Http\Request  $request
-	 * 
-	 * @return array
-	 */
-	protected function gatherRouteMiddleware($request)
-	{
-		if ( ! is_null($route = $request->route())) {
-			return $this->router->gatherRouteMiddleware($route);
-		}
+    /**
+     * Gather the route middleware for the given request.
+     * 
+     * @param  \Syscodes\Http\Request  $request
+     * 
+     * @return array
+     */
+    protected function gatherRouteMiddleware($request)
+    {
+        if ( ! is_null($route = $request->route())) {
+            return $this->router->gatherRouteMiddleware($route);
+        }
 
-		return [];
-	}
+        return [];
+    }
 	
-	/**
-	 * Parse a middleware string to get the name and parameters.
-	 * 
-	 * @param  string  $middleware
-	 * 
-	 * @return array
-	 */
-	protected function parseMiddleware($middleware)
-	{
-		[$name, $parameters] = array_pad(explode(':', $middleware, 2), 2, []);
+    /**
+     * Parse a middleware string to get the name and parameters.
+     * 
+     * @param  string  $middleware
+     * 
+     * @return array
+     */
+    protected function parseMiddleware($middleware)
+    {
+        [$name, $parameters] = array_pad(explode(':', $middleware, 2), 2, []);
 		
-		if (is_string($parameters)) {
-			$parameters = explode(',', $parameters);
-		}
+        if (is_string($parameters)) {
+            $parameters = explode(',', $parameters);
+        }
 		
-		return [$name, $parameters];
+        return [$name, $parameters];
     }
 
-	/**
-	 * Report the exception to the exception handler.
-	 * 
-	 * @param  \Throwable  $e
-	 * 
-	 * @return void
-	 */
-	protected function reportException(Throwable $e)
-	{
-		return $this->app[ExceptionHandler::class]->report($e);
-	}
+    /**
+     * Report the exception to the exception handler.
+     * 
+     * @param  \Throwable  $e
+     * 
+     * @return void
+     */
+    protected function reportException(Throwable $e)
+    {
+        return $this->app[ExceptionHandler::class]->report($e);
+    }
 	
-	/**
-	 * Render the exception to a response.
-	 * 
-	 * @param  \Syscodes\Http\Request  $request
-	 * @param  \Throwable  $e
-	 * 
-	 * @return \Syscodes\Http\Response
-	 */
-	protected function renderException($request, Throwable $e)
-	{
-		return $this->app[ExceptionHandler::class]->render($request, $e);
-	}
- }
\ No newline at end of file
+    /**
+     * Render the exception to a response.
+     * 
+     * @param  \Syscodes\Http\Request  $request
+     * @param  \Throwable  $e
+     * 
+     * @return \Syscodes\Http\Response
+     */
+    protected function renderException($request, Throwable $e)
+    {
+        return $this->app[ExceptionHandler::class]->render($request, $e);
+    }
+    }
\ No newline at end of file

Spacing +2 added lines, -2 removed lines

@@ -199,7 +199,7 @@ 
  	 */
 	protected function dispatchToRouter()
 	{
-		return function ($request) {
+		return function($request) {
 			$this->app->instance('request', $request);
 
 			return $this->router->dispatch($request);
@@ -235,7 +235,7 @@ 
 		);
 
 		foreach ($middlewares as $middleware) {
-			if (! is_string($middleware)) {
+			if ( ! is_string($middleware)) {
 				continue;
 			}
 			

src/components/Routing/Route.php

Indentation +721 added lines, -721 removed lines

@@ -40,738 +40,738 @@
  */
 class Route 
 {
-	use Concerns\RouteCondition,
-	    Concerns\RouteDependencyResolver;
+    use Concerns\RouteCondition,
+        Concerns\RouteDependencyResolver;
 	
-	/**
-	 * Action that the route will use when called.
-	 *
-	 * @var \Closure|string|array $action
-	 */
-	public $action;
-
-	/**
-	 * The computed gathered middleware.
-	 * 
-	 * @var array|null $computedMiddleware
-	 */
-	public $computedMiddleware;
-
-	/**
-	 * The container instance used by the route.
-	 * 
-	 * @var \Syscodes\Container\Container $container
-	 */
-	protected $container;
-
-	/**
-	 * The controller instance.
-	 * 
-	 * @var string $controller
-	 */
-	public $controller;
-
-	/**
-	 * The default values for the route.
-	 * 
-	 * @var array $defaults
-	 */
-	public $defaults = [];
-
-	/**
-	 * 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;
-
-	/**
-	* Patterns that should be replaced.
-	*
-	* @var array $patterns 
-	*/
-	public $patterns = [
-		'~/~'                    =>  '\/',               // Slash
-		'~{an:[^\/{}]+}~'        => '([0-9a-zA-Z]++)',   // Placeholder accepts alphabetic and numeric chars
-		'~{n:[^\/{}]+}~'         => '([0-9]++)',         // Placeholder accepts only numeric
-		'~{a:[^\/{}]+}~'         => '([a-zA-Z]++)',      // Placeholder accepts only alphabetic chars
-		'~{w:[^\/{}]+}~'         => '([0-9a-zA-Z-_]++)', // Placeholder accepts alphanumeric and underscore
-		'~{\*:[^\/{}]+}~'        => '(.++)',             // Placeholder match rest of url
-		'~(\\\/)?{\?:[^\/{}]+}~' => '\/?([^\/]*)',		 // Optional placeholder
-		'~{[^\/{}]+}~'           => '([^\/]++)'			 // Normal placeholder
-	];
-
-	/**
-	 * The URI pattern the route responds to.
-	 *
-	 * @var array $uri
-	 */
-	public $uri = [];
-
-	/**
-	 * Contains the arguments of the current route.
-	 *
-	 * @var array $where
-	 */
-	public $wheres = [];
-
-	/**
-	 * Constructor. Initialize route.
-	 *
-	 * @param  array|string|null  $method  
-	 * @param  string|null  $uri  
-	 * @param  \Closure|string|null  $action  
-	 *
-	 * @return void
-	 */
-	public function __construct($method = null, $uri = null, $action = null)
-	{
-		$this->uri = $uri;
-
-		// Set the method
-		$this->parseMethod($method);
-
-		// Set the action
-		$this->action = Arr::except($this->parseAction($action), ['prefix']);
-
-		if (is_null($prefix = Arr::get($this->action, 'prefix'))) {
-			$this->prefix($prefix);
-		}
-	}
-
-	// Getters
-
-	/**
-	 * Get the action of the current route.
-	 *
-	 * @return \Closure|string|array
-	 */
-	public function getAction()
-	{
-		return $this->action;
-	}
-
-	/**
-	 * Get the arguments of the current route.
-	 *
-	 * @return array
-	 */
-	public function getArguments()
-	{
-		return $this->wheres;
-	}
-
-	/**
-	 * Get the controller instance for the route.
-	 * 
-	 * @return mixed
-	 */
-	public function getController()
-	{
-		if ( ! $this->controller) {
-			$class = $this->parseControllerCallback()[0];
+    /**
+     * Action that the route will use when called.
+     *
+     * @var \Closure|string|array $action
+     */
+    public $action;
+
+    /**
+     * The computed gathered middleware.
+     * 
+     * @var array|null $computedMiddleware
+     */
+    public $computedMiddleware;
+
+    /**
+     * The container instance used by the route.
+     * 
+     * @var \Syscodes\Container\Container $container
+     */
+    protected $container;
+
+    /**
+     * The controller instance.
+     * 
+     * @var string $controller
+     */
+    public $controller;
+
+    /**
+     * The default values for the route.
+     * 
+     * @var array $defaults
+     */
+    public $defaults = [];
+
+    /**
+     * 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;
+
+    /**
+     * Patterns that should be replaced.
+     *
+     * @var array $patterns 
+     */
+    public $patterns = [
+        '~/~'                    =>  '\/',               // Slash
+        '~{an:[^\/{}]+}~'        => '([0-9a-zA-Z]++)',   // Placeholder accepts alphabetic and numeric chars
+        '~{n:[^\/{}]+}~'         => '([0-9]++)',         // Placeholder accepts only numeric
+        '~{a:[^\/{}]+}~'         => '([a-zA-Z]++)',      // Placeholder accepts only alphabetic chars
+        '~{w:[^\/{}]+}~'         => '([0-9a-zA-Z-_]++)', // Placeholder accepts alphanumeric and underscore
+        '~{\*:[^\/{}]+}~'        => '(.++)',             // Placeholder match rest of url
+        '~(\\\/)?{\?:[^\/{}]+}~' => '\/?([^\/]*)',		 // Optional placeholder
+        '~{[^\/{}]+}~'           => '([^\/]++)'			 // Normal placeholder
+    ];
+
+    /**
+     * The URI pattern the route responds to.
+     *
+     * @var array $uri
+     */
+    public $uri = [];
+
+    /**
+     * Contains the arguments of the current route.
+     *
+     * @var array $where
+     */
+    public $wheres = [];
+
+    /**
+     * Constructor. Initialize route.
+     *
+     * @param  array|string|null  $method  
+     * @param  string|null  $uri  
+     * @param  \Closure|string|null  $action  
+     *
+     * @return void
+     */
+    public function __construct($method = null, $uri = null, $action = null)
+    {
+        $this->uri = $uri;
+
+        // Set the method
+        $this->parseMethod($method);
+
+        // Set the action
+        $this->action = Arr::except($this->parseAction($action), ['prefix']);
+
+        if (is_null($prefix = Arr::get($this->action, 'prefix'))) {
+            $this->prefix($prefix);
+        }
+    }
+
+    // Getters
+
+    /**
+     * Get the action of the current route.
+     *
+     * @return \Closure|string|array
+     */
+    public function getAction()
+    {
+        return $this->action;
+    }
+
+    /**
+     * Get the arguments of the current route.
+     *
+     * @return array
+     */
+    public function getArguments()
+    {
+        return $this->wheres;
+    }
+
+    /**
+     * 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()
-	{
-		return $this->parseControllerCallback()[1];
-	}
-
-	/**
-	 * Get the request method of the current route.
-	 *
-	 * @return array|string
-	 */
-	public function getMethod()
-	{
-		return $this->method;
-	}
-
-	/**
-	 * Get the url of the current route.
-	 *
-	 * @return string
-	 */
-	public function getName()
-	{
-		return $this->action['as'] ?? null;
-	}
-
-	/**
-	 * Get the url of the current route.
-	 *
-	 * @return array
-	 */
-	public function getRoute()
-	{
-		return $this->uri;
-	}
-
-	/**
-	 * Get or set the domain for the route.
-	 * 
-	 * @param  string|null  $domain  
-	 * 
-	 * @return $this
-	 */
-	public function domain($domain = null)
-	{
-		if (is_null($domain)) {
-			return $this->getDomain();
-		}
-
-		$this->action['domain'] = $this->parseRoute($domain);
-
-		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()
-	{
-		return Str::parseCallback($this->action['uses']);
-	}
+            $this->controller = $this->container->make(ltrim($class, '\\'));
+        }
+
+        return $this->controller;
+    }
+
+    /**
+     * Get the controller method used for the route.
+     * 
+     * @return string
+     */
+    public function getControllerMethod()
+    {
+        return $this->parseControllerCallback()[1];
+    }
+
+    /**
+     * Get the request method of the current route.
+     *
+     * @return array|string
+     */
+    public function getMethod()
+    {
+        return $this->method;
+    }
+
+    /**
+     * Get the url of the current route.
+     *
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->action['as'] ?? null;
+    }
+
+    /**
+     * Get the url of the current route.
+     *
+     * @return array
+     */
+    public function getRoute()
+    {
+        return $this->uri;
+    }
+
+    /**
+     * Get or set the domain for the route.
+     * 
+     * @param  string|null  $domain  
+     * 
+     * @return $this
+     */
+    public function domain($domain = null)
+    {
+        if (is_null($domain)) {
+            return $this->getDomain();
+        }
+
+        $this->action['domain'] = $this->parseRoute($domain);
+
+        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()
+    {
+        return Str::parseCallback($this->action['uses']);
+    }
 	
-	/**
-	 * Checks whether the route's action is a controller.
-	 * 
-	 * @return bool
-	 */
-	public function isControllerAction()
-	{
-		return is_string($this->action['uses']);
-	}
-
-	/**
-	 * Get the dispatcher for the route's controller.
-	 * 
-	 * @return \Syscodes\Controller\ControllerDispatcher
-	 */
-	private function controllerDispatcher()
-	{
-		return new ControllerDispatcher($this->container);
-	}
-
-	// Setters
+    /**
+     * Checks whether the route's action is a controller.
+     * 
+     * @return bool
+     */
+    public function isControllerAction()
+    {
+        return is_string($this->action['uses']);
+    }
+
+    /**
+     * Get the dispatcher for the route's controller.
+     * 
+     * @return \Syscodes\Controller\ControllerDispatcher
+     */
+    private function controllerDispatcher()
+    {
+        return new ControllerDispatcher($this->container);
+    }
+
+    // Setters
 	
-	/**
-	 * 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($this->action['uses'])
-		)));
-	}
-
-	/**
-	 * Run the route action and return the response.
-	 * 
-	 * @return mixed
-	 */
-	protected function runResolverController()
-	{
-		return $this->controllerDispatcher()->dispatch($this, $this->getController(), $this->getControllerMethod());
-	}
-
-	/**
-	 * Set the action.
-	 *
-	 * @param  \Closure|string  $action
-	 *
-	 * @return $this
-	 *
-	 * @throws \InvalidArgumentException
-	 */
-	public function parseAction($action)
-	{
-		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 string $this
-	 * 
-	 * @throws \InvalidArgumentException
-	 */
-	public function parseMethod($method)
-	{
-		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'));				
-			}
-		}
-
-	    $this->method = $method;
-
-	    return $this;
-	}
-
-	/**
-	 * Set the route.
-	 *
-	 * @param  string|array|null  $uri
-	 *
-	 * @return string
-	 *
-	 * @throws  \InvalidArgumentException
-	 */
-	public function parseRoute($uri)
-	{
-		if ($uri === null) {
-			throw new InvalidArgumentException(__('route.uriNotProvided'));
-		}	
-
-		$this->uri = $this->parseRoutePath($uri);
-
-		return $this;
-	}
-
-	/**
-	 * Replace word patterns with regex in route uri.
-	 * 
-	 * @param  string  $uri
-	 * 
-	 * @return string
-	 */
-	protected function parseRoutePath($uri)
-	{
-		$uri = trim($uri, '\/?');
-		$uri = trim($uri, '\/');
+    /**
+     * 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($this->action['uses'])
+        )));
+    }
+
+    /**
+     * Run the route action and return the response.
+     * 
+     * @return mixed
+     */
+    protected function runResolverController()
+    {
+        return $this->controllerDispatcher()->dispatch($this, $this->getController(), $this->getControllerMethod());
+    }
+
+    /**
+     * Set the action.
+     *
+     * @param  \Closure|string  $action
+     *
+     * @return $this
+     *
+     * @throws \InvalidArgumentException
+     */
+    public function parseAction($action)
+    {
+        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 string $this
+     * 
+     * @throws \InvalidArgumentException
+     */
+    public function parseMethod($method)
+    {
+        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'));				
+            }
+        }
+
+        $this->method = $method;
+
+        return $this;
+    }
+
+    /**
+     * Set the route.
+     *
+     * @param  string|array|null  $uri
+     *
+     * @return string
+     *
+     * @throws  \InvalidArgumentException
+     */
+    public function parseRoute($uri)
+    {
+        if ($uri === null) {
+            throw new InvalidArgumentException(__('route.uriNotProvided'));
+        }	
+
+        $this->uri = $this->parseRoutePath($uri);
+
+        return $this;
+    }
+
+    /**
+     * Replace word patterns with regex in route uri.
+     * 
+     * @param  string  $uri
+     * 
+     * @return string
+     */
+    protected function parseRoutePath($uri)
+    {
+        $uri = trim($uri, '\/?');
+        $uri = trim($uri, '\/');
 		
-		preg_match_all('/\{([\w\:]+?)\??\}/', $uri, $matches);
+        preg_match_all('/\{([\w\:]+?)\??\}/', $uri, $matches);
 		
-		foreach ($matches[1] as $match) {
-			if (strpos($match, ':') === false) {
-				continue;
-			}
+        foreach ($matches[1] as $match) {
+            if (strpos($match, ':') === false) {
+                continue;
+            }
 			
-			$pattern  = array_keys($this->patterns);
-			$replace  = array_values($this->patterns);
-			$segments = explode(':', trim($match, '{}?'));
+            $pattern  = array_keys($this->patterns);
+            $replace  = array_values($this->patterns);
+            $segments = explode(':', trim($match, '{}?'));
 			
-			$uri = strpos($match, ':') !== false
-					? preg_replace($pattern, $replace, $uri)
-					: str_replace($match, '{'.$segments[0].'}', $uri);
-		}
+            $uri = strpos($match, ':') !== false
+                    ? preg_replace($pattern, $replace, $uri)
+                    : str_replace($match, '{'.$segments[0].'}', $uri);
+        }
 		
-		return $uri;
-	}
-
-	/**
-	 * Add a prefix to the route URI.
-	 * 
-	 * @param  string  $prefix
-	 * 
-	 * @return $this
-	 */
-	public function prefix($prefix)
-	{
-		if ( ! empty($newPrefix = trim(rtrim($prefix, '/').'/'.ltrim($this->action['prefix'] ?? '', '/'), '/'))) {
-			$this->action['prefix'] = $newPrefix;
-		}
+        return $uri;
+    }
+
+    /**
+     * Add a prefix to the route URI.
+     * 
+     * @param  string  $prefix
+     * 
+     * @return $this
+     */
+    public function prefix($prefix)
+    {
+        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->parseRoute($uri !== '/' ? trim($uri, '/') : $uri);
-	}
-
-	/**
-	 * Set the action array for the route.
-	 * 
-	 * @param  array  $action
-	 * 
-	 * @return $this
-	 */
-	public function setAction(array $action)
-	{
-		$this->action = $action;
-
-		if (isset($this->action['domain'])) {
-			$this->domain($this->action['domain']);
-		}
+        return $this->parseRoute($uri !== '/' ? trim($uri, '/') : $uri);
+    }
+
+    /**
+     * Set the action array for the route.
+     * 
+     * @param  array  $action
+     * 
+     * @return $this
+     */
+    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 $this
-	 */
-	public function name($name)
-	{
-		$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)
-	{
-		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 $this
-	 */
-	public function defaults($key, $value)
-	{
-		$this->defaults[$key] = $value;
-
-		return $this;
-	}
-
-	/**
-	 * Set a default values for the route.
-	 * 
-	 * @param  string  $defaults
-	 * 
-	 * @return $this
-	 */
-	public function setDefaults(array $defaults)
-	{
-		$this->defaults = $defaults;
-
-		return $this;
-	}
-
-	/**
-	 * Set the where.
-	 *
-	 * @param  array|string  $name
-	 * @param  string|null  $expression  
-	 *
-	 * @return $this
-	 */
-	public function where($name, string $expression = null)
-	{
-		$wheres = is_array($name) ? $name : [$name => $expression];
+        return $this;
+    }
+
+    /**
+     * Set the name.
+     *
+     * @param  string  $name
+     *
+     * @return $this
+     */
+    public function name($name)
+    {
+        $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)
+    {
+        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 $this
+     */
+    public function defaults($key, $value)
+    {
+        $this->defaults[$key] = $value;
+
+        return $this;
+    }
+
+    /**
+     * Set a default values for the route.
+     * 
+     * @param  string  $defaults
+     * 
+     * @return $this
+     */
+    public function setDefaults(array $defaults)
+    {
+        $this->defaults = $defaults;
+
+        return $this;
+    }
+
+    /**
+     * Set the where.
+     *
+     * @param  array|string  $name
+     * @param  string|null  $expression  
+     *
+     * @return $this
+     */
+    public function where($name, string $expression = null)
+    {
+        $wheres = is_array($name) ? $name : [$name => $expression];
 		
-		foreach ($wheres as $name => $expression) {
-			$this->wheres[$name] = $expression;
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Bind the route to a given request for execution.
-	 * 
-	 * @param  \Syscodes\Http\Request  $request
-	 * 
-	 * @return $this
-	 */
-	public function bind(Request $request)
-	{
-		$this->parameters = (new RouteParamBinding($this))->parameters($request);
-
-		return $this;
-	}
-
-	/**
-	 * Get all of the parameter names for the route.
-	 * 
-	 * @return array
-	 */
-	public function parameterNames()
-	{
-		if (isset($this->parameterNames)) {
-			return $this->parameterNames;
-		}
-
-		return $this->parameterNames = $this->compileParamNames();
-	}
-
-	/**
-	 * Get the parameter names for the route.
-	 * 
-	 * @return array
-	 */
-	protected function compileParamNames()
-	{
-		preg_match_all('~[^\/\{(.*?)\}]~', $this->domain().$this->uri, $matches);
-
-		return array_map(function ($match) {
-			return trim($match, '?');
-		}, $matches[0]);
-	}
-
-	/**
-	 * Get a given parameter from the route.
-	 * 
-	 * @param  string  $name
-	 * @param  mixed  $default  
-	 * 
-	 * @return array
-	 */
-	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 array
-	 */
-	public function setParameter($name, $value)
-	{
-		$this->parameters();
-
-		$this->parameters[$name] = $value;
-	}
-
-	/**
-	 * Get the key / value list of parameters without null values.
-	 * 
-	 * @return array
-	 */
-	public function parametersWithouNulls()
-	{
-		return array_filter($this->parameters(), function ($parameter) {
-			return ! is_null($parameter);
-		});
-	}
-
-	/**
-	 * Get the key / value list of parameters for the route.
-	 * 
-	 * @return array
-	 */
-	public function parameters()
-	{
-		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()
-	{
-		if ( ! is_null($this->computedMiddleware)) {
-			return $this->computedMiddleware;
-		}
-
-		$this->computedMiddleware = [];
-
-		return $this->computedMiddleware = array_unique(array_merge(
-			$this->middleware(),
-			$this->controllerMiddleware()
-		), SORT_REGULAR);
-	}
-
-	/**
-	 * Get or set the middlewares attached to the route.
-	 * 
-	 * @param  array|string|null  $middleware
-	 * 
-	 * @return $this|array
-	 */
-	public function middleware($middleware = null)
-	{
-		if (is_null($middleware)) {
-			return $this->getMiddleware();
-		}
-
-		if (is_string($middleware)) {
-			$middleware = func_get_args();
-		}
-
-		$this->action['middleware'] = array_merge(
-			$this->getMiddleware(),
-			$middleware
-		);
-
-		return $this;
-	}
-
-	/**
-	 * Get the middlewares attached to the route.
-	 * 
-	 * @return array
-	 */
-	protected function getMiddleware()
-	{
-		return (array) ($this->action['middleware'] ?? []);
-	}
-
-	/**
-	 * Get the middleware for the route's controller.
-	 * 
-	 * @return array
-	 */
-	public function controllerMiddleware()
-	{
-		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()
-	{
-		return in_array('http', $this->action, true);
-	}
-
-	/**
-	 * Determine if the route only responds to HTTPS requests.
-	 * 
-	 * @return bool
-	 */
-	public function httpsOnly()
-	{
-		return $this->secure();
-	}
-
-	/**
-	 * Determine if the route only responds to HTTPS requests.
-	 * 
-	 * @return bool
-	 */
-	public function secure()
-	{
-		return in_array('https', $this->action, true);
-	}
-
-	/**
-	 * Set the container instance on the route.
-	 * 
-	 * @param  \Syscodes\Container\Container  $container
-	 * 
-	 * @return $this
-	 */
-	public function setContainer(Container $container)
-	{
-		$this->container = $container;
-
-		return $this;
-	}
-
-	/**
-	 * Dynamically access route parameters.
-	 * 
-	 * @param  string  $key
-	 * 
-	 * @return mixed
-	 */
-	public function __get($key)
-	{
-		return $this->parameter($key);
-	}
+        foreach ($wheres as $name => $expression) {
+            $this->wheres[$name] = $expression;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Bind the route to a given request for execution.
+     * 
+     * @param  \Syscodes\Http\Request  $request
+     * 
+     * @return $this
+     */
+    public function bind(Request $request)
+    {
+        $this->parameters = (new RouteParamBinding($this))->parameters($request);
+
+        return $this;
+    }
+
+    /**
+     * Get all of the parameter names for the route.
+     * 
+     * @return array
+     */
+    public function parameterNames()
+    {
+        if (isset($this->parameterNames)) {
+            return $this->parameterNames;
+        }
+
+        return $this->parameterNames = $this->compileParamNames();
+    }
+
+    /**
+     * Get the parameter names for the route.
+     * 
+     * @return array
+     */
+    protected function compileParamNames()
+    {
+        preg_match_all('~[^\/\{(.*?)\}]~', $this->domain().$this->uri, $matches);
+
+        return array_map(function ($match) {
+            return trim($match, '?');
+        }, $matches[0]);
+    }
+
+    /**
+     * Get a given parameter from the route.
+     * 
+     * @param  string  $name
+     * @param  mixed  $default  
+     * 
+     * @return array
+     */
+    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 array
+     */
+    public function setParameter($name, $value)
+    {
+        $this->parameters();
+
+        $this->parameters[$name] = $value;
+    }
+
+    /**
+     * Get the key / value list of parameters without null values.
+     * 
+     * @return array
+     */
+    public function parametersWithouNulls()
+    {
+        return array_filter($this->parameters(), function ($parameter) {
+            return ! is_null($parameter);
+        });
+    }
+
+    /**
+     * Get the key / value list of parameters for the route.
+     * 
+     * @return array
+     */
+    public function parameters()
+    {
+        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()
+    {
+        if ( ! is_null($this->computedMiddleware)) {
+            return $this->computedMiddleware;
+        }
+
+        $this->computedMiddleware = [];
+
+        return $this->computedMiddleware = array_unique(array_merge(
+            $this->middleware(),
+            $this->controllerMiddleware()
+        ), SORT_REGULAR);
+    }
+
+    /**
+     * Get or set the middlewares attached to the route.
+     * 
+     * @param  array|string|null  $middleware
+     * 
+     * @return $this|array
+     */
+    public function middleware($middleware = null)
+    {
+        if (is_null($middleware)) {
+            return $this->getMiddleware();
+        }
+
+        if (is_string($middleware)) {
+            $middleware = func_get_args();
+        }
+
+        $this->action['middleware'] = array_merge(
+            $this->getMiddleware(),
+            $middleware
+        );
+
+        return $this;
+    }
+
+    /**
+     * Get the middlewares attached to the route.
+     * 
+     * @return array
+     */
+    protected function getMiddleware()
+    {
+        return (array) ($this->action['middleware'] ?? []);
+    }
+
+    /**
+     * Get the middleware for the route's controller.
+     * 
+     * @return array
+     */
+    public function controllerMiddleware()
+    {
+        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()
+    {
+        return in_array('http', $this->action, true);
+    }
+
+    /**
+     * Determine if the route only responds to HTTPS requests.
+     * 
+     * @return bool
+     */
+    public function httpsOnly()
+    {
+        return $this->secure();
+    }
+
+    /**
+     * Determine if the route only responds to HTTPS requests.
+     * 
+     * @return bool
+     */
+    public function secure()
+    {
+        return in_array('https', $this->action, true);
+    }
+
+    /**
+     * Set the container instance on the route.
+     * 
+     * @param  \Syscodes\Container\Container  $container
+     * 
+     * @return $this
+     */
+    public function setContainer(Container $container)
+    {
+        $this->container = $container;
+
+        return $this;
+    }
+
+    /**
+     * 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/Routing/MiddlewareResolver.php

Spacing +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
         
         [$name, $parameters] = array_pad(explode(':', $name, 2), 2, null);
         
-        return ($map[$name] ?? $name).(! is_null($parameters) ? ':'.$parameters : '');
+        return ($map[$name] ?? $name).( ! is_null($parameters) ? ':'.$parameters : '');
     }
     
     /**

src/components/Routing/Concerns/RouteResolver.php

Indentation +100 added lines, -100 removed lines

@@ -37,117 +37,117 @@
  */
 trait RouteResolver
 {
-	/**
-	 * The currently dispatched route instance.
-	 * 
-	 * @var \Syscodes\Routing\Route|null
-	 */
-	protected $current;
+    /**
+     * The currently dispatched route instance.
+     * 
+     * @var \Syscodes\Routing\Route|null
+     */
+    protected $current;
 
-	/**
-	 * Resolve the given route and call the method that belongs to the route.
-	 *
-	 * @param  \Syscodes\Http\Request  $request
-	 *
-	 * @return \Syscodes\Http\Response
-	 */
-	public function resolve(Request $request)
-	{
-		return $this->dispatchToRoute($request);
-	}
+    /**
+     * Resolve the given route and call the method that belongs to the route.
+     *
+     * @param  \Syscodes\Http\Request  $request
+     *
+     * @return \Syscodes\Http\Response
+     */
+    public function resolve(Request $request)
+    {
+        return $this->dispatchToRoute($request);
+    }
 
-	/**
-	 * Dispatch the request to a route and return the response.
-	 * 
-	 * @param  \Syscodes\Http\Request  $request
-	 *
-	 * @return \Syscodes\Http\Response
-	 */
-	protected function dispatchToRoute(Request $request)
-	{
-		return $this->runRoute($request, $this->findRoute($request));
-	}
+    /**
+     * Dispatch the request to a route and return the response.
+     * 
+     * @param  \Syscodes\Http\Request  $request
+     *
+     * @return \Syscodes\Http\Response
+     */
+    protected function dispatchToRoute(Request $request)
+    {
+        return $this->runRoute($request, $this->findRoute($request));
+    }
 
-	/**
-	 * Find the route matching a given request.
-	 * 
-	 * @param  \Syscodes\Http\Request  $request
-	 * 
-	 * @return \Syscodes\Routing\Route
-	 */
-	protected function findRoute($request)
-	{
-		// Get all register routes with the same request method
-		$this->current = $route = $this->routes->match($request);
+    /**
+     * Find the route matching a given request.
+     * 
+     * @param  \Syscodes\Http\Request  $request
+     * 
+     * @return \Syscodes\Routing\Route
+     */
+    protected function findRoute($request)
+    {
+        // Get all register routes with the same request method
+        $this->current = $route = $this->routes->match($request);
 
-		$this->container->instance(Route::class, $route);
+        $this->container->instance(Route::class, $route);
 
-		return $route;
-	}
+        return $route;
+    }
 
-	/**
-	 * Return the response for the given route.
-	 * 
-	 * @param  \Syscodes\Http\Request  $request
-	 * @param  \Syscodes\Routing\Route  $route
-	 * 
-	 * @return \Syscodes\Http\Response
-	 */
-	protected function runRoute(Request $request, Route $route)
-	{
-		$request->setRouteResolver(function () use ($route) {
-			return $route;
-		});
+    /**
+     * Return the response for the given route.
+     * 
+     * @param  \Syscodes\Http\Request  $request
+     * @param  \Syscodes\Routing\Route  $route
+     * 
+     * @return \Syscodes\Http\Response
+     */
+    protected function runRoute(Request $request, Route $route)
+    {
+        $request->setRouteResolver(function () use ($route) {
+            return $route;
+        });
 
-		return $this->callResponse($request, 
-			$this->runRouteStack($route, $request)
-		); 
-	}
+        return $this->callResponse($request, 
+            $this->runRouteStack($route, $request)
+        ); 
+    }
 
-	/**
-	 * Run the given route through a stack response instance.
-	 * 
-	 * @param  \Syscodes\Routing\Route  $route
-	 * @param  \Syscodes\Http\Request  $request
-	 * 
-	 * @return mixed
-	 */
-	protected function runRouteStack(Route $route, Request $request)
-	{
-		$skipMiddleware = $this->container->bound('middleware.disable') &&
-						  ($this->container->make('middleware.disable') === true);
+    /**
+     * Run the given route through a stack response instance.
+     * 
+     * @param  \Syscodes\Routing\Route  $route
+     * @param  \Syscodes\Http\Request  $request
+     * 
+     * @return mixed
+     */
+    protected function runRouteStack(Route $route, Request $request)
+    {
+        $skipMiddleware = $this->container->bound('middleware.disable') &&
+                          ($this->container->make('middleware.disable') === true);
 						  
 		
-		$middleware = $skipMiddleware ? [] : $this->gatherRouteMiddleware($route);
+        $middleware = $skipMiddleware ? [] : $this->gatherRouteMiddleware($route);
 
-		return (new Pipeline($this->container))
-				->send($request)
-				->through($middleware)
-				->then(function ($request) use ($route) {
-					return $this->callResponse(
-						$request, $route->runResolver()
-					); 
-				});
-	}
+        return (new Pipeline($this->container))
+                ->send($request)
+                ->through($middleware)
+                ->then(function ($request) use ($route) {
+                    return $this->callResponse(
+                        $request, $route->runResolver()
+                    ); 
+                });
+    }
 
-	/**
-	 * Create a response instance from the given value.
-	 * 
-	 * @param  \Syscodes\Http\Request  $request
-	 * @param  mixed  $response
-	 * 
-	 * @return \Syscodes\Http\Response
-	 */
-	protected function callResponse($request, $response)
-	{
-		if ( ! $response instanceof Response && 
-		      ($response instanceof Jsonserializable || 
-			   is_array($response))) {
-			$response = new JsonResponse($response);
-		} elseif ( ! $response instanceof Response) {
-			$response = new Response($response, 200, ['Content-Type' => 'text/html']);
-		}
+    /**
+     * Create a response instance from the given value.
+     * 
+     * @param  \Syscodes\Http\Request  $request
+     * @param  mixed  $response
+     * 
+     * @return \Syscodes\Http\Response
+     */
+    protected function callResponse($request, $response)
+    {
+        if ( ! $response instanceof Response && 
+              ($response instanceof Jsonserializable || 
+               is_array($response))) {
+            $response = new JsonResponse($response);
+        } elseif ( ! $response instanceof Response) {
+            $response = new Response($response, 200, ['Content-Type' => 'text/html']);
+        }
 
-		return $response->prepare($request);
-	}
+        return $response->prepare($request);
+    }
 }
\ No newline at end of file

Spacing +2 added lines, -2 removed lines

@@ -95,7 +95,7 @@ 
 	 */
 	protected function runRoute(Request $request, Route $route)
 	{
-		$request->setRouteResolver(function () use ($route) {
+		$request->setRouteResolver(function() use ($route) {
 			return $route;
 		});
 
@@ -123,7 +123,7 @@ 
 		return (new Pipeline($this->container))
 				->send($request)
 				->through($middleware)
-				->then(function ($request) use ($route) {
+				->then(function($request) use ($route) {
 					return $this->callResponse(
 						$request, $route->runResolver()
 					); 

src/components/Routing/Router.php

Indentation +621 added lines, -621 removed lines

@@ -39,651 +39,651 @@
  */
 class Router implements Routable
 {
-	use Concerns\RouteMap,
-	    Concerns\RouteResolver;
-
-	/**
-	 * The registered route value binders.
-	 * 
-	 * @var array $binders
-	 */
-	protected $binders = [];
-
-	/**
-	 * The container instance used by the router.
-	 * 
-	 * @var \Syscodes\Contracts\Container\Container $container
-	 */
-	protected $container;
-
-	/**
-	 * Variable of group route.
-	 *  
-	 * @var array $groupStack
-	 */
-	protected $groupStack = [];
+    use Concerns\RouteMap,
+        Concerns\RouteResolver;
+
+    /**
+     * The registered route value binders.
+     * 
+     * @var array $binders
+     */
+    protected $binders = [];
+
+    /**
+     * The container instance used by the router.
+     * 
+     * @var \Syscodes\Contracts\Container\Container $container
+     */
+    protected $container;
+
+    /**
+     * Variable of group route.
+     *  
+     * @var array $groupStack
+     */
+    protected $groupStack = [];
 	
-	/**
-	 * The registered string macros.
-	 * 
-	 * @var array $macros
-	 */
-	protected $macros = [];
-
-	/**
-	 * Middleware for function of filters
-	 *  
-	 * @var array $middleware
-	 */
-	protected $middleware = [];
+    /**
+     * The registered string macros.
+     * 
+     * @var array $macros
+     */
+    protected $macros = [];
+
+    /**
+     * 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 = [];
-
-	/** 
-	 * The route collection instance. 
-	 * 
-	 * @var \Syscodes\Routing\RouteCollection $routes
-	 */
-	protected $routes;
-
-	/**
-	 * The Resource instance.
-	 * 
-	 * @var \Syscodes\Routing\ResourceRegister $resources
-	 */
-	protected $resources;
-
-	/**
-	 * Constructor. Create a new Router instance.
-	 *
-	 * @param  \Syscodes\Contracts\Container\Container|null  $container  (null by default)
-	 * 
-	 * @return void
-	 */
-	public function __construct(Container $container = null)
-	{
-		$this->routes = new RouteCollection();
-
-		$this->container = $container ?: new Container;
-	}
-
-	/**
-	 * Get the prefix from the group on the stack.
-	 *
-	 * @return string
-	 */
-	public function getGroupPrefix()
-	{
-		if ( ! empty($this->groupStack)) {
-			$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|string  $callback
-	 *
-	 * @return void
-	 */
-	public function group(array $attributes, $callback) 
-	{
-		$this->updateGroupStack($attributes);
-
-		$this->loadRoutes($callback);
-
-		array_pop($this->groupStack);
-
-		return $this;
-	}
-
-	/**
-	 * Update the group stack with the given attributes.
-	 * 
-	 * @param  array  $attributes
-	 * 
-	 * @return void
-	 */
-	protected function updateGroupStack(array $attributes)
-	{
-		if ( ! empty($this->groupStack)) {
-			$attributes = $this->mergeGroup($attributes);
-		}
-
-		$this->groupStack[] = $attributes;
-	}
-
-	/**
-	 * Merge the given group attributes.
-	 * 
-	 * @param  array  $new
-	 * 
-	 * @return array
-	 */
-	protected function mergeGroup($new)
-	{
-		return RouteGroup::mergeGroup($new, end($this->groupStack));
-	}
+    /**
+     * The globally available parameter patterns.
+     * 
+     * @var array $patterns
+     */
+    protected $patterns = [];
+
+    /** 
+     * The route collection instance. 
+     * 
+     * @var \Syscodes\Routing\RouteCollection $routes
+     */
+    protected $routes;
+
+    /**
+     * The Resource instance.
+     * 
+     * @var \Syscodes\Routing\ResourceRegister $resources
+     */
+    protected $resources;
+
+    /**
+     * Constructor. Create a new Router instance.
+     *
+     * @param  \Syscodes\Contracts\Container\Container|null  $container  (null by default)
+     * 
+     * @return void
+     */
+    public function __construct(Container $container = null)
+    {
+        $this->routes = new RouteCollection();
+
+        $this->container = $container ?: new Container;
+    }
+
+    /**
+     * Get the prefix from the group on the stack.
+     *
+     * @return string
+     */
+    public function getGroupPrefix()
+    {
+        if ( ! empty($this->groupStack)) {
+            $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|string  $callback
+     *
+     * @return void
+     */
+    public function group(array $attributes, $callback) 
+    {
+        $this->updateGroupStack($attributes);
+
+        $this->loadRoutes($callback);
+
+        array_pop($this->groupStack);
+
+        return $this;
+    }
+
+    /**
+     * Update the group stack with the given attributes.
+     * 
+     * @param  array  $attributes
+     * 
+     * @return void
+     */
+    protected function updateGroupStack(array $attributes)
+    {
+        if ( ! empty($this->groupStack)) {
+            $attributes = $this->mergeGroup($attributes);
+        }
+
+        $this->groupStack[] = $attributes;
+    }
+
+    /**
+     * Merge the given group attributes.
+     * 
+     * @param  array  $new
+     * 
+     * @return array
+     */
+    protected function mergeGroup($new)
+    {
+        return RouteGroup::mergeGroup($new, end($this->groupStack));
+    }
 	
-	/**
-	 * Load the provided routes.
-	 * 
-	 * @param  \Closure|string  $callback
-	 * 
-	 * @return void
-	 */
-	protected function loadRoutes($callback)
-	{
-		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\Routing\Route
-	 */
-	public function addRoute($method, $route, $action)
-	{
-		return $this->routes->add($this->map($method, $route, $action));
-	}
-
-	/**
-	 * Create a redirect from one URI to another.
-	 * 
-	 * @param  string  $uri
-	 * @param  string  $destination
-	 * @param  int  $status  (302 by default)
-	 * 
-	 * @return \Syscodes\Routing\Route
-	 */
-	public function redirect($uri, $destination, $status = 302)
-	{
-		return $this->any($uri, function () use ($destination, $status) {
-			return new RedirectResponse($destination, $status);
-		});
-	}
-
-	/**
-	 * Register a new route that returns a view.
-	 * 
-	 * @param  string  $uri
-	 * @param  string  $view
-	 * @param  array  $data
-	 * 
-	 * @return \Syscodes\Routing\Route
-	 */
-	public function view($uri, $view, $data = [])
-	{
-		return $this->match(['GET', 'HEAD'], $uri, function () use ($view, $data) {
-			return $this->container->make('view')->make($view, $data);
-		});
-	}
-
-	/**
-	 * Add new route to routes array.
-	 *
-	 * @param  array|string  $method
-	 * @param  string  $route
-	 * @param  mixed  $action
-	 *
-	 * @return void
-	 * 
-	 * @throws \InvalidArgumentException
-	 */
-	public function map($method, $route, $action) 
-	{
-		if ($this->actionReferencesController($action)) {
-			$action = $this->convertToControllerAction($action);
-		}
-
-		$route = $this->newRoute(
-				array_map('strtoupper', (array) $method),
-				$this->prefix($route),
-				$action
-		);
-
-		if ($this->hasGroupStack()) {
-			$this->mergeGroupAttributesIntoRoute($route);			
-		}
-
-		$this->addWhereClausesToRoute($route);
+    /**
+     * Load the provided routes.
+     * 
+     * @param  \Closure|string  $callback
+     * 
+     * @return void
+     */
+    protected function loadRoutes($callback)
+    {
+        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\Routing\Route
+     */
+    public function addRoute($method, $route, $action)
+    {
+        return $this->routes->add($this->map($method, $route, $action));
+    }
+
+    /**
+     * Create a redirect from one URI to another.
+     * 
+     * @param  string  $uri
+     * @param  string  $destination
+     * @param  int  $status  (302 by default)
+     * 
+     * @return \Syscodes\Routing\Route
+     */
+    public function redirect($uri, $destination, $status = 302)
+    {
+        return $this->any($uri, function () use ($destination, $status) {
+            return new RedirectResponse($destination, $status);
+        });
+    }
+
+    /**
+     * Register a new route that returns a view.
+     * 
+     * @param  string  $uri
+     * @param  string  $view
+     * @param  array  $data
+     * 
+     * @return \Syscodes\Routing\Route
+     */
+    public function view($uri, $view, $data = [])
+    {
+        return $this->match(['GET', 'HEAD'], $uri, function () use ($view, $data) {
+            return $this->container->make('view')->make($view, $data);
+        });
+    }
+
+    /**
+     * Add new route to routes array.
+     *
+     * @param  array|string  $method
+     * @param  string  $route
+     * @param  mixed  $action
+     *
+     * @return void
+     * 
+     * @throws \InvalidArgumentException
+     */
+    public function map($method, $route, $action) 
+    {
+        if ($this->actionReferencesController($action)) {
+            $action = $this->convertToControllerAction($action);
+        }
+
+        $route = $this->newRoute(
+                array_map('strtoupper', (array) $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)
-	{
-		if ($action instanceof Closure) {
-			return false;
-		}
+    /**
+     * Determine if the action is routing to a controller.
+     * 
+     * @param  array  $action
+     * 
+     * @return bool
+     */
+    protected function actionReferencesController($action)
+    {
+        if ($action instanceof Closure) {
+            return false;
+        }
 		
-		return is_string($action) || (isset($action['uses']) && is_string($action['uses']));
-	}
+        return is_string($action) || (isset($action['uses']) && is_string($action['uses']));
+    }
 	
-	/**
-	 * Add a controller based route action to the action array.
-	 * 
-	 * @param  array|string  $action
-	 * 
-	 * @return array
-	 */
-	protected function convertToControllerAction($action)
-	{
-		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)
+    {
+        if (is_string($action)) {
+            $action = ['uses' => $action];
+        }
 		
-		if ( ! empty($this->groupStack)) {
-			$action['uses'] = $this->prependGroupUses($action['uses']);
-		}
+        if ( ! empty($this->groupStack)) {
+            $action['uses'] = $this->prependGroupUses($action['uses']);
+        }
 		
-		$action['controller'] = $action['uses'];
+        $action['controller'] = $action['uses'];
 		
-		return $action;
-	}
+        return $action;
+    }
 	
-	/**
-	 * Prepend the last group uses onto the use clause.
-	 * 
-	 * @param  string  $uses
-	 * 
-	 * @return string
-	 */
-	protected function prependGroupUses($uses)
-	{
-		$group = end($this->groupStack);
+    /**
+     * Prepend the last group uses onto the use clause.
+     * 
+     * @param  string  $uses
+     * 
+     * @return string
+     */
+    protected function prependGroupUses($uses)
+    {
+        $group = end($this->groupStack);
 		
-		return isset($group['namespace']) ? $group['namespace'].'\\'.$uses : $uses;
-	}
-
-	/**
-	 * Create a new Route object.
-	 * 
-	 * @param  array|string  $method
-	 * @param  string  $uri
-	 * @param  mixed  $action
-	 * 
-	 * @return \Syscodes\Routing\Route
-	 */
-	public function newRoute($method, $uri, $action)
-	{
-		return take(new Route($method, $uri, $action))
-		              ->setContainer($this->container);
-	}
+        return isset($group['namespace']) ? $group['namespace'].'\\'.$uses : $uses;
+    }
+
+    /**
+     * Create a new Route object.
+     * 
+     * @param  array|string  $method
+     * @param  string  $uri
+     * @param  mixed  $action
+     * 
+     * @return \Syscodes\Routing\Route
+     */
+    public function newRoute($method, $uri, $action)
+    {
+        return take(new Route($method, $uri, $action))
+                        ->setContainer($this->container);
+    }
 	
-	/**
-	 * Determine if the router currently has a group stack.
-	 * 
-	 * @return bool
-	 */
-	public function hasGroupStack()
-	{
-		return ! empty($this->groupStack);
-	}
+    /**
+     * Determine if the router currently has a group stack.
+     * 
+     * @return bool
+     */
+    public function hasGroupStack()
+    {
+        return ! empty($this->groupStack);
+    }
 	
-	/**
-	 * Merge the group stack with the controller action.
-	 * 
-	 * @param  \Syscpde\Routing\Route  $route
-	 * 
-	 * @return void
-	 */
-	protected function mergeGroupAttributesIntoRoute($route)
-	{
-		$action = static::mergeGroup($route->getAction(), end($this->groupStack));
+    /**
+     * Merge the group stack with the controller action.
+     * 
+     * @param  \Syscpde\Routing\Route  $route
+     * 
+     * @return void
+     */
+    protected function mergeGroupAttributesIntoRoute($route)
+    {
+        $action = static::mergeGroup($route->getAction(), end($this->groupStack));
 		
-		$route->setAction($action);
-	}
+        $route->setAction($action);
+    }
 	
-	/**
-	 * Add the necessary where clauses to the route based on its initial registration.
-	 * 
-	 * @param  \Syscodes\Routing\Route  $route
-	 * 
-	 * @return \Syscodes\Routing\Route
-	 */
-	protected function addWhereClausesToRoute($route)
-	{
-		return $route->where(array_merge(
-			$this->patterns, Arr::get($route->getAction(), 'where', [])
-		));
-	}
-
-	/**
-	 * Add a prefix to the route URI.
-	 *
-	 * @param  string  $uri
-	 *
-	 * @return string
-	 */
-	protected function prefix($uri)
-	{
-		$uri = is_null($uri) ? '' : trim($uri, '/').'/';
-
-		$uri = filter_var($uri, FILTER_SANITIZE_STRING);
-
-		// While we want to add a route within a group of '/',
-		// it doens't work with matching, so remove them...
-		if ($uri != '/') {
-			$uri = ltrim($uri, '/');
-		}
-
-		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)
-	{
-		return $this->patterns[$name] = $pattern;
-	}
-
-	/**
-	 * Set a group of global where patterns on all routes.
-	 * 
-	 * @param  array  $patterns
-	 * 
-	 * @return void
-	 */
-	public function patterns($patterns)
-	{
-		foreach ($patterns as $key => $pattern) {
-			$this->patterns[$key] = $pattern;
-		}
-	}
-
-	/**
-	 * Get a Resource instance.
-	 * 
-	 * @return \Syscodes\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\Http\Request  $request
-	 *
-	 * @return mixed
-	 */
-	public function dispatch(Request $request)
-	{
-		return $this->resolve($request);
-	}
-
-	/**
-	 * Gather the middleware for the given route.
-	 * 
-	 * @param  \Syscodes\Routing\Route  $route
-	 * 
-	 * @return array
-	 */
-	public function gatherRouteMiddleware(Route $route)
-	{
-		$middleware = array_map(function ($name) {
+    /**
+     * Add the necessary where clauses to the route based on its initial registration.
+     * 
+     * @param  \Syscodes\Routing\Route  $route
+     * 
+     * @return \Syscodes\Routing\Route
+     */
+    protected function addWhereClausesToRoute($route)
+    {
+        return $route->where(array_merge(
+            $this->patterns, Arr::get($route->getAction(), 'where', [])
+        ));
+    }
+
+    /**
+     * Add a prefix to the route URI.
+     *
+     * @param  string  $uri
+     *
+     * @return string
+     */
+    protected function prefix($uri)
+    {
+        $uri = is_null($uri) ? '' : trim($uri, '/').'/';
+
+        $uri = filter_var($uri, FILTER_SANITIZE_STRING);
+
+        // While we want to add a route within a group of '/',
+        // it doens't work with matching, so remove them...
+        if ($uri != '/') {
+            $uri = ltrim($uri, '/');
+        }
+
+        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)
+    {
+        return $this->patterns[$name] = $pattern;
+    }
+
+    /**
+     * Set a group of global where patterns on all routes.
+     * 
+     * @param  array  $patterns
+     * 
+     * @return void
+     */
+    public function patterns($patterns)
+    {
+        foreach ($patterns as $key => $pattern) {
+            $this->patterns[$key] = $pattern;
+        }
+    }
+
+    /**
+     * Get a Resource instance.
+     * 
+     * @return \Syscodes\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\Http\Request  $request
+     *
+     * @return mixed
+     */
+    public function dispatch(Request $request)
+    {
+        return $this->resolve($request);
+    }
+
+    /**
+     * Gather the middleware for the given route.
+     * 
+     * @param  \Syscodes\Routing\Route  $route
+     * 
+     * @return array
+     */
+    public function gatherRouteMiddleware(Route $route)
+    {
+        $middleware = array_map(function ($name) {
             return MiddlewareResolver::resolve($name, $this->middleware, $this->middlewareGroups);
         }, $route->gatherMiddleware());
 
         return Arr::flatten($middleware);
-	}
-
-	/**
-	 * Get all of the defined middleware
-	 * 
-	 * @return array
-	 */
-	public function getMiddleware()
-	{
-		return $this->middleware;
-	}
-
-	/**
-	 * Register a short-hand name for a middleware.
-	 * 
-	 * @param  string  $name
-	 * @param  string  $class
-	 * 
-	 * @return $this
-	 */
-	public function aliasMiddleware($name, $class)
-	{
-		$this->middleware[$name] = $class;
-
-		return $this;
-	}
-
-	/**
-	 * Register a group of middleware.
-	 * 
-	 * @param  string  $name
-	 * @param  array  $middleware
-	 * 
-	 * @return $this
-	 */
-	public function middlewareGroup($name, array $middleware)
-	{
-		$this->middlewareGroups[$name] = $middleware;
-
-		return $this;
-	}
-
-	/**
-	 * Check if a route with the given name exists.
-	 * 
-	 * @param  string  $name
-	 * 
-	 * @return bool
-	 */
-	public function has($name)
-	{
-		$names = is_array($name) ? $name : func_get_args();
-
-		foreach ($names as $value) {
-			if ( ! $this->routes->hasNamedRoute($value)) {
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	/**
-	 * Get the currently dispatched route instance.
-	 * 
-	 * @return \Syscodes\Routing\Route|null
-	 */
-	public function current()
-	{
-		return $this->current;
-	}
-
-	/**
-	 * Determine if the current route matches a pattern.
-	 * 
-	 * @param  mixed  ...$patterns
-	 * 
-	 * @return bool
-	 */
-	public function is(...$patterns)
-	{
-		return $this->currentRouteNamed(...$patterns);
-	}
-
-	/**
-	 * Determine if the current route matches a pattern.
-	 * 
-	 * @param  mixed  ...$patterns
-	 * 
-	 * @return bool
-	 */
-	public function currentRouteNamed(...$patterns)
-	{
-		return $this->current() && $this->current()->named(...$patterns);
-	}
-
-	/**
-	 * Register an array of resource controllers.
-	 * 
-	 * @param  array  $resources
-	 * @param  array  $options
-	 * 
-	 * @return void
-	 */
-	public function resources(array $resources, array $options = [])
-	{
-		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\Routing\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);
-	}
+    }
+
+    /**
+     * Get all of the defined middleware
+     * 
+     * @return array
+     */
+    public function getMiddleware()
+    {
+        return $this->middleware;
+    }
+
+    /**
+     * Register a short-hand name for a middleware.
+     * 
+     * @param  string  $name
+     * @param  string  $class
+     * 
+     * @return $this
+     */
+    public function aliasMiddleware($name, $class)
+    {
+        $this->middleware[$name] = $class;
+
+        return $this;
+    }
+
+    /**
+     * Register a group of middleware.
+     * 
+     * @param  string  $name
+     * @param  array  $middleware
+     * 
+     * @return $this
+     */
+    public function middlewareGroup($name, array $middleware)
+    {
+        $this->middlewareGroups[$name] = $middleware;
+
+        return $this;
+    }
+
+    /**
+     * Check if a route with the given name exists.
+     * 
+     * @param  string  $name
+     * 
+     * @return bool
+     */
+    public function has($name)
+    {
+        $names = is_array($name) ? $name : func_get_args();
+
+        foreach ($names as $value) {
+            if ( ! $this->routes->hasNamedRoute($value)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Get the currently dispatched route instance.
+     * 
+     * @return \Syscodes\Routing\Route|null
+     */
+    public function current()
+    {
+        return $this->current;
+    }
+
+    /**
+     * Determine if the current route matches a pattern.
+     * 
+     * @param  mixed  ...$patterns
+     * 
+     * @return bool
+     */
+    public function is(...$patterns)
+    {
+        return $this->currentRouteNamed(...$patterns);
+    }
+
+    /**
+     * Determine if the current route matches a pattern.
+     * 
+     * @param  mixed  ...$patterns
+     * 
+     * @return bool
+     */
+    public function currentRouteNamed(...$patterns)
+    {
+        return $this->current() && $this->current()->named(...$patterns);
+    }
+
+    /**
+     * Register an array of resource controllers.
+     * 
+     * @param  array  $resources
+     * @param  array  $options
+     * 
+     * @return void
+     */
+    public function resources(array $resources, array $options = [])
+    {
+        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\Routing\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);
+    }
 	
-	/**
-	 * Register a custom macro.
-	 * 
-	 * @param  string  $name
-	 * @param  callable  $callback
-	 * 
-	 * @return void
-	 */
-	public function macro($name, callable $callback)
-	{
-		$this->macros[$name] = $callback;
-	}
+    /**
+     * Register a custom macro.
+     * 
+     * @param  string  $name
+     * @param  callable  $callback
+     * 
+     * @return void
+     */
+    public function macro($name, callable $callback)
+    {
+        $this->macros[$name] = $callback;
+    }
 	
-	/**
-	 * Checks if macro is registered.
-	 * 
-	 * @param  string  $name
-	 * 
-	 * @return boolean
-	 */
-	public function hasMacro($name)
-	{
-		return isset($this->macros[$name]);
-	}
+    /**
+     * Checks if macro is registered.
+     * 
+     * @param  string  $name
+     * 
+     * @return boolean
+     */
+    public function hasMacro($name)
+    {
+        return isset($this->macros[$name]);
+    }
 	
-	/**
-	 * Dynamically handle calls into the router instance.
-	 * 
-	 * @param  string  $method
-	 * @param  array  $parameters
-	 * 
-	 * @return mixed
-	 */
-	public function __call($method, $parameters)
-	{
-		if (isset($this->macros[$method])) {
-			$callback = $this->macros[$method];
-
-			return call_user_func_array($callback, $parameters);
-		}
+    /**
+     * Dynamically handle calls into the router instance.
+     * 
+     * @param  string  $method
+     * @param  array  $parameters
+     * 
+     * @return mixed
+     */
+    public function __call($method, $parameters)
+    {
+        if (isset($this->macros[$method])) {
+            $callback = $this->macros[$method];
+
+            return call_user_func_array($callback, $parameters);
+        }
 		
-		return (new RouteRegister($this))->attribute($method, $parameters[0]);
-	}
+        return (new RouteRegister($this))->attribute($method, $parameters[0]);
+    }
 }
\ No newline at end of file

Spacing +3 added lines, -3 removed lines

@@ -241,7 +241,7 @@ 
 	 */
 	public function redirect($uri, $destination, $status = 302)
 	{
-		return $this->any($uri, function () use ($destination, $status) {
+		return $this->any($uri, function() use ($destination, $status) {
 			return new RedirectResponse($destination, $status);
 		});
 	}
@@ -257,7 +257,7 @@ 
 	 */
 	public function view($uri, $view, $data = [])
 	{
-		return $this->match(['GET', 'HEAD'], $uri, function () use ($view, $data) {
+		return $this->match(['GET', 'HEAD'], $uri, function() use ($view, $data) {
 			return $this->container->make('view')->make($view, $data);
 		});
 	}
@@ -483,7 +483,7 @@ 
 	 */
 	public function gatherRouteMiddleware(Route $route)
 	{
-		$middleware = array_map(function ($name) {
+		$middleware = array_map(function($name) {
             return MiddlewareResolver::resolve($name, $this->middleware, $this->middlewareGroups);
         }, $route->gatherMiddleware());
 

src/components/Controller/ControllerDispatcher.php

Spacing +1 added lines, -1 removed lines

@@ -94,7 +94,7 @@
 
         $middleware = $controller->getMiddleware();
 
-        return collect($middleware)->filter(function ($data) use ($method) {
+        return collect($middleware)->filter(function($data) use ($method) {
             return static::methodExcludedByOptions($method, $data['options']);
         })->all();
     }

src/components/Http/Request.php

Indentation +873 added lines, -873 removed lines

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

Spacing +2 added lines, -2 removed lines

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