caffeina-core / core

classes/URL.php

Spacing +7 added lines, -7 removed lines

@@ -21,27 +21,27 @@
             $query     = [],
             $fragment  = false;
 
-  public function __construct($url=''){
+  public function __construct($url = '') {
     if (empty($url) || !is_string($url)) return;
-    $tmp_url      = (strpos($url, '://') === false) ? "..N..://$url" : $url;
+    $tmp_url = (strpos($url, '://') === false) ? "..N..://$url" : $url;
     if (mb_detect_encoding($tmp_url, 'UTF-8', true) || ($parsed = parse_url($tmp_url)) === false) {
       preg_match('(^((?P<scheme>[^:/?#]+):(//))?((\\3|//)?(?:(?P<user>[^:]+):(?P<pass>[^@]+)@)?(?P<host>[^/?:#]*))(:(?P<port>\\d+))?(?P<path>[^?#]*)(\\?(?P<query>[^#]*))?(#(?P<fragment>.*))?)u', $tmp_url, $parsed);
     }
-    foreach($parsed as $k => $v) if(isset($this->$k)) $this->$k = $v;
+    foreach ($parsed as $k => $v) if (isset($this->$k)) $this->$k = $v;
     if ($this->scheme == '..N..') $this->scheme = null;
     if (!empty($this->query)) {
       parse_str($this->query, $this->query);
     }
   }
 
-  public function __toString(){
+  public function __toString() {
     $d = [];
     if ($this->scheme)         $d[] = "{$this->scheme}://";
-    if ($this->user)           $d[] = "{$this->user}" . (empty($this->pass)?'':":{$this->pass}") . "@";
+    if ($this->user)           $d[] = "{$this->user}".(empty($this->pass) ? '' : ":{$this->pass}")."@";
     if ($this->host)           $d[] = "{$this->host}";
     if ($this->port)           $d[] = ":{$this->port}";
-    if ($this->path)           $d[] = "/" . ltrim($this->path,"/");
-    if (!empty($this->query))  $d[] = "?" . http_build_query($this->query);
+    if ($this->path)           $d[] = "/".ltrim($this->path, "/");
+    if (!empty($this->query))  $d[] = "?".http_build_query($this->query);
     if ($this->fragment)       $d[] = "#{$this->fragment}";
     return implode('', $d);
   }

Braces +32 added lines, -12 removed lines

@@ -21,28 +21,48 @@
             $query     = [],
             $fragment  = false;
 
-  public function __construct($url=''){
-    if (empty($url) || !is_string($url)) return;
+  public function __construct($url='') {
+    if (empty($url) || !is_string($url)) {
+      return;
+    }
     $tmp_url      = (strpos($url, '://') === false) ? "..N..://$url" : $url;
     if (mb_detect_encoding($tmp_url, 'UTF-8', true) || ($parsed = parse_url($tmp_url)) === false) {
       preg_match('(^((?P<scheme>[^:/?#]+):(//))?((\\3|//)?(?:(?P<user>[^:]+):(?P<pass>[^@]+)@)?(?P<host>[^/?:#]*))(:(?P<port>\\d+))?(?P<path>[^?#]*)(\\?(?P<query>[^#]*))?(#(?P<fragment>.*))?)u', $tmp_url, $parsed);
     }
-    foreach($parsed as $k => $v) if(isset($this->$k)) $this->$k = $v;
-    if ($this->scheme == '..N..') $this->scheme = null;
+    foreach($parsed as $k => $v) if(isset($this->$k)) {
+      $this->$k = $v;
+    }
+    if ($this->scheme == '..N..') {
+      $this->scheme = null;
+    }
     if (!empty($this->query)) {
       parse_str($this->query, $this->query);
     }
   }
 
-  public function __toString(){
+  public function __toString() {
     $d = [];
-    if ($this->scheme)         $d[] = "{$this->scheme}://";
-    if ($this->user)           $d[] = "{$this->user}" . (empty($this->pass)?'':":{$this->pass}") . "@";
-    if ($this->host)           $d[] = "{$this->host}";
-    if ($this->port)           $d[] = ":{$this->port}";
-    if ($this->path)           $d[] = "/" . ltrim($this->path,"/");
-    if (!empty($this->query))  $d[] = "?" . http_build_query($this->query);
-    if ($this->fragment)       $d[] = "#{$this->fragment}";
+    if ($this->scheme) {
+      $d[] = "{$this->scheme}://";
+    }
+    if ($this->user) {
+      $d[] = "{$this->user}" . (empty($this->pass)?'':":{$this->pass}") . "@";
+    }
+    if ($this->host) {
+      $d[] = "{$this->host}";
+    }
+    if ($this->port) {
+      $d[] = ":{$this->port}";
+    }
+    if ($this->path) {
+      $d[] = "/" . ltrim($this->path,"/");
+    }
+    if (!empty($this->query)) {
+      $d[] = "?" . http_build_query($this->query);
+    }
+    if ($this->fragment) {
+      $d[] = "#{$this->fragment}";
+    }
     return implode('', $d);
   }
 

classes/Check.php

Indentation +18 added lines, -18 removed lines

@@ -14,7 +14,7 @@ 
   use Module;
 
   protected static $methods = [],
-                   $errors  = [];
+                    $errors  = [];
   public static    $data    = [];
 
   public static function valid($rules, $data){
@@ -103,105 +103,105 @@ 
     'required' => [
       'validate' => function($value) {
           return (is_numeric($value) && $value==0) || !empty($value);
-       },
-       'message' => "This value cannot be empty.",
+        },
+        'message' => "This value cannot be empty.",
     ],
 
     'alphanumeric' => [
       'validate' => function($value) {
-         return (bool)preg_match('/^[0-9a-zA-Z]+$/',$value);
+          return (bool)preg_match('/^[0-9a-zA-Z]+$/',$value);
       },
       'message' => "Value must be alphanumeric.",
     ],
 
     'numeric' => [
       'validate' => function($value) {
-         return (bool)preg_match('/^\d+$/',$value);
+          return (bool)preg_match('/^\d+$/',$value);
       },
       'message' => "Value must be numeric.",
     ],
 
     'email' => [
       'validate' => function($value) {
-         return (bool)filter_var($value, FILTER_VALIDATE_EMAIL);
+          return (bool)filter_var($value, FILTER_VALIDATE_EMAIL);
       },
       'message' => "This is not a valid email.",
     ],
 
     'url' => [
       'validate' => function($value) {
-         return (bool)filter_var($value, FILTER_VALIDATE_URL);
+          return (bool)filter_var($value, FILTER_VALIDATE_URL);
       },
       'message' => "This is not a valid URL.",
     ],
 
     'max' => [
       'validate' => function($value,$max) {
-       return $value<=$max ? true : false;
+        return $value<=$max ? true : false;
     },
       'message' => "Value must be less than {{arg_1}}.",
     ],
 
     'min' => [
       'validate' => function($value,$min) {
-         return $value >= $min;
+          return $value >= $min;
       },
       'message' => "Value must be greater than {{arg_1}}.",
     ],
 
     'range' => [
       'validate' => function($value,$min,$max) {
-         return ( $value >= $min ) && ( $value <= $max );
+          return ( $value >= $min ) && ( $value <= $max );
       },
       'message' => "This value must be in [{{arg_1}},{{arg_2}}] range.",
     ],
 
     'words' => [
       'validate' => function($value,$max) {
-         return str_word_count($value) <= $max;
+          return str_word_count($value) <= $max;
       },
       'message' => "Too many words, max count is {{arg_1}}.",
     ],
 
     'length' => [
       'validate' => function($value,$length) {
-         return strlen($value) == $length;
+          return strlen($value) == $length;
       },
       'message' => "This value must be {{arg_1}} characters.",
     ],
 
     'min_length' => [
       'validate' => function($value,$min) {
-         return strlen($value) >= $min;
+          return strlen($value) >= $min;
       },
       'message' => "Too few characters, min count is {{arg_1}}.",
     ],
 
     'max_length' => [
       'validate' => function($value,$max) {
-         return strlen($value) <= $max;
+          return strlen($value) <= $max;
       },
       'message' => "Too many characters, max count is {{arg_1}}.",
     ],
 
     'true' => [
       'validate' => function($value) {
-         return (bool)$value;
+          return (bool)$value;
       },
       'message' => "This value must be true.",
     ],
 
     'false' => [
       'validate' => function($value) {
-         return !$value;
+          return !$value;
       },
       'message' => "This value must be false.",
     ],
 
     'same_as' => [
       'validate' => function($value,$fieldname) {
-       $x = isset(Check::$data[$fieldname]) ? Check::$data[$fieldname] : '';
-         return $value == $x;
+        $x = isset(Check::$data[$fieldname]) ? Check::$data[$fieldname] : '';
+          return $value == $x;
       },
       'message' => "Field must be equal to {{arg_1}}.",
     ],

Spacing +34 added lines, -34 removed lines

@@ -17,46 +17,46 @@ 
                    $errors  = [];
   public static    $data    = [];
 
-  public static function valid($rules, $data){
+  public static function valid($rules, $data) {
     static::$errors = [];
     Event::triggerOnce('core.check.init');
-    self::$data = ($data = (array)$data);
+    self::$data = ($data = (array) $data);
 
-    foreach ((array)$rules as $field_name => $rule) {
+    foreach ((array) $rules as $field_name => $rule) {
 
       $current = isset($data[$field_name]) ? $data[$field_name] : null;
 
-      if (is_callable($rule)){
-        static::$errors[$field_name] = call_user_func($rule,$current);
+      if (is_callable($rule)) {
+        static::$errors[$field_name] = call_user_func($rule, $current);
         continue;
       } elseif (is_string($rule)) {
         $current_rules = array_flip(preg_split('/\s*\|\s*/', $rule));
       } else {
-        $current_rules = (array)$rule;
+        $current_rules = (array) $rule;
       }
 
       static::$errors[$field_name] = true;
 
-      foreach($current_rules as $method => $message) {
+      foreach ($current_rules as $method => $message) {
 
         $meth_name = strtok($method, ':');
         $opts      = strtok(':') ?: '';
         $opts      = $opts ? json_decode("[$opts]") : [];
         $meth_opts = $opts ? array_merge([$current], $opts) : [$current];
 
-        if ( static::$errors[$field_name] !== true ) continue 2;
+        if (static::$errors[$field_name] !== true) continue 2;
 
         if (empty(static::$methods[$meth_name])) {
           static::$errors[$field_name] = true;
         } else {
-          if (call_user_func_array(static::$methods[$meth_name]->validate,$meth_opts)){
+          if (call_user_func_array(static::$methods[$meth_name]->validate, $meth_opts)) {
             static::$errors[$field_name] = true;
           } else {
             $arg = [];
             foreach ($meth_opts as $key => $value) {
               $arg["arg_$key"] = $value;
             }
-            static::$errors[$field_name] = Text::render(static::$methods[$meth_name]->message,$arg);
+            static::$errors[$field_name] = Text::render(static::$methods[$meth_name]->message, $arg);
           }
         }
       }
@@ -65,28 +65,28 @@ 
     self::$data = [];
 
     // Clean non-errors
-    static::$errors = array_filter(static::$errors,function($v){
+    static::$errors = array_filter(static::$errors, function($v) {
       return $v !== true;
     });
 
     return empty(static::$errors);
   }
 
-  public static function method($name, $definition = null){
+  public static function method($name, $definition = null) {
     if (is_array($name)) {
-      foreach ($name as $method_name => $method_definition){
+      foreach ($name as $method_name => $method_definition) {
         if (is_callable($method_definition)) $method_definition = ['validate' => $method_definition];
         if (empty($method_definition['validate']) || !is_callable($method_definition['validate'])) continue;
         $method_definition['key']      = "core.check.error.$method_name";
-        $method_definition['message']  = Filter::with($method_definition['key'],@$method_definition['message']?:'Field not valid.');
-        static::$methods[$method_name] = (object)$method_definition;
+        $method_definition['message']  = Filter::with($method_definition['key'], @$method_definition['message'] ?: 'Field not valid.');
+        static::$methods[$method_name] = (object) $method_definition;
       }
     } else {
       if (is_callable($definition)) $definition = ['validate' => $definition];
       if (empty($definition['validate']) || !is_callable($definition['validate'])) return;
       $methods['key']         = "core.check.error.$name";
-      $methods['message']     = Filter::with($methods['key'],@$methods['message']?:'Field not valid.');
-      static::$methods[$name] = (object)$definition;
+      $methods['message']     = Filter::with($methods['key'], @$methods['message'] ?: 'Field not valid.');
+      static::$methods[$name] = (object) $definition;
     }
   }
 
@@ -96,89 +96,89 @@ 
 
 }
 
-Event::on('core.check.init',function(){
+Event::on('core.check.init', function() {
 
   Check::method([
 
     'required' => [
       'validate' => function($value) {
-          return (is_numeric($value) && $value==0) || !empty($value);
+          return (is_numeric($value) && $value == 0) || !empty($value);
        },
        'message' => "This value cannot be empty.",
     ],
 
     'alphanumeric' => [
       'validate' => function($value) {
-         return (bool)preg_match('/^[0-9a-zA-Z]+$/',$value);
+         return (bool) preg_match('/^[0-9a-zA-Z]+$/', $value);
       },
       'message' => "Value must be alphanumeric.",
     ],
 
     'numeric' => [
       'validate' => function($value) {
-         return (bool)preg_match('/^\d+$/',$value);
+         return (bool) preg_match('/^\d+$/', $value);
       },
       'message' => "Value must be numeric.",
     ],
 
     'email' => [
       'validate' => function($value) {
-         return (bool)filter_var($value, FILTER_VALIDATE_EMAIL);
+         return (bool) filter_var($value, FILTER_VALIDATE_EMAIL);
       },
       'message' => "This is not a valid email.",
     ],
 
     'url' => [
       'validate' => function($value) {
-         return (bool)filter_var($value, FILTER_VALIDATE_URL);
+         return (bool) filter_var($value, FILTER_VALIDATE_URL);
       },
       'message' => "This is not a valid URL.",
     ],
 
     'max' => [
-      'validate' => function($value,$max) {
-       return $value<=$max ? true : false;
+      'validate' => function($value, $max) {
+       return $value <= $max ? true : false;
     },
       'message' => "Value must be less than {{arg_1}}.",
     ],
 
     'min' => [
-      'validate' => function($value,$min) {
+      'validate' => function($value, $min) {
          return $value >= $min;
       },
       'message' => "Value must be greater than {{arg_1}}.",
     ],
 
     'range' => [
-      'validate' => function($value,$min,$max) {
-         return ( $value >= $min ) && ( $value <= $max );
+      'validate' => function($value, $min, $max) {
+         return ($value >= $min) && ($value <= $max);
       },
       'message' => "This value must be in [{{arg_1}},{{arg_2}}] range.",
     ],
 
     'words' => [
-      'validate' => function($value,$max) {
+      'validate' => function($value, $max) {
          return str_word_count($value) <= $max;
       },
       'message' => "Too many words, max count is {{arg_1}}.",
     ],
 
     'length' => [
-      'validate' => function($value,$length) {
+      'validate' => function($value, $length) {
          return strlen($value) == $length;
       },
       'message' => "This value must be {{arg_1}} characters.",
     ],
 
     'min_length' => [
-      'validate' => function($value,$min) {
+      'validate' => function($value, $min) {
          return strlen($value) >= $min;
       },
       'message' => "Too few characters, min count is {{arg_1}}.",
     ],
 
     'max_length' => [
-      'validate' => function($value,$max) {
+      'validate' => function($value, $max) {
          return strlen($value) <= $max;
       },
       'message' => "Too many characters, max count is {{arg_1}}.",
@@ -186,7 +186,7 @@ 
 
     'true' => [
       'validate' => function($value) {
-         return (bool)$value;
+         return (bool) $value;
       },
       'message' => "This value must be true.",
     ],
@@ -199,7 +199,7 @@ 
     ],
 
     'same_as' => [
-      'validate' => function($value,$fieldname) {
+      'validate' => function($value, $fieldname) {
        $x = isset(Check::$data[$fieldname]) ? Check::$data[$fieldname] : '';
          return $value == $x;
       },

Braces +22 added lines, -12 removed lines

@@ -17,7 +17,7 @@ 
                    $errors  = [];
   public static    $data    = [];
 
-  public static function valid($rules, $data){
+  public static function valid($rules, $data) {
     static::$errors = [];
     Event::triggerOnce('core.check.init');
     self::$data = ($data = (array)$data);
@@ -26,7 +26,7 @@ 
 
       $current = isset($data[$field_name]) ? $data[$field_name] : null;
 
-      if (is_callable($rule)){
+      if (is_callable($rule)) {
         static::$errors[$field_name] = call_user_func($rule,$current);
         continue;
       } elseif (is_string($rule)) {
@@ -44,12 +44,14 @@ 
         $opts      = $opts ? json_decode("[$opts]") : [];
         $meth_opts = $opts ? array_merge([$current], $opts) : [$current];
 
-        if ( static::$errors[$field_name] !== true ) continue 2;
+        if ( static::$errors[$field_name] !== true ) {
+          continue 2;
+        }
 
         if (empty(static::$methods[$meth_name])) {
           static::$errors[$field_name] = true;
         } else {
-          if (call_user_func_array(static::$methods[$meth_name]->validate,$meth_opts)){
+          if (call_user_func_array(static::$methods[$meth_name]->validate,$meth_opts)) {
             static::$errors[$field_name] = true;
           } else {
             $arg = [];
@@ -65,25 +67,33 @@ 
     self::$data = [];
 
     // Clean non-errors
-    static::$errors = array_filter(static::$errors,function($v){
+    static::$errors = array_filter(static::$errors,function($v) {
       return $v !== true;
     });
 
     return empty(static::$errors);
   }
 
-  public static function method($name, $definition = null){
+  public static function method($name, $definition = null) {
     if (is_array($name)) {
-      foreach ($name as $method_name => $method_definition){
-        if (is_callable($method_definition)) $method_definition = ['validate' => $method_definition];
-        if (empty($method_definition['validate']) || !is_callable($method_definition['validate'])) continue;
+      foreach ($name as $method_name => $method_definition) {
+        if (is_callable($method_definition)) {
+          $method_definition = ['validate' => $method_definition];
+        }
+        if (empty($method_definition['validate']) || !is_callable($method_definition['validate'])) {
+          continue;
+        }
         $method_definition['key']      = "core.check.error.$method_name";
         $method_definition['message']  = Filter::with($method_definition['key'],@$method_definition['message']?:'Field not valid.');
         static::$methods[$method_name] = (object)$method_definition;
       }
     } else {
-      if (is_callable($definition)) $definition = ['validate' => $definition];
-      if (empty($definition['validate']) || !is_callable($definition['validate'])) return;
+      if (is_callable($definition)) {
+        $definition = ['validate' => $definition];
+      }
+      if (empty($definition['validate']) || !is_callable($definition['validate'])) {
+        return;
+      }
       $methods['key']         = "core.check.error.$name";
       $methods['message']     = Filter::with($methods['key'],@$methods['message']?:'Field not valid.');
       static::$methods[$name] = (object)$definition;
@@ -96,7 +106,7 @@ 
 
 }
 
-Event::on('core.check.init',function(){
+Event::on('core.check.init',function() {
 
   Check::method([
 

classes/Error.php

Spacing +1 added lines, -1 removed lines

@@ -12,4 +12,4 @@
  */
 
 include_once __DIR__.'Errors.php';
-class_alias('Errors','Error',true);
+class_alias('Errors', 'Error', true);

classes/Cache.php

Indentation +4 added lines, -4 removed lines

@@ -11,10 +11,10 @@ 
  */
 
 class Cache {
-   use Module;
+    use Module;
    
-   protected static $driver = null;
-   protected static $enabled = true;
+    protected static $driver = null;
+    protected static $enabled = true;
 
     public static function get($key,$default='',$expire=0){
       if (static::$enabled){
@@ -69,7 +69,7 @@ 
             return true;
           }
         }
-       return false;
+        return false;
     }
 
     /**

Spacing +25 added lines, -25 removed lines

@@ -16,14 +16,14 @@ 
    protected static $driver = null;
    protected static $enabled = true;
 
-    public static function get($key,$default='',$expire=0){
-      if (static::$enabled){
+    public static function get($key, $default = '', $expire = 0) {
+      if (static::$enabled) {
         $hash = static::hash($key);
-        if(static::$driver->exists($hash) && $results = static::$driver->get($hash)){
+        if (static::$driver->exists($hash) && $results = static::$driver->get($hash)) {
             return $results;
         } else {
-            if($data = is_callable($default)?call_user_func($default):$default){
-                static::$driver->set($hash,$data,$expire);
+            if ($data = is_callable($default) ? call_user_func($default) : $default) {
+                static::$driver->set($hash, $data, $expire);
             }
             return $data;
         }
@@ -54,17 +54,17 @@ 
      *   ]);
      * 
      */
-    public static function using($driver){
-      foreach((array)$driver as $key => $value){
-          if(is_numeric($key)){
+    public static function using($driver) {
+      foreach ((array) $driver as $key => $value) {
+          if (is_numeric($key)) {
             $drv = $value;
             $conf = [];
           } else {
             $drv = $key;
             $conf = $value;
           }
-          $class = 'Cache\\' . ucfirst(strtolower($drv));
-          if(class_exists($class) && $class::valid()) {
+          $class = 'Cache\\'.ucfirst(strtolower($drv));
+          if (class_exists($class) && $class::valid()) {
             static::$driver = new $class($conf);
             return true;
           }
@@ -81,45 +81,45 @@ 
      *
      * @return boolean  Cache on/off status
      */
-    public static function enabled($enabled=null){
+    public static function enabled($enabled = null) {
         return $enabled ? static::$enabled : static::$enabled = $enabled;
     }
 
 
-    public static function set($key,$value,$expire=0){
-        return static::$driver->set(static::hash($key),$value,$expire);
+    public static function set($key, $value, $expire = 0) {
+        return static::$driver->set(static::hash($key), $value, $expire);
     }
 
-    public static function delete($key){
+    public static function delete($key) {
         return static::$driver->delete(static::hash($key));
     }
 
-    public static function exists($key){
+    public static function exists($key) {
         return static::$enabled && static::$driver->exists(static::hash($key));
     }
 
-    public static function flush(){
+    public static function flush() {
         return static::$driver->flush();
     }
 
-    public static function inc($key,$value=1){
-        return static::$driver->inc(static::hash($key),$value);
+    public static function inc($key, $value = 1) {
+        return static::$driver->inc(static::hash($key), $value);
     }
 
-    public static function dec($key,$value=1){
-        return static::$driver->dec(static::hash($key),$value);
+    public static function dec($key, $value = 1) {
+        return static::$driver->dec(static::hash($key), $value);
     }
 
-    public static function hash($key,$group=null){
+    public static function hash($key, $group = null) {
         static $hashes = [];
-        if (false === isset($hashes[$group][$key])){
+        if (false === isset($hashes[$group][$key])) {
             $k = $key;
-            if(is_array($key) && count($key)>1) list($group,$key) = $k;
-            $hashes[$group][$key] = ($group?$group.'-':'') . md5($key);
+            if (is_array($key) && count($key) > 1) list($group, $key) = $k;
+            $hashes[$group][$key] = ($group ? $group.'-' : '').md5($key);
         }
         return $hashes[$group][$key];
     }
 }
 
 
-Cache::using(['files','memory']);
+Cache::using(['files', 'memory']);

Braces +19 added lines, -17 removed lines

@@ -16,13 +16,13 @@ 
    protected static $driver = null;
    protected static $enabled = true;
 
-    public static function get($key,$default='',$expire=0){
-      if (static::$enabled){
+    public static function get($key,$default='',$expire=0) {
+      if (static::$enabled) {
         $hash = static::hash($key);
-        if(static::$driver->exists($hash) && $results = static::$driver->get($hash)){
+        if(static::$driver->exists($hash) && $results = static::$driver->get($hash)) {
             return $results;
         } else {
-            if($data = is_callable($default)?call_user_func($default):$default){
+            if($data = is_callable($default)?call_user_func($default):$default) {
                 static::$driver->set($hash,$data,$expire);
             }
             return $data;
@@ -54,9 +54,9 @@ 
      *   ]);
      * 
      */
-    public static function using($driver){
-      foreach((array)$driver as $key => $value){
-          if(is_numeric($key)){
+    public static function using($driver) {
+      foreach((array)$driver as $key => $value) {
+          if(is_numeric($key)) {
             $drv = $value;
             $conf = [];
           } else {
@@ -81,40 +81,42 @@ 
      *
      * @return boolean  Cache on/off status
      */
-    public static function enabled($enabled=null){
+    public static function enabled($enabled=null) {
         return $enabled ? static::$enabled : static::$enabled = $enabled;
     }
 
 
-    public static function set($key,$value,$expire=0){
+    public static function set($key,$value,$expire=0) {
         return static::$driver->set(static::hash($key),$value,$expire);
     }
 
-    public static function delete($key){
+    public static function delete($key) {
         return static::$driver->delete(static::hash($key));
     }
 
-    public static function exists($key){
+    public static function exists($key) {
         return static::$enabled && static::$driver->exists(static::hash($key));
     }
 
-    public static function flush(){
+    public static function flush() {
         return static::$driver->flush();
     }
 
-    public static function inc($key,$value=1){
+    public static function inc($key,$value=1) {
         return static::$driver->inc(static::hash($key),$value);
     }
 
-    public static function dec($key,$value=1){
+    public static function dec($key,$value=1) {
         return static::$driver->dec(static::hash($key),$value);
     }
 
-    public static function hash($key,$group=null){
+    public static function hash($key,$group=null) {
         static $hashes = [];
-        if (false === isset($hashes[$group][$key])){
+        if (false === isset($hashes[$group][$key])) {
             $k = $key;
-            if(is_array($key) && count($key)>1) list($group,$key) = $k;
+            if(is_array($key) && count($key)>1) {
+              list($group,$key) = $k;
+            }
             $hashes[$group][$key] = ($group?$group.'-':'') . md5($key);
         }
         return $hashes[$group][$key];

classes/Filter.php

Spacing +9 added lines, -9 removed lines

@@ -15,30 +15,30 @@
 
     protected static $_modders = [];
 
-    public static function add($name,callable $modder){
+    public static function add($name, callable $modder) {
         static::$_modders[$name][] = $modder;
     }
 
-    public static function single($name,callable $modder){
+    public static function single($name, callable $modder) {
         static::$_modders[$name] = [$modder];
     }
 
-    public static function remove($name,callable $modder = null){
-        if($modder === null) {
+    public static function remove($name, callable $modder = null) {
+        if ($modder === null) {
             unset(static::$_modders[$name]);
         } else {
-            if ($idx = array_search($modder,static::$_modders[$name],true))
+            if ($idx = array_search($modder, static::$_modders[$name], true))
                 unset(static::$_modders[$name][$idx]);
         }
     }
 
-    public static function with($names, $default){
-      foreach ((array)$names as $name) {
+    public static function with($names, $default) {
+      foreach ((array) $names as $name) {
         if (!empty(static::$_modders[$name])) {
             $value = $default;
-            $args = array_slice( func_get_args(), 2 );
+            $args = array_slice(func_get_args(), 2);
             foreach (static::$_modders[$name] as $modder) {
-                $value = call_user_func( $modder,$value,$args );
+                $value = call_user_func($modder, $value, $args);
             }
             return $value;
         }

Braces +7 added lines, -6 removed lines

@@ -15,24 +15,25 @@
 
     protected static $_modders = [];
 
-    public static function add($name,callable $modder){
+    public static function add($name,callable $modder) {
         static::$_modders[$name][] = $modder;
     }
 
-    public static function single($name,callable $modder){
+    public static function single($name,callable $modder) {
         static::$_modders[$name] = [$modder];
     }
 
-    public static function remove($name,callable $modder = null){
+    public static function remove($name,callable $modder = null) {
         if($modder === null) {
             unset(static::$_modders[$name]);
         } else {
-            if ($idx = array_search($modder,static::$_modders[$name],true))
-                unset(static::$_modders[$name][$idx]);
+            if ($idx = array_search($modder,static::$_modders[$name],true)) {
+                            unset(static::$_modders[$name][$idx]);
+            }
         }
     }
 
-    public static function with($names, $default){
+    public static function with($names, $default) {
       foreach ((array)$names as $name) {
         if (!empty(static::$_modders[$name])) {
             $value = $default;

classes/Loader.php

Spacing +7 added lines, -7 removed lines

@@ -13,20 +13,20 @@
 class Loader {
     protected static $paths = [];
     
-    public static function addPath($path,$name=null){
+    public static function addPath($path, $name = null) {
         static::$paths[$path] = $name;
     }
 
-    public static function register(){
+    public static function register() {
         ini_set('unserialize_callback_func', 'spl_autoload_call');
-        spl_autoload_register(function($class){
-            $cfile = strtr($class,'_\\','//') . '.php';
+        spl_autoload_register(function($class) {
+            $cfile = strtr($class, '_\\', '//').'.php';
             foreach (static::$paths as $path => $v) {
-                $file = rtrim($path,'/').'/'.$cfile;
-                if(is_file($file)) return include($file);
+                $file = rtrim($path, '/').'/'.$cfile;
+                if (is_file($file)) return include($file);
             }
             return false;
-        },false,true);
+        },false, true);
     }
     
 }

Braces +6 added lines, -4 removed lines

@@ -13,17 +13,19 @@
 class Loader {
     protected static $paths = [];
     
-    public static function addPath($path,$name=null){
+    public static function addPath($path,$name=null) {
         static::$paths[$path] = $name;
     }
 
-    public static function register(){
+    public static function register() {
         ini_set('unserialize_callback_func', 'spl_autoload_call');
-        spl_autoload_register(function($class){
+        spl_autoload_register(function($class) {
             $cfile = strtr($class,'_\\','//') . '.php';
             foreach (static::$paths as $path => $v) {
                 $file = rtrim($path,'/').'/'.$cfile;
-                if(is_file($file)) return include($file);
+                if(is_file($file)) {
+                  return include($file);
+                }
             }
             return false;
         },false,true);

classes/Model.php

Indentation +3 added lines, -3 removed lines

@@ -29,12 +29,12 @@ 
     }
 
     public static function all($page=1,$limit=-1){
-    		$offset = max(1,$page)-1;
+        $offset = max(1,$page)-1;
         return static::where($limit < 1 ? "" : "1 limit $limit offset $offset");
     }
 
     public function primaryKey(){
-    	$self    = get_called_class();
+      $self    = get_called_class();
       $key     = $self::persistenceOptions('key');
       return $this->$key;
     }
@@ -42,7 +42,7 @@ 
     public static function create(array $data){
         $tmp = new static;
         foreach ($data as $key => $value) {
-           $tmp->$key = $value;
+            $tmp->$key = $value;
         }
         $tmp->save();
         return $tmp;

Spacing +9 added lines, -9 removed lines

@@ -13,33 +13,33 @@
 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){
+        SQL::each($sql, function($row) use ($self, &$results, $key){
             $results[] = $self::load($row->$key);
         });
         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(){
-    	$self    = get_called_class();
-      $key     = $self::persistenceOptions('key');
+    public function primaryKey() {
+    	$self = get_called_class();
+      $key = $self::persistenceOptions('key');
       return $this->$key;
     }
 
-    public static function create(array $data){
+    public static function create(array $data) {
         $tmp = new static;
         foreach ($data as $key => $value) {
            $tmp->$key = $value;

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(array $data){
+    public static function create(array $data) {
         $tmp = new static;
         foreach ($data as $key => $value) {
            $tmp->$key = $value;

classes/Email/Ses.php

Indentation +2 added lines, -2 removed lines

@@ -18,7 +18,7 @@ 
     $options  = (object)$options;
     $region   = isset($options->region) ? $options->region : 'eu-west-1';
     if (empty($options->username) || empty($options->password))
-       throw new \Exception("[core.email.ses] You must provide an Amazon SES SMTP username and password", 1);
+        throw new \Exception("[core.email.ses] You must provide an Amazon SES SMTP username and password", 1);
 
     Smtp::onInit([
       'host'     => "email-smtp.{$region}.amazonaws.com",
@@ -32,7 +32,7 @@ 
 
   public function onSend(Envelope $envelope){
     if (!$envelope->from())
-       throw new \Exception("[core.email.ses] Amazon SES needs a registered `from` address", 1);
+        throw new \Exception("[core.email.ses] Amazon SES needs a registered `from` address", 1);
     return Smtp::onSend($envelope);
   }
 

Spacing +2 added lines, -2 removed lines

@@ -15,7 +15,7 @@ 
 class Ses extends Smtp {
 
   public function onInit($options) {
-    $options  = (object)$options;
+    $options  = (object) $options;
     $region   = isset($options->region) ? $options->region : 'eu-west-1';
     if (empty($options->username) || empty($options->password))
        throw new \Exception("[core.email.ses] You must provide an Amazon SES SMTP username and password", 1);
@@ -30,7 +30,7 @@ 
 
   }
 
-  public function onSend(Envelope $envelope){
+  public function onSend(Envelope $envelope) {
     if (!$envelope->from())
        throw new \Exception("[core.email.ses] Amazon SES needs a registered `from` address", 1);
     return Smtp::onSend($envelope);

Braces +7 added lines, -5 removed lines

@@ -17,8 +17,9 @@ 
   public function onInit($options) {
     $options  = (object)$options;
     $region   = isset($options->region) ? $options->region : 'eu-west-1';
-    if (empty($options->username) || empty($options->password))
-       throw new \Exception("[core.email.ses] You must provide an Amazon SES SMTP username and password", 1);
+    if (empty($options->username) || empty($options->password)) {
+           throw new \Exception("[core.email.ses] You must provide an Amazon SES SMTP username and password", 1);
+    }
 
     Smtp::onInit([
       'host'     => "email-smtp.{$region}.amazonaws.com",
@@ -30,9 +31,10 @@ 
 
   }
 
-  public function onSend(Envelope $envelope){
-    if (!$envelope->from())
-       throw new \Exception("[core.email.ses] Amazon SES needs a registered `from` address", 1);
+  public function onSend(Envelope $envelope) {
+    if (!$envelope->from()) {
+           throw new \Exception("[core.email.ses] Amazon SES needs a registered `from` address", 1);
+    }
     return Smtp::onSend($envelope);
   }
 

classes/Email/Proxy.php

Spacing +3 added lines, -3 removed lines

@@ -16,12 +16,12 @@
 
   protected $listener = 'core.email.proxy.send';
 
-  public function onInit($options){
+  public function onInit($options) {
     if (!empty($options['hook'])) $this->listener = $options['hook'];
   }
 
-  public function onSend(Envelope $envelope){
-    \Event::trigger('core.email.send',$envelope->to(),$envelope,'proxy');
+  public function onSend(Envelope $envelope) {
+    \Event::trigger('core.email.send', $envelope->to(), $envelope, 'proxy');
     \Event::trigger($this->listener, $envelope);
     return true;
   }

Braces +5 added lines, -3 removed lines

@@ -16,11 +16,13 @@
 
   protected $listener = 'core.email.proxy.send';
 
-  public function onInit($options){
-    if (!empty($options['hook'])) $this->listener = $options['hook'];
+  public function onInit($options) {
+    if (!empty($options['hook'])) {
+      $this->listener = $options['hook'];
+    }
   }
 
-  public function onSend(Envelope $envelope){
+  public function onSend(Envelope $envelope) {
     \Event::trigger('core.email.send',$envelope->to(),$envelope,'proxy');
     \Event::trigger($this->listener, $envelope);
     return true;