lenevor / syscodes

src/components/Support/helpers.php

Spacing +1 added lines, -1 removed lines

@@ -69,7 +69,7 @@
      */
     function dd()
     {
-        array_map(function ($x) {
+        array_map(function($x) {
             var_dump($x);
         },  func_get_args());
             

src/components/Routing/UrlGenerator.php

Spacing +2 added lines, -2 removed lines

@@ -262,7 +262,7 @@ 
 
         $uri = $this->trimUrl($root, $this->replaceRouteParameters($route->getRoute(), $parameters));
 
-        return $forced ? $uri : '/' .ltrim(str_replace($root, '', $uri), '/');
+        return $forced ? $uri : '/'.ltrim(str_replace($root, '', $uri), '/');
     }
     
     /**
@@ -324,7 +324,7 @@ 
      */
     protected function replaceNamedParameters($path, &$parameters)
     {
-        return preg_replace_callback('/\{(.*?)\??\}/', function ($match) use (&$parameters) {
+        return preg_replace_callback('/\{(.*?)\??\}/', function($match) use (&$parameters) {
             return isset($parameters[$match[1]]) ? Arr::pull($parameters, $match[1]) : $match[0];
         }, $path);
     }

src/components/Routing/Route.php

Indentation +645 added lines, -645 removed lines

@@ -40,663 +40,663 @@
  */
 class Route 
 {
-	use Concerns\RouteCondition,
-	    Concerns\RouteDependencyResolver;
+    use Concerns\RouteCondition,
+        Concerns\RouteDependencyResolver;
 	
-	/**
-	 * Action that the route will use when called.
-	 *
-	 * @var \Closure|string|array $action
-	 */
-	public $action;
-
-	/**
-	 * The container instance used by the route.
-	 * 
-	 * @var \Syscodes\Container\Container $container
-	 */
-	protected $container;
-
-	/**
-	 * The controller instance.
-	 * 
-	 * @var string $controller
-	 */
-	public $controller;
-
-	/**
-	 * The default values for the route.
-	 * 
-	 * @var array $defaults
-	 */
-	public $defaults = [];
-
-	/**
-	 * Variable of HTTP method.
-	 *  
-	 * @var array|string $method
-	 */
-	public $method;
-
-	/**
-	 * The array of matched parameters.
-	 * 
-	 * @var array $parameters
-	 */
-	public $parameters = [];
-
-	/**
-	 * The parameter names for the route.
-	 * 
-	 * @var string|null $parameterNames
-	 */
-	public $parameterNames;
-
-	/**
-	* Patterns that should be replaced.
-	*
-	* @var array $patterns 
-	*/
-	public $patterns = [
-		'~/~'                    =>  '\/',               // Slash
-		'~{an:[^\/{}]+}~'        => '([0-9a-zA-Z]++)',   // Placeholder accepts alphabetic and numeric chars
-		'~{n:[^\/{}]+}~'         => '([0-9]++)',         // Placeholder accepts only numeric
-		'~{a:[^\/{}]+}~'         => '([a-zA-Z]++)',      // Placeholder accepts only alphabetic chars
-		'~{w:[^\/{}]+}~'         => '([0-9a-zA-Z-_]++)', // Placeholder accepts alphanumeric and underscore
-		'~{\*:[^\/{}]+}~'        => '(.++)',             // Placeholder match rest of url
-		'~(\\\/)?{\?:[^\/{}]+}~' => '\/?([^\/]*)',		 // Optional placeholder
-		'~{[^\/{}]+}~'           => '([^\/]++)'			 // Normal placeholder
-	];
-
-	/**
-	 * The URI pattern the route responds to.
-	 *
-	 * @var array $uri
-	 */
-	public $uri = [];
-
-	/**
-	 * Contains the arguments of the current route.
-	 *
-	 * @var array $where
-	 */
-	public $wheres = [];
-
-	/**
-	 * Constructor. Initialize route.
-	 *
-	 * @param  array|string|null  $method  (null by default)
-	 * @param  string|null  $uri  (null by default)
-	 * @param  \Closure|string|null  $action  (null by default)
-	 *
-	 * @return void
-	 */
-	public function __construct($method = null, $uri = null, $action = null)
-	{
-		$this->uri = $uri;
-
-		// Set the method
-		$this->parseMethod($method);
-
-		// Set the action
-		$this->parseAction($action);
-
-		if (is_null($prefix = Arr::get($this->action, 'prefix'))) {
-			$this->prefix($prefix);
-		}
-	}
-
-	// Getters
-
-	/**
-	 * Get the action of the current route.
-	 *
-	 * @return \Closure|string
-	 */
-	public function getAction()
-	{
-		return $this->action;
-	}
-
-	/**
-	 * Get the arguments of the current route.
-	 *
-	 * @return string
-	 */
-	public function getArguments()
-	{
-		return $this->wheres;
-	}
-
-	/**
-	 * Get the controller instance for the route.
-	 * 
-	 * @return mixed
-	 */
-	public function getController()
-	{
-		if ( ! $this->controller) {
-			$class = $this->parseControllerCallback()[0];
+    /**
+     * Action that the route will use when called.
+     *
+     * @var \Closure|string|array $action
+     */
+    public $action;
+
+    /**
+     * The container instance used by the route.
+     * 
+     * @var \Syscodes\Container\Container $container
+     */
+    protected $container;
+
+    /**
+     * The controller instance.
+     * 
+     * @var string $controller
+     */
+    public $controller;
+
+    /**
+     * The default values for the route.
+     * 
+     * @var array $defaults
+     */
+    public $defaults = [];
+
+    /**
+     * Variable of HTTP method.
+     *  
+     * @var array|string $method
+     */
+    public $method;
+
+    /**
+     * The array of matched parameters.
+     * 
+     * @var array $parameters
+     */
+    public $parameters = [];
+
+    /**
+     * The parameter names for the route.
+     * 
+     * @var string|null $parameterNames
+     */
+    public $parameterNames;
+
+    /**
+     * Patterns that should be replaced.
+     *
+     * @var array $patterns 
+     */
+    public $patterns = [
+        '~/~'                    =>  '\/',               // Slash
+        '~{an:[^\/{}]+}~'        => '([0-9a-zA-Z]++)',   // Placeholder accepts alphabetic and numeric chars
+        '~{n:[^\/{}]+}~'         => '([0-9]++)',         // Placeholder accepts only numeric
+        '~{a:[^\/{}]+}~'         => '([a-zA-Z]++)',      // Placeholder accepts only alphabetic chars
+        '~{w:[^\/{}]+}~'         => '([0-9a-zA-Z-_]++)', // Placeholder accepts alphanumeric and underscore
+        '~{\*:[^\/{}]+}~'        => '(.++)',             // Placeholder match rest of url
+        '~(\\\/)?{\?:[^\/{}]+}~' => '\/?([^\/]*)',		 // Optional placeholder
+        '~{[^\/{}]+}~'           => '([^\/]++)'			 // Normal placeholder
+    ];
+
+    /**
+     * The URI pattern the route responds to.
+     *
+     * @var array $uri
+     */
+    public $uri = [];
+
+    /**
+     * Contains the arguments of the current route.
+     *
+     * @var array $where
+     */
+    public $wheres = [];
+
+    /**
+     * Constructor. Initialize route.
+     *
+     * @param  array|string|null  $method  (null by default)
+     * @param  string|null  $uri  (null by default)
+     * @param  \Closure|string|null  $action  (null by default)
+     *
+     * @return void
+     */
+    public function __construct($method = null, $uri = null, $action = null)
+    {
+        $this->uri = $uri;
+
+        // Set the method
+        $this->parseMethod($method);
+
+        // Set the action
+        $this->parseAction($action);
+
+        if (is_null($prefix = Arr::get($this->action, 'prefix'))) {
+            $this->prefix($prefix);
+        }
+    }
+
+    // Getters
+
+    /**
+     * Get the action of the current route.
+     *
+     * @return \Closure|string
+     */
+    public function getAction()
+    {
+        return $this->action;
+    }
+
+    /**
+     * Get the arguments of the current route.
+     *
+     * @return string
+     */
+    public function getArguments()
+    {
+        return $this->wheres;
+    }
+
+    /**
+     * Get the controller instance for the route.
+     * 
+     * @return mixed
+     */
+    public function getController()
+    {
+        if ( ! $this->controller) {
+            $class = $this->parseControllerCallback()[0];
  
-			$this->controller = $this->container->make(ltrim($class, '\\'));
-		}
-
-		return $this->controller;
-	}
-
-	/**
-	 * Get the controller method used for the route.
-	 * 
-	 * @return string
-	 */
-	public function getControllerMethod()
-	{
-		return $this->parseControllerCallback()[1];
-	}
-
-	/**
-	 * Get the request method of the current route.
-	 *
-	 * @return array
-	 */
-	public function getMethod()
-	{
-		return $this->method;
-	}
-
-	/**
-	 * Get the url of the current route.
-	 *
-	 * @return string
-	 */
-	public function getName()
-	{
-		return $this->action['as'] ?? null;
-	}
-
-	/**
-	 * Get the url of the current route.
-	 *
-	 * @return string
-	 */
-	public function getRoute()
-	{
-		return $this->uri;
-	}
-
-	/**
-	 * Get or set the domain for the route.
-	 * 
-	 * @param  string|null  $domain  (null by default)
-	 * 
-	 * @return $this
-	 */
-	public function domain($domain = null)
-	{
-		if (is_null($domain)) {
-			return $this->getDomain();
-		}
-
-		$this->action['domain'] = $this->parseRoute($domain);
-
-		return $this;
-	}
-
-	/**
-	 * Get the domain defined for the route.
-	 * 
-	 * @return string|null
-	 */
-	public function getDomain()
-	{
-		return isset($this->action['domain'])
-				? str_replace(['http://', 'https://'], '', $this->action['domain'])
-				: null;
-	}
-
-	/**
-	 * Parse the controller.
-	 * 
-	 * @return array
-	 */
-	public function parseControllerCallback()
-	{
-		return Str::parseCallback($this->action['uses']);
-	}
+            $this->controller = $this->container->make(ltrim($class, '\\'));
+        }
+
+        return $this->controller;
+    }
+
+    /**
+     * Get the controller method used for the route.
+     * 
+     * @return string
+     */
+    public function getControllerMethod()
+    {
+        return $this->parseControllerCallback()[1];
+    }
+
+    /**
+     * Get the request method of the current route.
+     *
+     * @return array
+     */
+    public function getMethod()
+    {
+        return $this->method;
+    }
+
+    /**
+     * Get the url of the current route.
+     *
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->action['as'] ?? null;
+    }
+
+    /**
+     * Get the url of the current route.
+     *
+     * @return string
+     */
+    public function getRoute()
+    {
+        return $this->uri;
+    }
+
+    /**
+     * Get or set the domain for the route.
+     * 
+     * @param  string|null  $domain  (null by default)
+     * 
+     * @return $this
+     */
+    public function domain($domain = null)
+    {
+        if (is_null($domain)) {
+            return $this->getDomain();
+        }
+
+        $this->action['domain'] = $this->parseRoute($domain);
+
+        return $this;
+    }
+
+    /**
+     * Get the domain defined for the route.
+     * 
+     * @return string|null
+     */
+    public function getDomain()
+    {
+        return isset($this->action['domain'])
+                ? str_replace(['http://', 'https://'], '', $this->action['domain'])
+                : null;
+    }
+
+    /**
+     * Parse the controller.
+     * 
+     * @return array
+     */
+    public function parseControllerCallback()
+    {
+        return Str::parseCallback($this->action['uses']);
+    }
 	
-	/**
-	 * Checks whether the route's action is a controller.
-	 * 
-	 * @return bool
-	 */
-	public function isControllerAction()
-	{
-		return is_string($this->action['uses']);
-	}
-
-	/**
-	 * Get the dispatcher for the route's controller.
-	 * 
-	 * @return \Syscodes\Controller\ControllerDispatcher
-	 */
-	private function controllerDispatcher()
-	{
-		return new ControllerDispatcher($this->container);
-	}
-
-	// Setters
+    /**
+     * Checks whether the route's action is a controller.
+     * 
+     * @return bool
+     */
+    public function isControllerAction()
+    {
+        return is_string($this->action['uses']);
+    }
+
+    /**
+     * Get the dispatcher for the route's controller.
+     * 
+     * @return \Syscodes\Controller\ControllerDispatcher
+     */
+    private function controllerDispatcher()
+    {
+        return new ControllerDispatcher($this->container);
+    }
+
+    // Setters
 	
-	/**
-	 * Run the route action and return the response.
-	 * 
-	 * @return mixed
-	 */
-	public function runResolver()
-	{
-		$this->container = $this->container ?: new Container;
-
-		try {
-			if ($this->isControllerAction()) {
-				return $this->runResolverController();
-			}
-
-			return $this->runResolverCallable();
-		} catch (HttpResponseException $e) {
-			return $e->getResponse();
-		}
-	}
-
-	/**
-	 * Run the route action and return the response.
-	 *  
-	 * @return mixed
-	 */
-	protected function runResolverCallable()
-	{
-		$callable = $this->action['uses'];
-
-		return $callable(...array_values($this->resolveMethodDependencies(
-			$this->parametersWithouNulls(), new ReflectionFunction($this->action['uses'])
-		)));
-	}
-
-	/**
-	 * Run the route action and return the response.
-	 * 
-	 * @return mixed
-	 */
-	protected function runResolverController()
-	{
-		return $this->controllerDispatcher()->dispatch($this, $this->getController(), $this->getControllerMethod());
-	}
-
-	/**
-	 * Set the action.
-	 *
-	 * @param  \Closure|string  $action
-	 *
-	 * @return $this
-	 *
-	 * @throws \InvalidArgumentException
-	 */
-	public function parseAction($action)
-	{
-		if ( ! (is_object($action) && ($action instanceof Closure)) && ($action === null || $action === '')) {
-			throw new InvalidArgumentException(__('route.actionClosureOrFunction'));
-		}
-
-		$this->action = RouteAction::parse($this->uri, $action);
-
-		return $this;
-	}
-
-	/**
-	 * Set the method of the current route.
-	 *
-	 * @param  array  $method
-	 *
-	 * @return string $this
-	 * 
-	 * @throws \InvalidArgumentException
-	 */
-	public function parseMethod($method)
-	{
-		if ($method === null || ! is_array($method) || empty($method)) {
-			throw new InvalidArgumentException(__('route.methodNotProvided'));
+    /**
+     * Run the route action and return the response.
+     * 
+     * @return mixed
+     */
+    public function runResolver()
+    {
+        $this->container = $this->container ?: new Container;
+
+        try {
+            if ($this->isControllerAction()) {
+                return $this->runResolverController();
+            }
+
+            return $this->runResolverCallable();
+        } catch (HttpResponseException $e) {
+            return $e->getResponse();
+        }
+    }
+
+    /**
+     * Run the route action and return the response.
+     *  
+     * @return mixed
+     */
+    protected function runResolverCallable()
+    {
+        $callable = $this->action['uses'];
+
+        return $callable(...array_values($this->resolveMethodDependencies(
+            $this->parametersWithouNulls(), new ReflectionFunction($this->action['uses'])
+        )));
+    }
+
+    /**
+     * Run the route action and return the response.
+     * 
+     * @return mixed
+     */
+    protected function runResolverController()
+    {
+        return $this->controllerDispatcher()->dispatch($this, $this->getController(), $this->getControllerMethod());
+    }
+
+    /**
+     * Set the action.
+     *
+     * @param  \Closure|string  $action
+     *
+     * @return $this
+     *
+     * @throws \InvalidArgumentException
+     */
+    public function parseAction($action)
+    {
+        if ( ! (is_object($action) && ($action instanceof Closure)) && ($action === null || $action === '')) {
+            throw new InvalidArgumentException(__('route.actionClosureOrFunction'));
+        }
+
+        $this->action = RouteAction::parse($this->uri, $action);
+
+        return $this;
+    }
+
+    /**
+     * Set the method of the current route.
+     *
+     * @param  array  $method
+     *
+     * @return string $this
+     * 
+     * @throws \InvalidArgumentException
+     */
+    public function parseMethod($method)
+    {
+        if ($method === null || ! is_array($method) || empty($method)) {
+            throw new InvalidArgumentException(__('route.methodNotProvided'));
 			
-		}
-
-		foreach ($method as $httpMethod) {
-			if ( ! in_array($httpMethod, ['GET', 'POST', 'PUT', 'DELETE', 'PATCH', 'OPTIONS', 'HEAD', 'ANY'])) {
-				throw new InvalidArgumentException(__('route.methodNotAllowed'));				
-			}
-		}
-
-	    $this->method = $method;
-
-	    return $this;
-	}
-
-	/**
-	 * Set the route.
-	 *
-	 * @param  string  $uri
-	 *
-	 * @return string
-	 *
-	 * @throws  \InvalidArgumentException
-	 */
-	public function parseRoute($uri)
-	{
-		if ($uri === null) {
-			throw new InvalidArgumentException(__('route.uriNotProvided'));
-		}	
-
-		$this->uri = $this->parseRoutePath($uri);
-
-		return $this;
-	}
-
-	/**
-	 * Replace word patterns with regex in route uri.
-	 * 
-	 * @param  string  $uri
-	 * 
-	 * @return string
-	 */
-	protected function parseRoutePath($uri)
-	{
-		$uri = trim($uri, '\/?');
-		$uri = trim($uri, '\/');
+        }
+
+        foreach ($method as $httpMethod) {
+            if ( ! in_array($httpMethod, ['GET', 'POST', 'PUT', 'DELETE', 'PATCH', 'OPTIONS', 'HEAD', 'ANY'])) {
+                throw new InvalidArgumentException(__('route.methodNotAllowed'));				
+            }
+        }
+
+        $this->method = $method;
+
+        return $this;
+    }
+
+    /**
+     * Set the route.
+     *
+     * @param  string  $uri
+     *
+     * @return string
+     *
+     * @throws  \InvalidArgumentException
+     */
+    public function parseRoute($uri)
+    {
+        if ($uri === null) {
+            throw new InvalidArgumentException(__('route.uriNotProvided'));
+        }	
+
+        $this->uri = $this->parseRoutePath($uri);
+
+        return $this;
+    }
+
+    /**
+     * Replace word patterns with regex in route uri.
+     * 
+     * @param  string  $uri
+     * 
+     * @return string
+     */
+    protected function parseRoutePath($uri)
+    {
+        $uri = trim($uri, '\/?');
+        $uri = trim($uri, '\/');
 		
-		preg_match_all('/\{([\w\:]+?)\??\}/', $uri, $matches);
+        preg_match_all('/\{([\w\:]+?)\??\}/', $uri, $matches);
 		
-		foreach ($matches[1] as $match) {
-			if (strpos($match, ':') === false) {
-				continue;
-			}
+        foreach ($matches[1] as $match) {
+            if (strpos($match, ':') === false) {
+                continue;
+            }
 			
-			$pattern  = array_keys($this->patterns);
-			$replace  = array_values($this->patterns);
-			$segments = explode(':', trim($match, '{}?'));
+            $pattern  = array_keys($this->patterns);
+            $replace  = array_values($this->patterns);
+            $segments = explode(':', trim($match, '{}?'));
 			
-			$uri = strpos($match, ':') !== false
-					? preg_replace($pattern, $replace, $uri)
-					: str_replace($match, '{'.$segments[0].'}', $uri);
-		}
+            $uri = strpos($match, ':') !== false
+                    ? preg_replace($pattern, $replace, $uri)
+                    : str_replace($match, '{'.$segments[0].'}', $uri);
+        }
 		
-		return $uri;
-	}
-
-	/**
-	 * Add a prefix to the route URI.
-	 * 
-	 * @param  string  $prefix
-	 * 
-	 * @return $this
-	 */
-	public function prefix($prefix)
-	{
-		if ( ! empty($newPrefix = trim(rtrim($prefix, '/').'/'.ltrim($this->action['prefix'] ?? '', '/'), '/'))) {
-			$this->action['prefix'] = $newPrefix;
-		}
+        return $uri;
+    }
+
+    /**
+     * Add a prefix to the route URI.
+     * 
+     * @param  string  $prefix
+     * 
+     * @return $this
+     */
+    public function prefix($prefix)
+    {
+        if ( ! empty($newPrefix = trim(rtrim($prefix, '/').'/'.ltrim($this->action['prefix'] ?? '', '/'), '/'))) {
+            $this->action['prefix'] = $newPrefix;
+        }
 		
-		$uri = rtrim($prefix, '/').'/'.ltrim($this->uri, '/');
+        $uri = rtrim($prefix, '/').'/'.ltrim($this->uri, '/');
 		
-		return $this->parseRoute($uri !== '/' ? trim($uri, '/') : $uri);
-	}
-
-	/**
-	 * Set the action array for the route.
-	 * 
-	 * @param  array  $action
-	 * 
-	 * @return $this
-	 */
-	public function setAction(array $action)
-	{
-		$this->action = $action;
-
-		if (isset($this->action['domain'])) {
-			$this->domain($this->action['domain']);
-		}
+        return $this->parseRoute($uri !== '/' ? trim($uri, '/') : $uri);
+    }
+
+    /**
+     * Set the action array for the route.
+     * 
+     * @param  array  $action
+     * 
+     * @return $this
+     */
+    public function setAction(array $action)
+    {
+        $this->action = $action;
+
+        if (isset($this->action['domain'])) {
+            $this->domain($this->action['domain']);
+        }
 		
-		return $this;
-	}
-
-	/**
-	 * Set the name.
-	 *
-	 * @param  string  $name
-	 *
-	 * @return string
-	 */
-	public function name($name)
-	{
-		$this->action['as'] = isset($this->action['as']) ? $this->action['as'].$name : $name;
-
-		return $this;
-	}
-
-	/**
-	 * Determine whether the route's name matches the given patterns.
-	 * 
-	 * @param  mixed  ...$patterns
-	 * 
-	 * @return bool
-	 */
-	public function named(...$patterns)
-	{
-		if (is_null($routeName = $this->getName())) {
-			return false;
-		}
-
-		foreach ($patterns as $pattern) {
-			if (Str::is($pattern, $routeName)) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Set a default value for the route.
-	 * 
-	 * @param  string  $key
-	 * @param  mixed   $value
-	 * 
-	 * @return $this
-	 */
-	public function defaults($key, $value)
-	{
-		$this->defaults[$key] = $value;
-
-		return $this;
-	}
-
-	/**
-	 * Set a default values for the route.
-	 * 
-	 * @param  string  $defaults
-	 * 
-	 * @return $this
-	 */
-	public function setDefaults(array $defaults)
-	{
-		$this->defaults = $defaults;
-
-		return $this;
-	}
-
-	/**
-	 * Set the where.
-	 *
-	 * @param  array|string  $name
-	 * @param  string|null  $expression  (null by default)
-	 *
-	 * @return $this
-	 */
-	public function where($name, string $expression = null)
-	{
-		$wheres = is_array($name) ? $name : [$name => $expression];
+        return $this;
+    }
+
+    /**
+     * Set the name.
+     *
+     * @param  string  $name
+     *
+     * @return string
+     */
+    public function name($name)
+    {
+        $this->action['as'] = isset($this->action['as']) ? $this->action['as'].$name : $name;
+
+        return $this;
+    }
+
+    /**
+     * Determine whether the route's name matches the given patterns.
+     * 
+     * @param  mixed  ...$patterns
+     * 
+     * @return bool
+     */
+    public function named(...$patterns)
+    {
+        if (is_null($routeName = $this->getName())) {
+            return false;
+        }
+
+        foreach ($patterns as $pattern) {
+            if (Str::is($pattern, $routeName)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Set a default value for the route.
+     * 
+     * @param  string  $key
+     * @param  mixed   $value
+     * 
+     * @return $this
+     */
+    public function defaults($key, $value)
+    {
+        $this->defaults[$key] = $value;
+
+        return $this;
+    }
+
+    /**
+     * Set a default values for the route.
+     * 
+     * @param  string  $defaults
+     * 
+     * @return $this
+     */
+    public function setDefaults(array $defaults)
+    {
+        $this->defaults = $defaults;
+
+        return $this;
+    }
+
+    /**
+     * Set the where.
+     *
+     * @param  array|string  $name
+     * @param  string|null  $expression  (null by default)
+     *
+     * @return $this
+     */
+    public function where($name, string $expression = null)
+    {
+        $wheres = is_array($name) ? $name : [$name => $expression];
 		
-		foreach ($wheres as $name => $expression) {
-			$this->wheres[$name] = $expression;
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Bind the route to a given request for execution.
-	 * 
-	 * @param  \Syscodes\Http\Request  $request
-	 * 
-	 * @return $this
-	 */
-	public function bind(Request $request)
-	{
-		$this->parameters = (new RouteParamBinding($this))->parameters($request);
-
-		return $this;
-	}
-
-	/**
-	 * Get all of the parameter names for the route.
-	 * 
-	 * @return array
-	 */
-	public function parameterNames()
-	{
-		if (isset($this->parameterNames)) {
-			return $this->parameterNames;
-		}
-
-		return $this->parameterNames = $this->compileParamNames();
-	}
-
-	/**
-	 * Get the parameter names for the route.
-	 * 
-	 * @return array
-	 */
-	protected function compileParamNames()
-	{
-		preg_match_all('~[^\/\{(.*?)\}]~', $this->domain().$this->uri, $matches);
-
-		return array_map(function ($match) {
-			return trim($match, '?');
-		}, $matches[0]);
-	}
-
-	/**
-	 * Get a given parameter from the route.
-	 * 
-	 * @param  string  $name
-	 * @param  mixed  $default  (null by default)
-	 * 
-	 * @return array
-	 */
-	public function parameter($name, $default = null)
-	{
-		return Arr::get($this->parameters(), $name, $default);
-	}
-
-	/**
-	 * Set a parameter to the given value.
-	 * 
-	 * @param  string  $name
-	 * @param  mixed  $value
-	 * 
-	 * @return array
-	 */
-	public function setParameter($name, $value)
-	{
-		$this->parameters();
-
-		$this->parameters[$name] = $value;
-	}
-
-	/**
-	 * Get the key / value list of parameters without null values.
-	 * 
-	 * @return array
-	 */
-	public function parametersWithouNulls()
-	{
-		return array_filter($this->parameters(), function ($parameter) {
-			return ! is_null($parameter);
-		});
-	}
-
-	/**
-	 * Get the key / value list of parameters for the route.
-	 * 
-	 * @return array
-	 */
-	public function parameters()
-	{
-		if (isset($this->parameters)) {
-			return $this->parameters;
-		}
-
-		throw new LogicException('The route is not bound.');
-	}
-
-	/**
-	 * Determine if the route only responds to HTTP requests.
-	 * 
-	 * @return bool
-	 */
-	public function httpOnly()
-	{
-		return in_array('http', $this->action, true);
-	}
-
-	/**
-	 * Determine if the route only responds to HTTPS requests.
-	 * 
-	 * @return bool
-	 */
-	public function httpsOnly()
-	{
-		return $this->secure();
-	}
-
-	/**
-	 * Determine if the route only responds to HTTPS requests.
-	 * 
-	 * @return bool
-	 */
-	public function secure()
-	{
-		return in_array('https', $this->action, true);
-	}
-
-	/**
-	 * Set the container instance on the route.
-	 * 
-	 * @param  \Syscodes\Container\Container  $container
-	 * 
-	 * @return $this
-	 */
-	public function setContainer(Container $container)
-	{
-		$this->container = $container;
-
-		return $this;
-	}
-
-	/**
-	 * Dynamically access route parameters.
-	 * 
-	 * @param  string  $key
-	 * 
-	 * @return mixed
-	 */
-	public function __get($key)
-	{
-		return $this->parameter($key);
-	}
+        foreach ($wheres as $name => $expression) {
+            $this->wheres[$name] = $expression;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Bind the route to a given request for execution.
+     * 
+     * @param  \Syscodes\Http\Request  $request
+     * 
+     * @return $this
+     */
+    public function bind(Request $request)
+    {
+        $this->parameters = (new RouteParamBinding($this))->parameters($request);
+
+        return $this;
+    }
+
+    /**
+     * Get all of the parameter names for the route.
+     * 
+     * @return array
+     */
+    public function parameterNames()
+    {
+        if (isset($this->parameterNames)) {
+            return $this->parameterNames;
+        }
+
+        return $this->parameterNames = $this->compileParamNames();
+    }
+
+    /**
+     * Get the parameter names for the route.
+     * 
+     * @return array
+     */
+    protected function compileParamNames()
+    {
+        preg_match_all('~[^\/\{(.*?)\}]~', $this->domain().$this->uri, $matches);
+
+        return array_map(function ($match) {
+            return trim($match, '?');
+        }, $matches[0]);
+    }
+
+    /**
+     * Get a given parameter from the route.
+     * 
+     * @param  string  $name
+     * @param  mixed  $default  (null by default)
+     * 
+     * @return array
+     */
+    public function parameter($name, $default = null)
+    {
+        return Arr::get($this->parameters(), $name, $default);
+    }
+
+    /**
+     * Set a parameter to the given value.
+     * 
+     * @param  string  $name
+     * @param  mixed  $value
+     * 
+     * @return array
+     */
+    public function setParameter($name, $value)
+    {
+        $this->parameters();
+
+        $this->parameters[$name] = $value;
+    }
+
+    /**
+     * Get the key / value list of parameters without null values.
+     * 
+     * @return array
+     */
+    public function parametersWithouNulls()
+    {
+        return array_filter($this->parameters(), function ($parameter) {
+            return ! is_null($parameter);
+        });
+    }
+
+    /**
+     * Get the key / value list of parameters for the route.
+     * 
+     * @return array
+     */
+    public function parameters()
+    {
+        if (isset($this->parameters)) {
+            return $this->parameters;
+        }
+
+        throw new LogicException('The route is not bound.');
+    }
+
+    /**
+     * Determine if the route only responds to HTTP requests.
+     * 
+     * @return bool
+     */
+    public function httpOnly()
+    {
+        return in_array('http', $this->action, true);
+    }
+
+    /**
+     * Determine if the route only responds to HTTPS requests.
+     * 
+     * @return bool
+     */
+    public function httpsOnly()
+    {
+        return $this->secure();
+    }
+
+    /**
+     * Determine if the route only responds to HTTPS requests.
+     * 
+     * @return bool
+     */
+    public function secure()
+    {
+        return in_array('https', $this->action, true);
+    }
+
+    /**
+     * Set the container instance on the route.
+     * 
+     * @param  \Syscodes\Container\Container  $container
+     * 
+     * @return $this
+     */
+    public function setContainer(Container $container)
+    {
+        $this->container = $container;
+
+        return $this;
+    }
+
+    /**
+     * Dynamically access route parameters.
+     * 
+     * @param  string  $key
+     * 
+     * @return mixed
+     */
+    public function __get($key)
+    {
+        return $this->parameter($key);
+    }
 }
\ No newline at end of file

src/components/Routing/Concerns/RouteResolver.php

Indentation +84 added lines, -84 removed lines

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

src/components/Routing/ResourceRegister.php

Spacing +1 added lines, -1 removed lines

@@ -339,7 +339,7 @@
      */
     protected function getNestedResourceUri(array $segments)
     {
-        return implode('/', array_map(function ($segment) {
+        return implode('/', array_map(function($segment) {
             return $segment.'/{'.$this->getResourceWilcard($segment).'}';
         }, $segments));
     }

src/components/Routing/Router.php

Indentation +557 added lines, -557 removed lines

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

Spacing +2 added lines, -2 removed lines

@@ -227,7 +227,7 @@ 
 	 */
 	public function redirect($uri, $destination, $status = 302)
 	{
-		return $this->any($uri, function () use ($destination, $status) {
+		return $this->any($uri, function() use ($destination, $status) {
 			return new RedirectResponse($destination, $status);
 		});
 	}
@@ -243,7 +243,7 @@ 
 	 */
 	public function view($uri, $view, $data = [])
 	{
-		return $this->match(['GET', 'HEAD'], $uri, function () use ($view, $data) {
+		return $this->match(['GET', 'HEAD'], $uri, function() use ($view, $data) {
 			return $this->container->make('view')->make($view, $data);
 		});
 	}

src/components/Routing/RouteGroup.php

Indentation +78 added lines, -78 removed lines

@@ -31,97 +31,97 @@
  */
 class RouteGroup
 {
- 	/**
-	 * Merge the given group attributes.
-	 * 
-	 * @param  array  $new
-	 * @param  array  $old
-	 * 
-	 * @return array
-	 */
-	public static function mergeGroup($new, $old)
-	{
-		if (isset($new['domain'])) {
-			unset($old['domain']);
-		}
+        /**
+         * Merge the given group attributes.
+         * 
+         * @param  array  $new
+         * @param  array  $old
+         * 
+         * @return array
+         */
+    public static function mergeGroup($new, $old)
+    {
+        if (isset($new['domain'])) {
+            unset($old['domain']);
+        }
 
-		$new = array_merge(static::formatUseAs($new, $old), [
+        $new = array_merge(static::formatUseAs($new, $old), [
             'namespace' => static::formatUseNamespace($new, $old),
             'prefix' => static::formatUsePrefix($new, $old),
             '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)
-	{
-		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)
+    {
+        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
-	 * 
-	 * @return string|null
-	 */
-	protected static function formatUsePrefix($new, $old)
-	{
-		$old = $old['prefix'] ?? null;
+    /**
+     * Format the prefix for the new group attributes.
+     * 
+     * @param  array  $new
+     * @param  array  $old
+     * 
+     * @return string|null
+     */
+    protected static function formatUsePrefix($new, $old)
+    {
+        $old = $old['prefix'] ?? null;
 
-		return isset($new['prefix']) 
-					? trim($old, '/').'/'.trim($new['prefix'], '/')
-					: $old;
-	}
+        return isset($new['prefix']) 
+                    ? trim($old, '/').'/'.trim($new['prefix'], '/')
+                    : $old;
+    }
 
-	/**
-	 * Format the "wheres" for the new group attributes.
-	 * 
-	 * @param  array  $new
-	 * @param  array  $old
-	 * 
-	 * @return array
-	 */
-	protected static function formatUseWhere($new, $old)
-	{
-		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)
+    {
+        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)
-	{
-		if (isset($old['as'])) {
+    /**
+     * Format the "as" clause of the new group attributes.
+     * 
+     * @param  array  $new
+     * @param  array  $old
+     * 
+     * @return array
+     */
+    protected static function formatUseAs($new, $old)
+    {
+        if (isset($old['as'])) {
             $new['as'] = $old['as'].($new['as'] ?? '');
         }
 
-		return $new;
-	}
+        return $new;
+    }
 }
\ No newline at end of file

src/components/Routing/RouteParamBinding.php

Spacing +1 added lines, -1 removed lines

@@ -95,7 +95,7 @@
 
         $parameters = array_intersect_key($matches, array_values($parameterNames));
         
-        return array_filter($parameters, function ($value) {
+        return array_filter($parameters, function($value) {
             return (is_string($value) && strlen($value) > 0);
         });
     }