caffeina-core / core

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/ZIP.php

Spacing +15 added lines, -15 removed lines

@@ -19,50 +19,50 @@
               $fileCache;
 
     public function __construct(array $options = []) {
-        $this->path    = empty($options['root'])?(tempnam(sys_get_temp_dir(), 'CFZ_').'.zip'):rtrim($options['root']);
+        $this->path    = empty($options['root']) ? (tempnam(sys_get_temp_dir(), 'CFZ_').'.zip') : rtrim($options['root']);
         $this->zipfile = new \ZipArchive();
-        if ( !$this->zipfile->open($this->path, \ZipArchive::CREATE) ){
+        if (!$this->zipfile->open($this->path, \ZipArchive::CREATE)) {
             throw new \Exception("File::ZIP Cannot open or create ".$this->path);
         }
     }
 
-    public function exists($path){
+    public function exists($path) {
         return false !== $this->zipfile->locateName($path);
     }
 
-    public function read($path){
+    public function read($path) {
         if (isset($this->fileCache[$path])) return $this->fileCache[$path];
         return $this->exists($path) ? $this->zipfile->getFromName($path) : false;
     }
 
-    public function write($path, $data){
+    public function write($path, $data) {
         // This is needed because we cant write and read from the same archive.
         $this->fileCache[$path] = $data;
         return $this->zipfile->addFromString($path, $data);
     }
 
-    public function append($path, $data){
-        return $this->write($path, ($this->read($path) ?: '') . $data);
+    public function append($path, $data) {
+        return $this->write($path, ($this->read($path) ?: '').$data);
     }
 
-    public function delete($path){
+    public function delete($path) {
         return $this->exists($path) ? $this->zipfile->deleteName($path) : false;
     }
 
-    public function move($old, $new){
+    public function move($old, $new) {
         // Atomic rename
         // This is needed because we cant write and read from the same archive.
-        return $this->write($new,$this->read($old)) && $this->delete($old);
+        return $this->write($new, $this->read($old)) && $this->delete($old);
         // return $this->zipfile->renameName($old, $new);
     }
 
-    public function search($pattern, $recursive=true){
+    public function search($pattern, $recursive = true) {
         $results = [];
-        $rx_pattern = '('.strtr($pattern,['.'=>'\.','*'=>'.*','?'=>'.']).')Ai';
+        $rx_pattern = '('.strtr($pattern, ['.'=>'\.', '*'=>'.*', '?'=>'.']).')Ai';
 
-        for( $i = 0, $c = $this->zipfile->numFiles; $i < $c; $i++ ){
-            $stat = $this->zipfile->statIndex( $i );
-            if (preg_match($rx_pattern,$stat['name'])) $results[] = $stat['name'];
+        for ($i = 0, $c = $this->zipfile->numFiles;$i < $c;$i++) {
+            $stat = $this->zipfile->statIndex($i);
+            if (preg_match($rx_pattern, $stat['name'])) $results[] = $stat['name'];
         }
 
         return $results;

Braces +15 added lines, -11 removed lines

@@ -21,48 +21,52 @@
     public function __construct(array $options = []) {
         $this->path    = empty($options['root'])?(tempnam(sys_get_temp_dir(), 'CFZ_').'.zip'):rtrim($options['root']);
         $this->zipfile = new \ZipArchive();
-        if ( !$this->zipfile->open($this->path, \ZipArchive::CREATE) ){
+        if ( !$this->zipfile->open($this->path, \ZipArchive::CREATE) ) {
             throw new \Exception("File::ZIP Cannot open or create ".$this->path);
         }
     }
 
-    public function exists($path){
+    public function exists($path) {
         return false !== $this->zipfile->locateName($path);
     }
 
-    public function read($path){
-        if (isset($this->fileCache[$path])) return $this->fileCache[$path];
+    public function read($path) {
+        if (isset($this->fileCache[$path])) {
+          return $this->fileCache[$path];
+        }
         return $this->exists($path) ? $this->zipfile->getFromName($path) : false;
     }
 
-    public function write($path, $data){
+    public function write($path, $data) {
         // This is needed because we cant write and read from the same archive.
         $this->fileCache[$path] = $data;
         return $this->zipfile->addFromString($path, $data);
     }
 
-    public function append($path, $data){
+    public function append($path, $data) {
         return $this->write($path, ($this->read($path) ?: '') . $data);
     }
 
-    public function delete($path){
+    public function delete($path) {
         return $this->exists($path) ? $this->zipfile->deleteName($path) : false;
     }
 
-    public function move($old, $new){
+    public function move($old, $new) {
         // Atomic rename
         // This is needed because we cant write and read from the same archive.
         return $this->write($new,$this->read($old)) && $this->delete($old);
         // return $this->zipfile->renameName($old, $new);
     }
 
-    public function search($pattern, $recursive=true){
+    public function search($pattern, $recursive=true) {
         $results = [];
         $rx_pattern = '('.strtr($pattern,['.'=>'\.','*'=>'.*','?'=>'.']).')Ai';
 
-        for( $i = 0, $c = $this->zipfile->numFiles; $i < $c; $i++ ){
+        for( $i = 0, $c = $this->zipfile->numFiles; $i < $c; $i++ ) {
             $stat = $this->zipfile->statIndex( $i );
-            if (preg_match($rx_pattern,$stat['name'])) $results[] = $stat['name'];
+            if (preg_match($rx_pattern,$stat['name'])) {
+              $results[] = $stat['name'];
+            }
         }
 
         return $results;

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

classes/Persistence.php

Indentation +9 added lines, -9 removed lines

@@ -135,14 +135,14 @@ 
    */
   private static function persistenceLoadDefault($pk, $table, $options){
     if ( $data = SQL::single("SELECT * FROM $table WHERE {$options['key']}=? LIMIT 1",[$pk]) ){
-       $obj = new static;
-       foreach ((array)$data as $key => $value) {
-         $obj->$key = $value;
-       }
-       return $obj;
-     } else {
-       return null;
-     }
+        $obj = new static;
+        foreach ((array)$data as $key => $value) {
+          $obj->$key = $value;
+        }
+        return $obj;
+      } else {
+        return null;
+      }
   }
 
   /**
@@ -163,7 +163,7 @@ 
    * Private Standard Save Method
    */
   private function persistenceSaveDefault($table,$options){
-     return SQL::insertOrUpdate($table,array_filter((array)$this),$options['key']);
+      return SQL::insertOrUpdate($table,array_filter((array)$this),$options['key']);
   }
 
 

Spacing +24 added lines, -24 removed lines

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

Braces +16 added lines, -14 removed lines

@@ -20,16 +20,18 @@ 
    * @param  mixed $options The options passed to the persistence layer.
    * @return mixed          All options array or a single value
    */
-  protected static function persistenceOptions($options=null){
+  protected static function persistenceOptions($options=null) {
     static $_options = [];
 
-    if ($options === null) return $_options;
+    if ($options === null) {
+      return $_options;
+    }
     if (is_array($options)) {
       return $_options = $options;
     } else {
       if (empty($_options['table'])) {
         $self = get_called_class();
-        if (defined("$self::_PRIMARY_KEY_")){
+        if (defined("$self::_PRIMARY_KEY_")) {
           $x = explode('.', $self::_PRIMARY_KEY_);
           $_options = [
             'table' => current($x),
@@ -37,7 +39,7 @@ 
           ];
         } else {
           // User pluralized class name as default table
-          switch(substr($s = strtolower($self),-1)){
+          switch(substr($s = strtolower($self),-1)) {
               case 'y': $table = substr($s,0,-1).'ies'; break;
               case 's': $table = substr($s,0,-1).'es';  break;
               default:  $table = $s.'s'; break;
@@ -61,7 +63,7 @@ 
    * @param  callable $callback The callback to use on model save
    * @return callable           Current save callback
    */
-  protected static function persistenceSave(callable $callback=null){
+  protected static function persistenceSave(callable $callback=null) {
     static $save_cb = null;
     return $callback ? $save_cb = $callback : $save_cb;
   }
@@ -74,7 +76,7 @@ 
    * @param  callable $callback The callback to use on model load
    * @return callable           Current load callback
    */
-  protected static function persistenceLoad(callable $callback=null){
+  protected static function persistenceLoad(callable $callback=null) {
     static $retrieve_cb = null;
     return $callback ? $retrieve_cb = $callback : $retrieve_cb;
   }
@@ -89,7 +91,7 @@ 
    * @param  array $options An associative array with options for the persistance layer.
    * @return void
    */
-  public static function persistOn($table, array $options=[]){
+  public static function persistOn($table, array $options=[]) {
     $options = array_merge($options,[
       'key' => 'id'
     ]);
@@ -103,7 +105,7 @@ 
    * @param  callable $callback The callback to use on model save
    * @return void
    */
-  public static function onSave(callable $callback){
+  public static function onSave(callable $callback) {
     static::persistenceSave($callback);
   }
 
@@ -112,7 +114,7 @@ 
    * @param  callable $callback The callback to use on model load
    * @return void
    */
-  public static function onLoad(callable $callback){
+  public static function onLoad(callable $callback) {
     static::persistenceLoad($callback);
   }
 
@@ -120,7 +122,7 @@ 
    * Load the model from the persistence layer
    * @return mixed The retrieved object
    */
-  public static function load($pk){
+  public static function load($pk) {
     $table = static::persistenceOptions('table');
     $cb    = static::persistenceLoad();
     $op    = static::persistenceOptions();
@@ -133,8 +135,8 @@ 
   /**
    * Private Standard Load Method
    */
-  private static function persistenceLoadDefault($pk, $table, $options){
-    if ( $data = SQL::single("SELECT * FROM $table WHERE {$options['key']}=? LIMIT 1",[$pk]) ){
+  private static function persistenceLoadDefault($pk, $table, $options) {
+    if ( $data = SQL::single("SELECT * FROM $table WHERE {$options['key']}=? LIMIT 1",[$pk]) ) {
        $obj = new static;
        foreach ((array)$data as $key => $value) {
          $obj->$key = $value;
@@ -149,7 +151,7 @@ 
    * Save the model to the persistence layer
    * @return mixed The results from the save callback. (default: lastInsertID)
    */
-  public function save(){
+  public function save() {
     $table  = static::persistenceOptions('table');
     $op     = static::persistenceOptions();
     $cb     = static::persistenceSave();
@@ -162,7 +164,7 @@ 
   /**
    * Private Standard Save Method
    */
-  private function persistenceSaveDefault($table,$options){
+  private function persistenceSaveDefault($table,$options) {
      return SQL::insertOrUpdate($table,array_filter((array)$this),$options['key']);
   }
 

classes/Token.php

Spacing +6 added lines, -6 removed lines

@@ -17,15 +17,15 @@ 
     $encoded_payload = implode('.', [rtrim(strtr(base64_encode(json_encode([
         'typ' => 'JWT',
         'alg' => $algo,
-      ])), '+/', '-_'),'='),
-      rtrim(strtr(base64_encode(json_encode($payload)), '+/', '-_'),'='),
+      ])), '+/', '-_'), '='),
+      rtrim(strtr(base64_encode(json_encode($payload)), '+/', '-_'), '='),
     ]);
-    return $encoded_payload . '.' . static::sign($encoded_payload, $secret, $algo);
+    return $encoded_payload.'.'.static::sign($encoded_payload, $secret, $algo);
   }
 
-  public static function decode($jwt, $secret = null, $verify = true){
+  public static function decode($jwt, $secret = null, $verify = true) {
 
-    if (substr_count($jwt,'.') != 2) throw new \Exception('Token not valid');
+    if (substr_count($jwt, '.') != 2) throw new \Exception('Token not valid');
 
     list($encoded_header, $encoded_payload, $client_sig) = explode('.', $jwt);
 
@@ -53,7 +53,7 @@ 
       'HS256' => 'sha256',
     ];
     if (empty($algos[$algo])) throw new \Exception('Signing algorithm not supported');
-    return rtrim(strtr(base64_encode(hash_hmac($algos[$algo], $payload, $secret, true)), '+/', '-_'),'=');
+    return rtrim(strtr(base64_encode(hash_hmac($algos[$algo], $payload, $secret, true)), '+/', '-_'), '=');
   }
 
 }

Braces +19 added lines, -10 removed lines

@@ -23,24 +23,31 @@ 
     return $encoded_payload . '.' . static::sign($encoded_payload, $secret, $algo);
   }
 
-  public static function decode($jwt, $secret = null, $verify = true){
+  public static function decode($jwt, $secret = null, $verify = true) {
 
-    if (substr_count($jwt,'.') != 2) throw new \Exception('Token not valid');
+    if (substr_count($jwt,'.') != 2) {
+      throw new \Exception('Token not valid');
+    }
 
     list($encoded_header, $encoded_payload, $client_sig) = explode('.', $jwt);
 
-    if (null === ($payload = json_decode(base64_decode(strtr($encoded_payload, '-_', '+/')))))
-      throw new \Exception('Invalid encoding');
+    if (null === ($payload = json_decode(base64_decode(strtr($encoded_payload, '-_', '+/'))))) {
+          throw new \Exception('Invalid encoding');
+    }
 
 
     if ($verify) {
-      if (null === ($header = json_decode(base64_decode(strtr($encoded_header, '-_', '+/')))))
-        throw new \Exception('Invalid encoding');
+      if (null === ($header = json_decode(base64_decode(strtr($encoded_header, '-_', '+/'))))) {
+              throw new \Exception('Invalid encoding');
+      }
 
-      if (empty($header->alg)) throw new \Exception('Invalid encoding');
+      if (empty($header->alg)) {
+        throw new \Exception('Invalid encoding');
+      }
 
-      if ($client_sig != static::sign("$encoded_header.$encoded_payload", $secret, $header->alg))
-        throw new \Exception('Token verification failed');
+      if ($client_sig != static::sign("$encoded_header.$encoded_payload", $secret, $header->alg)) {
+              throw new \Exception('Token verification failed');
+      }
     }
 
     return $payload;
@@ -52,7 +59,9 @@ 
       'HS384' => 'sha384',
       'HS256' => 'sha256',
     ];
-    if (empty($algos[$algo])) throw new \Exception('Signing algorithm not supported');
+    if (empty($algos[$algo])) {
+      throw new \Exception('Signing algorithm not supported');
+    }
     return rtrim(strtr(base64_encode(hash_hmac($algos[$algo], $payload, $secret, true)), '+/', '-_'),'=');
   }
 

classes/Text.php

Indentation +7 added lines, -7 removed lines

@@ -27,12 +27,12 @@
    * @param mixed $v (default: null)  The array of values exposed in template.
    * @return string
    */
-   public static function render($t,$v=null){
-     for($r=$ox=$x=false;false!==($x=$y=strpos($t,'{{',$x));
-       $r.=substr($t,$ox,$x-$ox),
-       $c=substr($t,$x+=2,$l=($y=strpos($t,'}}',$x))-$x),
-       $ox=$x+=$l+2,$r.=Object::fetch($c,$v)
-     ); return $r===false?$t:$r.substr($t,$ox);
-   }
+    public static function render($t,$v=null){
+      for($r=$ox=$x=false;false!==($x=$y=strpos($t,'{{',$x));
+        $r.=substr($t,$ox,$x-$ox),
+        $c=substr($t,$x+=2,$l=($y=strpos($t,'}}',$x))-$x),
+        $ox=$x+=$l+2,$r.=Object::fetch($c,$v)
+      ); return $r===false?$t:$r.substr($t,$ox);
+    }
 
 } /* End of class */

Spacing +6 added lines, -6 removed lines

@@ -27,12 +27,12 @@
    * @param mixed $v (default: null)  The array of values exposed in template.
    * @return string
    */
-   public static function render($t,$v=null){
-     for($r=$ox=$x=false;false!==($x=$y=strpos($t,'{{',$x));
-       $r.=substr($t,$ox,$x-$ox),
-       $c=substr($t,$x+=2,$l=($y=strpos($t,'}}',$x))-$x),
-       $ox=$x+=$l+2,$r.=Object::fetch($c,$v)
-     ); return $r===false?$t:$r.substr($t,$ox);
+   public static function render($t, $v = null) {
+     for ($r = $ox = $x = false;false !== ($x = $y = strpos($t, '{{', $x));
+       $r .= substr($t, $ox, $x - $ox),
+       $c = substr($t, $x += 2, $l = ($y = strpos($t, '}}', $x)) - $x),
+       $ox = $x += $l + 2, $r .= Object::fetch($c, $v)
+     );return $r === false ? $t : $r.substr($t, $ox);
    }
 
 } /* End of class */

Braces +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
    * @param mixed $v (default: null)  The array of values exposed in template.
    * @return string
    */
-   public static function render($t,$v=null){
+   public static function render($t,$v=null) {
      for($r=$ox=$x=false;false!==($x=$y=strpos($t,'{{',$x));
        $r.=substr($t,$ox,$x-$ox),
        $c=substr($t,$x+=2,$l=($y=strpos($t,'}}',$x))-$x),

classes/Map.php

Spacing +23 added lines, -23 removed lines

@@ -29,11 +29,11 @@ 
      * @param  mixed $default (optional) The default value. If is a callable it will executed and the return value will be used.
      * @return mixed The value of the key or the default (resolved) value if the key not existed.
      */
-    public function get($key, $default=null){
-        if ($ptr =& static::find($key,false)){
+    public function get($key, $default = null) {
+        if ($ptr = & static::find($key, false)) {
             return $ptr;
         } else {
-            if ($default !== null){
+            if ($default !== null) {
                 return static::set($key, is_callable($default) ? call_user_func($default) : $default);
             } else {
                 return null;
@@ -47,11 +47,11 @@ 
      * @param  mixed $value (optional) The value. If is a callable it will executed and the return value will be used.
      * @return mixed The value of the key or the default (resolved) value if the key not existed.
      */
-    public function set($key, $value=null){
+    public function set($key, $value = null) {
         if (is_array($key)) {
             return static::merge($key);
         } else {
-            $ptr = & static::find($key,true);
+            $ptr = & static::find($key, true);
             return $ptr = $value;
         }
     }
@@ -61,8 +61,8 @@ 
      * @param  string $key The key path in dot notation
      * @param  boolean $compact (optional) Compact map removing empty paths.
      */
-    public function delete($key, $compact=true){
-        static::set($key,null);
+    public function delete($key, $compact = true) {
+        static::set($key, null);
         if ($compact) static::compact();
     }
 
@@ -71,18 +71,18 @@ 
      * @param  string $key The key path in dot notation
      * @return boolean
      */
-    public function exists($key){
-        return null !== static::find($key,false);
+    public function exists($key) {
+        return null !== static::find($key, false);
     }
 
     /**
      * Clear all key path in map.
      */
-    public function clear(){
+    public function clear() {
         $this->fields = [];
     }
 
-    public function __construct($fields=null){
+    public function __construct($fields = null) {
         $this->load($fields);
     }
 
@@ -90,8 +90,8 @@ 
      * Load an associative array/object as the map source.
      * @param  string $fields The array to merge
      */
-    public function load($fields){
-        if ($fields) $this->fields = (array)$fields;
+    public function load($fields) {
+        if ($fields) $this->fields = (array) $fields;
     }
 
     /**
@@ -99,7 +99,7 @@ 
      * @param  array   $array The array to merge
      * @param  boolean $merge_back If `true` merge the map over the $array, if `false` (default) the reverse.
      */
-    public function merge(array $array, $merge_back=false){
+    public function merge(array $array, $merge_back = false) {
         $this->fields = $merge_back
             ? array_replace_recursive($array, $this->fields)
             : array_replace_recursive($this->fields, $array);
@@ -108,7 +108,7 @@ 
     /**
      * Compact map removing empty paths
      */
-    public function compact(){
+    public function compact() {
         function array_filter_rec($input, $callback = null) {
             foreach ($input as &$value) {
                 if (is_array($value)) {
@@ -118,7 +118,7 @@ 
             return array_filter($input, $callback);
         }
 
-        $this->fields = array_filter_rec($this->fields,function($a){ return $a !== null; });
+        $this->fields = array_filter_rec($this->fields, function($a) { return $a !== null;});
     }
 
     /**
@@ -128,15 +128,15 @@ 
      * @param  callable  If passed this callback will be applied to the founded value.
      * @return mixed The founded value.
      */
-    public function & find($path, $create=false, callable $operation=null) {
-        $tok = strtok($path,'.');
-        if($create){
-            $value =& $this->fields;
+    public function & find($path, $create = false, callable $operation = null) {
+        $tok = strtok($path, '.');
+        if ($create) {
+            $value = & $this->fields;
         } else {
             $value = $this->fields;
         }
-        while($tok !== false){
-            $value =& $value[$tok];
+        while ($tok !== false) {
+            $value = & $value[$tok];
             $tok = strtok('.');
         }
         if (is_callable($operation)) $operation($value);
@@ -150,7 +150,7 @@ 
      *
      * @return string        The json object
      */
-    public function jsonSerialize(){
+    public function jsonSerialize() {
       return $this->fields;
     }
 

Braces +23 added lines, -17 removed lines

@@ -29,11 +29,11 @@ 
      * @param  mixed $default (optional) The default value. If is a callable it will executed and the return value will be used.
      * @return mixed The value of the key or the default (resolved) value if the key not existed.
      */
-    public function get($key, $default=null){
-        if ($ptr =& static::find($key,false)){
+    public function get($key, $default=null) {
+        if ($ptr =& static::find($key,false)) {
             return $ptr;
         } else {
-            if ($default !== null){
+            if ($default !== null) {
                 return static::set($key, is_callable($default) ? call_user_func($default) : $default);
             } else {
                 return null;
@@ -47,7 +47,7 @@ 
      * @param  mixed $value (optional) The value. If is a callable it will executed and the return value will be used.
      * @return mixed The value of the key or the default (resolved) value if the key not existed.
      */
-    public function set($key, $value=null){
+    public function set($key, $value=null) {
         if (is_array($key)) {
             return static::merge($key);
         } else {
@@ -61,9 +61,11 @@ 
      * @param  string $key The key path in dot notation
      * @param  boolean $compact (optional) Compact map removing empty paths.
      */
-    public function delete($key, $compact=true){
+    public function delete($key, $compact=true) {
         static::set($key,null);
-        if ($compact) static::compact();
+        if ($compact) {
+          static::compact();
+        }
     }
 
     /**
@@ -71,18 +73,18 @@ 
      * @param  string $key The key path in dot notation
      * @return boolean
      */
-    public function exists($key){
+    public function exists($key) {
         return null !== static::find($key,false);
     }
 
     /**
      * Clear all key path in map.
      */
-    public function clear(){
+    public function clear() {
         $this->fields = [];
     }
 
-    public function __construct($fields=null){
+    public function __construct($fields=null) {
         $this->load($fields);
     }
 
@@ -90,8 +92,10 @@ 
      * Load an associative array/object as the map source.
      * @param  string $fields The array to merge
      */
-    public function load($fields){
-        if ($fields) $this->fields = (array)$fields;
+    public function load($fields) {
+        if ($fields) {
+          $this->fields = (array)$fields;
+        }
     }
 
     /**
@@ -99,7 +103,7 @@ 
      * @param  array   $array The array to merge
      * @param  boolean $merge_back If `true` merge the map over the $array, if `false` (default) the reverse.
      */
-    public function merge(array $array, $merge_back=false){
+    public function merge(array $array, $merge_back=false) {
         $this->fields = $merge_back
             ? array_replace_recursive($array, $this->fields)
             : array_replace_recursive($this->fields, $array);
@@ -108,7 +112,7 @@ 
     /**
      * Compact map removing empty paths
      */
-    public function compact(){
+    public function compact() {
         function array_filter_rec($input, $callback = null) {
             foreach ($input as &$value) {
                 if (is_array($value)) {
@@ -130,16 +134,18 @@ 
      */
     public function & find($path, $create=false, callable $operation=null) {
         $tok = strtok($path,'.');
-        if($create){
+        if($create) {
             $value =& $this->fields;
         } else {
             $value = $this->fields;
         }
-        while($tok !== false){
+        while($tok !== false) {
             $value =& $value[$tok];
             $tok = strtok('.');
         }
-        if (is_callable($operation)) $operation($value);
+        if (is_callable($operation)) {
+          $operation($value);
+        }
         return $value;
     }
 
@@ -150,7 +156,7 @@ 
      *
      * @return string        The json object
      */
-    public function jsonSerialize(){
+    public function jsonSerialize() {
       return $this->fields;
     }