caffeina-core / core

classes/Module.php

Spacing +3 added lines, -3 removed lines

@@ -13,7 +13,7 @@ 
 trait Module {
     static protected $__PROTOTYPE = array();
 
-    final public function __call($name, $args){
+    final public function __call($name, $args) {
       if (isset(static::$__PROTOTYPE[$name]) && static::$__PROTOTYPE[$name] instanceof \Closure)
         return call_user_func_array(static::$__PROTOTYPE[$name]->bindTo($this, $this), $args);
       if (get_parent_class())
@@ -21,14 +21,14 @@ 
       else throw new \BadMethodCallException;
     }
 
-    final public static function __callStatic($name, $args){
+    final public static function __callStatic($name, $args) {
       if (isset(static::$__PROTOTYPE[$name]) && static::$__PROTOTYPE[$name] instanceof \Closure)
         return forward_static_call_array(static::$__PROTOTYPE[$name], $args);
       if (get_parent_class()) return parent::__callStatic($name, $args);
       else throw new \BadMethodCallException;
     }
 
-    public static function extend($methods = []){
+    public static function extend($methods = []) {
       if ($methods) foreach ($methods as $name => $method) {
         if ($method && $method instanceof \Closure)
           static::$__PROTOTYPE[$name] = $method;

Braces +24 added lines, -14 removed lines

@@ -13,26 +13,36 @@
 trait Module {
     static protected $__PROTOTYPE = array();
 
-    final public function __call($name, $args){
-      if (isset(static::$__PROTOTYPE[$name]) && static::$__PROTOTYPE[$name] instanceof \Closure)
-        return call_user_func_array(static::$__PROTOTYPE[$name]->bindTo($this, $this), $args);
-      if (get_parent_class())
-        return parent::__call($name, $args);
-      else throw new \BadMethodCallException;
+    final public function __call($name, $args) {
+      if (isset(static::$__PROTOTYPE[$name]) && static::$__PROTOTYPE[$name] instanceof \Closure) {
+              return call_user_func_array(static::$__PROTOTYPE[$name]->bindTo($this, $this), $args);
+      }
+      if (get_parent_class()) {
+              return parent::__call($name, $args);
+      } else {
+        throw new \BadMethodCallException;
+      }
     }
 
-    final public static function __callStatic($name, $args){
-      if (isset(static::$__PROTOTYPE[$name]) && static::$__PROTOTYPE[$name] instanceof \Closure)
-        return forward_static_call_array(static::$__PROTOTYPE[$name], $args);
-      if (get_parent_class()) return parent::__callStatic($name, $args);
-      else throw new \BadMethodCallException;
+    final public static function __callStatic($name, $args) {
+      if (isset(static::$__PROTOTYPE[$name]) && static::$__PROTOTYPE[$name] instanceof \Closure) {
+              return forward_static_call_array(static::$__PROTOTYPE[$name], $args);
+      }
+      if (get_parent_class()) {
+        return parent::__callStatic($name, $args);
+      } else {
+        throw new \BadMethodCallException;
+      }
     }
 
-    public static function extend($methods = []){
-      if ($methods) foreach ($methods as $name => $method) {
+    public static function extend($methods = []) {
+      if ($methods) {
+        foreach ($methods as $name => $method) {
         if ($method && $method instanceof \Closure)
           static::$__PROTOTYPE[$name] = $method;
-        else throw new \BadMethodCallException;
+      } else {
+          throw new \BadMethodCallException;
+        }
       }
     }
 

classes/Response.php

Spacing +43 added lines, -43 removed lines

@@ -32,12 +32,12 @@ 
                      $sent        = false;
 
 
-    public static function charset($charset){
+    public static function charset($charset) {
         static::$charset = $charset;
     }
 
-    public static function type($mime){
-        static::header('Content-Type',$mime . (static::$charset ? '; charset='.static::$charset : ''));
+    public static function type($mime) {
+        static::header('Content-Type', $mime.(static::$charset ? '; charset='.static::$charset : ''));
     }
 
     /**
@@ -45,39 +45,39 @@ 
      * @param  string/bool $filename Pass a falsy value to disable download or pass a filename for exporting content
      * @return [type]        [description]
      */
-    public static function download($filename){
+    public static function download($filename) {
         static::$force_dl = $filename;
     }
 
     /**
      * Start capturing output
      */
-    public static function start(){
+    public static function start() {
         static::$buffer = ob_start();
     }
 
     /**
      * Enable CORS HTTP headers.
      */
-    public static function enableCORS(){
+    public static function enableCORS() {
 
         // Allow from any origin
-        if ($origin = filter_input(INPUT_SERVER,'HTTP_ORIGIN')) {
+        if ($origin = filter_input(INPUT_SERVER, 'HTTP_ORIGIN')) {
           static::header('Access-Control-Allow-Origin', $origin);
           static::header('Access-Control-Allow-Credentials', 'true');
           static::header('Access-Control-Max-Age', 86400);
         }
 
         // Access-Control headers are received during OPTIONS requests
-        if (filter_input(INPUT_SERVER,'REQUEST_METHOD') == 'OPTIONS') {
+        if (filter_input(INPUT_SERVER, 'REQUEST_METHOD') == 'OPTIONS') {
             static::clean();
 
-            if (filter_input(INPUT_SERVER,'HTTP_ACCESS_CONTROL_REQUEST_METHOD')) {
+            if (filter_input(INPUT_SERVER, 'HTTP_ACCESS_CONTROL_REQUEST_METHOD')) {
               static::header('Access-Control-Allow-Methods',
                 'GET, POST, PUT, DELETE, OPTIONS, HEAD, CONNECT, PATCH, TRACE');
             }
-            if ($req_h = filter_input(INPUT_SERVER,'HTTP_ACCESS_CONTROL_REQUEST_HEADERS')) {
-              static::header('Access-Control-Allow-Headers',$req_h);
+            if ($req_h = filter_input(INPUT_SERVER, 'HTTP_ACCESS_CONTROL_REQUEST_HEADERS')) {
+              static::header('Access-Control-Allow-Headers', $req_h);
             }
 
             static::send();
@@ -93,8 +93,8 @@ 
      * Finish the output buffer capturing.
      * @return string The captured buffer
      */
-    public static function end(){
-        if (static::$buffer){
+    public static function end() {
+        if (static::$buffer) {
             static::$payload[] = ob_get_contents();
             ob_end_clean();
             static::$buffer = null;
@@ -106,14 +106,14 @@ 
      * Check if an response output buffering is active.
      * @return boolean
      */
-    public static function isBuffering(){
+    public static function isBuffering() {
         return static::$buffer;
     }
 
     /**
      * Clear the response body
      */
-    public static function clean(){
+    public static function clean() {
         static::$payload = [];
     }
 
@@ -121,45 +121,45 @@ 
      * Append a JSON object to the buffer.
      * @param  mixed $payload Data to append to the response buffer
      */
-    public static function json($payload){
+    public static function json($payload) {
         static::type(static::TYPE_JSON);
-        static::$payload[] = json_encode($payload, Options::get('core.response.json_flags',JSON_NUMERIC_CHECK));
+        static::$payload[] = json_encode($payload, Options::get('core.response.json_flags', JSON_NUMERIC_CHECK));
     }
 
     /**
      * Append a text to the buffer.
      * @param  mixed $payload Text to append to the response buffer
      */
-    public static function text(){
+    public static function text() {
         static::type(static::TYPE_TEXT);
-        static::$payload[] = implode('',func_get_args());
+        static::$payload[] = implode('', func_get_args());
     }
 
     /**
      * Append an XML string to the buffer.
      * @param  mixed $payload Data to append to the response buffer
      */
-    public static function xml(){
+    public static function xml() {
         static::type(static::TYPE_XML);
-        static::$payload[] = implode('',func_get_args());
+        static::$payload[] = implode('', func_get_args());
     }
 
     /**
      * Append a SVG string to the buffer.
      * @param  mixed $payload Data to append to the response buffer
      */
-    public static function svg(){
+    public static function svg() {
         static::type(static::TYPE_SVG);
-        static::$payload[] = implode('',func_get_args());
+        static::$payload[] = implode('', func_get_args());
     }
 
     /**
      * Append an HTML string to the buffer.
      * @param  mixed $payload Data to append to the response buffer
      */
-    public static function html(){
+    public static function html() {
         static::type(static::TYPE_HTML);
-        static::$payload[] = implode('',func_get_args());
+        static::$payload[] = implode('', func_get_args());
     }
 
     /**
@@ -172,8 +172,8 @@ 
      *
      * @param  mixed $payload Data to append to the response buffer
      */
-    public static function add(){
-      foreach(func_get_args() as $data){
+    public static function add() {
+      foreach (func_get_args() as $data) {
         switch (true) {
           case is_callable($data) :
             return static::add($data());
@@ -187,27 +187,27 @@ 
       }
     }
 
-    public static function status($code,$message=''){
-        static::header('Status',$message?:$code,$code);
+    public static function status($code, $message = '') {
+        static::header('Status', $message ?: $code, $code);
     }
 
-    public static function header($name,$value,$code=null){
-        static::$headers[$name] = [$value,$code];
+    public static function header($name, $value, $code = null) {
+        static::$headers[$name] = [$value, $code];
     }
 
-    public static function error($code=500,$message='Application Error'){
-        Event::trigger('core.response.error',$code,$message);
-        static::status($code,$message);
+    public static function error($code = 500, $message = 'Application Error') {
+        Event::trigger('core.response.error', $code, $message);
+        static::status($code, $message);
     }
 
-    public static function body($setBody=null){
+    public static function body($setBody = null) {
       if ($setBody) static::$payload = [$setBody];
       return Filter::with('core.response.body',
-                is_array(static::$payload) ? implode('',static::$payload) : static::$payload
+                is_array(static::$payload) ? implode('', static::$payload) : static::$payload
              );
     }
 
-    public static function headers($setHeaders=null){
+    public static function headers($setHeaders = null) {
        if ($setHeaders) static::$headers = $setHeaders;
        return static::$headers;
     }
@@ -219,7 +219,7 @@ 
      *
      * @return array Headers and body of the response
      */
-    public static function save(){
+    public static function save() {
         return [
           'head' => static::$headers,
           'body' => static::body(),
@@ -233,13 +233,13 @@ 
      *
      * @param  array $data head/body saved state
      */
-    public static function load($data){
-      $data = (object)$data;
+    public static function load($data) {
+      $data = (object) $data;
       if (isset($data->head)) static::headers($data->head);
       if (isset($data->body)) static::body($data->body);
     }
 
-    public static function send($force = false){
+    public static function send($force = false) {
       if (!static::$sent || $force) {
         static::$sent = true;
         Event::trigger('core.response.send');
@@ -252,8 +252,8 @@ 
                 $code  = null;
             }
 
-            if ($value == 'Status'){
-              if (function_exists('http_response_code')){
+            if ($value == 'Status') {
+              if (function_exists('http_response_code')) {
                 http_response_code($code);
               } else {
                 header("Status: $code", true, $code);

Braces +44 added lines, -32 removed lines

@@ -32,11 +32,11 @@ 
                      $sent        = false;
 
 
-    public static function charset($charset){
+    public static function charset($charset) {
         static::$charset = $charset;
     }
 
-    public static function type($mime){
+    public static function type($mime) {
         static::header('Content-Type',$mime . (static::$charset ? '; charset='.static::$charset : ''));
     }
 
@@ -45,21 +45,21 @@ 
      * @param  string/bool $filename Pass a falsy value to disable download or pass a filename for exporting content
      * @return [type]        [description]
      */
-    public static function download($filename){
+    public static function download($filename) {
         static::$force_dl = $filename;
     }
 
     /**
      * Start capturing output
      */
-    public static function start(){
+    public static function start() {
         static::$buffer = ob_start();
     }
 
     /**
      * Enable CORS HTTP headers.
      */
-    public static function enableCORS(){
+    public static function enableCORS() {
 
         // Allow from any origin
         if ($origin = filter_input(INPUT_SERVER,'HTTP_ORIGIN')) {
@@ -93,8 +93,8 @@ 
      * Finish the output buffer capturing.
      * @return string The captured buffer
      */
-    public static function end(){
-        if (static::$buffer){
+    public static function end() {
+        if (static::$buffer) {
             static::$payload[] = ob_get_contents();
             ob_end_clean();
             static::$buffer = null;
@@ -106,14 +106,14 @@ 
      * Check if an response output buffering is active.
      * @return boolean
      */
-    public static function isBuffering(){
+    public static function isBuffering() {
         return static::$buffer;
     }
 
     /**
      * Clear the response body
      */
-    public static function clean(){
+    public static function clean() {
         static::$payload = [];
     }
 
@@ -121,7 +121,7 @@ 
      * Append a JSON object to the buffer.
      * @param  mixed $payload Data to append to the response buffer
      */
-    public static function json($payload){
+    public static function json($payload) {
         static::type(static::TYPE_JSON);
         static::$payload[] = json_encode($payload, Options::get('core.response.json_flags',JSON_NUMERIC_CHECK));
     }
@@ -130,7 +130,7 @@ 
      * Append a text to the buffer.
      * @param  mixed $payload Text to append to the response buffer
      */
-    public static function text(){
+    public static function text() {
         static::type(static::TYPE_TEXT);
         static::$payload[] = implode('',func_get_args());
     }
@@ -139,7 +139,7 @@ 
      * Append an XML string to the buffer.
      * @param  mixed $payload Data to append to the response buffer
      */
-    public static function xml(){
+    public static function xml() {
         static::type(static::TYPE_XML);
         static::$payload[] = implode('',func_get_args());
     }
@@ -148,7 +148,7 @@ 
      * Append a SVG string to the buffer.
      * @param  mixed $payload Data to append to the response buffer
      */
-    public static function svg(){
+    public static function svg() {
         static::type(static::TYPE_SVG);
         static::$payload[] = implode('',func_get_args());
     }
@@ -157,7 +157,7 @@ 
      * Append an HTML string to the buffer.
      * @param  mixed $payload Data to append to the response buffer
      */
-    public static function html(){
+    public static function html() {
         static::type(static::TYPE_HTML);
         static::$payload[] = implode('',func_get_args());
     }
@@ -172,8 +172,8 @@ 
      *
      * @param  mixed $payload Data to append to the response buffer
      */
-    public static function add(){
-      foreach(func_get_args() as $data){
+    public static function add() {
+      foreach(func_get_args() as $data) {
         switch (true) {
           case is_callable($data) :
             return static::add($data());
@@ -187,28 +187,32 @@ 
       }
     }
 
-    public static function status($code,$message=''){
+    public static function status($code,$message='') {
         static::header('Status',$message?:$code,$code);
     }
 
-    public static function header($name,$value,$code=null){
+    public static function header($name,$value,$code=null) {
         static::$headers[$name] = [$value,$code];
     }
 
-    public static function error($code=500,$message='Application Error'){
+    public static function error($code=500,$message='Application Error') {
         Event::trigger('core.response.error',$code,$message);
         static::status($code,$message);
     }
 
-    public static function body($setBody=null){
-      if ($setBody) static::$payload = [$setBody];
+    public static function body($setBody=null) {
+      if ($setBody) {
+        static::$payload = [$setBody];
+      }
       return Filter::with('core.response.body',
                 is_array(static::$payload) ? implode('',static::$payload) : static::$payload
              );
     }
 
-    public static function headers($setHeaders=null){
-       if ($setHeaders) static::$headers = $setHeaders;
+    public static function headers($setHeaders=null) {
+       if ($setHeaders) {
+         static::$headers = $setHeaders;
+       }
        return static::$headers;
     }
 
@@ -219,7 +223,7 @@ 
      *
      * @return array Headers and body of the response
      */
-    public static function save(){
+    public static function save() {
         return [
           'head' => static::$headers,
           'body' => static::body(),
@@ -233,27 +237,33 @@ 
      *
      * @param  array $data head/body saved state
      */
-    public static function load($data){
+    public static function load($data) {
       $data = (object)$data;
-      if (isset($data->head)) static::headers($data->head);
-      if (isset($data->body)) static::body($data->body);
+      if (isset($data->head)) {
+        static::headers($data->head);
+      }
+      if (isset($data->body)) {
+        static::body($data->body);
+      }
     }
 
-    public static function send($force = false){
+    public static function send($force = false) {
       if (!static::$sent || $force) {
         static::$sent = true;
         Event::trigger('core.response.send');
-        if (false === headers_sent()) foreach (static::$headers as $name => $value_code) {
+        if (false === headers_sent()) {
+          foreach (static::$headers as $name => $value_code) {
 
             if (is_array($value_code)) {
                 list($value, $code) = (count($value_code) > 1) ? $value_code : [current($value_code), 200];
+        }
             } else {
                 $value = $value_code;
                 $code  = null;
             }
 
-            if ($value == 'Status'){
-              if (function_exists('http_response_code')){
+            if ($value == 'Status') {
+              if (function_exists('http_response_code')) {
                 http_response_code($code);
               } else {
                 header("Status: $code", true, $code);
@@ -265,7 +275,9 @@ 
                 : header("$name: $value", true);
             }
         }
-        if (static::$force_dl) header('Content-Disposition: attachment; filename="'.static::$force_dl.'"');
+        if (static::$force_dl) {
+          header('Content-Disposition: attachment; filename="'.static::$force_dl.'"');
+        }
         echo static::body();
       }
     }

classes/Model.php

Indentation +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
     public static function create($data){
       $tmp = new static;
       foreach ((array)$data as $key => $value) {
-         $tmp->$key = $value;
+          $tmp->$key = $value;
       }
       $tmp->save();
       return $tmp;

Spacing +7 added lines, -7 removed lines

@@ -13,13 +13,13 @@ 
 abstract class Model {
     use Module, Persistence;
 
-    public static function where($where_sql = false){
+    public static function where($where_sql = false) {
       // Forward persistence calls to caller class, not Model
       $self  = get_called_class();
       $table = $self::persistenceOptions('table');
       $key   = $self::persistenceOptions('key');
 
-      $sql   = "select $key from $table" . ($where_sql ? " where $where_sql" : '');
+      $sql   = "select $key from $table".($where_sql ? " where $where_sql" : '');
 
       $results = [];
       SQL::each($sql, function($row) use ($self, &$results, $key){
@@ -28,20 +28,20 @@ 
       return $results;
     }
 
-    public static function all($page=1, $limit=-1){
-      $offset = max(1,$page)-1;
+    public static function all($page = 1, $limit = -1) {
+      $offset = max(1, $page) - 1;
       return static::where($limit < 1 ? "" : "1 limit $limit offset $offset");
     }
 
-    public function primaryKey(){
+    public function primaryKey() {
       $self = get_called_class();
       $key  = $self::persistenceOptions('key');
       return $this->$key;
     }
 
-    public static function create($data){
+    public static function create($data) {
       $tmp = new static;
-      foreach ((array)$data as $key => $value) {
+      foreach ((array) $data as $key => $value) {
          $tmp->$key = $value;
       }
       $tmp->save();

Braces +5 added lines, -5 removed lines

@@ -13,7 +13,7 @@ 
 abstract class Model {
     use Module, Persistence;
 
-    public static function where($where_sql = false){
+    public static function where($where_sql = false) {
       // Forward persistence calls to caller class, not Model
       $self  = get_called_class();
       $table = $self::persistenceOptions('table');
@@ -22,24 +22,24 @@ 
       $sql   = "select $key from $table" . ($where_sql ? " where $where_sql" : '');
 
       $results = [];
-      SQL::each($sql, function($row) use ($self, &$results, $key){
+      SQL::each($sql, function($row) use ($self, &$results, $key) {
           $results[] = $self::load($row->$key);
       });
       return $results;
     }
 
-    public static function all($page=1, $limit=-1){
+    public static function all($page=1, $limit=-1) {
       $offset = max(1,$page)-1;
       return static::where($limit < 1 ? "" : "1 limit $limit offset $offset");
     }
 
-    public function primaryKey(){
+    public function primaryKey() {
       $self = get_called_class();
       $key  = $self::persistenceOptions('key');
       return $this->$key;
     }
 
-    public static function create($data){
+    public static function create($data) {
       $tmp = new static;
       foreach ((array)$data as $key => $value) {
          $tmp->$key = $value;

classes/Persistence.php

Spacing +24 added lines, -24 removed lines

@@ -20,8 +20,8 @@ 
    * @param  mixed $options The options passed to the persistence layer.
    * @return mixed          All options array or a single value
    */
-  protected static function persistenceOptions($options=null){
-    static $_options = ['table'=>null,'key'=>'id'];
+  protected static function persistenceOptions($options = null) {
+    static $_options = ['table'=>null, 'key'=>'id'];
     if ($options === null) return $_options;
 
     if (is_array($options)) {
@@ -32,18 +32,18 @@ 
     } else {
       if (empty($_options['table'])) {
         $self = get_called_class();
-        if (defined("$self::_PRIMARY_KEY_")){
+        if (defined("$self::_PRIMARY_KEY_")) {
           $x = explode('.', $self::_PRIMARY_KEY_);
           $_options = [
             'table' => current($x),
-            'key'   => isset($x[1])?$x[1]:'id',
+            'key'   => isset($x[1]) ? $x[1] : 'id',
           ];
         } else {
           // User pluralized class name as default table
-          switch(substr($s = strtolower($self),-1)){
-              case 'y': $table = substr($s,0,-1).'ies'; break;
-              case 's': $table = substr($s,0,-1).'es';  break;
-              default:  $table = $s.'s'; break;
+          switch (substr($s = strtolower($self), -1)) {
+              case 'y': $table = substr($s, 0, -1).'ies';break;
+              case 's': $table = substr($s, 0, -1).'es';break;
+              default:  $table = $s.'s';break;
           }
           // Default ID
           $_options = [
@@ -64,7 +64,7 @@ 
    * @param  callable $callback The callback to use on model save
    * @return callable           Current save callback
    */
-  protected static function persistenceSave(callable $callback=null){
+  protected static function persistenceSave(callable $callback = null) {
     static $save_cb = null;
     return $callback ? $save_cb = $callback : $save_cb;
   }
@@ -77,7 +77,7 @@ 
    * @param  callable $callback The callback to use on model load
    * @return callable           Current load callback
    */
-  protected static function persistenceLoad(callable $callback=null){
+  protected static function persistenceLoad(callable $callback = null) {
     static $retrieve_cb = null;
     return $callback ? $retrieve_cb = $callback : $retrieve_cb;
   }
@@ -92,7 +92,7 @@ 
    * @param  array $options An associative array with options for the persistance layer.
    * @return void
    */
-  public static function persistOn($table, array $options=[]){
+  public static function persistOn($table, array $options = []) {
     $options['table'] = $table;
     static::persistenceOptions($options);
   }
@@ -103,7 +103,7 @@ 
    * @param  callable $callback The callback to use on model save
    * @return void
    */
-  public static function onSave(callable $callback){
+  public static function onSave(callable $callback) {
     static::persistenceSave($callback);
   }
 
@@ -112,7 +112,7 @@ 
    * @param  callable $callback The callback to use on model load
    * @return void
    */
-  public static function onLoad(callable $callback){
+  public static function onLoad(callable $callback) {
     static::persistenceLoad($callback);
   }
 
@@ -120,23 +120,23 @@ 
    * Load the model from the persistence layer
    * @return mixed The retrieved object
    */
-  public static function load($pk){
+  public static function load($pk) {
     $table = static::persistenceOptions('table');
     $cb    = static::persistenceLoad();
     $op    = static::persistenceOptions();
 
     // Use standard persistence on DB layer
-    return ( false == is_callable($cb) ) ?
-      static::persistenceLoadDefault($pk,$table,$op) : $cb($pk,$table,$op);
+    return (false == is_callable($cb)) ?
+      static::persistenceLoadDefault($pk, $table, $op) : $cb($pk, $table, $op);
   }
 
   /**
    * Private Standard Load Method
    */
-  private static function persistenceLoadDefault($pk, $table, $options){
-    if ( $data = SQL::single("SELECT * FROM $table WHERE {$options['key']}=? LIMIT 1",[$pk]) ){
+  private static function persistenceLoadDefault($pk, $table, $options) {
+    if ($data = SQL::single("SELECT * FROM $table WHERE {$options['key']}=? LIMIT 1", [$pk])) {
        $obj = new static;
-       foreach ((array)$data as $key => $value) {
+       foreach ((array) $data as $key => $value) {
          $obj->$key = $value;
        }
        return $obj;
@@ -149,21 +149,21 @@ 
    * Save the model to the persistence layer
    * @return mixed The results from the save callback. (default: lastInsertID)
    */
-  public function save(){
+  public function save() {
     $table  = static::persistenceOptions('table');
     $op     = static::persistenceOptions();
     $cb     = static::persistenceSave();
 
     // Use standard persistence on DB layer
-    $cb = $cb ? Closure::bind($cb, $this) : [$this,'persistenceSaveDefault'];
-    return $cb($table,$op);
+    $cb = $cb ? Closure::bind($cb, $this) : [$this, 'persistenceSaveDefault'];
+    return $cb($table, $op);
   }
 
   /**
    * Private Standard Save Method
    */
-  private function persistenceSaveDefault($table,$options){
-     return SQL::insertOrUpdate($table,array_filter((array)$this),$options['key']);
+  private function persistenceSaveDefault($table, $options) {
+     return SQL::insertOrUpdate($table, array_filter((array) $this), $options['key']);
   }
 
 

Braces +19 added lines, -15 removed lines

@@ -20,19 +20,23 @@ 
    * @param  mixed $options The options passed to the persistence layer.
    * @return mixed          All options array or a single value
    */
-  protected static function persistenceOptions($options=null){
+  protected static function persistenceOptions($options=null) {
     static $_options = ['table'=>null,'key'=>'id'];
-    if ($options === null) return $_options;
+    if ($options === null) {
+      return $_options;
+    }
 
     if (is_array($options)) {
       foreach ($_options as $key => &$value) {
-        if (isset($options[$key])) $value = $options[$key];
+        if (isset($options[$key])) {
+          $value = $options[$key];
+        }
       }
       return $_options;
     } else {
       if (empty($_options['table'])) {
         $self = get_called_class();
-        if (defined("$self::_PRIMARY_KEY_")){
+        if (defined("$self::_PRIMARY_KEY_")) {
           $x = explode('.', $self::_PRIMARY_KEY_);
           $_options = [
             'table' => current($x),
@@ -40,7 +44,7 @@ 
           ];
         } else {
           // User pluralized class name as default table
-          switch(substr($s = strtolower($self),-1)){
+          switch(substr($s = strtolower($self),-1)) {
               case 'y': $table = substr($s,0,-1).'ies'; break;
               case 's': $table = substr($s,0,-1).'es';  break;
               default:  $table = $s.'s'; break;
@@ -64,7 +68,7 @@ 
    * @param  callable $callback The callback to use on model save
    * @return callable           Current save callback
    */
-  protected static function persistenceSave(callable $callback=null){
+  protected static function persistenceSave(callable $callback=null) {
     static $save_cb = null;
     return $callback ? $save_cb = $callback : $save_cb;
   }
@@ -77,7 +81,7 @@ 
    * @param  callable $callback The callback to use on model load
    * @return callable           Current load callback
    */
-  protected static function persistenceLoad(callable $callback=null){
+  protected static function persistenceLoad(callable $callback=null) {
     static $retrieve_cb = null;
     return $callback ? $retrieve_cb = $callback : $retrieve_cb;
   }
@@ -92,7 +96,7 @@ 
    * @param  array $options An associative array with options for the persistance layer.
    * @return void
    */
-  public static function persistOn($table, array $options=[]){
+  public static function persistOn($table, array $options=[]) {
     $options['table'] = $table;
     static::persistenceOptions($options);
   }
@@ -103,7 +107,7 @@ 
    * @param  callable $callback The callback to use on model save
    * @return void
    */
-  public static function onSave(callable $callback){
+  public static function onSave(callable $callback) {
     static::persistenceSave($callback);
   }
 
@@ -112,7 +116,7 @@ 
    * @param  callable $callback The callback to use on model load
    * @return void
    */
-  public static function onLoad(callable $callback){
+  public static function onLoad(callable $callback) {
     static::persistenceLoad($callback);
   }
 
@@ -120,7 +124,7 @@ 
    * Load the model from the persistence layer
    * @return mixed The retrieved object
    */
-  public static function load($pk){
+  public static function load($pk) {
     $table = static::persistenceOptions('table');
     $cb    = static::persistenceLoad();
     $op    = static::persistenceOptions();
@@ -133,8 +137,8 @@ 
   /**
    * Private Standard Load Method
    */
-  private static function persistenceLoadDefault($pk, $table, $options){
-    if ( $data = SQL::single("SELECT * FROM $table WHERE {$options['key']}=? LIMIT 1",[$pk]) ){
+  private static function persistenceLoadDefault($pk, $table, $options) {
+    if ( $data = SQL::single("SELECT * FROM $table WHERE {$options['key']}=? LIMIT 1",[$pk]) ) {
        $obj = new static;
        foreach ((array)$data as $key => $value) {
          $obj->$key = $value;
@@ -149,7 +153,7 @@ 
    * Save the model to the persistence layer
    * @return mixed The results from the save callback. (default: lastInsertID)
    */
-  public function save(){
+  public function save() {
     $table  = static::persistenceOptions('table');
     $op     = static::persistenceOptions();
     $cb     = static::persistenceSave();
@@ -162,7 +166,7 @@ 
   /**
    * Private Standard Save Method
    */
-  private function persistenceSaveDefault($table,$options){
+  private function persistenceSaveDefault($table,$options) {
      return SQL::insertOrUpdate($table,array_filter((array)$this),$options['key']);
   }
 

classes/Route.php

Indentation +1 added lines, -1 removed lines

@@ -140,7 +140,7 @@
       Event::trigger('core.route.end', $this);
 
       return [Filter::with('core.route.response', Response::body())];
-     }
+      }
 
     /**
      * Check if route match URL and HTTP Method and run if it is valid.

Spacing +63 added lines, -63 removed lines

@@ -38,12 +38,12 @@ 
      * @param string $method The HTTP method for which the route must respond.
      * @return Route
      */
-    public function __construct($URLPattern, $callback = null, $method='get'){
-      $prefix  = static::$prefix ? rtrim(implode('',static::$prefix),'/') : '';
-      $pattern = "/" . trim($URLPattern, "/");
+    public function __construct($URLPattern, $callback = null, $method = 'get') {
+      $prefix  = static::$prefix ? rtrim(implode('', static::$prefix), '/') : '';
+      $pattern = "/".trim($URLPattern, "/");
       // Adjust / optionality with dynamic patterns
       // Ex:  /test/(:a) ===> /test(/:a)
-      $this->URLPattern = str_replace('//','/',str_replace('/(','(/', rtrim("{$prefix}{$pattern}","/")));
+      $this->URLPattern = str_replace('//', '/', str_replace('/(', '(/', rtrim("{$prefix}{$pattern}", "/")));
 
       $this->dynamic    = $this->isDynamic($this->URLPattern);
       $this->pattern    = $this->dynamic ? $this->compilePatternAsRegex($this->URLPattern, $this->rules) : $this->URLPattern;
@@ -60,19 +60,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,'/')
-      ){
-        foreach ( $args as $key => $value ) {
-          if ( false === is_string($key) ) unset($args[$key]);
+      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]);
         }
         return $args;
       }
@@ -85,12 +85,12 @@ 
      * @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);
-      $append_echoed_text = Options::get('core.route.append_echoed_text',true);
+      $append_echoed_text = Options::get('core.route.append_echoed_text', true);
 
       // Call direct befores
-      if ( $this->befores ) {
+      if ($this->befores) {
         // Reverse befores order
         foreach (array_reverse($this->befores) as $mw) {
           Event::trigger('core.route.before', $this, $mw);
@@ -98,7 +98,7 @@ 
           $mw_result  = call_user_func($mw);
           $raw_echoed = ob_get_clean();
           if ($append_echoed_text) Response::add($raw_echoed);
-          if ( false  === $mw_result ) {
+          if (false === $mw_result) {
             return [''];
           } else {
             Response::add($mw_result);
@@ -111,7 +111,7 @@ 
                   : $this->callback;
 
       if (is_callable($callback)) {
-        Response::type( Options::get('core.route.response_default_type', Response::TYPE_HTML) );
+        Response::type(Options::get('core.route.response_default_type', Response::TYPE_HTML));
 
         ob_start();
         $view_results = call_user_func_array($callback, $args);
@@ -122,14 +122,14 @@ 
       }
 
       // Apply afters
-      if ( $this->afters ) {
+      if ($this->afters) {
         foreach ($this->afters as $mw) {
           Event::trigger('core.route.after', $this, $mw);
           ob_start();
           $mw_result  = call_user_func($mw);
           $raw_echoed = ob_get_clean();
           if ($append_echoed_text) Response::add($raw_echoed);
-          if ( false  === $mw_result ) {
+          if (false === $mw_result) {
             return [''];
           } else {
             Response::add($mw_result);
@@ -148,8 +148,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;
     }
 
     /**
@@ -158,8 +158,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);
     }
 
     /**
@@ -168,8 +168,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');
     }
 
     /**
@@ -178,8 +178,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');
     }
 
     /**
@@ -188,8 +188,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('*');
     }
 
     /**
@@ -234,7 +234,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;
@@ -256,10 +256,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;
     }
 
@@ -297,10 +297,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)).'$#';
     }
 
     /**
@@ -310,10 +310,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]);
       }
@@ -325,8 +325,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, ':(?[*+');
     }
 
     /**
@@ -334,8 +334,8 @@ 
      * @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;
     }
 
@@ -344,10 +344,10 @@ 
      * @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;
 
       static::$prefix[] = $prefix;
       if (empty(static::$group)) static::$group = [];
@@ -361,7 +361,7 @@ 
           $vars = static::extractVariablesFromURL(static::compilePatternAsRegex($prefix_complete), null, true);
           // Errors in compile pattern or variable extraction, aborting.
           if (false === $vars) return false;
-          if ($callback) call_user_func_array($callback,$vars);
+          if ($callback) call_user_func_array($callback, $vars);
         break;
 
         // Static group
@@ -379,8 +379,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;
     }
@@ -390,27 +390,27 @@ 
      * @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;
                 }
             }
         }
 
         Response::status(404, '404 Resource not found.');
-        foreach (array_filter(Event::trigger(404)) as $res){
+        foreach (array_filter(Event::trigger(404)) as $res) {
 
         }
         return false;
@@ -420,34 +420,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 +83 added lines, -49 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') {
       $prefix  = static::$prefix ? rtrim(implode('',static::$prefix),'/') : '';
       $pattern = "/" . trim($URLPattern, "/");
       // Adjust / optionality with dynamic patterns
@@ -60,19 +60,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;
       }
@@ -85,7 +89,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);
       $append_echoed_text = Options::get('core.route.append_echoed_text',true);
 
@@ -97,7 +101,9 @@ 
           ob_start();
           $mw_result  = call_user_func($mw);
           $raw_echoed = ob_get_clean();
-          if ($append_echoed_text) Response::add($raw_echoed);
+          if ($append_echoed_text) {
+            Response::add($raw_echoed);
+          }
           if ( false  === $mw_result ) {
             return [''];
           } else {
@@ -117,7 +123,9 @@ 
         $view_results = call_user_func_array($callback, $args);
         $raw_echoed   = ob_get_clean();
 
-        if ($append_echoed_text) Response::add($raw_echoed);
+        if ($append_echoed_text) {
+          Response::add($raw_echoed);
+        }
         Response::add($view_results);
       }
 
@@ -128,7 +136,9 @@ 
           ob_start();
           $mw_result  = call_user_func($mw);
           $raw_echoed = ob_get_clean();
-          if ($append_echoed_text) Response::add($raw_echoed);
+          if ($append_echoed_text) {
+            Response::add($raw_echoed);
+          }
           if ( false  === $mw_result ) {
             return [''];
           } else {
@@ -148,7 +158,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;
     }
 
@@ -158,7 +168,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);
     }
 
@@ -168,7 +178,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');
     }
 
@@ -178,7 +188,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');
     }
 
@@ -188,7 +198,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('*');
     }
 
@@ -234,7 +244,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;
@@ -256,7 +266,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 );
@@ -285,7 +295,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;
       }
@@ -297,8 +309,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)).'$#';
     }
@@ -310,12 +322,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;
     }
@@ -325,7 +341,7 @@ 
      * @param  string  $pattern The URL schema.
      * @return boolean
      */
-    protected static function isDynamic($pattern){
+    protected static function isDynamic($pattern) {
       return strlen($pattern) != strcspn($pattern,':(?[*+');
     }
 
@@ -334,8 +350,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;
     }
 
@@ -344,13 +362,15 @@ 
      * @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;
 
       static::$prefix[] = $prefix;
-      if (empty(static::$group)) static::$group = [];
+      if (empty(static::$group)) {
+        static::$group = [];
+      }
       array_unshift(static::$group, new RouteGroup());
 
       switch (true) {
@@ -360,13 +380,19 @@ 
           // Capture vars
           $vars = static::extractVariablesFromURL(static::compilePatternAsRegex($prefix_complete), null, true);
           // Errors in compile pattern or variable extraction, aborting.
-          if (false === $vars) return false;
-          if ($callback) call_user_func_array($callback,$vars);
+          if (false === $vars) {
+            return false;
+          }
+          if ($callback) {
+            call_user_func_array($callback,$vars);
+          }
         break;
 
         // Static group
         case 0 === strpos(Request::URI(), $prefix_complete) :
-          if ($callback) call_user_func($callback);
+          if ($callback) {
+            call_user_func($callback);
+          }
         break;
 
       }
@@ -374,12 +400,14 @@ 
       $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;
 
     }
 
-    public static function exitWithError($code,$message="Application Error"){
+    public static function exitWithError($code,$message="Application Error") {
       Response::error($code,$message);
       Response::send();
       exit;
@@ -390,19 +418,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;
                 }
@@ -410,7 +442,7 @@ 
         }
 
         Response::status(404, '404 Resource not found.');
-        foreach (array_filter(Event::trigger(404)) as $res){
+        foreach (array_filter(Event::trigger(404)) as $res) {
 
         }
         return false;
@@ -420,34 +452,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;