caffeina-core / core

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;

classes/Email/Native.php

Spacing +4 added lines, -4 removed lines

@@ -14,9 +14,9 @@ 
 
 class Native implements Driver {
   
-  public function onInit($options){}
+  public function onInit($options) {}
 
-  public function onSend(Envelope $envelope){
+  public function onSend(Envelope $envelope) {
     // PHP requires direct handling of To and Subject Headers.
     $success     = true;
     $recipients  = $envelope->to();
@@ -24,8 +24,8 @@ 
     $envelope->to(false);
     $envelope->subject(false);
     foreach ($recipients as $to) {
-      $current_success = mail($to,$subject,$envelope->body(),$envelope->head());
-      \Event::trigger('core.email.send',$to,$envelope,'native');
+      $current_success = mail($to, $subject, $envelope->body(), $envelope->head());
+      \Event::trigger('core.email.send', $to, $envelope, 'native');
       $success = $success && $current_success;
     }
     return $success;

Braces +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
   
   public function onInit($options){}
 
-  public function onSend(Envelope $envelope){
+  public function onSend(Envelope $envelope) {
     // PHP requires direct handling of To and Subject Headers.
     $success     = true;
     $recipients  = $envelope->to();

classes/Email/Smtp.php

Spacing +17 added lines, -17 removed lines

@@ -25,36 +25,36 @@ 
     $password;
 
   public function onInit($options) {
-    $options        = (object)$options;
-    $this->host     = isset($options->host)     ? $options->host     : 'localhost';
+    $options        = (object) $options;
+    $this->host     = isset($options->host) ? $options->host : 'localhost';
     $this->username = isset($options->username) ? $options->username : false;
-    $this->secure   = isset($options->secure)   ? $options->secure   : ($this->username ? true : false);
-    $this->port     = isset($options->port)     ? $options->port     : ($this->secure ? 465 : 25);
+    $this->secure   = isset($options->secure) ? $options->secure : ($this->username ? true : false);
+    $this->port     = isset($options->port) ? $options->port : ($this->secure ? 465 : 25);
     $this->password = isset($options->password) ? $options->password : false;
   }
 
-  protected function connect(){
+  protected function connect() {
     if ($this->socket) $this->close();
-    $url = ($this->secure ? 'tls' : 'tcp') ."://{$this->host}";
-    $this->socket = fsockopen( $url, $this->port, $errno, $errstr, 30 );
-    if ( ! $this->socket ) throw new \Exception("Unable to connect to $url on port {$this->port}.");
+    $url = ($this->secure ? 'tls' : 'tcp')."://{$this->host}";
+    $this->socket = fsockopen($url, $this->port, $errno, $errstr, 30);
+    if (!$this->socket) throw new \Exception("Unable to connect to $url on port {$this->port}.");
     $this->lastMessage = '';
     $this->lastCode = 0;
   }
 
-  public function close(){
+  public function close() {
     $this->socket && @fclose($this->socket);
   }
 
-  protected function write($data, $nl = 1){
-    $payload = $data . str_repeat("\r\n",$nl);
+  protected function write($data, $nl = 1) {
+    $payload = $data.str_repeat("\r\n", $nl);
     fwrite($this->socket, $payload);
   }
 
-  protected function expectCode($code){
+  protected function expectCode($code) {
 
     $this->lastMessage = '';
-    while (substr($this->lastMessage, 3, 1) != ' '){
+    while (substr($this->lastMessage, 3, 1) != ' ') {
       $this->lastMessage = fgets($this->socket, 256);
     }
 
@@ -62,14 +62,14 @@ 
     return $code == $this->lastCode;
   }
 
-  protected function SMTPmail($from,$to,$body){
+  protected function SMTPmail($from, $to, $body) {
     $this->connect();
     $this->expectCode(220);
 
     $this->write("EHLO {$this->host}");
     $this->expectCode(250);
 
-    if ($this->username){
+    if ($this->username) {
       $this->write("AUTH LOGIN");
       $this->expectCode(334);
       $this->write(base64_encode($this->username));
@@ -98,7 +98,7 @@ 
     return $success;
   }
 
-  public function onSend(Envelope $envelope){
+  public function onSend(Envelope $envelope) {
     // PHP requires direct handling of To and Subject Headers.
     $success     = true;
     $recipients  = $envelope->to();
@@ -107,7 +107,7 @@ 
     $envelope->from(false);
     foreach ($recipients as $to) {
       $current_success = $this->SMTPmail($from, $to, $envelope->build());
-      \Event::trigger('core.email.send',$to,$envelope,'smtp');
+      \Event::trigger('core.email.send', $to, $envelope, 'smtp');
       $success = $success && $current_success;
     }
     return $success;

Braces +14 added lines, -10 removed lines

@@ -33,28 +33,32 @@ 
     $this->password = isset($options->password) ? $options->password : false;
   }
 
-  protected function connect(){
-    if ($this->socket) $this->close();
+  protected function connect() {
+    if ($this->socket) {
+      $this->close();
+    }
     $url = ($this->secure ? 'tls' : 'tcp') ."://{$this->host}";
     $this->socket = fsockopen( $url, $this->port, $errno, $errstr, 30 );
-    if ( ! $this->socket ) throw new \Exception("Unable to connect to $url on port {$this->port}.");
+    if ( ! $this->socket ) {
+      throw new \Exception("Unable to connect to $url on port {$this->port}.");
+    }
     $this->lastMessage = '';
     $this->lastCode = 0;
   }
 
-  public function close(){
+  public function close() {
     $this->socket && @fclose($this->socket);
   }
 
-  protected function write($data, $nl = 1){
+  protected function write($data, $nl = 1) {
     $payload = $data . str_repeat("\r\n",$nl);
     fwrite($this->socket, $payload);
   }
 
-  protected function expectCode($code){
+  protected function expectCode($code) {
 
     $this->lastMessage = '';
-    while (substr($this->lastMessage, 3, 1) != ' '){
+    while (substr($this->lastMessage, 3, 1) != ' ') {
       $this->lastMessage = fgets($this->socket, 256);
     }
 
@@ -62,14 +66,14 @@ 
     return $code == $this->lastCode;
   }
 
-  protected function SMTPmail($from,$to,$body){
+  protected function SMTPmail($from,$to,$body) {
     $this->connect();
     $this->expectCode(220);
 
     $this->write("EHLO {$this->host}");
     $this->expectCode(250);
 
-    if ($this->username){
+    if ($this->username) {
       $this->write("AUTH LOGIN");
       $this->expectCode(334);
       $this->write(base64_encode($this->username));
@@ -98,7 +102,7 @@ 
     return $success;
   }
 
-  public function onSend(Envelope $envelope){
+  public function onSend(Envelope $envelope) {
     // PHP requires direct handling of To and Subject Headers.
     $success     = true;
     $recipients  = $envelope->to();

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -66,7 +66,7 @@
     $this->connect();
     $this->expectCode(220);
 
-    $this->write("EHLO {$this->host}");
+    $this->write("ehlo {$this->host}");
     $this->expectCode(250);
 
     if ($this->username){

classes/Redirect.php

Spacing +7 added lines, -7 removed lines

@@ -13,8 +13,8 @@ 
 class Redirect {
     use Module;
 
-    public static function to($url){
-        if ($link = Filter::with('core.redirect',$url)) {
+    public static function to($url) {
+        if ($link = Filter::with('core.redirect', $url)) {
           Response::clean();
           Response::header('Location', $link);
           Response::send();
@@ -22,8 +22,8 @@ 
         }
     }
 
-    public static function back(){
-        if ($link = Filter::with('core.redirect', (empty($_SERVER['HTTP_REFERER']) ? Request::get('redirect_uri',false) : $_SERVER['HTTP_REFERER']) )){
+    public static function back() {
+        if ($link = Filter::with('core.redirect', (empty($_SERVER['HTTP_REFERER']) ? Request::get('redirect_uri', false) : $_SERVER['HTTP_REFERER']))) {
           Response::clean();
           Response::header('Location', $link);
           Response::send();
@@ -31,10 +31,10 @@ 
         }
     }
 
-    public static function viaJavaScript($url, $parent=false){
-      if ($link = Filter::with('core.redirect', $url)){
+    public static function viaJavaScript($url, $parent = false) {
+      if ($link = Filter::with('core.redirect', $url)) {
         Response::type('text/html');
-        Response::add('<script>'.($parent?'parent.':'').'location.href="',addslashes($link),'"</script>');
+        Response::add('<script>'.($parent ? 'parent.' : '').'location.href="', addslashes($link), '"</script>');
         Response::send();
         exit;
       }

Braces +5 added lines, -5 removed lines

@@ -13,7 +13,7 @@ 
 class Redirect {
     use Module;
 
-    public static function to($url){
+    public static function to($url) {
         if ($link = Filter::with('core.redirect',$url)) {
           Response::clean();
           Response::header('Location', $link);
@@ -22,8 +22,8 @@ 
         }
     }
 
-    public static function back(){
-        if ($link = Filter::with('core.redirect', (empty($_SERVER['HTTP_REFERER']) ? Request::get('redirect_uri',false) : $_SERVER['HTTP_REFERER']) )){
+    public static function back() {
+        if ($link = Filter::with('core.redirect', (empty($_SERVER['HTTP_REFERER']) ? Request::get('redirect_uri',false) : $_SERVER['HTTP_REFERER']) )) {
           Response::clean();
           Response::header('Location', $link);
           Response::send();
@@ -31,8 +31,8 @@ 
         }
     }
 
-    public static function viaJavaScript($url, $parent=false){
-      if ($link = Filter::with('core.redirect', $url)){
+    public static function viaJavaScript($url, $parent=false) {
+      if ($link = Filter::with('core.redirect', $url)) {
         Response::type('text/html');
         Response::add('<script>'.($parent?'parent.':'').'location.href="',addslashes($link),'"</script>');
         Response::send();

classes/FileSystem/Adapter.php

Spacing +1 added lines, -1 removed lines

@@ -20,6 +20,6 @@
   public function append($path, $data);
   public function delete($path);
   public function move($old_path, $new_path);
-  public function search($pattern, $recursive=true);
+  public function search($pattern, $recursive = true);
 
 }

classes/FileSystem/Memory.php

Spacing +10 added lines, -10 removed lines

@@ -15,40 +15,40 @@
 class Memory implements Adapter {
   protected $storage = [];
 
-  public function exists($path){
+  public function exists($path) {
     return isset($this->storage[$path]);
   }
 
-  public function read($path){
+  public function read($path) {
     return $this->exists($path) ? $this->storage[$path] : false;
   }
 
-  public function write($path, $data){
+  public function write($path, $data) {
     $this->storage[$path] = $data;
   }
 
-  public function append($path, $data){
+  public function append($path, $data) {
     @$this->storage[$path] .= $data;
   }
 
-  public function move($old, $new){
-    if($this->exists($old)){
+  public function move($old, $new) {
+    if ($this->exists($old)) {
       $this->storage[$new] = $this->storage[$old];
       unset($this->storage[$old]);
       return true;
     } else return false;
   }
 
-  public function delete($path){
+  public function delete($path) {
     unset($this->storage[$path]);
     return true;
   }
 
-  public function search($pattern, $recursive=true){
+  public function search($pattern, $recursive = true) {
     $results = [];
-    $rx_pattern = '('.strtr($pattern,['.'=>'\.','*'=>'.*','?'=>'.']).')Ai';
+    $rx_pattern = '('.strtr($pattern, ['.'=>'\.', '*'=>'.*', '?'=>'.']).')Ai';
     foreach (array_keys($this->storage) as $path) {
-      if (preg_match($rx_pattern,$path)) $results[] = $path;
+      if (preg_match($rx_pattern, $path)) $results[] = $path;
     }
     return $results;
   }

Braces +14 added lines, -10 removed lines

@@ -15,40 +15,44 @@
 class Memory implements Adapter {
   protected $storage = [];
 
-  public function exists($path){
+  public function exists($path) {
     return isset($this->storage[$path]);
   }
 
-  public function read($path){
+  public function read($path) {
     return $this->exists($path) ? $this->storage[$path] : false;
   }
 
-  public function write($path, $data){
+  public function write($path, $data) {
     $this->storage[$path] = $data;
   }
 
-  public function append($path, $data){
+  public function append($path, $data) {
     @$this->storage[$path] .= $data;
   }
 
-  public function move($old, $new){
-    if($this->exists($old)){
+  public function move($old, $new) {
+    if($this->exists($old)) {
       $this->storage[$new] = $this->storage[$old];
       unset($this->storage[$old]);
       return true;
-    } else return false;
+    } else {
+      return false;
+    }
   }
 
-  public function delete($path){
+  public function delete($path) {
     unset($this->storage[$path]);
     return true;
   }
 
-  public function search($pattern, $recursive=true){
+  public function search($pattern, $recursive=true) {
     $results = [];
     $rx_pattern = '('.strtr($pattern,['.'=>'\.','*'=>'.*','?'=>'.']).')Ai';
     foreach (array_keys($this->storage) as $path) {
-      if (preg_match($rx_pattern,$path)) $results[] = $path;
+      if (preg_match($rx_pattern,$path)) {
+        $results[] = $path;
+      }
     }
     return $results;
   }