lenevor / syscodes

src/components/Routing/Concerns/RouteMap.php

Indentation +125 added lines, -125 removed lines

@@ -27,139 +27,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\Components\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\Components\Routing\Route
+     */
+    abstract public function addRoute($method, $route, $action);
 
-	/**
-	 * Add a route for all posible methods.
-	 *
-	 * @param  string  $route
-	 * @param  \Closure|array|string|null  $action
-	 *
-	 * @return \Syscodes\Components\Routing\Route
-	 */
-	public function any($route, $action = null) 
-	{		
-		return $this->addRoute(self::$verbs, $route, $action);
-	}
+    /**
+     * Add a route for all posible methods.
+     *
+     * @param  string  $route
+     * @param  \Closure|array|string|null  $action
+     *
+     * @return \Syscodes\Components\Routing\Route
+     */
+    public function any($route, $action = null) 
+    {		
+        return $this->addRoute(self::$verbs, $route, $action);
+    }
 	
-	/**
-	 * Add a route with delete method.
-	 *
-	 * @param  string  $route
-	 * @param  \Closure|array|string|null  $action
-	 *
-	 * @return \Syscodes\Components\Routing\Route
-	 */
-	public function delete($route, $action = null) 
-	{
-		return $this->addRoute('DELETE', $route, $action);
-	}
+    /**
+     * Add a route with delete method.
+     *
+     * @param  string  $route
+     * @param  \Closure|array|string|null  $action
+     *
+     * @return \Syscodes\Components\Routing\Route
+     */
+    public function delete($route, $action = null) 
+    {
+        return $this->addRoute('DELETE', $route, $action);
+    }
 
-	/**
-	 * Add a route with get method.
-	 * 
-	 * @param  string  $route
-	 * @param  \Closure|array|string|null  $action
-	 *
-	 * @return \Syscodes\Components\Routing\Route
-	 */
-	public function get($route, $action = null) 
-	{
-		return $this->addRoute(['GET', 'HEAD'], $route, $action);
-	}
+    /**
+     * Add a route with get method.
+     * 
+     * @param  string  $route
+     * @param  \Closure|array|string|null  $action
+     *
+     * @return \Syscodes\Components\Routing\Route
+     */
+    public function get($route, $action = null) 
+    {
+        return $this->addRoute(['GET', 'HEAD'], $route, $action);
+    }
 
-	/**
-	 * Add a route with head method.
-	 *
-	 * @param  string  $route
-	 * @param  \Closure|array|string|null  $action
-	 *
-	 * @return \Syscodes\Components\Routing\Route
-	 */
-	public function head($route, $action = null)
-	{
-		return $this->addRoute('HEAD', $route, $action);
-	}
+    /**
+     * Add a route with head method.
+     *
+     * @param  string  $route
+     * @param  \Closure|array|string|null  $action
+     *
+     * @return \Syscodes\Components\Routing\Route
+     */
+    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  \Closure|array|string|null  $action
-	 * 
-	 * @return \Syscodes\Components\Routing\Route
-	 */
-	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  \Closure|array|string|null  $action
+     * 
+     * @return \Syscodes\Components\Routing\Route
+     */
+    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  \Closure|array|string|null  $action
-	 *
-	 * @return \Syscodes\Components\Routing\Route
-	 */
-	public function options($route, $action = null) 
-	{
-		return $this->addRoute('OPTIONS', $route, $action);
-	}
+    /**
+     * Add a route with options method
+     *
+     * @param  string  $route
+     * @param  \Closure|array|string|null  $action
+     *
+     * @return \Syscodes\Components\Routing\Route
+     */
+    public function options($route, $action = null) 
+    {
+        return $this->addRoute('OPTIONS', $route, $action);
+    }
 
-	/**
-	 * Add a route with patch method.
-	 *
-	 * @param  string  $route
-	 * @param  \Closure|array|string|null  $action
-	 *
-	 * @return \Syscodes\Components\Routing\Route
-	 */
-	public function patch($route, $action = null)
-	{
-		return $this->addRoute('PATCH', $route, $action);
-	}
+    /**
+     * Add a route with patch method.
+     *
+     * @param  string  $route
+     * @param  \Closure|array|string|null  $action
+     *
+     * @return \Syscodes\Components\Routing\Route
+     */
+    public function patch($route, $action = null)
+    {
+        return $this->addRoute('PATCH', $route, $action);
+    }
 
-	/**
-	 * Add a route with post method.
-	 *
-	 * @param  string  $route
-	 * @param  \Closure|array|string|null  $action
-	 *
-	 * @return \Syscodes\Components\Routing\Route
-	 */
-	public function post($route, $action = null) 
-	{
-		return $this->addRoute('POST', $route, $action);
-	}
+    /**
+     * Add a route with post method.
+     *
+     * @param  string  $route
+     * @param  \Closure|array|string|null  $action
+     *
+     * @return \Syscodes\Components\Routing\Route
+     */
+    public function post($route, $action = null) 
+    {
+        return $this->addRoute('POST', $route, $action);
+    }
 
-	/**
-	 * Add a route with put method.
-	 *
-	 * @param  string  $route
-	 * @param  \Closure|array|string|null  $action
-	 *
-	 * @return \Syscodes\Components\Routing\Route
-	 */
-	public function put($route, $action = null) 
-	{
-		return $this->addRoute('PUT', $route, $action);
-	}  
+    /**
+     * Add a route with put method.
+     *
+     * @param  string  $route
+     * @param  \Closure|array|string|null  $action
+     *
+     * @return \Syscodes\Components\Routing\Route
+     */
+    public function put($route, $action = null) 
+    {
+        return $this->addRoute('PUT', $route, $action);
+    }  
 }
\ No newline at end of file

src/components/Routing/Route.php

Spacing +1 added lines, -1 removed lines

@@ -854,7 +854,7 @@
 	 *
 	 * @return array|string
 	 */
-	public function getMethod(): array|string
+	public function getMethod(): array | string
 	{
 		return $this->method;
 	}

Indentation +837 added lines, -837 removed lines

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

src/components/Routing/Resolver/RouteResolver.php

Indentation +165 added lines, -165 removed lines

@@ -37,171 +37,171 @@
  */
 class RouteResolver
 {
-	/**
-	 * The container instance used by the router.
-	 * 
-	 * @var \Syscodes\Components\Contracts\Container\Container $container
-	 */
-	protected $container;
-
-	/**
-	 * The currently dispatched route instance.
-	 * 
-	 * @var \Syscodes\Components\Routing\Route|null
-	 */
-	protected $current;
-
-	/**
-	 * The Route instance.
-	 * 
-	 * @var \Syscodes\Components\Routing\Router|null
-	 */
-	protected $router;
-
-	/** 
-	 * The route collection instance. 
-	 * 
-	 * @var \Syscodes\Components\Routing\Collections\RouteCollection $routes
-	 */
-	protected $routes;
-
-	/**
-	 * Constructor. Create a new RouteResolver instance.
-	 * 
-	 * @param  \Syscodes\Components\Routing\Router  $router
-	 * @param  \Syscodes\Components\Routing\Collections\RouteCollection $routes
-	 * @param  \Syscodes\Components\Contracts\Container\Container|null  $container
-	 * 
-	 * @return void
-	 */
-	public function __construct(Router $router, RouteCollection $routes, Container $container = null)
-	{
-		$this->router    = $router;
-		$this->routes    = $routes;
-		$this->container = $container ?: new Container;
-	}
-
-	/**
-	 * Resolve the given route and call the method that belongs to the route.
-	 *
-	 * @param  \Syscodes\Components\Http\Request  $request
-	 *
-	 * @return \Syscodes\Components\Http\Response
-	 */
-	public function resolve(Request $request): Response
-	{
-		return $this->dispatchToRoute($request);
-	}
-
-	/**
-	 * Dispatch the request to a route and return the response.
-	 * 
-	 * @param  \Syscodes\Components\Http\Request  $request
-	 *
-	 * @return \Syscodes\Components\Http\Response
-	 */
-	protected function dispatchToRoute(Request $request): Response
-	{
-		return $this->runRoute($request, $this->findRoute($request));
-	}
-
-	/**
-	 * Find the route matching a given request.
-	 * 
-	 * @param  \Syscodes\Components\Http\Request  $request
-	 * 
-	 * @return \Syscodes\Components\Routing\Route
-	 */
-	protected function findRoute($request): Route
-	{
-		// Get all register routes with the same request method
-		$this->current = $route = $this->routes->match($request);
-
-		$this->container->instance(Route::class, $route);
-
-		return $route;
-	}
-
-	/**
-	 * Return the response for the given route.
-	 * 
-	 * @param  \Syscodes\Components\Http\Request  $request
-	 * @param  \Syscodes\Components\Routing\Route  $route
-	 * 
-	 * @return \Syscodes\Components\Http\Response
-	 */
-	protected function runRoute(Request $request, Route $route): Response
-	{
-		$request->setRouteResolver(fn () => $route);
-
-		return $this->callResponse($request, 
-			$this->runRouteStack($route, $request)
-		); 
-	}
-
-	/**
-	 * Run the given route through a stack response instance.
-	 * 
-	 * @param  \Syscodes\Components\Routing\Route  $route
-	 * @param  \Syscodes\Components\Http\Request  $request
-	 * 
-	 * @return mixed
-	 */
-	protected function runRouteStack(Route $route, Request $request)
-	{
-		$skipMiddleware = $this->container->bound('middleware.disable') &&
-						  ($this->container->make('middleware.disable') === true);
+    /**
+     * The container instance used by the router.
+     * 
+     * @var \Syscodes\Components\Contracts\Container\Container $container
+     */
+    protected $container;
+
+    /**
+     * The currently dispatched route instance.
+     * 
+     * @var \Syscodes\Components\Routing\Route|null
+     */
+    protected $current;
+
+    /**
+     * The Route instance.
+     * 
+     * @var \Syscodes\Components\Routing\Router|null
+     */
+    protected $router;
+
+    /** 
+     * The route collection instance. 
+     * 
+     * @var \Syscodes\Components\Routing\Collections\RouteCollection $routes
+     */
+    protected $routes;
+
+    /**
+     * Constructor. Create a new RouteResolver instance.
+     * 
+     * @param  \Syscodes\Components\Routing\Router  $router
+     * @param  \Syscodes\Components\Routing\Collections\RouteCollection $routes
+     * @param  \Syscodes\Components\Contracts\Container\Container|null  $container
+     * 
+     * @return void
+     */
+    public function __construct(Router $router, RouteCollection $routes, Container $container = null)
+    {
+        $this->router    = $router;
+        $this->routes    = $routes;
+        $this->container = $container ?: new Container;
+    }
+
+    /**
+     * Resolve the given route and call the method that belongs to the route.
+     *
+     * @param  \Syscodes\Components\Http\Request  $request
+     *
+     * @return \Syscodes\Components\Http\Response
+     */
+    public function resolve(Request $request): Response
+    {
+        return $this->dispatchToRoute($request);
+    }
+
+    /**
+     * Dispatch the request to a route and return the response.
+     * 
+     * @param  \Syscodes\Components\Http\Request  $request
+     *
+     * @return \Syscodes\Components\Http\Response
+     */
+    protected function dispatchToRoute(Request $request): Response
+    {
+        return $this->runRoute($request, $this->findRoute($request));
+    }
+
+    /**
+     * Find the route matching a given request.
+     * 
+     * @param  \Syscodes\Components\Http\Request  $request
+     * 
+     * @return \Syscodes\Components\Routing\Route
+     */
+    protected function findRoute($request): Route
+    {
+        // Get all register routes with the same request method
+        $this->current = $route = $this->routes->match($request);
+
+        $this->container->instance(Route::class, $route);
+
+        return $route;
+    }
+
+    /**
+     * Return the response for the given route.
+     * 
+     * @param  \Syscodes\Components\Http\Request  $request
+     * @param  \Syscodes\Components\Routing\Route  $route
+     * 
+     * @return \Syscodes\Components\Http\Response
+     */
+    protected function runRoute(Request $request, Route $route): Response
+    {
+        $request->setRouteResolver(fn () => $route);
+
+        return $this->callResponse($request, 
+            $this->runRouteStack($route, $request)
+        ); 
+    }
+
+    /**
+     * Run the given route through a stack response instance.
+     * 
+     * @param  \Syscodes\Components\Routing\Route  $route
+     * @param  \Syscodes\Components\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->router->gatherRouteMiddleware($route);
-
-		return (new Pipeline($this->container))
-				->send($request)
-				->through($middleware)
-				->then(fn ($request) => $this->callResponse($request, $route->runResolver()));
-	}
-
-	/**
-	 * Create a response instance from the given value.
-	 * 
-	 * @param  \Syscodes\Components\Http\Request  $request
-	 * @param  mixed  $response
-	 * 
-	 * @return \Syscodes\Components\Http\Response
-	 */
-	public function callResponse($request, $response): Response
-	{
-		return static::toResponse($request, $response);
-	}
-
-	/**
-	 * Static version of callResponse.
-	 * 
-	 * @param  \Syscodes\Components\Http\Request  $request
-	 * @param  mixed  $response
-	 * 
-	 * @return \Syscodes\Components\Http\Response
-	 */
-	public static function toResponse($request, $response): 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);
-	}
-
-	/**
-	 * Get the currently dispatched route instance.
-	 * 
-	 * @return \Syscodes\Components\Routing\Route|null
-	 */
-	public function current()
-	{
-		return $this->current;
-	}
+        $middleware = $skipMiddleware ? [] : $this->router->gatherRouteMiddleware($route);
+
+        return (new Pipeline($this->container))
+                ->send($request)
+                ->through($middleware)
+                ->then(fn ($request) => $this->callResponse($request, $route->runResolver()));
+    }
+
+    /**
+     * Create a response instance from the given value.
+     * 
+     * @param  \Syscodes\Components\Http\Request  $request
+     * @param  mixed  $response
+     * 
+     * @return \Syscodes\Components\Http\Response
+     */
+    public function callResponse($request, $response): Response
+    {
+        return static::toResponse($request, $response);
+    }
+
+    /**
+     * Static version of callResponse.
+     * 
+     * @param  \Syscodes\Components\Http\Request  $request
+     * @param  mixed  $response
+     * 
+     * @return \Syscodes\Components\Http\Response
+     */
+    public static function toResponse($request, $response): 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);
+    }
+
+    /**
+     * Get the currently dispatched route instance.
+     * 
+     * @return \Syscodes\Components\Routing\Route|null
+     */
+    public function current()
+    {
+        return $this->current;
+    }
 }
\ No newline at end of file

src/components/Routing/RouteGroup.php

Indentation +91 added lines, -91 removed lines

@@ -29,105 +29,105 @@
  */
 class RouteGroup
 {
- 	/**
-	 * Merge the given group attributes.
-	 * 
-	 * @param  array  $new
-	 * @param  array  $old
-	 * @param  bool  $existsPrefix
-	 * 
-	 * @return array
-	 */
-	public static function mergeGroup($new, $old, $existsPrefix = true): array
-	{
-		if (isset($new['domain'])) {
-			unset($old['domain']);
-		}
+        /**
+         * Merge the given group attributes.
+         * 
+         * @param  array  $new
+         * @param  array  $old
+         * @param  bool  $existsPrefix
+         * 
+         * @return array
+         */
+    public static function mergeGroup($new, $old, $existsPrefix = true): array
+    {
+        if (isset($new['domain'])) {
+            unset($old['domain']);
+        }
 		
-		if (isset($new['controller'])) {
-			unset($old['controller']);
-		}
+        if (isset($new['controller'])) {
+            unset($old['controller']);
+        }
 
-		$new = array_merge(static::formatUseAs($new, $old), [
-			'namespace' => static::formatUseNamespace($new, $old),
-			'prefix' => static::formatUsePrefix($new, $old, $existsPrefix),
-			'where' => static::formatUseWhere($new, $old)
-		]);
+        $new = array_merge(static::formatUseAs($new, $old), [
+            'namespace' => static::formatUseNamespace($new, $old),
+            'prefix' => static::formatUsePrefix($new, $old, $existsPrefix),
+            'where' => static::formatUseWhere($new, $old)
+        ]);
 		
-		return array_merge_recursive(
-			Arr::except($old, array('namespace', 'prefix', 'where', 'as')), $new
-		);
-	}
+        return array_merge_recursive(
+            Arr::except($old, array('namespace', 'prefix', 'where', 'as')), $new
+        );
+    }
 
-	/**
-	 * Format the uses namespace for the new group attributes.
-	 * 
-	 * @param  array  $new
-	 * @param  array  $old
-	 * 
-	 * @return string|null
-	 */
-	protected static function formatUseNamespace($new, $old): ?string
-	{
-		if (isset($new['namespace'])) {
-			return isset($old['namespace'])
-			       ? trim($old['namespace'], '\\').'\\'.trim($new['namespace'], '\\')
-			       : trim($new['namespace'], '\\');
-		}
+    /**
+     * Format the uses namespace for the new group attributes.
+     * 
+     * @param  array  $new
+     * @param  array  $old
+     * 
+     * @return string|null
+     */
+    protected static function formatUseNamespace($new, $old): ?string
+    {
+        if (isset($new['namespace'])) {
+            return isset($old['namespace'])
+                   ? trim($old['namespace'], '\\').'\\'.trim($new['namespace'], '\\')
+                   : trim($new['namespace'], '\\');
+        }
 
-		return $old['namespace'] ?? null;
-	}
+        return $old['namespace'] ?? null;
+    }
 
-	/**
-	 * Format the prefix for the new group attributes.
-	 * 
-	 * @param  array  $new
-	 * @param  array  $old
-	 * @param  bool  $existPrefix
-	 * 
-	 * @return string|null
-	 */
-	protected static function formatUsePrefix($new, $old, bool $existsPrefix = true): ?string
-	{
-		$old = $old['prefix'] ?? null;
+    /**
+     * Format the prefix for the new group attributes.
+     * 
+     * @param  array  $new
+     * @param  array  $old
+     * @param  bool  $existPrefix
+     * 
+     * @return string|null
+     */
+    protected static function formatUsePrefix($new, $old, bool $existsPrefix = true): ?string
+    {
+        $old = $old['prefix'] ?? null;
 		
-		if ($existsPrefix) {
-			return trim(isset($new['prefix']) ? trim($old, '/').'/'.trim($new['prefix'], '/') : $old, '/');
-		} else {
-			return trim(isset($new['prefix']) ? trim($new['prefix'], '/').'/'.trim($old, '/') : $old, '/');
-		}
-	}
+        if ($existsPrefix) {
+            return trim(isset($new['prefix']) ? trim($old, '/').'/'.trim($new['prefix'], '/') : $old, '/');
+        } else {
+            return trim(isset($new['prefix']) ? trim($new['prefix'], '/').'/'.trim($old, '/') : $old, '/');
+        }
+    }
 
-	/**
-	 * Format the "wheres" for the new group attributes.
-	 * 
-	 * @param  array  $new
-	 * @param  array  $old
-	 * 
-	 * @return array
-	 */
-	protected static function formatUseWhere($new, $old): array
-	{
-		return array_merge(
-			$old['where'] ?? [],
-			$new['where'] ?? []
-		);
-	}
+    /**
+     * Format the "wheres" for the new group attributes.
+     * 
+     * @param  array  $new
+     * @param  array  $old
+     * 
+     * @return array
+     */
+    protected static function formatUseWhere($new, $old): array
+    {
+        return array_merge(
+            $old['where'] ?? [],
+            $new['where'] ?? []
+        );
+    }
 
-	/**
-	 * Format the "as" clause of the new group attributes.
-	 * 
-	 * @param  array  $new
-	 * @param  array  $old
-	 * 
-	 * @return array
-	 */
-	protected static function formatUseAs($new, $old): array
-	{
-		if (isset($old['as'])) {
-			$new['as'] = $old['as'].($new['as'] ?? '');
-		}
+    /**
+     * Format the "as" clause of the new group attributes.
+     * 
+     * @param  array  $new
+     * @param  array  $old
+     * 
+     * @return array
+     */
+    protected static function formatUseAs($new, $old): array
+    {
+        if (isset($old['as'])) {
+            $new['as'] = $old['as'].($new['as'] ?? '');
+        }
 
-		return $new;
-	}
+        return $new;
+    }
 }
\ No newline at end of file

src/components/Routing/Supported/RouteFileRegister.php

Indentation -1 removed lines

@@ -40,7 +40,6 @@
      * Create a new route file registrar instance.
      *
      * @param  \Syscodes\Components\Routing\Router  $router
-
      * @return void
      */
     public function __construct(Router $router)

src/components/Routing/RoutingServiceProvider.php

Spacing +4 added lines, -4 removed lines

@@ -74,14 +74,14 @@ 
      */
     protected function registerUrlGenerator()
     {
-        $this->app->singleton('url', function ($app) {            
+        $this->app->singleton('url', function($app) {            
             $routes = $app['router']->getRoutes();
 
             return new UrlGenerator($routes, $app['request']);            
         });
 
-        $this->app->extend('url', function (UrlGeneratorContract $url, $app) {
-            $url->setSessionResolver(function () use ($app) {
+        $this->app->extend('url', function(UrlGeneratorContract $url, $app) {
+            $url->setSessionResolver(function() use ($app) {
                 return $app['session'] ?? null;
             });
 
@@ -96,7 +96,7 @@ 
      */
     protected function registerRedirector()
     {
-        $this->app->singleton('redirect', function ($app) {
+        $this->app->singleton('redirect', function($app) {
             $redirector = new Redirector($app['url']);
             
             if (isset($app['session.store'])) {

src/components/Routing/Generators/UrlGenerator.php

Spacing +2 added lines, -2 removed lines

@@ -152,7 +152,7 @@ 
      * 
      * @return string|null
      */
-    protected function getPreviousUrlSession(): string|null
+    protected function getPreviousUrlSession(): string | null
     {
         $session = $this->getSession();
         
@@ -427,7 +427,7 @@ 
      */
     public function format($root, $path, $tail = ''): string
     {
-        return trim($root .'/' .trim($path .'/' .$tail, '/'), '/');
+        return trim($root.'/'.trim($path.'/'.$tail, '/'), '/');
     }
 
     /**

src/components/Routing/Generators/RouteUrlGenerator.php

Indentation +1 added lines, -1 removed lines

@@ -103,7 +103,7 @@
         $uri = $this->url->format(
                     $root,
                     $this->replaceRouteParameters($route->getUri(), $parameters)
-               );
+                );
 
         if (preg_match_all('/{(.*?)}/', $uri, $missingParameters)) {
             throw UrlGeneratorException::missingParameters($route, $missingParameters[1]);

Spacing +2 added lines, -2 removed lines

@@ -286,10 +286,10 @@
         // parameters that are in the array and add them to the query string or we
         // will make the initial query string if it wasn't started with strings.
         if (count($keyed) < count($parameters)) {
-            $query .= '&' .implode('&', $this->getNumericParameters($parameters));
+            $query .= '&'.implode('&', $this->getNumericParameters($parameters));
         }
         
-        return '?' .trim($query, '&');
+        return '?'.trim($query, '&');
     }
     
     /**

src/components/Debug/Exceptions/Util/TemplateHandler.php

Indentation +210 added lines, -210 removed lines

@@ -30,247 +30,247 @@
  */
 class TemplateHandler
 {
-	/**
-	 * Benchmark instance.
-	 * 
-	 * @var string $benchmark
-	 */
-	protected $benchmark;
+    /**
+     * Benchmark instance.
+     * 
+     * @var string $benchmark
+     */
+    protected $benchmark;
 
-	/**
-	 * Nesting level of the output buffering mechanism.
-	 *
-	 * @var string $obLevel
-	 */
-	public $obLevel;
+    /**
+     * Nesting level of the output buffering mechanism.
+     *
+     * @var string $obLevel
+     */
+    public $obLevel;
 	
-	/**
-	 * The functions of system what control errors and exceptions.
-	 * 
-	 * @var string|object $system
-	 */
-	protected $system;
+    /**
+     * The functions of system what control errors and exceptions.
+     * 
+     * @var string|object $system
+     */
+    protected $system;
 	
-	/**
-	 * An array of variables to be passed to all templates.
-	 * 
-	 * @var array $variables
-	 */
-	protected $variables = [];
+    /**
+     * An array of variables to be passed to all templates.
+     * 
+     * @var array $variables
+     */
+    protected $variables = [];
 
-	/**
-	 * Constructor. The TemplateHandler class instance.
-	 * 
-	 * @return void
-	 */
-	public function __construct()
-	{
-		$this->system    = new System;
-		$this->benchmark = new Benchmark;
-		$this->obLevel   = $this->system->getOutputBufferLevel();
-	}
+    /**
+     * Constructor. The TemplateHandler class instance.
+     * 
+     * @return void
+     */
+    public function __construct()
+    {
+        $this->system    = new System;
+        $this->benchmark = new Benchmark;
+        $this->obLevel   = $this->system->getOutputBufferLevel();
+    }
 
-	/**
-	 * Clean Path: This makes nicer looking paths for the error output.
-	 *
-	 * @param  string  $file
-	 *
-	 * @return string
-	 */
-	public function cleanPath($file): string
-	{
-		if (strpos($file, appPath().DIRECTORY_SEPARATOR) === 0) {
-			$file = appPath().DIRECTORY_SEPARATOR.substr($file, strlen(appPath().DIRECTORY_SEPARATOR));
-		} elseif (strpos($file, basePath().DIRECTORY_SEPARATOR) === 0) {
-			$file = basePath().DIRECTORY_SEPARATOR.substr($file, strlen(basePath().DIRECTORY_SEPARATOR));
-		} elseif (strpos($file, configPath().DIRECTORY_SEPARATOR) === 0) {
-			$file = configPath().DIRECTORY_SEPARATOR.substr($file, strlen(configPath().DIRECTORY_SEPARATOR));
-		} elseif (strpos($file, resourcePath().DIRECTORY_SEPARATOR) === 0) {
-			$file = resourcePath().DIRECTORY_SEPARATOR.substr($file, strlen(resourcePath().DIRECTORY_SEPARATOR));
-		}
+    /**
+     * Clean Path: This makes nicer looking paths for the error output.
+     *
+     * @param  string  $file
+     *
+     * @return string
+     */
+    public function cleanPath($file): string
+    {
+        if (strpos($file, appPath().DIRECTORY_SEPARATOR) === 0) {
+            $file = appPath().DIRECTORY_SEPARATOR.substr($file, strlen(appPath().DIRECTORY_SEPARATOR));
+        } elseif (strpos($file, basePath().DIRECTORY_SEPARATOR) === 0) {
+            $file = basePath().DIRECTORY_SEPARATOR.substr($file, strlen(basePath().DIRECTORY_SEPARATOR));
+        } elseif (strpos($file, configPath().DIRECTORY_SEPARATOR) === 0) {
+            $file = configPath().DIRECTORY_SEPARATOR.substr($file, strlen(configPath().DIRECTORY_SEPARATOR));
+        } elseif (strpos($file, resourcePath().DIRECTORY_SEPARATOR) === 0) {
+            $file = resourcePath().DIRECTORY_SEPARATOR.substr($file, strlen(resourcePath().DIRECTORY_SEPARATOR));
+        }
 
-		return $file;
-	}
+        return $file;
+    }
 
-	/**
-	 * Display memory usage in real-world units. Intended for use
-	 * with memory_get_usage, etc.
-	 *
-	 * @param  int  $bytes
-	 *
-	 * @return string
-	 */
-	public function displayMemory(int $bytes): string
-	{
-		if ($bytes < 1024) {
-			return $bytes.'B';
-		} else if ($bytes < 1048576) {
-			return round($bytes/1024, 2).'KB';
-		}
+    /**
+     * Display memory usage in real-world units. Intended for use
+     * with memory_get_usage, etc.
+     *
+     * @param  int  $bytes
+     *
+     * @return string
+     */
+    public function displayMemory(int $bytes): string
+    {
+        if ($bytes < 1024) {
+            return $bytes.'B';
+        } else if ($bytes < 1048576) {
+            return round($bytes/1024, 2).'KB';
+        }
 
-		return round($bytes/1048576, 2).'MB';
-	}
+        return round($bytes/1048576, 2).'MB';
+    }
 
-	/**
-	 * Escapes a string for output in an HTML document.
-	 * 
-	 * @param  string  $text
-	 * 
-	 * @return string
-	 */
-	public function escape($text): string
-	{
-		$flags = ENT_QUOTES;
+    /**
+     * Escapes a string for output in an HTML document.
+     * 
+     * @param  string  $text
+     * 
+     * @return string
+     */
+    public function escape($text): string
+    {
+        $flags = ENT_QUOTES;
 		
-		// HHVM has all constants defined, but only ENT_IGNORE
-		// works at the moment
-		if (defined("ENT_SUBSTITUTE") && ! defined("HHVM_VERSION")) {
-			$flags |= ENT_SUBSTITUTE;
-		} else {
-			$flags |= ENT_IGNORE;
-		}
+        // HHVM has all constants defined, but only ENT_IGNORE
+        // works at the moment
+        if (defined("ENT_SUBSTITUTE") && ! defined("HHVM_VERSION")) {
+            $flags |= ENT_SUBSTITUTE;
+        } else {
+            $flags |= ENT_IGNORE;
+        }
 		
-		$text = str_replace(chr(9), '    ', $text);
+        $text = str_replace(chr(9), '    ', $text);
 		
-		return htmlspecialchars($text, $flags, "UTF-8");
-	}
+        return htmlspecialchars($text, $flags, "UTF-8");
+    }
 
-	/**
-	 * Returns all variables for this helper.
-	 * 
-	 * @return array
-	 */
-	public function getVariables(): array
-	{
-		return $this->variables;
-	}
+    /**
+     * Returns all variables for this helper.
+     * 
+     * @return array
+     */
+    public function getVariables(): array
+    {
+        return $this->variables;
+    }
 
-	/**
-	 * Creates a syntax-highlighted version of a PHP file.
-	 *
-	 * @param  string  $file
-	 * @param  int     $lineNumber
-	 * @param  int     $lines
-	 *
-	 * @return bool|string
-	 * 
-	 * @throws \Exception
-	 */
-	public function highlightFile($file, $lineNumber, $lines = 15)
-	{
-		if (empty ($file) || ! is_readable($file)) {
-			return false;
-		}
+    /**
+     * Creates a syntax-highlighted version of a PHP file.
+     *
+     * @param  string  $file
+     * @param  int     $lineNumber
+     * @param  int     $lines
+     *
+     * @return bool|string
+     * 
+     * @throws \Exception
+     */
+    public function highlightFile($file, $lineNumber, $lines = 15)
+    {
+        if (empty ($file) || ! is_readable($file)) {
+            return false;
+        }
 
-		// Set our highlight colors:
-		if (function_exists('ini_set')) {
-			ini_set('highlight.bg', '#000');
-			ini_set('highlight.comment', '#B5B5B5');
-			ini_set('highlight.default', '#E5E5E5');
-			ini_set('highlight.html', '#06B');
-			ini_set('highlight.keyword', '#FF9361');
-			ini_set('highlight.string', '#61ABFF');
-		}
+        // Set our highlight colors:
+        if (function_exists('ini_set')) {
+            ini_set('highlight.bg', '#000');
+            ini_set('highlight.comment', '#B5B5B5');
+            ini_set('highlight.default', '#E5E5E5');
+            ini_set('highlight.html', '#06B');
+            ini_set('highlight.keyword', '#FF9361');
+            ini_set('highlight.string', '#61ABFF');
+        }
 
-		try {
-			$origin = file_get_contents($file);
-		} catch (Exception $e) {
-			return false;
-		}
+        try {
+            $origin = file_get_contents($file);
+        } catch (Exception $e) {
+            return false;
+        }
 
-		$origin  = str_replace(["\r\n", "\r"], "\n", $origin);
-		$origin  = explode("\n", highlight_string($origin , true));
-		$origin  = str_replace('<br />', "\n", $origin [1]);
+        $origin  = str_replace(["\r\n", "\r"], "\n", $origin);
+        $origin  = explode("\n", highlight_string($origin , true));
+        $origin  = str_replace('<br />', "\n", $origin [1]);
 
-		$origin  = explode("\n", str_replace("\r\n", "\n", $origin));
+        $origin  = explode("\n", str_replace("\r\n", "\n", $origin));
 
-		// Get just the part to show
-		$start = $lineNumber - (int) round($lines / 2);
-		$start = $start < 0 ? 0 : $start;
+        // Get just the part to show
+        $start = $lineNumber - (int) round($lines / 2);
+        $start = $start < 0 ? 0 : $start;
 
-		// Get just the lines we need to display, while keeping line numbers...
-		$origin  = array_splice($origin, $start, $lines, true);
+        // Get just the lines we need to display, while keeping line numbers...
+        $origin  = array_splice($origin, $start, $lines, true);
 
-		// Used to format the line number in the source
-		$format = '% '.strlen($start + $lines).'d';
+        // Used to format the line number in the source
+        $format = '% '.strlen($start + $lines).'d';
 
-		$out = '';
-		// Because the highlighting may have an uneven number
-		// of open and close span tags on one line, we need
-		// to ensure we can close them all to get the lines
-		// showing correctly.
-		$spans = 1;
+        $out = '';
+        // Because the highlighting may have an uneven number
+        // of open and close span tags on one line, we need
+        // to ensure we can close them all to get the lines
+        // showing correctly.
+        $spans = 1;
 
-		foreach ($origin as $n => $row) {
-			$spans += substr_count($row, '<span') - substr_count($row, '</span');
-			$row = str_replace(["\r", "\n"], ['', ''], $row);
+        foreach ($origin as $n => $row) {
+            $spans += substr_count($row, '<span') - substr_count($row, '</span');
+            $row = str_replace(["\r", "\n"], ['', ''], $row);
 
-			if (($n+$start+1) == $lineNumber) {
-				preg_match_all('#<[^>]+>#', $row, $tags);
-				$out .= sprintf("<span class='line highlight'><span class='number'>{$format}</span> %s\n</span>%s",
-						$n + $start + 1,
-						strip_tags($row),
-						implode('', $tags[0])
-				);
-			} else {
-				$out .= sprintf('<span class="number">'.$format.'</span> %s <span class="line">', $n + $start + 1, $row) ."\n";
-			}
-		}
+            if (($n+$start+1) == $lineNumber) {
+                preg_match_all('#<[^>]+>#', $row, $tags);
+                $out .= sprintf("<span class='line highlight'><span class='number'>{$format}</span> %s\n</span>%s",
+                        $n + $start + 1,
+                        strip_tags($row),
+                        implode('', $tags[0])
+                );
+            } else {
+                $out .= sprintf('<span class="number">'.$format.'</span> %s <span class="line">', $n + $start + 1, $row) ."\n";
+            }
+        }
 
-		$out .= str_repeat('</span>', $spans);
+        $out .= str_repeat('</span>', $spans);
 
-		return '<pre class="code-blocks"><code>'.$out.'</code></pre>';
-	}
+        return '<pre class="code-blocks"><code>'.$out.'</code></pre>';
+    }
 
-	/**
-	 * Sets the variables to be passed to all templates rendered 
-	 * by this template helper.
-	 * 
-	 * @param  array  $variables
-	 * 
-	 * @return void
-	 */
-	public function setVariables(array $variables): void
-	{
-		$this->variables = $variables;
-	}
+    /**
+     * Sets the variables to be passed to all templates rendered 
+     * by this template helper.
+     * 
+     * @param  array  $variables
+     * 
+     * @return void
+     */
+    public function setVariables(array $variables): void
+    {
+        $this->variables = $variables;
+    }
 
-	/**
-	 * Convert a string to a slug version of itself.
-	 * 
-	 * @param  string  $original
-	 * 
-	 * @return string
-	 */
-	public function slug($original): string
-	{
-		$slug = str_replace(" ", "-", $original);
-		$slug = preg_replace('/[^\w\d\-\_]/i',' ', $slug);
+    /**
+     * Convert a string to a slug version of itself.
+     * 
+     * @param  string  $original
+     * 
+     * @return string
+     */
+    public function slug($original): string
+    {
+        $slug = str_replace(" ", "-", $original);
+        $slug = preg_replace('/[^\w\d\-\_]/i',' ', $slug);
 
-		return strtolower($slug);
-	}
+        return strtolower($slug);
+    }
 
-	/**
-	 * Given an exception and status code will display the error to the client.
-	 *
-	 * @param  string  $template
-	 * 
-	 * @return void
-	 */
-	public function render($template): void
-	{
-		$vars = $this->getVariables();
+    /**
+     * Given an exception and status code will display the error to the client.
+     *
+     * @param  string  $template
+     * 
+     * @return void
+     */
+    public function render($template): void
+    {
+        $vars = $this->getVariables();
 
-		$vars['template'] = $this;
+        $vars['template'] = $this;
 		
-		if ($this->system->getOutputBufferLevel() > $this->obLevel + 1) {
-			@$this->system->endOutputBuffering();
-		}
+        if ($this->system->getOutputBufferLevel() > $this->obLevel + 1) {
+            @$this->system->endOutputBuffering();
+        }
 
-		// Instantiate the error view and prepare the vars
-		call_user_func(function () {
-			extract(func_get_arg(1));
-			include func_get_arg(0);
-		}, $template, $vars);
-	}
+        // Instantiate the error view and prepare the vars
+        call_user_func(function () {
+            extract(func_get_arg(1));
+            include func_get_arg(0);
+        }, $template, $vars);
+    }
 }
\ No newline at end of file

Spacing +8 added lines, -8 removed lines

@@ -105,10 +105,10 @@ 
 		if ($bytes < 1024) {
 			return $bytes.'B';
 		} else if ($bytes < 1048576) {
-			return round($bytes/1024, 2).'KB';
+			return round($bytes / 1024, 2).'KB';
 		}
 
-		return round($bytes/1048576, 2).'MB';
+		return round($bytes / 1048576, 2).'MB';
 	}
 
 	/**
@@ -179,7 +179,7 @@ 
 		}
 
 		$origin  = str_replace(["\r\n", "\r"], "\n", $origin);
-		$origin  = explode("\n", highlight_string($origin , true));
+		$origin  = explode("\n", highlight_string($origin, true));
 		$origin  = str_replace('<br />', "\n", $origin [1]);
 
 		$origin  = explode("\n", str_replace("\r\n", "\n", $origin));
@@ -189,7 +189,7 @@ 
 		$start = $start < 0 ? 0 : $start;
 
 		// Get just the lines we need to display, while keeping line numbers...
-		$origin  = array_splice($origin, $start, $lines, true);
+		$origin = array_splice($origin, $start, $lines, true);
 
 		// Used to format the line number in the source
 		$format = '% '.strlen($start + $lines).'d';
@@ -205,7 +205,7 @@ 
 			$spans += substr_count($row, '<span') - substr_count($row, '</span');
 			$row = str_replace(["\r", "\n"], ['', ''], $row);
 
-			if (($n+$start+1) == $lineNumber) {
+			if (($n + $start + 1) == $lineNumber) {
 				preg_match_all('#<[^>]+>#', $row, $tags);
 				$out .= sprintf("<span class='line highlight'><span class='number'>{$format}</span> %s\n</span>%s",
 						$n + $start + 1,
@@ -213,7 +213,7 @@ 
 						implode('', $tags[0])
 				);
 			} else {
-				$out .= sprintf('<span class="number">'.$format.'</span> %s <span class="line">', $n + $start + 1, $row) ."\n";
+				$out .= sprintf('<span class="number">'.$format.'</span> %s <span class="line">', $n + $start + 1, $row)."\n";
 			}
 		}
 
@@ -245,7 +245,7 @@ 
 	public function slug($original): string
 	{
 		$slug = str_replace(" ", "-", $original);
-		$slug = preg_replace('/[^\w\d\-\_]/i',' ', $slug);
+		$slug = preg_replace('/[^\w\d\-\_]/i', ' ', $slug);
 
 		return strtolower($slug);
 	}
@@ -268,7 +268,7 @@ 
 		}
 
 		// Instantiate the error view and prepare the vars
-		call_user_func(function () {
+		call_user_func(function() {
 			extract(func_get_arg(1));
 			include func_get_arg(0);
 		}, $template, $vars);