lenevor / syscodes

src/components/Database/Query/Processors/SqlServerProcessor.php

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
      */
     public function processColumnListing($results)
     {
-        return array_map(function ($result) {
+        return array_map(function($result) {
             return ((object) $result)->column_name;
         }, $results);
     }

src/components/Database/Query/Processors/SQLiteProcessor.php

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
      */
     public function accessColumnListing($results)
     {
-        return array_map(function ($result) {
+        return array_map(function($result) {
             return ((object) $result)->column_name;
         }, $results);
     }

src/components/Database/Connectors/PostgresConnector.php

Indentation +7 added lines, -7 removed lines

@@ -66,13 +66,13 @@
         return $connection;
     }
 
-     /**
-     * Create a DSN string from a configuration.
-     * 
-     * @param  array  $config
-     * 
-     * @return string
-     */
+        /**
+         * Create a DSN string from a configuration.
+         * 
+         * @param  array  $config
+         * 
+         * @return string
+         */
     protected function getDsn(array $config)
     {
         extract($config, EXTR_SKIP);

src/components/Routing/RouteFileRegister.php

Indentation -1 removed lines

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

src/components/Routing/RoutingServiceProvider.php

Spacing +3 added lines, -3 removed lines

@@ -53,7 +53,7 @@ 
      */
     protected function registerRouter()
     {
-        $this->app->singleton('router', function ($app) {
+        $this->app->singleton('router', function($app) {
             return new Router($app);
         });
     }
@@ -77,7 +77,7 @@ 
      */
     protected function registerUrlGenerator()
     {
-        $this->app->singleton('url', function ($app) {
+        $this->app->singleton('url', function($app) {
             
             $routes = $app['router']->getRoutes();
 
@@ -93,7 +93,7 @@ 
      */
     protected function registerRedirector()
     {
-        $this->app->singleton('redirect', function ($app) {
+        $this->app->singleton('redirect', function($app) {
             return new Redirector($app['url']);
         });
     }

src/components/Routing/Route.php

Spacing +8 added lines, -8 removed lines

@@ -99,13 +99,13 @@ 
 	* @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
+		'~/~'                    =>  '\/', // 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
+		'~{\*:[^\/{}]+}~'        => '(.++)', // Placeholder match rest of url
+		'~(\\\/)?{\?:[^\/{}]+}~' => '\/?([^\/]*)', // Optional placeholder
 		'~{[^\/{}]+}~'           => '([^\/]++)'			 // Normal placeholder
 	];
 
@@ -608,7 +608,7 @@ 
 	{
 		preg_match_all('~[^\/\{(.*?)\}]~', $this->domain().$this->uri, $matches);
 
-		return array_map(function ($match) {
+		return array_map(function($match) {
 			return trim($match, '?');
 		}, $matches[0]);
 	}
@@ -648,7 +648,7 @@ 
 	 */
 	public function parametersWithouNulls()
 	{
-		return array_filter($this->parameters(), function ($parameter) {
+		return array_filter($this->parameters(), function($parameter) {
 			return ! is_null($parameter);
 		});
 	}

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/RouteMap.php

Indentation +125 added lines, -125 removed lines

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

src/components/Routing/Concerns/RouteDependencyResolver.php

Spacing +1 added lines, -1 removed lines

@@ -117,7 +117,7 @@
      */
     protected function getInParameters($class, array $parameters)
     {
-        return ! is_null(Arr::first($parameters, function ($value) use ($class) {
+        return ! is_null(Arr::first($parameters, function($value) use ($class) {
             return $value instanceof $class;
         }));
     }

src/components/Routing/Concerns/RouteResolver.php

Spacing +1 added lines, -1 removed lines

@@ -85,7 +85,7 @@
 	{		
 		return (new Pipeline($this->container))
 				->send($request)
-				->then(function ($request) use ($route) {
+				->then(function($request) use ($route) {
 					return $this->callResponse(
 						$request, $route->runResolver()
 					); 

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