caffeina-core / core

classes/Email.php

Indentation +2 added lines, -2 removed lines

@@ -14,8 +14,8 @@
   use Module;
 
   protected static $driver,
-                   $options,
-                   $driver_name;
+                    $options,
+                    $driver_name;
 
   public static function using($driver, $options = null){
     $class = 'Email\\'.ucfirst(strtolower($driver));

Braces +7 added lines, -5 removed lines

@@ -17,17 +17,19 @@ 
                    $options,
                    $driver_name;
 
-  public static function using($driver, $options = null){
+  public static function using($driver, $options = null) {
     $class = 'Email\\'.ucfirst(strtolower($driver));
-    if ( ! class_exists($class) ) throw new Exception("[core.email] : $driver driver not found.");
+    if ( ! class_exists($class) ) {
+      throw new Exception("[core.email] : $driver driver not found.");
+    }
     static::$driver_name = $driver;
     static::$options     = $options;
     static::$driver      = new $class;
     static::$driver->onInit($options);
   }
 
-  public static function create($mail=[]){
-    if (is_a($mail, 'Email\\Envelope')){
+  public static function create($mail=[]) {
+    if (is_a($mail, 'Email\\Envelope')) {
       return $mail;
     } else {
       return new Email\Envelope(array_merge([
@@ -43,7 +45,7 @@ 
     }
   }
 
-  public static function send($mail){
+  public static function send($mail) {
     return static::$driver->onSend(static::create($mail));
   }
 

Spacing +7 added lines, -7 removed lines

@@ -17,17 +17,17 @@ 
                    $options,
                    $driver_name;
 
-  public static function using($driver, $options = null){
+  public static function using($driver, $options = null) {
     $class = 'Email\\'.ucfirst(strtolower($driver));
-    if ( ! class_exists($class) ) throw new Exception("[core.email] : $driver driver not found.");
+    if (!class_exists($class)) throw new Exception("[core.email] : $driver driver not found.");
     static::$driver_name = $driver;
     static::$options     = $options;
     static::$driver      = new $class;
     static::$driver->onInit($options);
   }
 
-  public static function create($mail=[]){
-    if (is_a($mail, 'Email\\Envelope')){
+  public static function create($mail = []) {
+    if (is_a($mail, 'Email\\Envelope')) {
       return $mail;
     } else {
       return new Email\Envelope(array_merge([
@@ -43,13 +43,13 @@ 
     }
   }
 
-  public static function send($mail){
+  public static function send($mail) {
     $envelope = static::create($mail);
     $results = (array) static::$driver->onSend($envelope);
     Event::trigger('core.email.send', $envelope->to(), $envelope, static::$driver, $results);
-    return count($results) && array_reduce( $results, function($carry, $item) {
+    return count($results) && array_reduce($results, function($carry, $item) {
       return $carry && $item;
-    }, true );
+    }, true);
   }
 
 }

classes/Module.php

Spacing +9 added lines, -9 removed lines

@@ -13,7 +13,7 @@ 
 trait Module {
     static protected $__classMethods = array();
     
-    public function __call($name, $args){
+    public function __call($name, $args) {
         if (isset(static::$__classMethods[$name]) && static::$__classMethods[$name] instanceof \Closure) {
             return call_user_func_array(static::$__classMethods[$name]->bindTo($this, $this), $args);
         }
@@ -25,19 +25,19 @@ 
         throw new \BadMethodCallException;
     }
     
-    public static function __prototypeAdd($name, \Closure $method){
+    public static function __prototypeAdd($name, \Closure $method) {
         static::$__classMethods[$name] = $method;
     }
 
-    public static function __prototypeGet($name){
-        return isset(static::$__classMethods[$name])?static::$__classMethods[$name]:null;
+    public static function __prototypeGet($name) {
+        return isset(static::$__classMethods[$name]) ? static::$__classMethods[$name] : null;
     }
     
-    public static function __prototypeRemove($name){
+    public static function __prototypeRemove($name) {
         unset(static::$__classMethods[$name]);
     }
     
-    public static function __callStatic($name, $args){
+    public static function __callStatic($name, $args) {
         if (isset(static::$__classMethods[$name]) && static::$__classMethods[$name] instanceof \Closure) {
             return forward_static_call_array(static::$__classMethods[$name], $args);
         }
@@ -49,10 +49,10 @@ 
         throw new \BadMethodCallException;
     }
     
-    public static function extend($methodMap=[]){
+    public static function extend($methodMap = []) {
         if ($methodMap) foreach ($methodMap as $name => $method) {
-            if($method && $method instanceof \Closure) {
-                static::__prototypeAdd($name,$method);
+            if ($method && $method instanceof \Closure) {
+                static::__prototypeAdd($name, $method);
             } else throw new \BadMethodCallException;
         }
     }

Braces +12 added lines, -8 removed lines

@@ -13,7 +13,7 @@ 
 trait Module {
     static protected $__classMethods = array();
     
-    public function __call($name, $args){
+    public function __call($name, $args) {
         if (isset(static::$__classMethods[$name]) && static::$__classMethods[$name] instanceof \Closure) {
             return call_user_func_array(static::$__classMethods[$name]->bindTo($this, $this), $args);
         }
@@ -25,19 +25,19 @@ 
         throw new \BadMethodCallException;
     }
     
-    public static function __prototypeAdd($name, \Closure $method){
+    public static function __prototypeAdd($name, \Closure $method) {
         static::$__classMethods[$name] = $method;
     }
 
-    public static function __prototypeGet($name){
+    public static function __prototypeGet($name) {
         return isset(static::$__classMethods[$name])?static::$__classMethods[$name]:null;
     }
     
-    public static function __prototypeRemove($name){
+    public static function __prototypeRemove($name) {
         unset(static::$__classMethods[$name]);
     }
     
-    public static function __callStatic($name, $args){
+    public static function __callStatic($name, $args) {
         if (isset(static::$__classMethods[$name]) && static::$__classMethods[$name] instanceof \Closure) {
             return forward_static_call_array(static::$__classMethods[$name], $args);
         }
@@ -49,11 +49,15 @@ 
         throw new \BadMethodCallException;
     }
     
-    public static function extend($methodMap=[]){
-        if ($methodMap) foreach ($methodMap as $name => $method) {
+    public static function extend($methodMap=[]) {
+        if ($methodMap) {
+          foreach ($methodMap as $name => $method) {
             if($method && $method instanceof \Closure) {
                 static::__prototypeAdd($name,$method);
-            } else throw new \BadMethodCallException;
+        }
+            } else {
+              throw new \BadMethodCallException;
+            }
         }
     }
 }

classes/Work.php

Indentation +2 added lines, -2 removed lines

@@ -34,7 +34,7 @@ 
   }
 
   public static function send($id,$passValue) {
-     isset(self::$workers[$id]) && self::$workers[$id]->pass($passValue);
+      isset(self::$workers[$id]) && self::$workers[$id]->pass($passValue);
   }
 
   public static function run(){
@@ -43,7 +43,7 @@ 
       $task = self::$pool->dequeue();
       $task->run();
       if ($task->complete()) {
-         unset(self::$workers[$task->id()]);
+          unset(self::$workers[$task->id()]);
       } else {
           self::$pool->enqueue($task);
       }

Spacing +14 added lines, -14 removed lines

@@ -21,9 +21,9 @@ 
   protected static $workers;
   protected static $lastID = 0;
 
-  public static function add($id, $job=null){
-    self::$pool or ( self::$pool = new \SplQueue() );
-    if(is_callable($id) && $job===null){
+  public static function add($id, $job = null) {
+    self::$pool or (self::$pool = new \SplQueue());
+    if (is_callable($id) && $job === null) {
       $job = $id;
       $id = ++self::$lastID;
     }
@@ -33,12 +33,12 @@ 
     return $task;
   }
 
-  public static function send($id,$passValue) {
+  public static function send($id, $passValue) {
      isset(self::$workers[$id]) && self::$workers[$id]->pass($passValue);
   }
 
-  public static function run(){
-    self::$pool or ( self::$pool = new \SplQueue() );
+  public static function run() {
+    self::$pool or (self::$pool = new \SplQueue());
     while (!self::$pool->isEmpty()) {
       $task = self::$pool->dequeue();
       $task->run();
@@ -54,7 +54,7 @@ 
    * Defer callback execution after script execution
    * @param callable $callback The deferred callback
    */ d
-  public static function after(callable $callback){
+  public static function after(callable $callback) {
     static::$inited_shutdown || static::install_shutdown();
     Event::on('core.shutdown', $callback);
   }
@@ -62,24 +62,24 @@ 
   /**
    * Single shot defer handeler install
    */
-  protected static function install_shutdown(){
+  protected static function install_shutdown() {
     if (static::$inited_shutdown) return;
     
     // Disable time limit
     set_time_limit(0);
     
     // HHVM support
-    if(function_exists('register_postsend_function')){
-      register_postsend_function(function(){
+    if (function_exists('register_postsend_function')) {
+      register_postsend_function(function() {
         Event::trigger('core.shutdown');
       });
-    } else if(function_exists('fastcgi_finish_request')) {
-      register_shutdown_function(function(){
+    } else if (function_exists('fastcgi_finish_request')) {
+      register_shutdown_function(function() {
         fastcgi_finish_request();
         Event::trigger('core.shutdown');
       });       
     } else {
-      register_shutdown_function(function(){
+      register_shutdown_function(function() {
         Event::trigger('core.shutdown');
       });
     }
@@ -121,7 +121,7 @@ 
     }
 
     public function complete() {
-        return ! $this->coroutine->valid();
+        return !$this->coroutine->valid();
     }
 
 }

Braces +12 added lines, -10 removed lines

@@ -21,9 +21,9 @@ 
   protected static $workers;
   protected static $lastID = 0;
 
-  public static function add($id, $job=null){
+  public static function add($id, $job=null) {
     self::$pool or ( self::$pool = new \SplQueue() );
-    if(is_callable($id) && $job===null){
+    if(is_callable($id) && $job===null) {
       $job = $id;
       $id = ++self::$lastID;
     }
@@ -37,7 +37,7 @@ 
      isset(self::$workers[$id]) && self::$workers[$id]->pass($passValue);
   }
 
-  public static function run(){
+  public static function run() {
     self::$pool or ( self::$pool = new \SplQueue() );
     while (!self::$pool->isEmpty()) {
       $task = self::$pool->dequeue();
@@ -54,7 +54,7 @@ 
    * Defer callback execution after script execution
    * @param callable $callback The deferred callback
    */ d
-  public static function after(callable $callback){
+  public static function after(callable $callback) {
     static::$inited_shutdown || static::install_shutdown();
     Event::on('core.shutdown', $callback);
   }
@@ -62,24 +62,26 @@ 
   /**
    * Single shot defer handeler install
    */
-  protected static function install_shutdown(){
-    if (static::$inited_shutdown) return;
+  protected static function install_shutdown() {
+    if (static::$inited_shutdown) {
+      return;
+    }
     
     // Disable time limit
     set_time_limit(0);
     
     // HHVM support
-    if(function_exists('register_postsend_function')){
-      register_postsend_function(function(){
+    if(function_exists('register_postsend_function')) {
+      register_postsend_function(function() {
         Event::trigger('core.shutdown');
       });
     } else if(function_exists('fastcgi_finish_request')) {
-      register_shutdown_function(function(){
+      register_shutdown_function(function() {
         fastcgi_finish_request();
         Event::trigger('core.shutdown');
       });       
     } else {
-      register_shutdown_function(function(){
+      register_shutdown_function(function() {
         Event::trigger('core.shutdown');
       });
     }

classes/Cache/Files.php

Spacing +25 added lines, -25 removed lines

@@ -15,23 +15,23 @@ 
 class Files implements Adapter {
     protected $options;
 
-    public static function valid(){
+    public static function valid() {
         return true;
     }
 
-    public function __construct($options=[]){
-        $this->options = (object) array_merge($options,[
+    public function __construct($options = []) {
+        $this->options = (object) array_merge($options, [
             'cache_dir' => sys_get_temp_dir().'/core_file_cache',
         ]);
-        $this->options->cache_dir = rtrim($this->options->cache_dir,'/');
-        if(false===is_dir($this->options->cache_dir)) mkdir($this->options->cache_dir,0777,true);
+        $this->options->cache_dir = rtrim($this->options->cache_dir, '/');
+        if (false === is_dir($this->options->cache_dir)) mkdir($this->options->cache_dir, 0777, true);
         $this->options->cache_dir .= '/';
     }
 
-    public function get($key){
+    public function get($key) {
         $cache_file_name = $this->options->cache_dir.$key.'.cache.php';
-        if(is_file($cache_file_name) && $data = @unserialize(file_get_contents($cache_file_name))){
-            if($data[0] && (time() > $data[0])) {
+        if (is_file($cache_file_name) && $data = @unserialize(file_get_contents($cache_file_name))) {
+            if ($data[0] && (time() > $data[0])) {
                 unlink($cache_file_name);
                 return null;
             }
@@ -41,39 +41,39 @@ 
         }
     }
 
-    public function set($key,$value,$expire=0){
+    public function set($key, $value, $expire = 0) {
         $cache_file_name = $this->options->cache_dir.$key.'.cache.php';
-        file_put_contents($cache_file_name,serialize([$expire?time()+$expire:0,$value]));
+        file_put_contents($cache_file_name, serialize([$expire ? time() + $expire : 0, $value]));
     }
 
-    public function delete($key){
+    public function delete($key) {
         $cache_file_name = $this->options->cache_dir.$key.'.cache.php';
-      if(is_file($cache_file_name)) unlink($cache_file_name);
+      if (is_file($cache_file_name)) unlink($cache_file_name);
     }
 
-    public function exists($key){
+    public function exists($key) {
         $cache_file_name = $this->options->cache_dir.$key.'.cache.php';
-        if(false === is_file($cache_file_name)) return false;
-        $peek = file_get_contents($cache_file_name,false,null,-1,32);
-        $expire = explode('{i:0;i:',$peek,2);
-        $expire = explode(';',end($expire),2);
+        if (false === is_file($cache_file_name)) return false;
+        $peek = file_get_contents($cache_file_name, false, null, -1, 32);
+        $expire = explode('{i:0;i:', $peek, 2);
+        $expire = explode(';', end($expire), 2);
         $expire = current($expire);
-        if($expire && $expire < time()){
+        if ($expire && $expire < time()) {
             unlink($cache_file_name);
             return false;
         } else return true;
     }
 
-    public function flush(){
-        exec('rm -f ' . $this->options->cache_dir . '*.cache.php');
+    public function flush() {
+        exec('rm -f '.$this->options->cache_dir.'*.cache.php');
     }
 
-    public function inc($key,$value=1){
-        if(null === ($current = $this->get($key))) $current = $value; else $current += $value;
-        $this->set($key,$current);
+    public function inc($key, $value = 1) {
+        if (null === ($current = $this->get($key))) $current = $value;else $current += $value;
+        $this->set($key, $current);
     }
 
-    public function dec($key,$value=1){
-        $this->inc($key,-abs($value));
+    public function dec($key, $value = 1) {
+        $this->inc($key, -abs($value));
     }
 }

Braces +28 added lines, -16 removed lines

@@ -15,22 +15,24 @@ 
 class Files implements Adapter {
     protected $options;
 
-    public static function valid(){
+    public static function valid() {
         return true;
     }
 
-    public function __construct($options=[]){
+    public function __construct($options=[]) {
         $this->options = (object) array_merge($options,[
             'cache_dir' => sys_get_temp_dir().'/core_file_cache',
         ]);
         $this->options->cache_dir = rtrim($this->options->cache_dir,'/');
-        if(false===is_dir($this->options->cache_dir)) mkdir($this->options->cache_dir,0777,true);
+        if(false===is_dir($this->options->cache_dir)) {
+          mkdir($this->options->cache_dir,0777,true);
+        }
         $this->options->cache_dir .= '/';
     }
 
-    public function get($key){
+    public function get($key) {
         $cache_file_name = $this->options->cache_dir.$key.'.cache.php';
-        if(is_file($cache_file_name) && $data = @unserialize(file_get_contents($cache_file_name))){
+        if(is_file($cache_file_name) && $data = @unserialize(file_get_contents($cache_file_name))) {
             if($data[0] && (time() > $data[0])) {
                 unlink($cache_file_name);
                 return null;
@@ -41,39 +43,49 @@ 
         }
     }
 
-    public function set($key,$value,$expire=0){
+    public function set($key,$value,$expire=0) {
         $cache_file_name = $this->options->cache_dir.$key.'.cache.php';
         file_put_contents($cache_file_name,serialize([$expire?time()+$expire:0,$value]));
     }
 
-    public function delete($key){
+    public function delete($key) {
         $cache_file_name = $this->options->cache_dir.$key.'.cache.php';
-      if(is_file($cache_file_name)) unlink($cache_file_name);
+      if(is_file($cache_file_name)) {
+        unlink($cache_file_name);
+      }
     }
 
-    public function exists($key){
+    public function exists($key) {
         $cache_file_name = $this->options->cache_dir.$key.'.cache.php';
-        if(false === is_file($cache_file_name)) return false;
+        if(false === is_file($cache_file_name)) {
+          return false;
+        }
         $peek = file_get_contents($cache_file_name,false,null,-1,32);
         $expire = explode('{i:0;i:',$peek,2);
         $expire = explode(';',end($expire),2);
         $expire = current($expire);
-        if($expire && $expire < time()){
+        if($expire && $expire < time()) {
             unlink($cache_file_name);
             return false;
-        } else return true;
+        } else {
+          return true;
+        }
     }
 
-    public function flush(){
+    public function flush() {
         exec('rm -f ' . $this->options->cache_dir . '*.cache.php');
     }
 
-    public function inc($key,$value=1){
-        if(null === ($current = $this->get($key))) $current = $value; else $current += $value;
+    public function inc($key,$value=1) {
+        if(null === ($current = $this->get($key))) {
+          $current = $value;
+        } else {
+          $current += $value;
+        }
         $this->set($key,$current);
     }
 
-    public function dec($key,$value=1){
+    public function dec($key,$value=1) {
         $this->inc($key,-abs($value));
     }
 }

classes/Cache/Adapter.php

Spacing +4 added lines, -4 removed lines

@@ -12,15 +12,15 @@
 
 namespace Cache;
 
-interface Adapter  {
+interface Adapter {
   public function get($key);
-  public function set($key,$value,$expire=0);
+  public function set($key, $value, $expire = 0);
   public function delete($key);
   public function exists($key);
   public function flush();
 
-  public function inc($key,$value=1);
-  public function dec($key,$value=1);
+  public function inc($key, $value = 1);
+  public function dec($key, $value = 1);
 
   public static function valid();
 }
\ No newline at end of file

Braces +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 
 namespace Cache;
 
-interface Adapter  {
+interface Adapter {
   public function get($key);
   public function set($key,$value,$expire=0);
   public function delete($key);

classes/Cache/Memory.php

Spacing +12 added lines, -12 removed lines

@@ -16,13 +16,13 @@ 
 
   protected $memory = [];
 
-    public static function valid(){
+    public static function valid() {
         return true;
     }
 
-    public function get($key){
-      if(isset($this->memory[$key])){
-        if($this->memory[$key][1] && (time() > $this->memory[$key][1])) {
+    public function get($key) {
+      if (isset($this->memory[$key])) {
+        if ($this->memory[$key][1] && (time() > $this->memory[$key][1])) {
           unset($this->memory[$key]);
           return null;
         }
@@ -30,27 +30,27 @@ 
       }
     }
 
-    public function set($key,$value,$expire=0){
-      $this->memory[$key] = [$value,$expire?time()+$expire:0];
+    public function set($key, $value, $expire = 0) {
+      $this->memory[$key] = [$value, $expire ? time() + $expire : 0];
     }
 
-    public function delete($key){
+    public function delete($key) {
       unset($this->memory[$key]);
     }
 
-    public function exists($key){
+    public function exists($key) {
       return isset($this->memory[$key]) && (!$this->memory[$key][1] || (time() <= $this->memory[$key][1]));
     }
 
-    public function flush(){
+    public function flush() {
       $this->memory = [];
     }
 
-    public function inc($key,$value=1){
+    public function inc($key, $value = 1) {
       return isset($this->memory[$key]) ? $this->memory[$key][0] += $value : $this->memory[$key][0] = $value;
     }
 
-    public function dec($key,$value=1){
-        $this->inc($key,-abs($value));
+    public function dec($key, $value = 1) {
+        $this->inc($key, -abs($value));
     }
 }

Braces +9 added lines, -9 removed lines

@@ -16,12 +16,12 @@ 
 
   protected $memory = [];
 
-    public static function valid(){
+    public static function valid() {
         return true;
     }
 
-    public function get($key){
-      if(isset($this->memory[$key])){
+    public function get($key) {
+      if(isset($this->memory[$key])) {
         if($this->memory[$key][1] && (time() > $this->memory[$key][1])) {
           unset($this->memory[$key]);
           return null;
@@ -30,27 +30,27 @@ 
       }
     }
 
-    public function set($key,$value,$expire=0){
+    public function set($key,$value,$expire=0) {
       $this->memory[$key] = [$value,$expire?time()+$expire:0];
     }
 
-    public function delete($key){
+    public function delete($key) {
       unset($this->memory[$key]);
     }
 
-    public function exists($key){
+    public function exists($key) {
       return isset($this->memory[$key]) && (!$this->memory[$key][1] || (time() <= $this->memory[$key][1]));
     }
 
-    public function flush(){
+    public function flush() {
       $this->memory = [];
     }
 
-    public function inc($key,$value=1){
+    public function inc($key,$value=1) {
       return isset($this->memory[$key]) ? $this->memory[$key][0] += $value : $this->memory[$key][0] = $value;
     }
 
-    public function dec($key,$value=1){
+    public function dec($key,$value=1) {
         $this->inc($key,-abs($value));
     }
 }

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