lenevor / syscodes

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

src/components/Console/Cli.php

Indentation +714 added lines, -714 removed lines

@@ -33,721 +33,721 @@
  */
 class Cli
 {
-	/**
- 	 * Background color identifier.
- 	 *
- 	 * @var array $backgroundColors
- 	 */
- 	protected static $backgroundColors = [
- 		'black'      => '40',
- 		'red'        => '41',
- 		'green'      => '42',
- 		'yellow'     => '43',
- 		'blue'       => '44',
- 		'magenta'    => '45',
- 		'cyan'       => '46',
- 		'light_gray' => '47'
- 	];
-
-	/**
-	 * Foreground color identifier.
- 	 *
- 	 * @var array $foregroundColors
-	 */
-	protected static $foregroundColors = [
-		'black'         => '0;30',
-		'dark_gray'     => '1;30',
-		'blue'          => '0;34',
-		'dark_blue'     => '1;34',
-		'light_blue'    => '1;34',
-		'green'         => '0;32',
-		'light_green'   => '1;32',
-		'cyan'          => '0;36', 
-		'light_cyan'    => '1;36',
-		'red'           => '0;31',
-		'light_red'     => '1;31',
-		'purple'        => '0;35',
-		'light_purple'  => '1;35',
-		'light_yellow'  => '0;33',
-		'yellow'        => '1;33',
-		'light_gray'    => '0;37',
-		'white'         => '1;37'
- 	];
-
-	/**
-	 * Indicates that you do not use any color for foreground or background.
-	 *
-	 * @var bool $noColor
-	 */
-	public static $noColor = false;
-
-	/**
-	 * String of arguments to be used in console.
-	 *
-	 * @var array $options
-	 */
-	protected static $options = [];
-
-	/**
-	 * Readline Support for command line.
-	 *
-	 * @var bool $readlineSupport
-	 */
-	public static $readlineSupport = false;
-
-	/**
-	 * List of array segments.
-	 *
-	 * @var array $segments
-	 */
-	protected static $segments = [];
-
- 	/**
- 	 * The standar STDERR is where the application writes its error messages.
- 	 *
- 	 * @var string $stderr 
- 	 */
- 	protected static $stderr;
-
- 	/**
- 	 * The estandar STDOUT is where the application records its output messages.
- 	 *
- 	 * @var resource $stdout
- 	 */
- 	protected static $stdout;
-
- 	/**
-	 * Message that tells the user that he is waiting to receive an order.
-	 *
-	 * @var string $waitMsg
-	 */
-	public static $waitMsg = 'Press any key to continue...';
-
-	/**
-	 * Static constructor. Parses all the CLI params.
-	 * 
-	 * @return \Syscodes\Contracts\Core\Lenevor  $core
-	 * 
-	 * @throws \Exception
-	 */
- 	public static function initialize()
- 	{
- 		// Readline is an extension for PHP that makes interactive the command console
- 		static::$readlineSupport = extension_loaded('readline');
-
- 		// clear segments & options to keep testing clean
- 		static::$options  = [];
- 		static::$segments = [];
-
- 		static::parseCommandLine();
-
- 		// Writes its error messages
- 		static::$stderr = STDERR;
-
- 		// Records its output messages
- 		static::$stdout = STDOUT;
- 	}
-
- 	/**
- 	 * Beeps a certain number of times.
-	 *
-	 * @param  int  $num  The number of times to beep
-	 *
- 	 * @return int
- 	 */
- 	public static function bell(int $num = 1)
- 	{
- 		echo str_repeat("\x07", $num);
- 	}
-
- 	/**
- 	 * Clears the screen of output.
- 	 *
- 	 * @return void
- 	 */
- 	public static function clearScreen()
- 	{
- 		static::isWindows()
- 			// Windows doesn't work for this, but their terminal is tiny so shove this in
- 			? static::newLine(40)
- 			// Anything with a flair of Unix will handle these magic characters
- 			: fwrite(static::$stdout, chr(27)."[H".chr(27)."[2J");
- 	}
-
- 	/**
- 	 * Returns the given text with the correct color codes for a foreground and
-	 * optionally a background color.
- 	 *
- 	 * @param  string  $text  The text to color
- 	 * @param  string  $foreground  The foreground color
- 	 * @param  string  $background  The background color
- 	 * @param  string  $format  Other formatting to apply. Currently only 'underline' is understood
- 	 *
- 	 * @return string  The color coded string
- 	 *
- 	 * @throws \Syscodes\Core\Exceptions\LenevorException
- 	 */
- 	public static function color(string $text, string $foreground, string $background = null, string $format = null)
- 	{
- 		if (static::$noColor)
- 		{
- 			return $text;
- 		}
-
- 		if ( ! Arr::exists(static::$foregroundColors, $foreground)) {
- 			throw new LenevorException(static::error("Invalid CLI foreground color: {$foreground}."));
- 		}
-
- 		if ( $background !== null && ! Arr::exists(static::$backgroundColors, $background)) {
- 			throw new LenevorException(static::error("Invalid CLI background color: {$background}."));
- 		}
-
- 		$string = "\033[".static::$foregroundColors[$foreground]."m";
-
- 		if ($background !== null) {
- 			$string .= "\033[".static::$backgroundColors[$background]."m";
- 		}
-
- 		if ($format === 'underline') {
- 			$string .= "\033[4m";
- 		}
-
- 		$string .= $text."\033[0m";
-
- 		return $string;
- 	}
-
- 	/**
- 	 * Get the number of characters in a string.
- 	 *
- 	 * @param  string  $string
- 	 *
- 	 * @return int
- 	 */
- 	public static function strlen(?string $string)
- 	{
- 		if (is_null($string)) {
- 			return 0;
- 		}
-
- 		foreach (static::$foregroundColors as $color) {
- 			$string = strtr($string, ["\033[".$color.'m' => '']);
- 		}
-
- 		foreach (static::$backgroundColors as $color) {
- 			$string = strtr($string, ["\033[".$color.'m' => '']);
- 		}
-
- 		$string = strtr($string, ["\033[4m" => '', "\033[0m" => '']);
-
- 		return mb_strlen($string);
- 	}
-
- 	/**
- 	 * Outputs an error to the CLI using STDERR instead of STDOUT.
- 	 *
- 	 * @param  string|array  $text  The text to output, or array of errors
- 	 * @param  string  $foreground  The foreground color
- 	 * @param  string|null  $background  the background color
- 	 *
- 	 * @return string
- 	 */
- 	public static function error(string $text = '', string $foreground = 'light_red', string $background = null)
- 	{
-		if (is_array($text)) {
-			$text = implode(PHP_EOL, $text);
-		}
+    /**
+     * Background color identifier.
+     *
+     * @var array $backgroundColors
+     */
+        protected static $backgroundColors = [
+            'black'      => '40',
+            'red'        => '41',
+            'green'      => '42',
+            'yellow'     => '43',
+            'blue'       => '44',
+            'magenta'    => '45',
+            'cyan'       => '46',
+            'light_gray' => '47'
+        ];
+
+    /**
+     * Foreground color identifier.
+     *
+     * @var array $foregroundColors
+     */
+    protected static $foregroundColors = [
+        'black'         => '0;30',
+        'dark_gray'     => '1;30',
+        'blue'          => '0;34',
+        'dark_blue'     => '1;34',
+        'light_blue'    => '1;34',
+        'green'         => '0;32',
+        'light_green'   => '1;32',
+        'cyan'          => '0;36', 
+        'light_cyan'    => '1;36',
+        'red'           => '0;31',
+        'light_red'     => '1;31',
+        'purple'        => '0;35',
+        'light_purple'  => '1;35',
+        'light_yellow'  => '0;33',
+        'yellow'        => '1;33',
+        'light_gray'    => '0;37',
+        'white'         => '1;37'
+        ];
+
+    /**
+     * Indicates that you do not use any color for foreground or background.
+     *
+     * @var bool $noColor
+     */
+    public static $noColor = false;
+
+    /**
+     * String of arguments to be used in console.
+     *
+     * @var array $options
+     */
+    protected static $options = [];
+
+    /**
+     * Readline Support for command line.
+     *
+     * @var bool $readlineSupport
+     */
+    public static $readlineSupport = false;
+
+    /**
+     * List of array segments.
+     *
+     * @var array $segments
+     */
+    protected static $segments = [];
+
+        /**
+         * The standar STDERR is where the application writes its error messages.
+         *
+         * @var string $stderr 
+         */
+        protected static $stderr;
+
+        /**
+         * The estandar STDOUT is where the application records its output messages.
+         *
+         * @var resource $stdout
+         */
+        protected static $stdout;
+
+        /**
+         * Message that tells the user that he is waiting to receive an order.
+         *
+         * @var string $waitMsg
+         */
+    public static $waitMsg = 'Press any key to continue...';
+
+    /**
+     * Static constructor. Parses all the CLI params.
+     * 
+     * @return \Syscodes\Contracts\Core\Lenevor  $core
+     * 
+     * @throws \Exception
+     */
+        public static function initialize()
+        {
+            // Readline is an extension for PHP that makes interactive the command console
+            static::$readlineSupport = extension_loaded('readline');
+
+            // clear segments & options to keep testing clean
+            static::$options  = [];
+            static::$segments = [];
+
+            static::parseCommandLine();
+
+            // Writes its error messages
+            static::$stderr = STDERR;
+
+            // Records its output messages
+            static::$stdout = STDOUT;
+        }
+
+        /**
+         * Beeps a certain number of times.
+         *
+         * @param  int  $num  The number of times to beep
+         *
+         * @return int
+         */
+        public static function bell(int $num = 1)
+        {
+            echo str_repeat("\x07", $num);
+        }
+
+        /**
+         * Clears the screen of output.
+         *
+         * @return void
+         */
+        public static function clearScreen()
+        {
+            static::isWindows()
+                // Windows doesn't work for this, but their terminal is tiny so shove this in
+             ? static::newLine(40)
+                // Anything with a flair of Unix will handle these magic characters
+             : fwrite(static::$stdout, chr(27)."[H".chr(27)."[2J");
+        }
+
+        /**
+         * Returns the given text with the correct color codes for a foreground and
+         * optionally a background color.
+         *
+         * @param  string  $text  The text to color
+         * @param  string  $foreground  The foreground color
+         * @param  string  $background  The background color
+         * @param  string  $format  Other formatting to apply. Currently only 'underline' is understood
+         *
+         * @return string  The color coded string
+         *
+         * @throws \Syscodes\Core\Exceptions\LenevorException
+         */
+        public static function color(string $text, string $foreground, string $background = null, string $format = null)
+        {
+            if (static::$noColor)
+            {
+                return $text;
+            }
+
+            if ( ! Arr::exists(static::$foregroundColors, $foreground)) {
+                throw new LenevorException(static::error("Invalid CLI foreground color: {$foreground}."));
+            }
+
+            if ( $background !== null && ! Arr::exists(static::$backgroundColors, $background)) {
+                throw new LenevorException(static::error("Invalid CLI background color: {$background}."));
+            }
+
+            $string = "\033[".static::$foregroundColors[$foreground]."m";
+
+            if ($background !== null) {
+                $string .= "\033[".static::$backgroundColors[$background]."m";
+            }
+
+            if ($format === 'underline') {
+                $string .= "\033[4m";
+            }
+
+            $string .= $text."\033[0m";
+
+            return $string;
+        }
+
+        /**
+         * Get the number of characters in a string.
+         *
+         * @param  string  $string
+         *
+         * @return int
+         */
+        public static function strlen(?string $string)
+        {
+            if (is_null($string)) {
+                return 0;
+            }
+
+            foreach (static::$foregroundColors as $color) {
+                $string = strtr($string, ["\033[".$color.'m' => '']);
+            }
+
+            foreach (static::$backgroundColors as $color) {
+                $string = strtr($string, ["\033[".$color.'m' => '']);
+            }
+
+            $string = strtr($string, ["\033[4m" => '', "\033[0m" => '']);
+
+            return mb_strlen($string);
+        }
+
+        /**
+         * Outputs an error to the CLI using STDERR instead of STDOUT.
+         *
+         * @param  string|array  $text  The text to output, or array of errors
+         * @param  string  $foreground  The foreground color
+         * @param  string|null  $background  the background color
+         *
+         * @return string
+         */
+        public static function error(string $text = '', string $foreground = 'light_red', string $background = null)
+        {
+        if (is_array($text)) {
+            $text = implode(PHP_EOL, $text);
+        }
 		
-		if ($foreground || $background) {
-			$text = static::color($text, $foreground, $background);
-		}
+        if ($foreground || $background) {
+            $text = static::color($text, $foreground, $background);
+        }
 		
-		static::fwrite(static::$stderr, $text.PHP_EOL);
-	}
-
-	/**
-	 * Attempts to determine the width of the viewable CLI window.
-	 *
-	 * @param  int  $default
-	 *
-	 * @return int
-	 */
-	public static function getWidth(int $default = 80)
-	{
-		if (static::isWindows() || (int) shell_exec('tput cols') === 0) {
-			return $default;
-		}
-
-		return (int) shell_exec('tput cols');
-	}
-
-	/**
-	 * Attempts to determine the height of the viewable CLI window.
-	 *
-	 * @param  int  $default
-	 *
-	 * @return int
-	 */
-	public static function getHeight(int $default = 32)
-	{
-		if (static::isWindows()) {
-			return $default;
-		}
-
-		return (int) shell_exec('tput lines');
-	}
-
-	/**
-	 * Takes a string and writes it to the command line, wrapping to a maximum width. 
-	 * If no maximum width is specified, will wrap to the window's max.
-	 *
-	 * @param  string  $string
-	 * @param  int  $max
-	 * @param  int $padLeft
-	 *
-	 * @return string
-	 */
-	public static function wrap(string $string = null, int $max = 0, int $padLeft = 0)
-	{
-		if (empty($string)) {
-			return '';
-		}
-
-		if ($max === 0) {
-			$max = static::getWidth();
-		}
-
-		if (static::getWidth() < $max) {
-			$max = static::getWidth();
-		}
-
-		$max = $max - $padLeft;
-
-		$lines = wordwrap($string, $max);
-
-		if ($pad_left > 0) {
-			$lines = explode(PHP_EOL, $lines);
-
-			$first = true;
-
-			array_walk ($lines, function (&$line, $index) use ($pad_left, &$first) {
-				if ( ! $first) {
-					$line = str_repeat(' ', $pad_left) . $line;
-				} else {
-					$first = false;
-				}
-			});
-
-			$lines = implode(PHP_EOL, $lines);
-		}
-
-		return $lines;
-	}
-
- 	/**
- 	 * Get input from the shell, using readline or the standard STDIN.
- 	 *
- 	 * @param  string|int  $prefix  The name of the option (int if unnamed)
- 	 *
- 	 * @return string
- 	 */
- 	public static function input($prefix = '')
- 	{
- 		if (static::$readlineSupport) {
- 			return readline($prefix);
- 		}
-
- 		echo $prefix;
-
- 		return fgets(STDIN);
- 	}
-
- 	/**
- 	 * If operating system === windows.
- 	 * 
- 	 * @return string
- 	 */
- 	public static function isWindows()
- 	{
- 		return stripos(PHP_OS, 'WIN') === 0;
- 	}
-
- 	/**
- 	 * Enter a number of empty lines.
- 	 * 
- 	 * @param  int  $num  Number of lines to output
- 	 *
- 	 * @return void
- 	 */
- 	public static function newLine(int $num = 1)
- 	{
- 		for ($i = 0; $i < $num; $i++) {			
- 			static::write();
- 		}
- 	}
-
- 	/**
-	 * Returns the option with the given name. You can also give the option number.
-	 *
-	 * @param  string|int  $name  The name of the option (int if unnamed)
-	 * @param  mixed  $default  The value to return if the option is not defined
-	 *
-	 * @return mixed
-	 * 
-	 * @uses   \Syscodes\Contract\Core\Lenevor
-	 */
- 	public static function option($name, $default = null)
- 	{
- 		if ( ! isset(static::$options[$name])) {
- 			return Lenevor::value($default);
- 		}
-
- 		return static::$options[$name];
-	}
-
-	/**
-	 * Parses the command line it was called from and collects all
-	 * options and valid segments.
-	 * 
-	 * @return bool
-	 */
-	protected static function parseCommandLine()
-	{
-		$options = false;
-
-		for ($i = 1; $i < $_SERVER['argc']; $i++) {
-			if ( ! $options && mb_strpos($_SERVER['argv'][$i], '-') === false) {
-				static::$segments[] = $_SERVER['argv'][$i];
-
-				continue;
-			}
-
-			$options = true;
-
-			$args  = str_replace('-', '', $_SERVER['argv'][$i]);
-			$value = null;
-
-			if (isset($_SERVER['argv'][$i + 1]) && mb_strpos($_SERVER['argv'][$i + 1], '-') !== 0) {
-				$value = $_SERVER['argv'][$i + 1];
-				$i++;
-			}
-
-			static::$options[$args] = $value;
-
-			$options = false;
-		}
-	}
-
-	/**
-	 * Returns the command line string portions of the arguments, minus
-	 * any options, as a string.
-	 *
-	 * @return string
-	 */
-	public static function getURI()
-	{
-		return implode('/', static::$segments);
-	}
-
-	/**
-	 * Returns an individual segment.
-	 *
-	 * @param  int  $index
-	 * 
-	 * @return mixed|null
-	 */
-	public static function getSegment(int $index)
-	{
-		if ( ! isset(static::$segments[$index - 1])) {
-			return null;
-		}
-
-		return static::$segments[$index - 1];
-	}
-
-	/**
-	 * Returns the raw array of segments found.
-	 *
-	 * @return array
-	 */
-	public static function getSegments()
-	{
-		return static::$segments;
-	}
-
- 	/**
- 	 * Asks the user for input.  This can have either 1 or 2 arguments.
-	 *
-	 * Usage:
-	 *
-	 * // Waits for any key press
-	 * Cli::prompt();
-	 *
-	 * // Takes any input
-	 * $color = Cli::prompt('What is your favorite color?');
-	 *
-	 * // Takes any input, but offers default
-	 * $color = Cli::prompt('What is your favourite color?', 'white');
-	 *
-	 * // Will only accept the options in the array
-	 * $ready = Cli::prompt('Are you ready?', array('y','n'));
-	 *
-	 * @return string The user input
-	 */
- 	public static function prompt()
- 	{
- 		$args = func_get_args();
-
-		$options = [];
-		$output  = '';
-		$default = null;
-
-		// How many we got
-		$arg_count = count($args);
-
-		// Is the last argument a boolean? True means required
-		$required = end($args) === true;
-
-		// Reduce the argument count if required was passed, we don't care about that anymore
-		$required === true and --$arg_count;
-
-		// This method can take a few crazy combinations of arguments, so lets work it out
-		switch ($arg_count) {
-			case 2:
-
-				// E.g: $ready = Cli::prompt('Are you ready?', ['y','n']);
-				if (is_array($args[1])) {
-					list($output, $options) = $args;
-				}
-				// E.g: $color = Cli::prompt('What is your favourite color?', 'white');
-				elseif (is_string($args[1])) {
-					list($output, $default) = $args;
-				}
-
-			break;
-
-			case 1:
-
-				// No question (probably been asked already) so just show options
-				// E.g: $ready = Cli::prompt(array('y','n'));
-				if (is_array($args[0])) {
-					$options = $args[0];
-				}
-				// Question without options
-				// E.g: $ready = Cli::prompt('What did you do today?');
-				elseif (is_string($args[0])) {
-					$output = $args[0];
-				}
-
-			break;
-		}
-
-		// If a question has been asked with the read
-		if ($output !== '') {
-			$extra_output = '';
-
-			if ($default !== null) {
-				$extra_output = ' [ Default: "'.$default.'" ]';
-			} elseif ($options !== []) {
-				$extra_output = ' [ '.implode(' | ', $options).' ]';
-			}
-
-			static::fwrite(static::$stdout, $output.$extra_output.': ');
-		}
-
-		// Read the input from keyboard.
-		$input = trim(static::input()) ?: $default;
-
-		// No input provided and we require one (default will stop this being called)
-		if (empty($input) and $required === true) {
-			static::write('This is required.');
-			static::newLine();
-
-			$input = forward_static_call_array([__CLASS__, 'prompt'], $args);
-		}
-
-		// If options are provided and the choice is not in the array, tell them to try again
-		if ( ! empty($options) and ! in_array($input, $options)) {
-			static::write('This is not a valid option. Please try again.');
-			static::newLine();
-
-			$input = forward_static_call_array([__CLASS__, 'prompt'], $args);
-		}
-
-		return $input;
- 	}
-
- 	/**
- 	 * Allows you to set a commandline option from code.
- 	 *
- 	 * @param  string|int  $name  The name of the option (int if unnamed)
-	 * @param  mixed|null  $value  The value to set, or null to delete the option
-	 *
-	 * @return mixed
-	 */
- 	public static function setOption($name, $value = null)
- 	{
- 		if ($value == null) {
- 			if (isset(static::$options[$name])) {
- 				unset(static::$options[$name]);
- 			}
- 		} else {
- 			static::$options[$name] = $value;
- 		}
- 	}
-
- 	/**
- 	 * Waits a certain number of seconds, optionally showing a wait message and
-	 * waiting for a key press.
- 	 *
- 	 * @param  int  $seconds  Number of seconds
- 	 * @param  bool  $countdown  Show a countdown or not
- 	 *
- 	 * @return string
- 	 */
- 	public static function wait(int $seconds = 0, bool $countdown = false)
- 	{
- 		if ($countdown === true) {
-			$time = $seconds;
-
- 			while ($time > 0) {
- 				fwrite(static::$stdout, $time.'... ');
- 				sleep(1);
- 				$time--;
- 			}
-
- 			static::write();
- 		} else {
- 			if ($seconds = 0) {
- 				sleep($seconds);
- 			} else {
- 				static::write(static::$waitMsg);
- 				static::input();
- 			}
- 		}
- 	}
-
- 	/**
- 	 * Outputs a string to the cli.	If you send an array it will implode them 
- 	 * with a line break.
- 	 * 
- 	 * @param  string|array  $text  The text to output, or array of lines
- 	 * @param  string|null  $foreground  The foreground color
- 	 * @param  string|null  $background  The background color
- 	 *
- 	 * @return string
- 	 */
- 	public static function write(string $text = '', string $foreground = null, string $background = null)
- 	{
- 		if (is_array($text)) {
- 			$text = implode(PHP_EOL, $text);
- 		}
-
- 		if ($foreground OR $background) {
- 			$text = static::color($text, $foreground, $background);
- 		}
-
- 		static::fwrite(static::$stdout, $text.PHP_EOL);
- 	}
-
- 	/**
- 	 * Returns a well formatted table.
- 	 *
- 	 * @param  array  $tbody  List of rows
- 	 * @param  array  $thead  List of columns
- 	 *
- 	 * @return void
- 	 */
- 	public static function table(array $tbody, array $thead = [])
- 	{
- 		$rows = [];
-
- 		if ( ! empty($thead)) {
- 			$rows[] = array_values($thead);
- 		}
-
- 		foreach ($tbody as $tr) {
- 			$rows[] = count($rows);
- 		}
-
- 		$totalRows = count($rows);
-
- 		// Store all columns lengths
- 		$allColsLengths = [];
-
- 		// Store maximum lengths by column
- 		$maxColsLengths = [];
-
- 		for ($row = 0; $row < $totalRows; $row++) {
- 			$column = 0;
-
- 			foreach ($rows[$row] as $col) {
- 				$allColsLengths[$row][$column] = static::strlen($col);
-
- 				if ( ! isset($maxColsLengths[$column]) || $allColsLengths[$row][$column] > $maxColsLengths[$column]) {
- 					$maxColsLengths[$column] = $allColsLengths[$row][$column];
- 				}
-
- 				$column++;
- 			}
- 		}
-
- 		for ($row = 0; $row < $totalRows; $row++) {
- 			$column = 0;
-
- 			foreach ($rows[$row] as $col)
- 			{
- 				$diverse = $maxColsLengths[$column] - static::strlen($col);
+        static::fwrite(static::$stderr, $text.PHP_EOL);
+    }
+
+    /**
+     * Attempts to determine the width of the viewable CLI window.
+     *
+     * @param  int  $default
+     *
+     * @return int
+     */
+    public static function getWidth(int $default = 80)
+    {
+        if (static::isWindows() || (int) shell_exec('tput cols') === 0) {
+            return $default;
+        }
+
+        return (int) shell_exec('tput cols');
+    }
+
+    /**
+     * Attempts to determine the height of the viewable CLI window.
+     *
+     * @param  int  $default
+     *
+     * @return int
+     */
+    public static function getHeight(int $default = 32)
+    {
+        if (static::isWindows()) {
+            return $default;
+        }
+
+        return (int) shell_exec('tput lines');
+    }
+
+    /**
+     * Takes a string and writes it to the command line, wrapping to a maximum width. 
+     * If no maximum width is specified, will wrap to the window's max.
+     *
+     * @param  string  $string
+     * @param  int  $max
+     * @param  int $padLeft
+     *
+     * @return string
+     */
+    public static function wrap(string $string = null, int $max = 0, int $padLeft = 0)
+    {
+        if (empty($string)) {
+            return '';
+        }
+
+        if ($max === 0) {
+            $max = static::getWidth();
+        }
+
+        if (static::getWidth() < $max) {
+            $max = static::getWidth();
+        }
+
+        $max = $max - $padLeft;
+
+        $lines = wordwrap($string, $max);
+
+        if ($pad_left > 0) {
+            $lines = explode(PHP_EOL, $lines);
+
+            $first = true;
+
+            array_walk ($lines, function (&$line, $index) use ($pad_left, &$first) {
+                if ( ! $first) {
+                    $line = str_repeat(' ', $pad_left) . $line;
+                } else {
+                    $first = false;
+                }
+            });
+
+            $lines = implode(PHP_EOL, $lines);
+        }
+
+        return $lines;
+    }
+
+        /**
+         * Get input from the shell, using readline or the standard STDIN.
+         *
+         * @param  string|int  $prefix  The name of the option (int if unnamed)
+         *
+         * @return string
+         */
+        public static function input($prefix = '')
+        {
+            if (static::$readlineSupport) {
+                return readline($prefix);
+            }
+
+            echo $prefix;
+
+            return fgets(STDIN);
+        }
+
+        /**
+         * If operating system === windows.
+         * 
+         * @return string
+         */
+        public static function isWindows()
+        {
+            return stripos(PHP_OS, 'WIN') === 0;
+        }
+
+        /**
+         * Enter a number of empty lines.
+         * 
+         * @param  int  $num  Number of lines to output
+         *
+         * @return void
+         */
+        public static function newLine(int $num = 1)
+        {
+            for ($i = 0; $i < $num; $i++) {			
+                static::write();
+            }
+        }
+
+        /**
+         * Returns the option with the given name. You can also give the option number.
+         *
+         * @param  string|int  $name  The name of the option (int if unnamed)
+         * @param  mixed  $default  The value to return if the option is not defined
+         *
+         * @return mixed
+         * 
+         * @uses   \Syscodes\Contract\Core\Lenevor
+         */
+        public static function option($name, $default = null)
+        {
+            if ( ! isset(static::$options[$name])) {
+                return Lenevor::value($default);
+            }
+
+            return static::$options[$name];
+    }
+
+    /**
+     * Parses the command line it was called from and collects all
+     * options and valid segments.
+     * 
+     * @return bool
+     */
+    protected static function parseCommandLine()
+    {
+        $options = false;
+
+        for ($i = 1; $i < $_SERVER['argc']; $i++) {
+            if ( ! $options && mb_strpos($_SERVER['argv'][$i], '-') === false) {
+                static::$segments[] = $_SERVER['argv'][$i];
+
+                continue;
+            }
+
+            $options = true;
+
+            $args  = str_replace('-', '', $_SERVER['argv'][$i]);
+            $value = null;
+
+            if (isset($_SERVER['argv'][$i + 1]) && mb_strpos($_SERVER['argv'][$i + 1], '-') !== 0) {
+                $value = $_SERVER['argv'][$i + 1];
+                $i++;
+            }
+
+            static::$options[$args] = $value;
+
+            $options = false;
+        }
+    }
+
+    /**
+     * Returns the command line string portions of the arguments, minus
+     * any options, as a string.
+     *
+     * @return string
+     */
+    public static function getURI()
+    {
+        return implode('/', static::$segments);
+    }
+
+    /**
+     * Returns an individual segment.
+     *
+     * @param  int  $index
+     * 
+     * @return mixed|null
+     */
+    public static function getSegment(int $index)
+    {
+        if ( ! isset(static::$segments[$index - 1])) {
+            return null;
+        }
+
+        return static::$segments[$index - 1];
+    }
+
+    /**
+     * Returns the raw array of segments found.
+     *
+     * @return array
+     */
+    public static function getSegments()
+    {
+        return static::$segments;
+    }
+
+        /**
+         * Asks the user for input.  This can have either 1 or 2 arguments.
+         *
+         * Usage:
+         *
+         * // Waits for any key press
+         * Cli::prompt();
+         *
+         * // Takes any input
+         * $color = Cli::prompt('What is your favorite color?');
+         *
+         * // Takes any input, but offers default
+         * $color = Cli::prompt('What is your favourite color?', 'white');
+         *
+         * // Will only accept the options in the array
+         * $ready = Cli::prompt('Are you ready?', array('y','n'));
+         *
+         * @return string The user input
+         */
+        public static function prompt()
+        {
+            $args = func_get_args();
+
+        $options = [];
+        $output  = '';
+        $default = null;
+
+        // How many we got
+        $arg_count = count($args);
+
+        // Is the last argument a boolean? True means required
+        $required = end($args) === true;
+
+        // Reduce the argument count if required was passed, we don't care about that anymore
+        $required === true and --$arg_count;
+
+        // This method can take a few crazy combinations of arguments, so lets work it out
+        switch ($arg_count) {
+            case 2:
+
+                // E.g: $ready = Cli::prompt('Are you ready?', ['y','n']);
+                if (is_array($args[1])) {
+                    list($output, $options) = $args;
+                }
+                // E.g: $color = Cli::prompt('What is your favourite color?', 'white');
+                elseif (is_string($args[1])) {
+                    list($output, $default) = $args;
+                }
+
+            break;
+
+            case 1:
+
+                // No question (probably been asked already) so just show options
+                // E.g: $ready = Cli::prompt(array('y','n'));
+                if (is_array($args[0])) {
+                    $options = $args[0];
+                }
+                // Question without options
+                // E.g: $ready = Cli::prompt('What did you do today?');
+                elseif (is_string($args[0])) {
+                    $output = $args[0];
+                }
+
+            break;
+        }
+
+        // If a question has been asked with the read
+        if ($output !== '') {
+            $extra_output = '';
+
+            if ($default !== null) {
+                $extra_output = ' [ Default: "'.$default.'" ]';
+            } elseif ($options !== []) {
+                $extra_output = ' [ '.implode(' | ', $options).' ]';
+            }
+
+            static::fwrite(static::$stdout, $output.$extra_output.': ');
+        }
+
+        // Read the input from keyboard.
+        $input = trim(static::input()) ?: $default;
+
+        // No input provided and we require one (default will stop this being called)
+        if (empty($input) and $required === true) {
+            static::write('This is required.');
+            static::newLine();
+
+            $input = forward_static_call_array([__CLASS__, 'prompt'], $args);
+        }
+
+        // If options are provided and the choice is not in the array, tell them to try again
+        if ( ! empty($options) and ! in_array($input, $options)) {
+            static::write('This is not a valid option. Please try again.');
+            static::newLine();
+
+            $input = forward_static_call_array([__CLASS__, 'prompt'], $args);
+        }
+
+        return $input;
+        }
+
+        /**
+         * Allows you to set a commandline option from code.
+         *
+         * @param  string|int  $name  The name of the option (int if unnamed)
+         * @param  mixed|null  $value  The value to set, or null to delete the option
+         *
+         * @return mixed
+         */
+        public static function setOption($name, $value = null)
+        {
+            if ($value == null) {
+                if (isset(static::$options[$name])) {
+                    unset(static::$options[$name]);
+                }
+            } else {
+                static::$options[$name] = $value;
+            }
+        }
+
+        /**
+         * Waits a certain number of seconds, optionally showing a wait message and
+         * waiting for a key press.
+         *
+         * @param  int  $seconds  Number of seconds
+         * @param  bool  $countdown  Show a countdown or not
+         *
+         * @return string
+         */
+        public static function wait(int $seconds = 0, bool $countdown = false)
+        {
+            if ($countdown === true) {
+            $time = $seconds;
+
+                while ($time > 0) {
+                    fwrite(static::$stdout, $time.'... ');
+                    sleep(1);
+                    $time--;
+                }
+
+                static::write();
+            } else {
+                if ($seconds = 0) {
+                    sleep($seconds);
+                } else {
+                    static::write(static::$waitMsg);
+                    static::input();
+                }
+            }
+        }
+
+        /**
+         * Outputs a string to the cli.	If you send an array it will implode them 
+         * with a line break.
+         * 
+         * @param  string|array  $text  The text to output, or array of lines
+         * @param  string|null  $foreground  The foreground color
+         * @param  string|null  $background  The background color
+         *
+         * @return string
+         */
+        public static function write(string $text = '', string $foreground = null, string $background = null)
+        {
+            if (is_array($text)) {
+                $text = implode(PHP_EOL, $text);
+            }
+
+            if ($foreground OR $background) {
+                $text = static::color($text, $foreground, $background);
+            }
+
+            static::fwrite(static::$stdout, $text.PHP_EOL);
+        }
+
+        /**
+         * Returns a well formatted table.
+         *
+         * @param  array  $tbody  List of rows
+         * @param  array  $thead  List of columns
+         *
+         * @return void
+         */
+        public static function table(array $tbody, array $thead = [])
+        {
+            $rows = [];
+
+            if ( ! empty($thead)) {
+                $rows[] = array_values($thead);
+            }
+
+            foreach ($tbody as $tr) {
+                $rows[] = count($rows);
+            }
+
+            $totalRows = count($rows);
+
+            // Store all columns lengths
+            $allColsLengths = [];
+
+            // Store maximum lengths by column
+            $maxColsLengths = [];
+
+            for ($row = 0; $row < $totalRows; $row++) {
+                $column = 0;
+
+                foreach ($rows[$row] as $col) {
+                    $allColsLengths[$row][$column] = static::strlen($col);
+
+                    if ( ! isset($maxColsLengths[$column]) || $allColsLengths[$row][$column] > $maxColsLengths[$column]) {
+                        $maxColsLengths[$column] = $allColsLengths[$row][$column];
+                    }
+
+                    $column++;
+                }
+            }
+
+            for ($row = 0; $row < $totalRows; $row++) {
+                $column = 0;
+
+                foreach ($rows[$row] as $col)
+                {
+                    $diverse = $maxColsLengths[$column] - static::strlen($col);
  				
- 				if ($diverse) {
- 					$rows[$row][$column] = $rows[$row][$column].str_repeat(' ', $diverse);
- 				}
-
- 				$column++;
- 			} 			
- 		}
-
- 		$table = '';
-		$cols  = '';
-
- 		for ($row = 0; $row < $rows; $row++) {
- 			if (0 === $row) {
- 				$cols = '+';
-
- 				foreach ($rows[$row] as $col) {
- 					$cols .= str_repeat('-', static::strlen($col) + 2).'+';
- 				}
-
- 				$table .= $cols.PHP_EOL;
- 			}
-
- 			$table .= '| '.implode('-', $rows[$row]).' |'.PHP_EOL;
-
- 			if (0 === $row && ( ! empty($thead)) || ($row + 1) === $rows) {
- 				$table .= $cols.PHP_EOL;
- 			}
- 		}
-
- 		static::write($table);
- 	}
-
-	/**
-	 * The library is intended for used on Cli commanda, 
-	 * this commands can be called from controllers and 
-	 * elsewhere of framework.
-	 * 
-	 * @param  resource  $handle
-	 * @param  string  $text
-	 * 
-	 * @return string
-	 */
-	protected static function fwrite($handle, string $text)
-	{
-		if (isCli()) {
-			fwrite($handle, $text);
-			return;
-		}
-
-		echo $text;
-	}
+                    if ($diverse) {
+                        $rows[$row][$column] = $rows[$row][$column].str_repeat(' ', $diverse);
+                    }
+
+                    $column++;
+                } 			
+            }
+
+            $table = '';
+        $cols  = '';
+
+            for ($row = 0; $row < $rows; $row++) {
+                if (0 === $row) {
+                    $cols = '+';
+
+                    foreach ($rows[$row] as $col) {
+                        $cols .= str_repeat('-', static::strlen($col) + 2).'+';
+                    }
+
+                    $table .= $cols.PHP_EOL;
+                }
+
+                $table .= '| '.implode('-', $rows[$row]).' |'.PHP_EOL;
+
+                if (0 === $row && ( ! empty($thead)) || ($row + 1) === $rows) {
+                    $table .= $cols.PHP_EOL;
+                }
+            }
+
+            static::write($table);
+        }
+
+    /**
+     * The library is intended for used on Cli commanda, 
+     * this commands can be called from controllers and 
+     * elsewhere of framework.
+     * 
+     * @param  resource  $handle
+     * @param  string  $text
+     * 
+     * @return string
+     */
+    protected static function fwrite($handle, string $text)
+    {
+        if (isCli()) {
+            fwrite($handle, $text);
+            return;
+        }
+
+        echo $text;
+    }
 }
\ No newline at end of file

Spacing +4 added lines, -4 removed lines

@@ -198,7 +198,7 @@ 
  			throw new LenevorException(static::error("Invalid CLI foreground color: {$foreground}."));
  		}
 
- 		if ( $background !== null && ! Arr::exists(static::$backgroundColors, $background)) {
+ 		if ($background !== null && ! Arr::exists(static::$backgroundColors, $background)) {
  			throw new LenevorException(static::error("Invalid CLI background color: {$background}."));
  		}
 
@@ -330,9 +330,9 @@ 
 
 			$first = true;
 
-			array_walk ($lines, function (&$line, $index) use ($pad_left, &$first) {
+			array_walk($lines, function(&$line, $index) use ($pad_left, &$first) {
 				if ( ! $first) {
-					$line = str_repeat(' ', $pad_left) . $line;
+					$line = str_repeat(' ', $pad_left).$line;
 				} else {
 					$first = false;
 				}
@@ -708,7 +708,7 @@ 
  		}
 
  		$table = '';
-		$cols  = '';
+		$cols = '';
 
  		for ($row = 0; $row < $rows; $row++) {
  			if (0 === $row) {

src/components/Console/Application.php

Indentation +47 added lines, -47 removed lines

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

src/components/Core/Support/Providers/EventServiceProvider.php

Spacing +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
      */
     public function register()
     {
-        $this->booting(function () {
+        $this->booting(function() {
             $events = $this->listens();
 
             foreach ((array) $events as $event => $listeners) {

src/components/Events/Dispatcher.php

Spacing +2 added lines, -2 removed lines

@@ -133,7 +133,7 @@ 
             return $this->createClassListener($listener, $wildcard);
         }
 
-        return function ($event, $payload) use ($listener, $wildcard) {
+        return function($event, $payload) use ($listener, $wildcard) {
             if ($wildcard) {
                 return $listener($event, $payload);
             }
@@ -152,7 +152,7 @@ 
      */
     public function createClassListener($listener, $wildcard = false)
     {
-        return function ($event, $payload) use ($listener, $wildcard) {
+        return function($event, $payload) use ($listener, $wildcard) {
             if ($wildcard) {
                 return call_user_func($this->createClassClosure($listener), $event, $payload);
             }