lenevor / syscodes

src/components/Support/Chronos/Traits/Factory.php

Indentation +10 added lines, -10 removed lines

@@ -58,12 +58,12 @@ 
         $this->timezone = $timezone instanceof DateTimeZone ? $timezone : new DateTimeZone($timezone);
         
         if ( ! empty($time)) {
-			if (is_string($time) && static::hasRelativeKeywords($time)) {
-				$dateTime = new DateTime('now', $this->timezone);
-				$dateTime->modify($time);
+            if (is_string($time) && static::hasRelativeKeywords($time)) {
+                $dateTime = new DateTime('now', $this->timezone);
+                $dateTime->modify($time);
 
-				$time = $dateTime->format('Y-m-d H:i:s');
-			}
+                $time = $dateTime->format('Y-m-d H:i:s');
+            }
         }
         
         return parent::__construct($time, $this->timezone);
@@ -118,8 +118,8 @@ 
      * @return \Syscodes\Support\Chronos\Time
      */
     public static function yesterday($timezone = null, string $locale = null)
-	{
-		return static::parse(date('Y-m-d 00:00:00', strtotime('-1 day')), $timezone, $locale);
+    {
+        return static::parse(date('Y-m-d 00:00:00', strtotime('-1 day')), $timezone, $locale);
     }
 
     /**
@@ -131,8 +131,8 @@ 
      * @return \Syscodes\Support\Chronos\Time
      */
     public static function tomorrow($timezone = null, string $locale = null)
-	{
-		return static::parse(date('Y-m-d 00:00:00', strtotime('+1 day')), $timezone, $locale);
+    {
+        return static::parse(date('Y-m-d 00:00:00', strtotime('+1 day')), $timezone, $locale);
     }
 
     /**
@@ -264,7 +264,7 @@ 
 
     /**
      * Creates an instance of Time that will be returned during testing
-	 * when calling 'Time::now' instead of the current time.
+     * when calling 'Time::now' instead of the current time.
      * 
      * @param  \Syscodes\Support\Chronos\Time|string  $datetime  
      * @param  string|null  $timezone 

src/components/Routing/Concerns/RouteMap.php

Indentation +125 added lines, -125 removed lines

@@ -29,139 +29,139 @@
  */
 trait RouteMap
 {
-	/**
-	 * All of the verbs supported by the router.
-	 * 
-	 * @var array $verbs
-	 */
-	public static $verbs = ['GET', 'HEAD', 'POST', 'PUT', 'DELETE', 'PATCH', 'OPTIONS'];
+    /**
+     * All of the verbs supported by the router.
+     * 
+     * @var array $verbs
+     */
+    public static $verbs = ['GET', 'HEAD', 'POST', 'PUT', 'DELETE', 'PATCH', 'OPTIONS'];
 
-	/**
-	 * Add a route to the underlying route collection.
-	 *
-	 * @param  string  $method
-	 * @param  string  $route
-	 * @param  mixed  $action
-	 *
-	 * @return \Syscodes\Routing\Route
-	 */
-	abstract public function addRoute($method, $route, $action);
+    /**
+     * Add a route to the underlying route collection.
+     *
+     * @param  string  $method
+     * @param  string  $route
+     * @param  mixed  $action
+     *
+     * @return \Syscodes\Routing\Route
+     */
+    abstract public function addRoute($method, $route, $action);
 
-	/**
-	 * Add a route for all posible methods.
-	 *
-	 * @param  string  $route
-	 * @param  string|callable|null  $action
-	 *
-	 * @return void
-	 */
-	public function any($route, $action = null) 
-	{		
-		return $this->addRoute(self::$verbs, $route, $action);
-	}
+    /**
+     * Add a route for all posible methods.
+     *
+     * @param  string  $route
+     * @param  string|callable|null  $action
+     *
+     * @return void
+     */
+    public function any($route, $action = null) 
+    {		
+        return $this->addRoute(self::$verbs, $route, $action);
+    }
 	
-	/**
-	 * Add a route with delete method.
-	 *
-	 * @param  string  $route
-	 * @param  string|callable|null  $action
-	 *
-	 * @return void
-	 */
-	public function delete($route, $action = null) 
-	{
-		return $this->addRoute('DELETE', $route, $action);
-	}
+    /**
+     * Add a route with delete method.
+     *
+     * @param  string  $route
+     * @param  string|callable|null  $action
+     *
+     * @return void
+     */
+    public function delete($route, $action = null) 
+    {
+        return $this->addRoute('DELETE', $route, $action);
+    }
 
-	/**
-	 * Add a route with get method.
-	 *
-	 * @param  string  $route
-	 * @param  string|callable|null  $action
-	 *
-	 * @return void
-	 */
-	public function get($route, $action = null) 
-	{
-		return $this->addRoute(['GET', 'HEAD'], $route, $action);
-	}
+    /**
+     * Add a route with get method.
+     *
+     * @param  string  $route
+     * @param  string|callable|null  $action
+     *
+     * @return void
+     */
+    public function get($route, $action = null) 
+    {
+        return $this->addRoute(['GET', 'HEAD'], $route, $action);
+    }
 
-	/**
-	 * Add a route with head method.
-	 *
-	 * @param  string  $route
-	 * @param  string|callable|null  $action
-	 *
-	 * @return void
-	 */
-	public function head($route, $action = null)
-	{
-		return $this->addRoute('HEAD', $route, $action);
-	}
+    /**
+     * Add a route with head method.
+     *
+     * @param  string  $route
+     * @param  string|callable|null  $action
+     *
+     * @return void
+     */
+    public function head($route, $action = null)
+    {
+        return $this->addRoute('HEAD', $route, $action);
+    }
 
-	/**
-	 * Register a new route with the given methods.
-	 * 
-	 * @param  array|string  $methods
-	 * @param  string  $route
-	 * @param  string|callable|null  $action
-	 * 
-	 * @return void
-	 */
-	public function match($methods, $route, $action = null)
-	{
-		return $this->addRoute(array_map('strtoupper', (array) $methods), $route, $action);
-	}
+    /**
+     * Register a new route with the given methods.
+     * 
+     * @param  array|string  $methods
+     * @param  string  $route
+     * @param  string|callable|null  $action
+     * 
+     * @return void
+     */
+    public function match($methods, $route, $action = null)
+    {
+        return $this->addRoute(array_map('strtoupper', (array) $methods), $route, $action);
+    }
 
-	/**
-	 * Add a route with options method.
-	 *
-	 * @param  string  $route
-	 * @param  string|callable|null  $action
-	 *
-	 * @return void
-	 */
-	public function options($route, $action = null) 
-	{
-		return $this->addRoute('OPTIONS', $route, $action);
-	}
+    /**
+     * Add a route with options method.
+     *
+     * @param  string  $route
+     * @param  string|callable|null  $action
+     *
+     * @return void
+     */
+    public function options($route, $action = null) 
+    {
+        return $this->addRoute('OPTIONS', $route, $action);
+    }
 
-	/**
-	 * Add a route with patch method.
-	 *
-	 * @param  string  $route
-	 * @param  string|callable|null  $action
-	 *
-	 * @return void
-	 */
-	public function patch($route, $action = null)
-	{
-		return $this->addRoute('PATCH', $route, $action);
-	}
+    /**
+     * Add a route with patch method.
+     *
+     * @param  string  $route
+     * @param  string|callable|null  $action
+     *
+     * @return void
+     */
+    public function patch($route, $action = null)
+    {
+        return $this->addRoute('PATCH', $route, $action);
+    }
 
-	/**
-	 * Add a route with post method.
-	 *
-	 * @param  string  $route
-	 * @param  string|callable|null  $action
-	 *
-	 * @return void
-	 */
-	public function post($route, $action = null) 
-	{
-		return $this->addRoute('POST', $route, $action);
-	}
+    /**
+     * Add a route with post method.
+     *
+     * @param  string  $route
+     * @param  string|callable|null  $action
+     *
+     * @return void
+     */
+    public function post($route, $action = null) 
+    {
+        return $this->addRoute('POST', $route, $action);
+    }
 
-	/**
-	 * Add a route with put method.
-	 *
-	 * @param  string  $route
-	 * @param  string|callable|null  $action
-	 *
-	 * @return void
-	 */
-	public function put($route, $action = null) 
-	{
-		return $this->addRoute('PUT', $route, $action);
-	}  
+    /**
+     * Add a route with put method.
+     *
+     * @param  string  $route
+     * @param  string|callable|null  $action
+     *
+     * @return void
+     */
+    public function put($route, $action = null) 
+    {
+        return $this->addRoute('PUT', $route, $action);
+    }  
 }
\ No newline at end of file

src/components/Core/Http/Lenevor.php

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;
 			}
 			

Indentation +235 added lines, -235 removed lines

@@ -39,274 +39,274 @@
  */
 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());
+        }
 
-		$this->app->loadDeferredProviders();
-	}
+        $this->app->loadDeferredProviders();
+    }
 
-	/**
-	 * 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

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/Contracts/Console/Application.php

Indentation +12 added lines, -12 removed lines

@@ -29,17 +29,17 @@
  */
 interface Application
 {
-	/**
-	 * Runs the current command discovered on the CLI.
-	 * 
-	 * @return void
-	 */	
-	public function run();
+    /**
+     * Runs the current command discovered on the CLI.
+     * 
+     * @return void
+     */	
+    public function run();
 	
-	/**
-	 * Displays basic information about the Console.
-	 * 
-	 * @return void
-	 */ 
-	public function showHeader(); 
+    /**
+     * Displays basic information about the Console.
+     * 
+     * @return void
+     */ 
+    public function showHeader(); 
 }
\ No newline at end of file

src/components/Console/Application.php

Indentation +45 added lines, -45 removed lines

@@ -34,57 +34,57 @@
  */
 class Application implements ApplicationContracts
 {
-	/**
-	 * The Lenevor application instance..
-	 * 
-	 * @var \Syscodes\Contracts\Container|Container $lenevor
-	 */
-	protected $lenevor;
+    /**
+     * The Lenevor application instance..
+     * 
+     * @var \Syscodes\Contracts\Container|Container $lenevor
+     */
+    protected $lenevor;
 
-	/**
-	 * Console constructor. Initialize the console of Lenevor.
-	 *
-	 * @param  \Syscodes\Contracts\Core\Lenevor  $core
-	 * 
-	 * @return void
-	 */
-	public function __construct(Container $lenevor)
-	{		
-		// Initialize the Cli
-		if (isCli()) {
-			Cli::initialize();
-		}
+    /**
+     * Console constructor. Initialize the console of Lenevor.
+     *
+     * @param  \Syscodes\Contracts\Core\Lenevor  $core
+     * 
+     * @return void
+     */
+    public function __construct(Container $lenevor)
+    {		
+        // Initialize the Cli
+        if (isCli()) {
+            Cli::initialize();
+        }
 
-		$this->lenevor = $lenevor;
-	}
+        $this->lenevor = $lenevor;
+    }
 
-	/**
-	 * Runs the current command discovered on the CLI.
-	 *
-	 * @return void
-	 */
-	public function run()
-	{
-		$path = Cli::getURI();
+    /**
+     * Runs the current command discovered on the CLI.
+     *
+     * @return void
+     */
+    public function run()
+    {
+        $path = Cli::getURI();
 
 				
-	}
+    }
 
-	/**
-	 * Displays basic information about the Console.
-	 *
-	 * @return $this 
-	 */
-	public function showHeader()
-	{		
-		Cli::write(Version::PRODUCT.' '
-			.Cli::color(Version::RELEASE, 'cyan').' | '
-			.'Server Time: '.Cli::color(date('Y/m/d H:i:sa'), 'light_yellow').' | '
-			.cli::color('['.PHP_OS.']', 'light_purple')
-		);
+    /**
+     * Displays basic information about the Console.
+     *
+     * @return $this 
+     */
+    public function showHeader()
+    {		
+        Cli::write(Version::PRODUCT.' '
+            .Cli::color(Version::RELEASE, 'cyan').' | '
+            .'Server Time: '.Cli::color(date('Y/m/d H:i:sa'), 'light_yellow').' | '
+            .cli::color('['.PHP_OS.']', 'light_purple')
+        );
 
-		Cli::newLine(1);
+        Cli::newLine(1);
 
-		return $this;
-	}
+        return $this;
+    }
 }
\ No newline at end of file

src/components/Controller/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 : '');
     }
     
     /**