caffeina-core / core

classes/Route.php

Indentation +39 added lines, -39 removed lines

@@ -14,9 +14,9 @@ 
     use Module;
 
     protected static $routes,
-                     $base    = '',
-                     $prefix  = [],
-                     $group   = [];
+                      $base    = '',
+                      $prefix  = [],
+                      $group   = [];
 
     protected $URLPattern     = '',
               $pattern        = '',
@@ -85,20 +85,20 @@ 
         $method = strtolower($method);
         $this->response 			 		= '';
         $this->response_object 		= null;
-       	$this->response_is_object = false;
+          $this->response_is_object = false;
 
         // Call direct befores
         if ( $this->befores ) {
           // Reverse befores order
           foreach (array_reverse($this->befores) as $mw) {
-	        	ob_start();
+            ob_start();
             $mw_result = call_user_func($mw->bindTo($this));
-          	$this->response .= ob_get_clean();
+            $this->response .= ob_get_clean();
             if ( false  === $mw_result ) {
-            	return [''];
+              return [''];
             } else if (is_a($mw_result,'View') || is_string($mw_result)) {
               $this->response .= (string)$mw_result;
-          	}
+            }
           }
         }
 
@@ -109,51 +109,51 @@ 
 
         if (is_callable($callback)) {
           // Capure callback output
-					Response::type(Response::TYPE_HTML);
-	        ob_start();
-	        // Silence "Cannot bind an instance to a static closure" warnings
-	        $view_results 	 = call_user_func_array(@$callback->bindTo($this), $args);
-	        $this->response .= ob_get_clean();
-
-	        // Render View if returned, else echo string or encode json response
-	        if ( null !== $view_results ) {
-	          if (is_a($view_results,'View') || is_string($view_results)) {
-	              $this->response .= (string)$view_results;
-	          } else {
-			        	$this->response_is_object = true;
-	              $this->response_object 		= $view_results;
-	          }
-	        }
+          Response::type(Response::TYPE_HTML);
+          ob_start();
+          // Silence "Cannot bind an instance to a static closure" warnings
+          $view_results 	 = call_user_func_array(@$callback->bindTo($this), $args);
+          $this->response .= ob_get_clean();
+
+          // Render View if returned, else echo string or encode json response
+          if ( null !== $view_results ) {
+            if (is_a($view_results,'View') || is_string($view_results)) {
+                $this->response .= (string)$view_results;
+            } else {
+                $this->response_is_object = true;
+                $this->response_object 		= $view_results;
+            }
+          }
 
         } else if (is_a($callback,'View') || is_string($callback)) {
           // return rendered View or direct string
-        	$this->response .= (string)$callback;
+          $this->response .= (string)$callback;
         } else {
           // JSON encode returned value
-        	$this->response_is_object = true;
-        	$this->response_object 		= $callback;
+          $this->response_is_object = true;
+          $this->response_object 		= $callback;
         }
 
         // Apply afters
         if ( $this->afters ) {
           foreach ($this->afters as $mw) {
-	        	ob_start();
+            ob_start();
             $mw_result = call_user_func($mw->bindTo($this));
-          	$this->response .= ob_get_clean();
+            $this->response .= ob_get_clean();
             if ( false  === $mw_result ) {
-            	return [''];
+              return [''];
             } else if (is_a($mw_result,'View') || is_string($mw_result)) {
               $this->response .= (string)$mw_result;
-          	}
+            }
           }
         }
 
         Event::trigger('core.route.after', $this);
 
         if ( $this->response_is_object ){
-			$this->response = Response::json($this->response_object);
+      $this->response = Response::json($this->response_object);
         } else {
-			Response::add($this->response);
+      Response::add($this->response);
         }
 
         Event::trigger('core.route.end', $this);
@@ -303,10 +303,10 @@ 
         $route           = new static($URLPattern);
         $route->callback = [];
         foreach ($callbacks as $method => $callback) {
-           $method = strtolower($method);
-           if (Request::method() !== $method) continue;
-           $route->callback[$method] = $callback;
-           $route->methods[$method]  = 1;
+            $method = strtolower($method);
+            if (Request::method() !== $method) continue;
+            $route->callback[$method] = $callback;
+            $route->methods[$method]  = 1;
         }
         return $route;
     }
@@ -408,9 +408,9 @@ 
     }
 
     public static function exitWithError($code,$message="Application Error"){
-    	Response::error($code,$message);
-    	Response::send();
-    	exit;
+      Response::error($code,$message);
+      Response::send();
+      exit;
     }
 
     /**

Spacing +79 added lines, -79 removed lines

@@ -38,9 +38,9 @@ 
      * @param string $method The HTTP method for which the route must respond.
      * @return Route
      */
-    public function __construct($URLPattern, $callback = null, $method='get'){
-        $this->URLPattern = rtrim(implode('',static::$prefix),'/') . '/' . trim($URLPattern,'/')?:'/';
-        $this->URLPattern = $this->URLPattern != '/' ? rtrim($this->URLPattern,'/') : $this->URLPattern;
+    public function __construct($URLPattern, $callback = null, $method = 'get') {
+        $this->URLPattern = rtrim(implode('', static::$prefix), '/').'/'.trim($URLPattern, '/') ?: '/';
+        $this->URLPattern = $this->URLPattern != '/' ? rtrim($this->URLPattern, '/') : $this->URLPattern;
         $this->dynamic    = $this->isDynamic($this->URLPattern);
         $this->pattern    = $this->dynamic ? $this->compilePatternAsRegex($this->URLPattern, $this->rules) : $this->URLPattern;
         $this->callback   = $callback;
@@ -56,19 +56,19 @@ 
      * @param  string $method The HTTP Method to check against.
      * @return boolean
      */
-    public function match($URL,$method='get'){
+    public function match($URL, $method = 'get') {
         $method = strtolower($method);
 
         // * is an http method wildcard
         if (empty($this->methods[$method]) && empty($this->methods['*'])) return false;
-        $URL = rtrim($URL,'/');
+        $URL = rtrim($URL, '/');
         $args = [];
-        if ( $this->dynamic
-               ? preg_match($this->pattern,$URL,$args)
-               : $URL == rtrim($this->pattern,'/')
-        ){
+        if ($this->dynamic
+               ? preg_match($this->pattern, $URL, $args)
+               : $URL == rtrim($this->pattern, '/')
+        ) {
             foreach ($args as $key => $value) {
-              if ( false === is_string($key) ) unset($args[$key]);
+              if (false === is_string($key)) unset($args[$key]);
             }
             return $args;
         }
@@ -81,23 +81,23 @@ 
      * @param  string $method The HTTP Method requested.
      * @return array The callback response.
      */
-    public function run(array $args, $method='get'){
+    public function run(array $args, $method = 'get') {
         $method = strtolower($method);
-        $this->response 			 		= '';
-        $this->response_object 		= null;
+        $this->response = '';
+        $this->response_object = null;
        	$this->response_is_object = false;
 
         // Call direct befores
-        if ( $this->befores ) {
+        if ($this->befores) {
           // Reverse befores order
           foreach (array_reverse($this->befores) as $mw) {
 	        	ob_start();
             $mw_result = call_user_func($mw->bindTo($this));
           	$this->response .= ob_get_clean();
-            if ( false  === $mw_result ) {
+            if (false === $mw_result) {
             	return [''];
-            } else if (is_a($mw_result,'View') || is_string($mw_result)) {
-              $this->response .= (string)$mw_result;
+            } else if (is_a($mw_result, 'View') || is_string($mw_result)) {
+              $this->response .= (string) $mw_result;
           	}
           }
         }
@@ -112,45 +112,45 @@ 
 					Response::type(Response::TYPE_HTML);
 	        ob_start();
 	        // Silence "Cannot bind an instance to a static closure" warnings
-	        $view_results 	 = call_user_func_array(@$callback->bindTo($this), $args);
+	        $view_results = call_user_func_array(@$callback->bindTo($this), $args);
 	        $this->response .= ob_get_clean();
 
 	        // Render View if returned, else echo string or encode json response
-	        if ( null !== $view_results ) {
-	          if (is_a($view_results,'View') || is_string($view_results)) {
-	              $this->response .= (string)$view_results;
+	        if (null !== $view_results) {
+	          if (is_a($view_results, 'View') || is_string($view_results)) {
+	              $this->response .= (string) $view_results;
 	          } else {
 			        	$this->response_is_object = true;
-	              $this->response_object 		= $view_results;
+	              $this->response_object = $view_results;
 	          }
 	        }
 
-        } else if (is_a($callback,'View') || is_string($callback)) {
+        } else if (is_a($callback, 'View') || is_string($callback)) {
           // return rendered View or direct string
-        	$this->response .= (string)$callback;
+        	$this->response .= (string) $callback;
         } else {
           // JSON encode returned value
         	$this->response_is_object = true;
-        	$this->response_object 		= $callback;
+        	$this->response_object = $callback;
         }
 
         // Apply afters
-        if ( $this->afters ) {
+        if ($this->afters) {
           foreach ($this->afters as $mw) {
 	        	ob_start();
             $mw_result = call_user_func($mw->bindTo($this));
           	$this->response .= ob_get_clean();
-            if ( false  === $mw_result ) {
+            if (false === $mw_result) {
             	return [''];
-            } else if (is_a($mw_result,'View') || is_string($mw_result)) {
-              $this->response .= (string)$mw_result;
+            } else if (is_a($mw_result, 'View') || is_string($mw_result)) {
+              $this->response .= (string) $mw_result;
           	}
           }
         }
 
         Event::trigger('core.route.after', $this);
 
-        if ( $this->response_is_object ){
+        if ($this->response_is_object) {
 			$this->response = Response::json($this->response_object);
         } else {
 			Response::add($this->response);
@@ -167,8 +167,8 @@ 
      * @param  string $method The HTTP Method to check against.
      * @return array The callback response.
      */
-    public function runIfMatch($URL, $method='get'){
-        return ($args = $this->match($URL,$method)) ? $this->run($args,$method) : null;
+    public function runIfMatch($URL, $method = 'get') {
+        return ($args = $this->match($URL, $method)) ? $this->run($args, $method) : null;
     }
 
     /**
@@ -177,8 +177,8 @@ 
      * @param  $callback The callback to be invoked (with variables extracted from the route if present) when the route match the request URI.
      * @return Route
      */
-    public static function on($URLPattern, $callback = null){
-        return new Route($URLPattern,$callback);
+    public static function on($URLPattern, $callback = null) {
+        return new Route($URLPattern, $callback);
     }
 
     /**
@@ -187,8 +187,8 @@ 
      * @param  $callback The callback to be invoked (with variables extracted from the route if present) when the route match the request URI.
      * @return Route
      */
-    public static function get($URLPattern, $callback = null){
-        return (new Route($URLPattern,$callback))->via('get');
+    public static function get($URLPattern, $callback = null) {
+        return (new Route($URLPattern, $callback))->via('get');
     }
 
     /**
@@ -197,8 +197,8 @@ 
      * @param  $callback The callback to be invoked (with variables extracted from the route if present) when the route match the request URI.
      * @return Route
      */
-    public static function post($URLPattern, $callback = null){
-        return (new Route($URLPattern,$callback))->via('post');
+    public static function post($URLPattern, $callback = null) {
+        return (new Route($URLPattern, $callback))->via('post');
     }
 
     /**
@@ -207,8 +207,8 @@ 
      * @param  $callback The callback to be invoked (with variables extracted from the route if present) when the route match the request URI.
      * @return Route
      */
-    public static function any($URLPattern, $callback = null){
-        return (new Route($URLPattern,$callback))->via('*');
+    public static function any($URLPattern, $callback = null) {
+        return (new Route($URLPattern, $callback))->via('*');
     }
 
     /**
@@ -253,7 +253,7 @@ 
      */
     public function & via(){
         $this->methods = [];
-        foreach (func_get_args() as $method){
+        foreach (func_get_args() as $method) {
             $this->methods[strtolower($method)] = true;
         }
         return $this;
@@ -275,10 +275,10 @@ 
      * @return Route
      */
     public function & rules(array $rules){
-        foreach ((array)$rules as $varname => $rule){
+        foreach ((array) $rules as $varname => $rule) {
             $this->rules[$varname] = $rule;
         }
-        $this->pattern = $this->compilePatternAsRegex($this->URLPattern,$this->rules);
+        $this->pattern = $this->compilePatternAsRegex($this->URLPattern, $this->rules);
         return $this;
     }
 
@@ -316,10 +316,10 @@ 
      * @param  string $pattern The URL schema.
      * @return string The compiled PREG RegEx.
      */
-    protected static function compilePatternAsRegex($pattern, $rules=[]){
-        return '#^'.preg_replace_callback('#:([a-zA-Z]\w*)#S',function($g) use (&$rules){
-            return '(?<' . $g[1] . '>' . (isset($rules[$g[1]])?$rules[$g[1]]:'[^/]+') .')';
-        },str_replace(['.',')','*'],['\.',')?','.+'],$pattern)).'$#';
+    protected static function compilePatternAsRegex($pattern, $rules = []) {
+        return '#^'.preg_replace_callback('#:([a-zA-Z]\w*)#S', function($g) use (&$rules){
+            return '(?<'.$g[1].'>'.(isset($rules[$g[1]]) ? $rules[$g[1]] : '[^/]+').')';
+        },str_replace(['.', ')', '*'], ['\.', ')?', '.+'], $pattern)).'$#';
     }
 
     /**
@@ -329,10 +329,10 @@ 
      * @param  boolean $cut If true don't limit the matching to the whole URL (used for group pattern extraction)
      * @return array The extracted variables
      */
-    protected static function extractVariablesFromURL($pattern, $URL=null, $cut=false){
+    protected static function extractVariablesFromURL($pattern, $URL = null, $cut = false) {
         $URL     = $URL ?: Request::URI();
-        $pattern = $cut ? str_replace('$#','',$pattern).'#' : $pattern;
-        if ( !preg_match($pattern,$URL,$args) ) return false;
+        $pattern = $cut ? str_replace('$#', '', $pattern).'#' : $pattern;
+        if (!preg_match($pattern, $URL, $args)) return false;
         foreach ($args as $key => $value) {
             if (false === is_string($key)) unset($args[$key]);
         }
@@ -344,8 +344,8 @@ 
      * @param  string  $pattern The URL schema.
      * @return boolean
      */
-    protected static function isDynamic($pattern){
-      return strlen($pattern) != strcspn($pattern,':(?[*+');
+    protected static function isDynamic($pattern) {
+      return strlen($pattern) != strcspn($pattern, ':(?[*+');
     }
 
     /**
@@ -353,9 +353,9 @@ 
      * @param Route $r
      * @return Route
      */
-    public static function add($r){
-        if ( isset(static::$group[0]) ) static::$group[0]->add($r);
-        return static::$routes[implode('',static::$prefix)][] = $r;
+    public static function add($r) {
+        if (isset(static::$group[0])) static::$group[0]->add($r);
+        return static::$routes[implode('', static::$prefix)][] = $r;
     }
 
     /**
@@ -363,16 +363,16 @@ 
      * @param  string $prefix The url prefix for the internal route definitions.
      * @param  string $callback This callback is invoked on $prefix match of the current request URI.
      */
-    public static function group($prefix,$callback=null){
+    public static function group($prefix, $callback = null) {
 
         // Skip definition if current request doesn't match group.
 
-        $prefix_complete = rtrim(implode('',static::$prefix),'/') . $prefix;
+        $prefix_complete = rtrim(implode('', static::$prefix), '/').$prefix;
 
-        if ( static::isDynamic($prefix) ){
+        if (static::isDynamic($prefix)) {
 
             // Dynamic group, capture vars
-            $vars = static::extractVariablesFromURL(static::compilePatternAsRegex($prefix_complete),null,true);
+            $vars = static::extractVariablesFromURL(static::compilePatternAsRegex($prefix_complete), null, true);
 
             // Errors in compile pattern or variable extraction, aborting.
             if (false === $vars) return;
@@ -380,14 +380,14 @@ 
             static::$prefix[] = $prefix;
             if (empty(static::$group)) static::$group = [];
             array_unshift(static::$group, new RouteGroup());
-            if ($callback) call_user_func_array($callback,$vars);
+            if ($callback) call_user_func_array($callback, $vars);
             $group = static::$group[0];
             array_shift(static::$group);
             array_pop(static::$prefix);
-            if (empty(static::$prefix)) static::$prefix=[''];
+            if (empty(static::$prefix)) static::$prefix = [''];
             return $group;
 
-        } else if ( 0 === strpos(Request::URI(), $prefix_complete) ){
+        } else if (0 === strpos(Request::URI(), $prefix_complete)) {
 
             // Static group
             static::$prefix[] = $prefix;
@@ -397,7 +397,7 @@ 
             $group = static::$group[0];
             array_shift(static::$group);
             array_pop(static::$prefix);
-            if (empty(static::$prefix)) static::$prefix=[''];
+            if (empty(static::$prefix)) static::$prefix = [''];
             return $group;
         } else {
 
@@ -407,8 +407,8 @@ 
 
     }
 
-    public static function exitWithError($code,$message="Application Error"){
-    	Response::error($code,$message);
+    public static function exitWithError($code, $message = "Application Error") {
+    	Response::error($code, $message);
     	Response::send();
     	exit;
     }
@@ -418,20 +418,20 @@ 
      * @param  string $URL The URL to match onto.
      * @return boolean true if a route callback was executed.
      */
-    public static function dispatch($URL=null,$method=null){
+    public static function dispatch($URL = null, $method = null) {
         if (!$URL)     $URL     = Request::URI();
         if (!$method)  $method  = Request::method();
 
-        $__deferred_send = new Deferred(function(){
-          if (Options::get('core.response.autosend',true)){
+        $__deferred_send = new Deferred(function() {
+          if (Options::get('core.response.autosend', true)) {
             Response::send();
           }
         });
 
-        foreach ((array)static::$routes as $group => $routes){
+        foreach ((array) static::$routes as $group => $routes) {
             foreach ($routes as $route) {
-                if (is_a($route, 'Route') && false !== ($args = $route->match($URL,$method))){
-                    $route->run($args,$method);
+                if (is_a($route, 'Route') && false !== ($args = $route->match($URL, $method))) {
+                    $route->run($args, $method);
                     return true;
                 }
             }
@@ -446,34 +446,34 @@ 
 class RouteGroup {
   protected $routes;
 
-  public function __construct(){
+  public function __construct() {
     $this->routes = new SplObjectStorage;
     return Route::add($this);
   }
 
-  public function has($r){
+  public function has($r) {
     return $this->routes->contains($r);
   }
 
-  public function add($r){
+  public function add($r) {
     $this->routes->attach($r);
     return $this;
   }
 
-  public function remove($r){
+  public function remove($r) {
     if ($this->routes->contains($r)) $this->routes->detach($r);
     return $this;
   }
 
-  public function before($callbacks){
-    foreach ($this->routes as $route){
+  public function before($callbacks) {
+    foreach ($this->routes as $route) {
       $route->before($callbacks);
     }
     return $this;
   }
 
-  public function after($callbacks){
-    foreach ($this->routes as $route){
+  public function after($callbacks) {
+    foreach ($this->routes as $route) {
       $route->after($callbacks);
     }
     return $this;

Braces +82 added lines, -50 removed lines

@@ -38,7 +38,7 @@ 
      * @param string $method The HTTP method for which the route must respond.
      * @return Route
      */
-    public function __construct($URLPattern, $callback = null, $method='get'){
+    public function __construct($URLPattern, $callback = null, $method='get') {
         $this->URLPattern = rtrim(implode('',static::$prefix),'/') . '/' . trim($URLPattern,'/')?:'/';
         $this->URLPattern = $this->URLPattern != '/' ? rtrim($this->URLPattern,'/') : $this->URLPattern;
         $this->dynamic    = $this->isDynamic($this->URLPattern);
@@ -56,19 +56,23 @@ 
      * @param  string $method The HTTP Method to check against.
      * @return boolean
      */
-    public function match($URL,$method='get'){
+    public function match($URL,$method='get') {
         $method = strtolower($method);
 
         // * is an http method wildcard
-        if (empty($this->methods[$method]) && empty($this->methods['*'])) return false;
+        if (empty($this->methods[$method]) && empty($this->methods['*'])) {
+          return false;
+        }
         $URL = rtrim($URL,'/');
         $args = [];
         if ( $this->dynamic
                ? preg_match($this->pattern,$URL,$args)
                : $URL == rtrim($this->pattern,'/')
-        ){
+        ) {
             foreach ($args as $key => $value) {
-              if ( false === is_string($key) ) unset($args[$key]);
+              if ( false === is_string($key) ) {
+                unset($args[$key]);
+              }
             }
             return $args;
         }
@@ -81,7 +85,7 @@ 
      * @param  string $method The HTTP Method requested.
      * @return array The callback response.
      */
-    public function run(array $args, $method='get'){
+    public function run(array $args, $method='get') {
         $method = strtolower($method);
         $this->response 			 		= '';
         $this->response_object 		= null;
@@ -150,7 +154,7 @@ 
 
         Event::trigger('core.route.after', $this);
 
-        if ( $this->response_is_object ){
+        if ( $this->response_is_object ) {
 			$this->response = Response::json($this->response_object);
         } else {
 			Response::add($this->response);
@@ -167,7 +171,7 @@ 
      * @param  string $method The HTTP Method to check against.
      * @return array The callback response.
      */
-    public function runIfMatch($URL, $method='get'){
+    public function runIfMatch($URL, $method='get') {
         return ($args = $this->match($URL,$method)) ? $this->run($args,$method) : null;
     }
 
@@ -177,7 +181,7 @@ 
      * @param  $callback The callback to be invoked (with variables extracted from the route if present) when the route match the request URI.
      * @return Route
      */
-    public static function on($URLPattern, $callback = null){
+    public static function on($URLPattern, $callback = null) {
         return new Route($URLPattern,$callback);
     }
 
@@ -187,7 +191,7 @@ 
      * @param  $callback The callback to be invoked (with variables extracted from the route if present) when the route match the request URI.
      * @return Route
      */
-    public static function get($URLPattern, $callback = null){
+    public static function get($URLPattern, $callback = null) {
         return (new Route($URLPattern,$callback))->via('get');
     }
 
@@ -197,7 +201,7 @@ 
      * @param  $callback The callback to be invoked (with variables extracted from the route if present) when the route match the request URI.
      * @return Route
      */
-    public static function post($URLPattern, $callback = null){
+    public static function post($URLPattern, $callback = null) {
         return (new Route($URLPattern,$callback))->via('post');
     }
 
@@ -207,7 +211,7 @@ 
      * @param  $callback The callback to be invoked (with variables extracted from the route if present) when the route match the request URI.
      * @return Route
      */
-    public static function any($URLPattern, $callback = null){
+    public static function any($URLPattern, $callback = null) {
         return (new Route($URLPattern,$callback))->via('*');
     }
 
@@ -253,7 +257,7 @@ 
      */
     public function & via(){
         $this->methods = [];
-        foreach (func_get_args() as $method){
+        foreach (func_get_args() as $method) {
             $this->methods[strtolower($method)] = true;
         }
         return $this;
@@ -275,7 +279,7 @@ 
      * @return Route
      */
     public function & rules(array $rules){
-        foreach ((array)$rules as $varname => $rule){
+        foreach ((array)$rules as $varname => $rule) {
             $this->rules[$varname] = $rule;
         }
         $this->pattern = $this->compilePatternAsRegex($this->URLPattern,$this->rules);
@@ -304,7 +308,9 @@ 
         $route->callback = [];
         foreach ($callbacks as $method => $callback) {
            $method = strtolower($method);
-           if (Request::method() !== $method) continue;
+           if (Request::method() !== $method) {
+             continue;
+           }
            $route->callback[$method] = $callback;
            $route->methods[$method]  = 1;
         }
@@ -316,8 +322,8 @@ 
      * @param  string $pattern The URL schema.
      * @return string The compiled PREG RegEx.
      */
-    protected static function compilePatternAsRegex($pattern, $rules=[]){
-        return '#^'.preg_replace_callback('#:([a-zA-Z]\w*)#S',function($g) use (&$rules){
+    protected static function compilePatternAsRegex($pattern, $rules=[]) {
+        return '#^'.preg_replace_callback('#:([a-zA-Z]\w*)#S',function($g) use (&$rules) {
             return '(?<' . $g[1] . '>' . (isset($rules[$g[1]])?$rules[$g[1]]:'[^/]+') .')';
         },str_replace(['.',')','*'],['\.',')?','.+'],$pattern)).'$#';
     }
@@ -329,12 +335,16 @@ 
      * @param  boolean $cut If true don't limit the matching to the whole URL (used for group pattern extraction)
      * @return array The extracted variables
      */
-    protected static function extractVariablesFromURL($pattern, $URL=null, $cut=false){
+    protected static function extractVariablesFromURL($pattern, $URL=null, $cut=false) {
         $URL     = $URL ?: Request::URI();
         $pattern = $cut ? str_replace('$#','',$pattern).'#' : $pattern;
-        if ( !preg_match($pattern,$URL,$args) ) return false;
+        if ( !preg_match($pattern,$URL,$args) ) {
+          return false;
+        }
         foreach ($args as $key => $value) {
-            if (false === is_string($key)) unset($args[$key]);
+            if (false === is_string($key)) {
+              unset($args[$key]);
+            }
         }
         return $args;
     }
@@ -344,7 +354,7 @@ 
      * @param  string  $pattern The URL schema.
      * @return boolean
      */
-    protected static function isDynamic($pattern){
+    protected static function isDynamic($pattern) {
       return strlen($pattern) != strcspn($pattern,':(?[*+');
     }
 
@@ -353,8 +363,10 @@ 
      * @param Route $r
      * @return Route
      */
-    public static function add($r){
-        if ( isset(static::$group[0]) ) static::$group[0]->add($r);
+    public static function add($r) {
+        if ( isset(static::$group[0]) ) {
+          static::$group[0]->add($r);
+        }
         return static::$routes[implode('',static::$prefix)][] = $r;
     }
 
@@ -363,41 +375,55 @@ 
      * @param  string $prefix The url prefix for the internal route definitions.
      * @param  string $callback This callback is invoked on $prefix match of the current request URI.
      */
-    public static function group($prefix,$callback=null){
+    public static function group($prefix,$callback=null) {
 
         // Skip definition if current request doesn't match group.
 
         $prefix_complete = rtrim(implode('',static::$prefix),'/') . $prefix;
 
-        if ( static::isDynamic($prefix) ){
+        if ( static::isDynamic($prefix) ) {
 
             // Dynamic group, capture vars
             $vars = static::extractVariablesFromURL(static::compilePatternAsRegex($prefix_complete),null,true);
 
             // Errors in compile pattern or variable extraction, aborting.
-            if (false === $vars) return;
+            if (false === $vars) {
+              return;
+            }
 
             static::$prefix[] = $prefix;
-            if (empty(static::$group)) static::$group = [];
+            if (empty(static::$group)) {
+              static::$group = [];
+            }
             array_unshift(static::$group, new RouteGroup());
-            if ($callback) call_user_func_array($callback,$vars);
+            if ($callback) {
+              call_user_func_array($callback,$vars);
+            }
             $group = static::$group[0];
             array_shift(static::$group);
             array_pop(static::$prefix);
-            if (empty(static::$prefix)) static::$prefix=[''];
+            if (empty(static::$prefix)) {
+              static::$prefix=[''];
+            }
             return $group;
 
-        } else if ( 0 === strpos(Request::URI(), $prefix_complete) ){
+        } else if ( 0 === strpos(Request::URI(), $prefix_complete) ) {
 
             // Static group
             static::$prefix[] = $prefix;
-            if (empty(static::$group)) static::$group = [];
+            if (empty(static::$group)) {
+              static::$group = [];
+            }
             array_unshift(static::$group, new RouteGroup());
-            if ($callback) call_user_func($callback);
+            if ($callback) {
+              call_user_func($callback);
+            }
             $group = static::$group[0];
             array_shift(static::$group);
             array_pop(static::$prefix);
-            if (empty(static::$prefix)) static::$prefix=[''];
+            if (empty(static::$prefix)) {
+              static::$prefix=[''];
+            }
             return $group;
         } else {
 
@@ -407,7 +433,7 @@ 
 
     }
 
-    public static function exitWithError($code,$message="Application Error"){
+    public static function exitWithError($code,$message="Application Error") {
     	Response::error($code,$message);
     	Response::send();
     	exit;
@@ -418,19 +444,23 @@ 
      * @param  string $URL The URL to match onto.
      * @return boolean true if a route callback was executed.
      */
-    public static function dispatch($URL=null,$method=null){
-        if (!$URL)     $URL     = Request::URI();
-        if (!$method)  $method  = Request::method();
+    public static function dispatch($URL=null,$method=null) {
+        if (!$URL) {
+          $URL     = Request::URI();
+        }
+        if (!$method) {
+          $method  = Request::method();
+        }
 
-        $__deferred_send = new Deferred(function(){
-          if (Options::get('core.response.autosend',true)){
+        $__deferred_send = new Deferred(function() {
+          if (Options::get('core.response.autosend',true)) {
             Response::send();
           }
         });
 
-        foreach ((array)static::$routes as $group => $routes){
+        foreach ((array)static::$routes as $group => $routes) {
             foreach ($routes as $route) {
-                if (is_a($route, 'Route') && false !== ($args = $route->match($URL,$method))){
+                if (is_a($route, 'Route') && false !== ($args = $route->match($URL,$method))) {
                     $route->run($args,$method);
                     return true;
                 }
@@ -446,34 +476,36 @@ 
 class RouteGroup {
   protected $routes;
 
-  public function __construct(){
+  public function __construct() {
     $this->routes = new SplObjectStorage;
     return Route::add($this);
   }
 
-  public function has($r){
+  public function has($r) {
     return $this->routes->contains($r);
   }
 
-  public function add($r){
+  public function add($r) {
     $this->routes->attach($r);
     return $this;
   }
 
-  public function remove($r){
-    if ($this->routes->contains($r)) $this->routes->detach($r);
+  public function remove($r) {
+    if ($this->routes->contains($r)) {
+      $this->routes->detach($r);
+    }
     return $this;
   }
 
-  public function before($callbacks){
-    foreach ($this->routes as $route){
+  public function before($callbacks) {
+    foreach ($this->routes as $route) {
       $route->before($callbacks);
     }
     return $this;
   }
 
-  public function after($callbacks){
-    foreach ($this->routes as $route){
+  public function after($callbacks) {
+    foreach ($this->routes as $route) {
       $route->after($callbacks);
     }
     return $this;