lenevor / syscodes

src/components/Routing/Route.php

Indentation +837 added lines, -837 removed lines

@@ -43,857 +43,857 @@
  */
 class Route 
 {
-	use Concerns\RouteCondition,
-	    Concerns\RouteDependencyResolver;
-
-	/**
-	 * The validators used by the routes.
-	 * 
-	 * @var array $validators
-	 */
-	public static $validators;
+    use Concerns\RouteCondition,
+        Concerns\RouteDependencyResolver;
+
+    /**
+     * The validators used by the routes.
+     * 
+     * @var array $validators
+     */
+    public static $validators;
 	
-	/**
-	 * Action that the route will use when called.
-	 *
-	 * @var \Closure|string|array $action
-	 */
-	public $action;
-
-	/**
-	 * The compiled version of the route.
-	 * 
-	 * @var \Syscodes\Bundles\ApplicationBundle\Routing\CompiledRoute|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\CompiledRoute|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/Debug/Exceptions/Resources/views/partials/frames/frame_list.php

Braces +5 added lines, -2 removed lines

@@ -8,7 +8,8 @@ 
 			<div class="frame-info-class">
 			<?php if ($frame->getClass() == '') : ?>
 				<span class="frame-function"><?= e($frame->getFunction()) ?></span>
-			<?php else: ?>
+			<?php else {
+    : ?>
 				<span class="frame-class"><?= e($frame->getClass()) ?></span>
 				<?php if ($frame->getFunction() != '') : ?>
 				<span class="frame-function"><?= e($frame->getFunction()) ?></span>
@@ -20,5 +21,7 @@ 
 			<span class="frame-line"><?= (int) $frame->getLine() ?></span>
 		</div>		
 	</div>		
-<?php endforeach; ?>	
+<?php endforeach;
+}
+?>	
 </aside>
\ No newline at end of file

src/components/Debug/GDebug.php

Indentation +394 added lines, -394 removed lines

@@ -38,414 +38,414 @@
  */
 class GDebug implements DebugContract
 {
-	/**
-	 * Allow Handlers to force the script to quit.
-	 * 
-	 * @var bool $allowQuit
-	 */
-	protected $allowQuit = true;
+    /**
+     * Allow Handlers to force the script to quit.
+     * 
+     * @var bool $allowQuit
+     */
+    protected $allowQuit = true;
 	
-	/**
-	 * Benchmark instance.
-	 * 
-	 * @var string|object $benchmark
-	 */
-	protected $benchmark;
-
-	/**
-	 * The handler stack.
-	 * 
-	 * @var array $handlerStack
-	 */
-	protected $handlerStack = [];
-
-	/**
-	 * The send Http code by default: 500 Internal Server Error.
-	 * 
-	 * @var bool $sendHttpCode
-	 */
-	protected $sendHttpCode = 500;
-
-	/**
-	 * The send output.
-	 * 
-	 * @var bool $sendOutput
-	 */
-	protected $sendOutput = true;
-
-	/**
-	 * The functions of system what control errors and exceptions.
-	 * 
-	 * @var string|object $system
-	 */
-	protected $system;
-
-	/**
-	 * In certain scenarios, like in shutdown handler, we can not throw exceptions.
-	 * 
-	 * @var bool $throwExceptions
-	 */
-	protected $throwExceptions = true;
-
-	/**
-	 * Constructor. The Debug class instance.
-	 * 
-	 * @param  \Syscodes\Components\Debug\Util\System|null  $system
-	 * 
-	 * @return void
-	 */
-	public function __construct(System $system = null)
-	{
-		$this->system    = $system ?: new System;
-		$this->benchmark = new Benchmark;
-	}
-
-	/**
-	 * Catches any uncaught errors and exceptions, including most Fatal errors. Will log the 
-	 * error, display it if display_errors is on, and fire an event that allows custom actions 
-	 * to be taken at this point.
-	 *
-	 * @param  \Throwable  $exception
-	 *
-	 * @return string
-	 */
-	public function handleException(Throwable $exception): string
-	{	
-		// The start benchmark
-		$this->benchmark->start('total_execution', LENEVOR_START);
-
-		$supervisor = $this->getSupervisor($exception);
-
-		// Start buffer
-		$this->system->startOutputBuferring();
-
-		$handlerResponse    = null;
-		$handlerContentType = null;
+    /**
+     * Benchmark instance.
+     * 
+     * @var string|object $benchmark
+     */
+    protected $benchmark;
+
+    /**
+     * The handler stack.
+     * 
+     * @var array $handlerStack
+     */
+    protected $handlerStack = [];
+
+    /**
+     * The send Http code by default: 500 Internal Server Error.
+     * 
+     * @var bool $sendHttpCode
+     */
+    protected $sendHttpCode = 500;
+
+    /**
+     * The send output.
+     * 
+     * @var bool $sendOutput
+     */
+    protected $sendOutput = true;
+
+    /**
+     * The functions of system what control errors and exceptions.
+     * 
+     * @var string|object $system
+     */
+    protected $system;
+
+    /**
+     * In certain scenarios, like in shutdown handler, we can not throw exceptions.
+     * 
+     * @var bool $throwExceptions
+     */
+    protected $throwExceptions = true;
+
+    /**
+     * Constructor. The Debug class instance.
+     * 
+     * @param  \Syscodes\Components\Debug\Util\System|null  $system
+     * 
+     * @return void
+     */
+    public function __construct(System $system = null)
+    {
+        $this->system    = $system ?: new System;
+        $this->benchmark = new Benchmark;
+    }
+
+    /**
+     * Catches any uncaught errors and exceptions, including most Fatal errors. Will log the 
+     * error, display it if display_errors is on, and fire an event that allows custom actions 
+     * to be taken at this point.
+     *
+     * @param  \Throwable  $exception
+     *
+     * @return string
+     */
+    public function handleException(Throwable $exception): string
+    {	
+        // The start benchmark
+        $this->benchmark->start('total_execution', LENEVOR_START);
+
+        $supervisor = $this->getSupervisor($exception);
+
+        // Start buffer
+        $this->system->startOutputBuferring();
+
+        $handlerResponse    = null;
+        $handlerContentType = null;
 		
-		try {
-			foreach (array_reverse($this->handlerStack) as $handler) {			
-				$handler->setDebug($this);
-				$handler->setException($exception);
-				$handler->setSupervisor($supervisor);
+        try {
+            foreach (array_reverse($this->handlerStack) as $handler) {			
+                $handler->setDebug($this);
+                $handler->setException($exception);
+                $handler->setSupervisor($supervisor);
 				
-				$handlerResponse = $handler->handle();
+                $handlerResponse = $handler->handle();
 	
-				// Collect the content type for possible sending in the headers
-				$handlerContentType = method_exists($handler, 'contentType') ? $handler->contentType() : null;
+                // Collect the content type for possible sending in the headers
+                $handlerContentType = method_exists($handler, 'contentType') ? $handler->contentType() : null;
 	
-				if (in_array($handlerResponse, [MainHandler::LAST_HANDLER, MainHandler::QUIT])) {
-					break;
-				}
-			}
+                if (in_array($handlerResponse, [MainHandler::LAST_HANDLER, MainHandler::QUIT])) {
+                    break;
+                }
+            }
 	
-			$quit = $handlerResponse == MainHandler::QUIT && $this->allowQuit();
-		}
-		finally {
-			// Returns the contents of the output buffer
-			$output = $this->system->CleanOutputBuffer();	
-		}
-
-		// Returns the contents of the output buffer for loading time of page
-		$totalTime = $this->benchmark->getElapsedTime('total_execution');
-		$output    = str_replace('{{ elapsed_time }}', $totalTime, $output);
-
-		if ($this->writeToOutput()) {
-			if ($quit) {
-				while ($this->system->getOutputBufferLevel() > 0) {
-					// Cleanes the output buffer
-					$this->system->endOutputBuffering();
-				}
-
-				if (Misc::sendHeaders() && $handlerContentType)	{
-					header("Content-Type: {$handlerContentType}");
-				}
-			}
-
-			$this->writeToOutputBuffer($output);
-		}
-
-		if ($quit) {
-			$this->system->flushOutputBuffer();
-			$this->system->stopException($this->sendHttpCode());
-		}
-
-		return $output;
-	}
-
-	/**
-	 * Allow Handlers to force the script to quit.
-	 * 
-	 * @param  bool|int|null  $exit
-	 * 
-	 * @return bool
-	 */
-	public function allowQuit($exit = null): bool
-	{
-		if (func_num_args() == 0) {
-			return $this->allowQuit;
-		}
-
-		return $this->allowQuit = (bool) $exit;
-	}
-
-	/**
-	 * Lenevor Exception push output directly to the client it the data  
-	 * if they are true, but if it is false, the output will be returned 
-	 * by exception.
-	 * 
-	 * @param  bool|int|null  $send
-	 *
-	 * @return bool
-	 */
-	public function writeToOutput($send = null): bool
-	{
-		if (func_num_args() == 0) {
-			return $this->sendOutput;
-		}
+            $quit = $handlerResponse == MainHandler::QUIT && $this->allowQuit();
+        }
+        finally {
+            // Returns the contents of the output buffer
+            $output = $this->system->CleanOutputBuffer();	
+        }
+
+        // Returns the contents of the output buffer for loading time of page
+        $totalTime = $this->benchmark->getElapsedTime('total_execution');
+        $output    = str_replace('{{ elapsed_time }}', $totalTime, $output);
+
+        if ($this->writeToOutput()) {
+            if ($quit) {
+                while ($this->system->getOutputBufferLevel() > 0) {
+                    // Cleanes the output buffer
+                    $this->system->endOutputBuffering();
+                }
+
+                if (Misc::sendHeaders() && $handlerContentType)	{
+                    header("Content-Type: {$handlerContentType}");
+                }
+            }
+
+            $this->writeToOutputBuffer($output);
+        }
+
+        if ($quit) {
+            $this->system->flushOutputBuffer();
+            $this->system->stopException($this->sendHttpCode());
+        }
+
+        return $output;
+    }
+
+    /**
+     * Allow Handlers to force the script to quit.
+     * 
+     * @param  bool|int|null  $exit
+     * 
+     * @return bool
+     */
+    public function allowQuit($exit = null): bool
+    {
+        if (func_num_args() == 0) {
+            return $this->allowQuit;
+        }
+
+        return $this->allowQuit = (bool) $exit;
+    }
+
+    /**
+     * Lenevor Exception push output directly to the client it the data  
+     * if they are true, but if it is false, the output will be returned 
+     * by exception.
+     * 
+     * @param  bool|int|null  $send
+     *
+     * @return bool
+     */
+    public function writeToOutput($send = null): bool
+    {
+        if (func_num_args() == 0) {
+            return $this->sendOutput;
+        }
 		
-		return $this->sendOutput = (bool) $send;
-	}
+        return $this->sendOutput = (bool) $send;
+    }
 	
-	/**
-	 * Generate output to the browser.
-	 * 
-	 * @param  string  $output
-	 * 
-	 * @return static
-	 */
-	protected function writeToOutputBuffer($output): static
-	{
-		if ($this->sendHttpCode() && Misc::sendHeaders()) {
-			$this->system->setHttpResponseCode($this->sendHttpCode());
-		}
+    /**
+     * Generate output to the browser.
+     * 
+     * @param  string  $output
+     * 
+     * @return static
+     */
+    protected function writeToOutputBuffer($output): static
+    {
+        if ($this->sendHttpCode() && Misc::sendHeaders()) {
+            $this->system->setHttpResponseCode($this->sendHttpCode());
+        }
 		
-		echo $output;
+        echo $output;
 		
-		return $this;
-	}
-
-	/**
-	 * Error handler
-	 *
-	 * This will catch the php native error and treat it as a exception which will 
-	 * provide a full back trace on all errors.
-	 *
-	 * @param  int  $level
-	 * @param  string  $message
-	 * @param  string|null  $file
-	 * @param  int|null  $line
-	 * 
-	 * @return bool
-	 * 
-	 * @throws \ErrorException
-	 */
-	public function handleError(
-		int $level, 
-		string $message, 
-		string $file = null, 
-		int $line = null
-	): bool {
-		if ($level & $this->system->getErrorReportingLevel()) {
-			$exception = new ErrorException($message, $level, $level, $file, $line);
-
-			if ($this->throwExceptions) {
-				throw $exception;
-			} else {
-				$this->handleException($exception);
-			}
-
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Appends a handler to the end of the stack.
-	 * 
-	 * @param  \Callable|\Syscodes\Components\Contracts\Debug\Handler  $handler
-	 * 
-	 * @return static
-	 */
-	public function appendHandler($handler): static
-	{
-		array_unshift($this->handlerStack, $this->resolveHandler($handler));
-
-		return $this;
-	}
-
-	/**
-	 * Prepends a handler to the start of the stack.
-	 * 
-	 * @param  \Callable|\Syscodes\Components\Contracts\Debug\Handler  $handler
-	 * 
-	 * @return static
-	 */
-	public function prependHandler($handler): static
-	{
-		return $this->pushHandler($handler);
-	}
-
-	/**
-	 * Pushes a handler to the end of the stack.
-	 * 
-	 * @param  string|callable  $handler
-	 * 
-	 * @return static
-	 */
-	public function pushHandler($handler): static
-	{
-		$this->handlerStack[] = $this->resolveHandler($handler);
-
-		return $this;
-	}
-
-	/**
-	 * Create a CallbackHandler from callable and throw if handler is invalid.
-	 * 
-	 * @param  \Callable|\Syscodes\Components\Contracts\Debug\Handler  $handler
-	 * 
-	 * @return \Syscodes\Components\Contracts\Debug\Handler
-	 * 
-	 * @throws \InvalidArgumentException If argument is not callable or instance of \Syscodes\Components\Contracts\Debug\Handler
-	 */
-	protected function resolveHandler($handler)
-	{
-		if (is_callable($handler)) {
-			$handler = new CallbackHandler($handler);
-		}
-
-		if ( ! $handler instanceof MainHandler) {
-			throw new InvalidArgumentException(
-				"Argument to " . __METHOD__ . " must be a callable, or instance of ".
-				"Syscodes\Components\\Contracts\\Debug\\Handler"
-			);
-		}
-
-		return $handler;
-	}
-
-	/**
-	 * Returns an array with all handlers, in the order they were added to the stack.
-	 * 
-	 * @return array
-	 */
-	public function getHandlers(): array
-	{
-		return $this->handlerStack;
-	}
-
-	/**
-	 * Clears all handlers in the handlerStack, including the default PleasingPage handler.
-	 * 
-	 * @return static
-	 */
-	public function clearHandlers(): static
-	{
-		$this->handlerStack = [];
-
-		return $this;
-	}
-
-	/**
-	 * Removes the last handler in the stack and returns it.
-	 * 
-	 * @return array|null
-	 */
-	public function popHandler()
-	{
-		return array_pop($this->handlerStack);
-	}
-
-	/**
-	 * Gets supervisor already specified.
-	 * 
-	 * @param  \Throwable  $exception
-	 * 
-	 * @return \Syscodes\Components\Debug\Engine\Supervisor
-	 */
-	protected function getSupervisor(Throwable $exception)
-	{
-		return new Supervisor($exception);
-	}
-
-	/**
-	 * Unregisters all handlers registered by this Debug instance.
-	 * 
-	 * @return void
-	 */
-	public function off(): void
-	{
-		$this->system->restoreExceptionHandler();
-		$this->system->restoreErrorHandler();
-	}
+        return $this;
+    }
+
+    /**
+     * Error handler
+     *
+     * This will catch the php native error and treat it as a exception which will 
+     * provide a full back trace on all errors.
+     *
+     * @param  int  $level
+     * @param  string  $message
+     * @param  string|null  $file
+     * @param  int|null  $line
+     * 
+     * @return bool
+     * 
+     * @throws \ErrorException
+     */
+    public function handleError(
+        int $level, 
+        string $message, 
+        string $file = null, 
+        int $line = null
+    ): bool {
+        if ($level & $this->system->getErrorReportingLevel()) {
+            $exception = new ErrorException($message, $level, $level, $file, $line);
+
+            if ($this->throwExceptions) {
+                throw $exception;
+            } else {
+                $this->handleException($exception);
+            }
+
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Appends a handler to the end of the stack.
+     * 
+     * @param  \Callable|\Syscodes\Components\Contracts\Debug\Handler  $handler
+     * 
+     * @return static
+     */
+    public function appendHandler($handler): static
+    {
+        array_unshift($this->handlerStack, $this->resolveHandler($handler));
+
+        return $this;
+    }
+
+    /**
+     * Prepends a handler to the start of the stack.
+     * 
+     * @param  \Callable|\Syscodes\Components\Contracts\Debug\Handler  $handler
+     * 
+     * @return static
+     */
+    public function prependHandler($handler): static
+    {
+        return $this->pushHandler($handler);
+    }
+
+    /**
+     * Pushes a handler to the end of the stack.
+     * 
+     * @param  string|callable  $handler
+     * 
+     * @return static
+     */
+    public function pushHandler($handler): static
+    {
+        $this->handlerStack[] = $this->resolveHandler($handler);
+
+        return $this;
+    }
+
+    /**
+     * Create a CallbackHandler from callable and throw if handler is invalid.
+     * 
+     * @param  \Callable|\Syscodes\Components\Contracts\Debug\Handler  $handler
+     * 
+     * @return \Syscodes\Components\Contracts\Debug\Handler
+     * 
+     * @throws \InvalidArgumentException If argument is not callable or instance of \Syscodes\Components\Contracts\Debug\Handler
+     */
+    protected function resolveHandler($handler)
+    {
+        if (is_callable($handler)) {
+            $handler = new CallbackHandler($handler);
+        }
+
+        if ( ! $handler instanceof MainHandler) {
+            throw new InvalidArgumentException(
+                "Argument to " . __METHOD__ . " must be a callable, or instance of ".
+                "Syscodes\Components\\Contracts\\Debug\\Handler"
+            );
+        }
+
+        return $handler;
+    }
+
+    /**
+     * Returns an array with all handlers, in the order they were added to the stack.
+     * 
+     * @return array
+     */
+    public function getHandlers(): array
+    {
+        return $this->handlerStack;
+    }
+
+    /**
+     * Clears all handlers in the handlerStack, including the default PleasingPage handler.
+     * 
+     * @return static
+     */
+    public function clearHandlers(): static
+    {
+        $this->handlerStack = [];
+
+        return $this;
+    }
+
+    /**
+     * Removes the last handler in the stack and returns it.
+     * 
+     * @return array|null
+     */
+    public function popHandler()
+    {
+        return array_pop($this->handlerStack);
+    }
+
+    /**
+     * Gets supervisor already specified.
+     * 
+     * @param  \Throwable  $exception
+     * 
+     * @return \Syscodes\Components\Debug\Engine\Supervisor
+     */
+    protected function getSupervisor(Throwable $exception)
+    {
+        return new Supervisor($exception);
+    }
+
+    /**
+     * Unregisters all handlers registered by this Debug instance.
+     * 
+     * @return void
+     */
+    public function off(): void
+    {
+        $this->system->restoreExceptionHandler();
+        $this->system->restoreErrorHandler();
+    }
 	
-	/**
-	 * Registers this instance as an error handler.
-	 * 
-	 * @return void
-	 */
-	public function on() : void
-	{
-		// Set the exception handler
-		$this->system->setExceptionHandler([$this, self::EXCEPTION_HANDLER]);
-		// Set the error handler
-		$this->system->setErrorHandler([$this, self::ERROR_HANDLER]);
-		// Set the handler for shutdown to catch Parse errors
-		$this->system->registerShutdownFunction([$this, self::SHUTDOWN_HANDLER]);
-	}
-
-	/**
-	 * Lenevor Exception will by default send HTTP code 500, but you may wish
-	 * to use 502, 503, or another 5xx family code.
-	 * 
-	 * @param  bool|int  $code
-	 * 
-	 * @return int|false
-	 * 
-	 * @throws \InvalidArgumentException
-	 */
-	public function sendHttpCode($code = null)
-	{
-		if (func_num_args() == 0) {
-			return $this->sendHttpCode;
-		}
+    /**
+     * Registers this instance as an error handler.
+     * 
+     * @return void
+     */
+    public function on() : void
+    {
+        // Set the exception handler
+        $this->system->setExceptionHandler([$this, self::EXCEPTION_HANDLER]);
+        // Set the error handler
+        $this->system->setErrorHandler([$this, self::ERROR_HANDLER]);
+        // Set the handler for shutdown to catch Parse errors
+        $this->system->registerShutdownFunction([$this, self::SHUTDOWN_HANDLER]);
+    }
+
+    /**
+     * Lenevor Exception will by default send HTTP code 500, but you may wish
+     * to use 502, 503, or another 5xx family code.
+     * 
+     * @param  bool|int  $code
+     * 
+     * @return int|false
+     * 
+     * @throws \InvalidArgumentException
+     */
+    public function sendHttpCode($code = null)
+    {
+        if (func_num_args() == 0) {
+            return $this->sendHttpCode;
+        }
 		
-		if ( ! $code) {
-			return $this->sendHttpCode = false;
-		}
+        if ( ! $code) {
+            return $this->sendHttpCode = false;
+        }
 		
-		if ($code === true) {
-			$code = 500;
-		}
+        if ($code === true) {
+            $code = 500;
+        }
 		
-		if ($code < 400 || 600 <= $code) {
-			throw new InvalidArgumentException("Invalid status code {$code}, must be 4xx or 5xx");
-		}
+        if ($code < 400 || 600 <= $code) {
+            throw new InvalidArgumentException("Invalid status code {$code}, must be 4xx or 5xx");
+        }
 		
-		return $this->sendHttpCode = $code;
-	}
-
-	/**
-	 * This will catch errors that are generated at the shutdown level of execution.
-	 *
-	 * @return void
-	 *
-	 * @throws \ErrorException
-	 */
-	public function handleShutdown()
-	{
-		$this->throwExceptions = false;
-
-		$error = $this->system->getLastError();
-
-		// If we've got an error that hasn't been displayed, then convert
-		// it to an Exception and use the Exception handler to display it
-		// to the user
-		if ($error && Misc::isFatalError($error['type'])) {
-			$this->allowQuit = false;
+        return $this->sendHttpCode = $code;
+    }
+
+    /**
+     * This will catch errors that are generated at the shutdown level of execution.
+     *
+     * @return void
+     *
+     * @throws \ErrorException
+     */
+    public function handleShutdown()
+    {
+        $this->throwExceptions = false;
+
+        $error = $this->system->getLastError();
+
+        // If we've got an error that hasn't been displayed, then convert
+        // it to an Exception and use the Exception handler to display it
+        // to the user
+        if ($error && Misc::isFatalError($error['type'])) {
+            $this->allowQuit = false;
 			
-			$this->handleError($error['type'], $error['message'], $error['file'], $error['line']);
-		}
-	}
+            $this->handleError($error['type'], $error['message'], $error['file'], $error['line']);
+        }
+    }
 }
\ No newline at end of file

src/components/Stopwatch/Benchmark.php

Indentation +1 added lines, -1 removed lines

@@ -143,7 +143,7 @@
         $seconds  = (int) ($duration - $hours * 60 * 60 - $minutes * 60); 
         
         if ($seconds <= 0) {
-           return ' ms';
+            return ' ms';
         } elseif ($seconds > 0) {
             return ' s';
         }