caffeina-core / core

classes/File.php

Indentation +2 added lines, -2 removed lines

@@ -22,11 +22,11 @@
     }
 
     public static function unmount($alias) {
-       unset(static::$mount_points[$alias]);
+        unset(static::$mount_points[$alias]);
     }
 
     public static function mounts() {
-       return array_keys(static::$mount_points);
+        return array_keys(static::$mount_points);
     }
 
     public static function __callStatic($name, $params) {

Spacing +11 added lines, -11 removed lines

@@ -31,22 +31,22 @@ 
 
     public static function __callStatic($name, $params) {
         $uri = array_shift($params);
-        if ($file_location = static::locate($uri)){
+        if ($file_location = static::locate($uri)) {
             list($mount, $path) = $file_location;
             array_unshift($params, static::resolvePath($path));
             if (empty(static::$mount_points[$mount])) return false;
-            return call_user_func_array([static::$mount_points[$mount],$name],$params);
+            return call_user_func_array([static::$mount_points[$mount], $name], $params);
         } else return false;
     }
 
     public static function locate($path) {
-        if (strpos($path,'://')!==false) {
-            list($mount, $filepath) = explode('://',$path,2);
+        if (strpos($path, '://') !== false) {
+            list($mount, $filepath) = explode('://', $path, 2);
             $filepath = static::resolvePath($filepath);
             return isset(static::$mount_points[$mount]) ? [$mount, $filepath] : false;
         } else {
             $path = static::resolvePath($path);
-            foreach(static::$mount_points as $mount => $fs){
+            foreach (static::$mount_points as $mount => $fs) {
                 if ($fs->exists($path)) return [$mount, $path];
             }
             return false;
@@ -65,13 +65,13 @@ 
                 $absolutes[] = $part;
             }
         }
-        return trim(implode('/', $absolutes),'/');
+        return trim(implode('/', $absolutes), '/');
     }
 
-    public static function search($pattern, $recursive=true){
+    public static function search($pattern, $recursive = true) {
         $results = [];
         foreach (static::$mount_points as $mount => $fs) {
-            foreach($fs->search($pattern, $recursive) as $path) {
+            foreach ($fs->search($pattern, $recursive) as $path) {
                 $results[] = $mount.'://'.$path;
             }
         }
@@ -79,7 +79,7 @@ 
     }
 
 
-    public static function move($old,$new) {
+    public static function move($old, $new) {
         $src  = static::locate($old);
         $dest = static::locate($new);
         if ($src && $dest) {
@@ -87,9 +87,9 @@ 
             $_dfs = static::$mount_points[$dest[0]];
             if ($src[0] == $dest[0]) {
                 // Same filesystem
-                return $_sfs->move($src[1],$dest[1]);
+                return $_sfs->move($src[1], $dest[1]);
             } else {
-                return $_dfs->write($dest[1],$_sfs->read($src[1])) && $_sfs->delete($src[1]);
+                return $_dfs->write($dest[1], $_sfs->read($src[1])) && $_sfs->delete($src[1]);
             }
         } else return false;
     }

Braces +21 added lines, -9 removed lines

@@ -17,7 +17,9 @@ 
 
     public static function mount($alias, $driver, $options = null) {
         $driver_class = '\\FileSystem\\'.ucfirst(strtolower($driver));
-        if (!class_exists($driver_class)) throw new \Exception('Filesystem adapter '.$driver.' not found.');
+        if (!class_exists($driver_class)) {
+          throw new \Exception('Filesystem adapter '.$driver.' not found.');
+        }
         static::$mount_points[$alias] = new $driver_class($options);
     }
 
@@ -31,12 +33,16 @@ 
 
     public static function __callStatic($name, $params) {
         $uri = array_shift($params);
-        if ($file_location = static::locate($uri)){
+        if ($file_location = static::locate($uri)) {
             list($mount, $path) = $file_location;
             array_unshift($params, static::resolvePath($path));
-            if (empty(static::$mount_points[$mount])) return false;
+            if (empty(static::$mount_points[$mount])) {
+              return false;
+            }
             return call_user_func_array([static::$mount_points[$mount],$name],$params);
-        } else return false;
+        } else {
+          return false;
+        }
     }
 
     public static function locate($path) {
@@ -46,8 +52,10 @@ 
             return isset(static::$mount_points[$mount]) ? [$mount, $filepath] : false;
         } else {
             $path = static::resolvePath($path);
-            foreach(static::$mount_points as $mount => $fs){
-                if ($fs->exists($path)) return [$mount, $path];
+            foreach(static::$mount_points as $mount => $fs) {
+                if ($fs->exists($path)) {
+                  return [$mount, $path];
+                }
             }
             return false;
         }
@@ -58,7 +66,9 @@ 
         $parts = array_filter(explode('/', $path), 'strlen');
         $absolutes = [];
         foreach ($parts as $part) {
-            if ('.' == $part) continue;
+            if ('.' == $part) {
+              continue;
+            }
             if ('..' == $part) {
                 array_pop($absolutes);
             } else {
@@ -68,7 +78,7 @@ 
         return trim(implode('/', $absolutes),'/');
     }
 
-    public static function search($pattern, $recursive=true){
+    public static function search($pattern, $recursive=true) {
         $results = [];
         foreach (static::$mount_points as $mount => $fs) {
             foreach($fs->search($pattern, $recursive) as $path) {
@@ -91,7 +101,9 @@ 
             } else {
                 return $_dfs->write($dest[1],$_sfs->read($src[1])) && $_sfs->delete($src[1]);
             }
-        } else return false;
+        } else {
+          return false;
+        }
     }
 
 

classes/Service.php

Indentation +2 added lines, -2 removed lines

@@ -28,12 +28,12 @@
     }
 
     public static function __callStatic($serviceName, $serviceParameters){
-    	return empty(static::$services[$serviceName])
+      return empty(static::$services[$serviceName])
                    ? null
                    : (is_callable(static::$services[$serviceName])
                        ? call_user_func_array( static::$services[$serviceName], $serviceParameters)
                        : static::$services[$serviceName]
-                   );
+                    );
     }
 
 

Spacing +4 added lines, -4 removed lines

@@ -15,23 +15,23 @@
     use Module;
     private static $services = [];
 
-    public static function register($serviceName, $serviceFactory){
+    public static function register($serviceName, $serviceFactory) {
       static::$services[$serviceName] = function() use ($serviceName, $serviceFactory) {
         return static::$services[$serviceName] = call_user_func_array($serviceFactory, func_get_args());
       };
     }
 
-    public static function registerFactory($serviceName, $serviceFactory){
+    public static function registerFactory($serviceName, $serviceFactory) {
         static::$services[$serviceName] = function() use ($serviceName, $serviceFactory) {
             return call_user_func_array($serviceFactory, func_get_args());
         };
     }
 
-    public static function __callStatic($serviceName, $serviceParameters){
+    public static function __callStatic($serviceName, $serviceParameters) {
     	return empty(static::$services[$serviceName])
                    ? null
                    : (is_callable(static::$services[$serviceName])
-                       ? call_user_func_array( static::$services[$serviceName], $serviceParameters)
+                       ? call_user_func_array(static::$services[$serviceName], $serviceParameters)
                        : static::$services[$serviceName]
                    );
     }

Braces +3 added lines, -3 removed lines

@@ -15,19 +15,19 @@
     use Module;
     private static $services = [];
 
-    public static function register($serviceName, $serviceFactory){
+    public static function register($serviceName, $serviceFactory) {
       static::$services[$serviceName] = function() use ($serviceName, $serviceFactory) {
         return static::$services[$serviceName] = call_user_func_array($serviceFactory, func_get_args());
       };
     }
 
-    public static function registerFactory($serviceName, $serviceFactory){
+    public static function registerFactory($serviceName, $serviceFactory) {
         static::$services[$serviceName] = function() use ($serviceName, $serviceFactory) {
             return call_user_func_array($serviceFactory, func_get_args());
         };
     }
 
-    public static function __callStatic($serviceName, $serviceParameters){
+    public static function __callStatic($serviceName, $serviceParameters) {
     	return empty(static::$services[$serviceName])
                    ? null
                    : (is_callable(static::$services[$serviceName])

classes/Shell.php

Indentation +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
                   $w[] = '--'.$value;                      
                 } else {
                   if(is_bool($value)){
-                     if($value) $w[] = '--'.$key;
+                      if($value) $w[] = '--'.$key;
                   } else { 
                     $w[] = '--'.$key.'='.escapeshellarg($value);  
                   }                    

Spacing +27 added lines, -27 removed lines

@@ -22,17 +22,17 @@ 
      * @param array $params 
      * @return string
      */
-    protected static function _compileCommand($command,array $params){
+    protected static function _compileCommand($command, array $params) {
         $s = $w = [];
         foreach ($params as $p) {
             if ($p instanceof static) {
               $s[] = '$('.$p->getShellCommand().')';
             } else if (is_array($p)) foreach ($p as $key => $value) {
-                if(is_numeric($key)){
+                if (is_numeric($key)) {
                   $w[] = '--'.$value;                      
                 } else {
-                  if(is_bool($value)){
-                     if($value) $w[] = '--'.$key;
+                  if (is_bool($value)) {
+                     if ($value) $w[] = '--'.$key;
                   } else { 
                     $w[] = '--'.$key.'='.escapeshellarg($value);  
                   }                    
@@ -42,7 +42,7 @@ 
             }
         }
         return trim(
-            '/usr/bin/env '.$command.' '.implode(' ',array_merge($w,$s))
+            '/usr/bin/env '.$command.' '.implode(' ', array_merge($w, $s))
         );
     }
  
@@ -50,68 +50,68 @@ 
      * Returns the compiled shell command
      * @return string
      */
-    public function getShellCommand(){
+    public function getShellCommand() {
         return $this->command;
     }
 
-    public static function __callStatic($command,$params){
+    public static function __callStatic($command, $params) {
         // Check if is an alias
-        if (isset(static::$aliases[$command])){
-            if(!$results = call_user_func_array(static::$aliases[$command],$params))
+        if (isset(static::$aliases[$command])) {
+            if (!$results = call_user_func_array(static::$aliases[$command], $params))
                 throw new Exception('Shell aliases must return a Shell class or a command string.');
-            return $results instanceof static? $results : new static($results);
+            return $results instanceof static ? $results : new static($results);
         } else {
-            return new static($command,$params);
+            return new static($command, $params);
         }
     }
     
-    public function __construct($command,$params=null){
-        $this->command = $params?static::_compileCommand($command,$params):$command;
+    public function __construct($command, $params = null) {
+        $this->command = $params ? static::_compileCommand($command, $params) : $command;
     }
     
-    public function __toString(){
+    public function __toString() {
         $output = [];
-        exec($this->command,$output,$error_code);
-        return empty($output)?'':implode(PHP_EOL,$output);
+        exec($this->command, $output, $error_code);
+        return empty($output) ? '' : implode(PHP_EOL, $output);
     }
 
     /**
      * Concatenate multiple shell commands via piping
      * @return Shell The piped shell command
      */
-    public static function pipe(/* ... */){
+    public static function pipe(/* ... */) {
         $cmd = [];
         foreach (func_get_args() as $item) {
-            $cmd[] = ($item instanceof static)?$item->getShellCommand():$item;
+            $cmd[] = ($item instanceof static) ? $item->getShellCommand() : $item;
         }
-        return new static(implode(' | ',$cmd));
+        return new static(implode(' | ', $cmd));
     }
 
     /**
      * Concatenate multiple shell commands via logical implication ( && )
      * @return Shell The concatenated shell command
      */
-    public static function sequence(/* ... */){
+    public static function sequence(/* ... */) {
         $cmd = [];
         foreach (func_get_args() as $item) {
-            $cmd[] = ($item instanceof static)?$item->getShellCommand():$item;
+            $cmd[] = ($item instanceof static) ? $item->getShellCommand() : $item;
         }
-        return new static(implode(' && ',$cmd));
+        return new static(implode(' && ', $cmd));
     }
 
-    public static function execCommand($command,$params){
-        return new static($command,$params);
+    public static function execCommand($command, $params) {
+        return new static($command, $params);
     }
 
-    public static function alias($command,callable $callback){
+    public static function alias($command, callable $callback) {
         static::$aliases[$command] = $callback;
     }
 
-    public static function escape($arg){
+    public static function escape($arg) {
         return escapeshellarg($arg);
     }
 
-    public function run(){
+    public function run() {
         return $this->__toString();
     }
 

Braces +24 added lines, -19 removed lines

@@ -22,18 +22,22 @@ 
      * @param array $params 
      * @return string
      */
-    protected static function _compileCommand($command,array $params){
+    protected static function _compileCommand($command,array $params) {
         $s = $w = [];
         foreach ($params as $p) {
             if ($p instanceof static) {
               $s[] = '$('.$p->getShellCommand().')';
-            } else if (is_array($p)) foreach ($p as $key => $value) {
+            } else if (is_array($p)) {
+              foreach ($p as $key => $value) {
                 if(is_numeric($key)){
-                  $w[] = '--'.$value;                      
+                  $w[] = '--'.$value;
+            }
                 } else {
-                  if(is_bool($value)){
-                     if($value) $w[] = '--'.$key;
-                  } else { 
+                  if(is_bool($value)) {
+                     if($value) {
+                       $w[] = '--'.$key;
+                     }
+                  } else {
                     $w[] = '--'.$key.'='.escapeshellarg($value);  
                   }                    
                 }
@@ -50,26 +54,27 @@ 
      * Returns the compiled shell command
      * @return string
      */
-    public function getShellCommand(){
+    public function getShellCommand() {
         return $this->command;
     }
 
-    public static function __callStatic($command,$params){
+    public static function __callStatic($command,$params) {
         // Check if is an alias
-        if (isset(static::$aliases[$command])){
-            if(!$results = call_user_func_array(static::$aliases[$command],$params))
-                throw new Exception('Shell aliases must return a Shell class or a command string.');
+        if (isset(static::$aliases[$command])) {
+            if(!$results = call_user_func_array(static::$aliases[$command],$params)) {
+                            throw new Exception('Shell aliases must return a Shell class or a command string.');
+            }
             return $results instanceof static? $results : new static($results);
         } else {
             return new static($command,$params);
         }
     }
     
-    public function __construct($command,$params=null){
+    public function __construct($command,$params=null) {
         $this->command = $params?static::_compileCommand($command,$params):$command;
     }
     
-    public function __toString(){
+    public function __toString() {
         $output = [];
         exec($this->command,$output,$error_code);
         return empty($output)?'':implode(PHP_EOL,$output);
@@ -79,7 +84,7 @@ 
      * Concatenate multiple shell commands via piping
      * @return Shell The piped shell command
      */
-    public static function pipe(/* ... */){
+    public static function pipe(/* ... */) {
         $cmd = [];
         foreach (func_get_args() as $item) {
             $cmd[] = ($item instanceof static)?$item->getShellCommand():$item;
@@ -91,7 +96,7 @@ 
      * Concatenate multiple shell commands via logical implication ( && )
      * @return Shell The concatenated shell command
      */
-    public static function sequence(/* ... */){
+    public static function sequence(/* ... */) {
         $cmd = [];
         foreach (func_get_args() as $item) {
             $cmd[] = ($item instanceof static)?$item->getShellCommand():$item;
@@ -99,19 +104,19 @@ 
         return new static(implode(' && ',$cmd));
     }
 
-    public static function execCommand($command,$params){
+    public static function execCommand($command,$params) {
         return new static($command,$params);
     }
 
-    public static function alias($command,callable $callback){
+    public static function alias($command,callable $callback) {
         static::$aliases[$command] = $callback;
     }
 
-    public static function escape($arg){
+    public static function escape($arg) {
         return escapeshellarg($arg);
     }
 
-    public function run(){
+    public function run() {
         return $this->__toString();
     }
 

classes/FileSystem/Native.php

Doc Comments +3 added lines

@@ -28,6 +28,9 @@
       return $this->exists($path) ? file_get_contents($this->realPath($path)) : false;
   }
 
+  /**
+   * @param string|false $data
+   */
   public function write($path, $data){
       $r_path = $this->realPath($path);
       if ( ! is_dir($r_dir = dirname($r_path)) ) @mkdir($r_dir,0775,true);

Spacing +18 added lines, -18 removed lines

@@ -17,42 +17,42 @@ 
   protected $root;
 
   public function __construct(array $options = []) {
-      $this->root = empty($options['root'])?'/':(rtrim($options['root'],'/').'/');
+      $this->root = empty($options['root']) ? '/' : (rtrim($options['root'], '/').'/');
   }
 
-  public function exists($path){
+  public function exists($path) {
       return file_exists($this->realPath($path));
   }
 
-  public function read($path){
+  public function read($path) {
       return $this->exists($path) ? file_get_contents($this->realPath($path)) : false;
   }
 
-  public function write($path, $data){
+  public function write($path, $data) {
       $r_path = $this->realPath($path);
-      if ( ! is_dir($r_dir = dirname($r_path)) ) @mkdir($r_dir,0775,true);
+      if (!is_dir($r_dir = dirname($r_path))) @mkdir($r_dir, 0775, true);
       return file_put_contents($r_path, $data);
   }
 
-  public function append($path, $data){
+  public function append($path, $data) {
       return file_put_contents($this->realPath($path), $data, FILE_APPEND);
   }
 
-  public function move($old, $new){
+  public function move($old, $new) {
       // Atomic
-      if($this->exists($old)){
-          return $this->write($new,$this->read($old)) && $this->delete($old);
+      if ($this->exists($old)) {
+          return $this->write($new, $this->read($old)) && $this->delete($old);
       } else return false;
   }
 
-  public function delete($path){
+  public function delete($path) {
       return $this->exists($path) ? unlink($this->realPath($path)) : false;
   }
 
-  public function search($pattern, $recursive=true){
+  public function search($pattern, $recursive = true) {
       $results    = [];
       $root_len   = strlen($this->root);
-      $rx_pattern = '('.strtr($pattern,['.'=>'\.','*'=>'.*','?'=>'.']).')Ai';
+      $rx_pattern = '('.strtr($pattern, ['.'=>'\.', '*'=>'.*', '?'=>'.']).')Ai';
 
       /*
       $files = new \RegexIterator(new \RecursiveDirectoryIterator($this->root,
@@ -68,12 +68,12 @@ 
               new \RecursiveDirectoryIterator(
                   $this->root,
                   \RecursiveDirectoryIterator::SKIP_DOTS)),
-                  $rx_pattern,\RegexIterator::GET_MATCH);
+                  $rx_pattern, \RegexIterator::GET_MATCH);
 
       $fileList = [];
-      foreach($tree as $group) {
-          foreach($group as $path) {
-              $results[] = trim(substr($path, $root_len),'/');
+      foreach ($tree as $group) {
+          foreach ($group as $path) {
+              $results[] = trim(substr($path, $root_len), '/');
           }
       }
 
@@ -81,8 +81,8 @@ 
 
   }
 
-  protected function realPath($path){
-      return $this->root . $path;
+  protected function realPath($path) {
+      return $this->root.$path;
   }
 
 }

Braces +15 added lines, -11 removed lines

@@ -20,36 +20,40 @@ 
       $this->root = empty($options['root'])?'/':(rtrim($options['root'],'/').'/');
   }
 
-  public function exists($path){
+  public function exists($path) {
       return file_exists($this->realPath($path));
   }
 
-  public function read($path){
+  public function read($path) {
       return $this->exists($path) ? file_get_contents($this->realPath($path)) : false;
   }
 
-  public function write($path, $data){
+  public function write($path, $data) {
       $r_path = $this->realPath($path);
-      if ( ! is_dir($r_dir = dirname($r_path)) ) @mkdir($r_dir,0775,true);
+      if ( ! is_dir($r_dir = dirname($r_path)) ) {
+        @mkdir($r_dir,0775,true);
+      }
       return file_put_contents($r_path, $data);
   }
 
-  public function append($path, $data){
+  public function append($path, $data) {
       return file_put_contents($this->realPath($path), $data, FILE_APPEND);
   }
 
-  public function move($old, $new){
+  public function move($old, $new) {
       // Atomic
-      if($this->exists($old)){
+      if($this->exists($old)) {
           return $this->write($new,$this->read($old)) && $this->delete($old);
-      } else return false;
+      } else {
+        return false;
+      }
   }
 
-  public function delete($path){
+  public function delete($path) {
       return $this->exists($path) ? unlink($this->realPath($path)) : false;
   }
 
-  public function search($pattern, $recursive=true){
+  public function search($pattern, $recursive=true) {
       $results    = [];
       $root_len   = strlen($this->root);
       $rx_pattern = '('.strtr($pattern,['.'=>'\.','*'=>'.*','?'=>'.']).')Ai';
@@ -81,7 +85,7 @@ 
 
   }
 
-  protected function realPath($path){
+  protected function realPath($path) {
       return $this->root . $path;
   }
 

classes/View/PHP.php

Doc Comments +3 added lines

@@ -56,6 +56,9 @@
 class PHPContext {
   protected $data = [];
 
+  /**
+   * @param string $path
+   */
   public function __construct($data=[], $path=null){
       $this->data = $data;
   }

Indentation +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
   const EXTENSION = 'php';
 
   protected static $templatePath,
-                   $globals = [];
+                    $globals = [];
 
   public function __construct($path=null,$options=[]){
       self::$templatePath = ($path ? rtrim($path,'/') : __DIR__) . '/';

Spacing +14 added lines, -14 removed lines

@@ -19,26 +19,26 @@ 
   protected static $templatePath,
                    $globals = [];
 
-  public function __construct($path=null,$options=[]){
-      self::$templatePath = ($path ? rtrim($path,'/') : __DIR__) . '/';
+  public function __construct($path = null, $options = []) {
+      self::$templatePath = ($path ? rtrim($path, '/') : __DIR__).'/';
   }
 
-  public static function exists($path){
+  public static function exists($path) {
       return is_file(self::$templatePath.$path.'.php');
   }
 
-  public static function addGlobal($key,$val){
+  public static function addGlobal($key, $val) {
     self::$globals[$key] = $val;
   }
 
-  public static function addGlobals(array $defs){
-    foreach ((array)$defs as $key=>$val) {
+  public static function addGlobals(array $defs) {
+    foreach ((array) $defs as $key=>$val) {
         self::$globals[$key] = $val;
     }
   }
 
-  public function render($template, $data=[]){
-      $template_path = self::$templatePath . trim($template,'/') . '.php';
+  public function render($template, $data = []) {
+      $template_path = self::$templatePath.trim($template, '/').'.php';
       $sandbox = function() use ($template_path){
           ob_start();
           include($template_path);
@@ -56,19 +56,19 @@ 
 class PHPContext {
   protected $data = [];
 
-  public function __construct($data=[], $path=null){
+  public function __construct($data = [], $path = null) {
       $this->data = $data;
   }
 
-  public function partial($template, $vars=[]){
-      return \View::from($template,array_merge($this->data,$vars));
+  public function partial($template, $vars = []) {
+      return \View::from($template, array_merge($this->data, $vars));
   }
 
-  public function __isset($n){ return true; }
+  public function __isset($n) { return true;}
 
-  public function __unset($n){}
+  public function __unset($n) {}
 
-  public function __get($n){
+  public function __get($n) {
     return empty($this->data[$n]) ? '' : $this->data[$n];
   }
 }

Braces +9 added lines, -9 removed lines

@@ -19,27 +19,27 @@ 
   protected static $templatePath,
                    $globals = [];
 
-  public function __construct($path=null,$options=[]){
+  public function __construct($path=null,$options=[]) {
       self::$templatePath = ($path ? rtrim($path,'/') : __DIR__) . '/';
   }
 
-  public static function exists($path){
+  public static function exists($path) {
       return is_file(self::$templatePath.$path.'.php');
   }
 
-  public static function addGlobal($key,$val){
+  public static function addGlobal($key,$val) {
     self::$globals[$key] = $val;
   }
 
-  public static function addGlobals(array $defs){
+  public static function addGlobals(array $defs) {
     foreach ((array)$defs as $key=>$val) {
         self::$globals[$key] = $val;
     }
   }
 
-  public function render($template, $data=[]){
+  public function render($template, $data=[]) {
       $template_path = self::$templatePath . trim($template,'/') . '.php';
-      $sandbox = function() use ($template_path){
+      $sandbox = function() use ($template_path) {
           ob_start();
           include($template_path);
           $__buffer__ = ob_get_contents();
@@ -56,11 +56,11 @@ 
 class PHPContext {
   protected $data = [];
 
-  public function __construct($data=[], $path=null){
+  public function __construct($data=[], $path=null) {
       $this->data = $data;
   }
 
-  public function partial($template, $vars=[]){
+  public function partial($template, $vars=[]) {
       return \View::from($template,array_merge($this->data,$vars));
   }
 
@@ -68,7 +68,7 @@ 
 
   public function __unset($n){}
 
-  public function __get($n){
+  public function __get($n) {
     return empty($this->data[$n]) ? '' : $this->data[$n];
   }
 }

classes/Hash.php

Indentation +134 added lines, -134 removed lines

@@ -11,151 +11,151 @@
  */
 
 class Hash {
-	use Module;
+  use Module;
 
-	/**
-	 * Create ah hash for payload
-	 * @param  mixed $payload The payload string/object/array
-	 * @param  integer $method  The hashing method, default is "md5"
-	 * @return string          The hash string
-	 */
-	public static function make($payload, $method = 'md5') {
-		return hash($method, serialize($payload));
-	}
+  /**
+   * Create ah hash for payload
+   * @param  mixed $payload The payload string/object/array
+   * @param  integer $method  The hashing method, default is "md5"
+   * @return string          The hash string
+   */
+  public static function make($payload, $method = 'md5') {
+    return hash($method, serialize($payload));
+  }
 
-	/**
-	 * Verify if given payload matches hash
-	 * @param  mixed $payload  The payload string/object/array
-	 * @param  string $hash    The hash string
-	 * @param  integer $method The hashing method
-	 * @return bool            Returns `true` if payload matches hash
-	 */
-	public static function verify($payload, $hash, $method = 'md5') {
-		return static::make($payload, $method) == $hash;
-	}
+  /**
+   * Verify if given payload matches hash
+   * @param  mixed $payload  The payload string/object/array
+   * @param  string $hash    The hash string
+   * @param  integer $method The hashing method
+   * @return bool            Returns `true` if payload matches hash
+   */
+  public static function verify($payload, $hash, $method = 'md5') {
+    return static::make($payload, $method) == $hash;
+  }
 
-	/**
-	 * List registered hashing algorithms
-	 *
-	 * @method methods
-	 *
-	 * @return array   Array containing the list of supported hashing algorithms.
-	 */
-	public static function methods() {
-		return hash_algos();
-	}
+  /**
+   * List registered hashing algorithms
+   *
+   * @method methods
+   *
+   * @return array   Array containing the list of supported hashing algorithms.
+   */
+  public static function methods() {
+    return hash_algos();
+  }
 
-	/**
-	 * Check if an alghoritm is registered in current PHP
-	 *
-	 * @method can
-	 *
-	 * @param  string $algo The hashing algorithm name
-	 *
-	 * @return bool
-	 */
-	public static function can($algo) {
-		return in_array($algo, hash_algos());
-	}
+  /**
+   * Check if an alghoritm is registered in current PHP
+   *
+   * @method can
+   *
+   * @param  string $algo The hashing algorithm name
+   *
+   * @return bool
+   */
+  public static function can($algo) {
+    return in_array($algo, hash_algos());
+  }
 
-	/**
-	 * Static magic for creating hashes with a specified algorithm.
-	 *
-	 * See [hash-algos](http://php.net/manual/it/function.hash-algos.php) for a list of algorithms
-	 */
-	public static function __callStatic($method, $params) {
-		return self::make(current($params), $method);
-	}
+  /**
+   * Static magic for creating hashes with a specified algorithm.
+   *
+   * See [hash-algos](http://php.net/manual/it/function.hash-algos.php) for a list of algorithms
+   */
+  public static function __callStatic($method, $params) {
+    return self::make(current($params), $method);
+  }
 
-	public static function uuid($type = 4, $namespace = '', $name = '') {
-		switch ($type) {
-		case 3:if (preg_match('/^\{?[0-9a-f]{8}\-?[0-9a-f]{4}\-?[0-9a-f]{4}\-?' .
-				'[0-9a-f]{4}\-?[0-9a-f]{12}\}?$/Si', $namespace) !== 1) {
-				return false;
-			}
+  public static function uuid($type = 4, $namespace = '', $name = '') {
+    switch ($type) {
+    case 3:if (preg_match('/^\{?[0-9a-f]{8}\-?[0-9a-f]{4}\-?[0-9a-f]{4}\-?' .
+        '[0-9a-f]{4}\-?[0-9a-f]{12}\}?$/Si', $namespace) !== 1) {
+        return false;
+      }
 
-			$nhex = str_replace(array('-', '{', '}'), '', $namespace);
-			$nstr = '';for ($i = 0; $i < strlen($nhex); $i += 2) {
-				$nstr .= chr(hexdec($nhex[$i] . $nhex[$i + 1]));
-			}
+      $nhex = str_replace(array('-', '{', '}'), '', $namespace);
+      $nstr = '';for ($i = 0; $i < strlen($nhex); $i += 2) {
+        $nstr .= chr(hexdec($nhex[$i] . $nhex[$i + 1]));
+      }
 
-			$hash = md5($nstr . $name);
-			return sprintf('%08s-%04s-%04x-%04x-%12s',
-				substr($hash, 0, 8), substr($hash, 8, 4),
-				(hexdec(substr($hash, 12, 4)) & 0x0fff) | 0x3000,
-				(hexdec(substr($hash, 16, 4)) & 0x3fff) | 0x8000,
-				substr($hash, 20, 12));
-		case 5:if (preg_match('/^\{?[0-9a-f]{8}\-?[0-9a-f]{4}\-?[0-9a-f]{4}\-?' .
-				'[0-9a-f]{4}\-?[0-9a-f]{12}\}?$/Si', $namespace) !== 1) {
-				return false;
-			}
+      $hash = md5($nstr . $name);
+      return sprintf('%08s-%04s-%04x-%04x-%12s',
+        substr($hash, 0, 8), substr($hash, 8, 4),
+        (hexdec(substr($hash, 12, 4)) & 0x0fff) | 0x3000,
+        (hexdec(substr($hash, 16, 4)) & 0x3fff) | 0x8000,
+        substr($hash, 20, 12));
+    case 5:if (preg_match('/^\{?[0-9a-f]{8}\-?[0-9a-f]{4}\-?[0-9a-f]{4}\-?' .
+        '[0-9a-f]{4}\-?[0-9a-f]{12}\}?$/Si', $namespace) !== 1) {
+        return false;
+      }
 
-			$nhex = str_replace(array('-', '{', '}'), '', $namespace);
-			$nstr = '';for ($i = 0; $i < strlen($nhex); $i += 2) {
-				$nstr .= chr(hexdec($nhex[$i] . $nhex[$i + 1]));
-			}
+      $nhex = str_replace(array('-', '{', '}'), '', $namespace);
+      $nstr = '';for ($i = 0; $i < strlen($nhex); $i += 2) {
+        $nstr .= chr(hexdec($nhex[$i] . $nhex[$i + 1]));
+      }
 
-			$hash = sha1($nstr . $name);
-			return sprintf('%08s-%04s-%04x-%04x-%12s',
-				substr($hash, 0, 8), substr($hash, 8, 4),
-				(hexdec(substr($hash, 12, 4)) & 0x0fff) | 0x5000,
-				(hexdec(substr($hash, 16, 4)) & 0x3fff) | 0x8000,
-				substr($hash, 20, 12));
-		default:case 4:return sprintf('%04x%04x-%04x-%04x-%04x-%04x%04x%04x',
-				mt_rand(0, 0xffff), mt_rand(0, 0xffff), mt_rand(0, 0xffff),
-				mt_rand(0, 0x0fff) | 0x4000, mt_rand(0, 0x3fff) | 0x8000,
-				mt_rand(0, 0xffff), mt_rand(0, 0xffff), mt_rand(0, 0xffff));
-		}
-	}
+      $hash = sha1($nstr . $name);
+      return sprintf('%08s-%04s-%04x-%04x-%12s',
+        substr($hash, 0, 8), substr($hash, 8, 4),
+        (hexdec(substr($hash, 12, 4)) & 0x0fff) | 0x5000,
+        (hexdec(substr($hash, 16, 4)) & 0x3fff) | 0x8000,
+        substr($hash, 20, 12));
+    default:case 4:return sprintf('%04x%04x-%04x-%04x-%04x-%04x%04x%04x',
+        mt_rand(0, 0xffff), mt_rand(0, 0xffff), mt_rand(0, 0xffff),
+        mt_rand(0, 0x0fff) | 0x4000, mt_rand(0, 0x3fff) | 0x8000,
+        mt_rand(0, 0xffff), mt_rand(0, 0xffff), mt_rand(0, 0xffff));
+    }
+  }
 
-	public static function murmurhash3_int($key, $seed = 0) {
-		$key = (string) $key;
-		$klen = strlen($key);
-		$h1 = $seed;
-		for ($i = 0, $bytes = $klen - ($remainder = $klen & 3); $i < $bytes;) {
-			$k1 = ((ord($key[$i]) & 0xff))
-			 | ((ord($key[++$i]) & 0xff) << 8)
-			 | ((ord($key[++$i]) & 0xff) << 16)
-			 | ((ord($key[++$i]) & 0xff) << 24);
-			++$i;
-			$k1 = (((($k1 & 0xffff) * 0xcc9e2d51)
-				 + ((((($k1 >= 0 ? $k1 >> 16 : (($k1 & 0x7fffffff) >> 16) | 0x8000)) * 0xcc9e2d51) & 0xffff) << 16)))
-			 & 0xffffffff;
-			$k1 = $k1 << 15 | ($k1 >= 0 ? $k1 >> 17 : (($k1 & 0x7fffffff) >> 17) | 0x4000);
-			$k1 = (((($k1 & 0xffff) * 0x1b873593) + ((((($k1 >= 0 ? $k1 >> 16 : (($k1 & 0x7fffffff) >> 16) | 0x8000))
-				 * 0x1b873593) & 0xffff) << 16))) & 0xffffffff;
-			$h1 ^= $k1;
-			$h1 = $h1 << 13 | ($h1 >= 0 ? $h1 >> 19 : (($h1 & 0x7fffffff) >> 19) | 0x1000);
-			$h1b = (((($h1 & 0xffff) * 5) + ((((($h1 >= 0 ? $h1 >> 16 : (($h1 & 0x7fffffff) >> 16) | 0x8000)) * 5)
-				 & 0xffff) << 16))) & 0xffffffff;
-			$h1 = ((($h1b & 0xffff) + 0x6b64) + ((((($h1b >= 0 ? $h1b >> 16 : (($h1b & 0x7fffffff) >> 16) | 0x8000))
-				 + 0xe654) & 0xffff) << 16));
-		}
-		$k1 = 0;
-		switch ($remainder) {
-		case 3:$k1 ^= (ord($key[$i + 2]) & 0xff) << 16;
-		case 2:$k1 ^= (ord($key[$i + 1]) & 0xff) << 8;
-		case 1:$k1 ^= (ord($key[$i]) & 0xff);
-			$k1 = ((($k1 & 0xffff) * 0xcc9e2d51) + ((((($k1 >= 0 ? $k1 >> 16 : (($k1 & 0x7fffffff) >> 16) | 0x8000))
-				 * 0xcc9e2d51) & 0xffff) << 16)) & 0xffffffff;
-			$k1 = $k1 << 15 | ($k1 >= 0 ? $k1 >> 17 : (($k1 & 0x7fffffff) >> 17) | 0x4000);
-			$k1 = ((($k1 & 0xffff) * 0x1b873593) + ((((($k1 >= 0 ? $k1 >> 16 : (($k1 & 0x7fffffff) >> 16) | 0x8000))
-				 * 0x1b873593) & 0xffff) << 16)) & 0xffffffff;
-			$h1 ^= $k1;
-		}
-		$h1 ^= $klen;
-		$h1 ^= ($h1 >= 0 ? $h1 >> 16 : (($h1 & 0x7fffffff) >> 16) | 0x8000);
-		$h1 = ((($h1 & 0xffff) * 0x85ebca6b) + ((((($h1 >= 0 ? $h1 >> 16 : (($h1 & 0x7fffffff) >> 16) | 0x8000))
-			 * 0x85ebca6b) & 0xffff) << 16)) & 0xffffffff;
-		$h1 ^= ($h1 >= 0 ? $h1 >> 13 : (($h1 & 0x7fffffff) >> 13) | 0x40000);
-		$h1 = (((($h1 & 0xffff) * 0xc2b2ae35) + ((((($h1 >= 0 ? $h1 >> 16 : (($h1 & 0x7fffffff) >> 16) | 0x8000))
-			 * 0xc2b2ae35) & 0xffff) << 16))) & 0xffffffff;
-		$h1 ^= ($h1 >= 0 ? $h1 >> 16 : (($h1 & 0x7fffffff) >> 16) | 0x8000);
-		return $h1;
-	}
+  public static function murmurhash3_int($key, $seed = 0) {
+    $key = (string) $key;
+    $klen = strlen($key);
+    $h1 = $seed;
+    for ($i = 0, $bytes = $klen - ($remainder = $klen & 3); $i < $bytes;) {
+      $k1 = ((ord($key[$i]) & 0xff))
+        | ((ord($key[++$i]) & 0xff) << 8)
+        | ((ord($key[++$i]) & 0xff) << 16)
+        | ((ord($key[++$i]) & 0xff) << 24);
+      ++$i;
+      $k1 = (((($k1 & 0xffff) * 0xcc9e2d51)
+         + ((((($k1 >= 0 ? $k1 >> 16 : (($k1 & 0x7fffffff) >> 16) | 0x8000)) * 0xcc9e2d51) & 0xffff) << 16)))
+        & 0xffffffff;
+      $k1 = $k1 << 15 | ($k1 >= 0 ? $k1 >> 17 : (($k1 & 0x7fffffff) >> 17) | 0x4000);
+      $k1 = (((($k1 & 0xffff) * 0x1b873593) + ((((($k1 >= 0 ? $k1 >> 16 : (($k1 & 0x7fffffff) >> 16) | 0x8000))
+         * 0x1b873593) & 0xffff) << 16))) & 0xffffffff;
+      $h1 ^= $k1;
+      $h1 = $h1 << 13 | ($h1 >= 0 ? $h1 >> 19 : (($h1 & 0x7fffffff) >> 19) | 0x1000);
+      $h1b = (((($h1 & 0xffff) * 5) + ((((($h1 >= 0 ? $h1 >> 16 : (($h1 & 0x7fffffff) >> 16) | 0x8000)) * 5)
+          & 0xffff) << 16))) & 0xffffffff;
+      $h1 = ((($h1b & 0xffff) + 0x6b64) + ((((($h1b >= 0 ? $h1b >> 16 : (($h1b & 0x7fffffff) >> 16) | 0x8000))
+         + 0xe654) & 0xffff) << 16));
+    }
+    $k1 = 0;
+    switch ($remainder) {
+    case 3:$k1 ^= (ord($key[$i + 2]) & 0xff) << 16;
+    case 2:$k1 ^= (ord($key[$i + 1]) & 0xff) << 8;
+    case 1:$k1 ^= (ord($key[$i]) & 0xff);
+      $k1 = ((($k1 & 0xffff) * 0xcc9e2d51) + ((((($k1 >= 0 ? $k1 >> 16 : (($k1 & 0x7fffffff) >> 16) | 0x8000))
+         * 0xcc9e2d51) & 0xffff) << 16)) & 0xffffffff;
+      $k1 = $k1 << 15 | ($k1 >= 0 ? $k1 >> 17 : (($k1 & 0x7fffffff) >> 17) | 0x4000);
+      $k1 = ((($k1 & 0xffff) * 0x1b873593) + ((((($k1 >= 0 ? $k1 >> 16 : (($k1 & 0x7fffffff) >> 16) | 0x8000))
+         * 0x1b873593) & 0xffff) << 16)) & 0xffffffff;
+      $h1 ^= $k1;
+    }
+    $h1 ^= $klen;
+    $h1 ^= ($h1 >= 0 ? $h1 >> 16 : (($h1 & 0x7fffffff) >> 16) | 0x8000);
+    $h1 = ((($h1 & 0xffff) * 0x85ebca6b) + ((((($h1 >= 0 ? $h1 >> 16 : (($h1 & 0x7fffffff) >> 16) | 0x8000))
+       * 0x85ebca6b) & 0xffff) << 16)) & 0xffffffff;
+    $h1 ^= ($h1 >= 0 ? $h1 >> 13 : (($h1 & 0x7fffffff) >> 13) | 0x40000);
+    $h1 = (((($h1 & 0xffff) * 0xc2b2ae35) + ((((($h1 >= 0 ? $h1 >> 16 : (($h1 & 0x7fffffff) >> 16) | 0x8000))
+       * 0xc2b2ae35) & 0xffff) << 16))) & 0xffffffff;
+    $h1 ^= ($h1 >= 0 ? $h1 >> 16 : (($h1 & 0x7fffffff) >> 16) | 0x8000);
+    return $h1;
+  }
 
-	public static function murmurhash3($key, $seed = 0) {
-		return base_convert(static::murmurhash3_int($key, $seed), 10, 32);
-	}
+  public static function murmurhash3($key, $seed = 0) {
+    return base_convert(static::murmurhash3_int($key, $seed), 10, 32);
+  }
 
 }

Switch Indentation +41 added lines, -41 removed lines

@@ -69,42 +69,42 @@ 
 
 	public static function uuid($type = 4, $namespace = '', $name = '') {
 		switch ($type) {
-		case 3:if (preg_match('/^\{?[0-9a-f]{8}\-?[0-9a-f]{4}\-?[0-9a-f]{4}\-?' .
-				'[0-9a-f]{4}\-?[0-9a-f]{12}\}?$/Si', $namespace) !== 1) {
-				return false;
-			}
+		  case 3:if (preg_match('/^\{?[0-9a-f]{8}\-?[0-9a-f]{4}\-?[0-9a-f]{4}\-?' .
+				  '[0-9a-f]{4}\-?[0-9a-f]{12}\}?$/Si', $namespace) !== 1) {
+				  return false;
+			  }
 
-			$nhex = str_replace(array('-', '{', '}'), '', $namespace);
-			$nstr = '';for ($i = 0; $i < strlen($nhex); $i += 2) {
-				$nstr .= chr(hexdec($nhex[$i] . $nhex[$i + 1]));
-			}
+			  $nhex = str_replace(array('-', '{', '}'), '', $namespace);
+			  $nstr = '';for ($i = 0; $i < strlen($nhex); $i += 2) {
+				  $nstr .= chr(hexdec($nhex[$i] . $nhex[$i + 1]));
+			  }
 
-			$hash = md5($nstr . $name);
-			return sprintf('%08s-%04s-%04x-%04x-%12s',
-				substr($hash, 0, 8), substr($hash, 8, 4),
-				(hexdec(substr($hash, 12, 4)) & 0x0fff) | 0x3000,
-				(hexdec(substr($hash, 16, 4)) & 0x3fff) | 0x8000,
-				substr($hash, 20, 12));
-		case 5:if (preg_match('/^\{?[0-9a-f]{8}\-?[0-9a-f]{4}\-?[0-9a-f]{4}\-?' .
-				'[0-9a-f]{4}\-?[0-9a-f]{12}\}?$/Si', $namespace) !== 1) {
-				return false;
-			}
+			  $hash = md5($nstr . $name);
+			  return sprintf('%08s-%04s-%04x-%04x-%12s',
+				  substr($hash, 0, 8), substr($hash, 8, 4),
+				  (hexdec(substr($hash, 12, 4)) & 0x0fff) | 0x3000,
+				  (hexdec(substr($hash, 16, 4)) & 0x3fff) | 0x8000,
+				  substr($hash, 20, 12));
+		  case 5:if (preg_match('/^\{?[0-9a-f]{8}\-?[0-9a-f]{4}\-?[0-9a-f]{4}\-?' .
+				  '[0-9a-f]{4}\-?[0-9a-f]{12}\}?$/Si', $namespace) !== 1) {
+				  return false;
+			  }
 
-			$nhex = str_replace(array('-', '{', '}'), '', $namespace);
-			$nstr = '';for ($i = 0; $i < strlen($nhex); $i += 2) {
-				$nstr .= chr(hexdec($nhex[$i] . $nhex[$i + 1]));
-			}
+			  $nhex = str_replace(array('-', '{', '}'), '', $namespace);
+			  $nstr = '';for ($i = 0; $i < strlen($nhex); $i += 2) {
+				  $nstr .= chr(hexdec($nhex[$i] . $nhex[$i + 1]));
+			  }
 
-			$hash = sha1($nstr . $name);
-			return sprintf('%08s-%04s-%04x-%04x-%12s',
-				substr($hash, 0, 8), substr($hash, 8, 4),
-				(hexdec(substr($hash, 12, 4)) & 0x0fff) | 0x5000,
-				(hexdec(substr($hash, 16, 4)) & 0x3fff) | 0x8000,
-				substr($hash, 20, 12));
-		default:case 4:return sprintf('%04x%04x-%04x-%04x-%04x-%04x%04x%04x',
-				mt_rand(0, 0xffff), mt_rand(0, 0xffff), mt_rand(0, 0xffff),
-				mt_rand(0, 0x0fff) | 0x4000, mt_rand(0, 0x3fff) | 0x8000,
-				mt_rand(0, 0xffff), mt_rand(0, 0xffff), mt_rand(0, 0xffff));
+			  $hash = sha1($nstr . $name);
+			  return sprintf('%08s-%04s-%04x-%04x-%12s',
+				  substr($hash, 0, 8), substr($hash, 8, 4),
+				  (hexdec(substr($hash, 12, 4)) & 0x0fff) | 0x5000,
+				  (hexdec(substr($hash, 16, 4)) & 0x3fff) | 0x8000,
+				  substr($hash, 20, 12));
+		  default:case 4:return sprintf('%04x%04x-%04x-%04x-%04x-%04x%04x%04x',
+				  mt_rand(0, 0xffff), mt_rand(0, 0xffff), mt_rand(0, 0xffff),
+				  mt_rand(0, 0x0fff) | 0x4000, mt_rand(0, 0x3fff) | 0x8000,
+				  mt_rand(0, 0xffff), mt_rand(0, 0xffff), mt_rand(0, 0xffff));
 		}
 	}
 
@@ -133,15 +133,15 @@ 
 		}
 		$k1 = 0;
 		switch ($remainder) {
-		case 3:$k1 ^= (ord($key[$i + 2]) & 0xff) << 16;
-		case 2:$k1 ^= (ord($key[$i + 1]) & 0xff) << 8;
-		case 1:$k1 ^= (ord($key[$i]) & 0xff);
-			$k1 = ((($k1 & 0xffff) * 0xcc9e2d51) + ((((($k1 >= 0 ? $k1 >> 16 : (($k1 & 0x7fffffff) >> 16) | 0x8000))
-				 * 0xcc9e2d51) & 0xffff) << 16)) & 0xffffffff;
-			$k1 = $k1 << 15 | ($k1 >= 0 ? $k1 >> 17 : (($k1 & 0x7fffffff) >> 17) | 0x4000);
-			$k1 = ((($k1 & 0xffff) * 0x1b873593) + ((((($k1 >= 0 ? $k1 >> 16 : (($k1 & 0x7fffffff) >> 16) | 0x8000))
-				 * 0x1b873593) & 0xffff) << 16)) & 0xffffffff;
-			$h1 ^= $k1;
+		  case 3:$k1 ^= (ord($key[$i + 2]) & 0xff) << 16;
+		  case 2:$k1 ^= (ord($key[$i + 1]) & 0xff) << 8;
+		  case 1:$k1 ^= (ord($key[$i]) & 0xff);
+			  $k1 = ((($k1 & 0xffff) * 0xcc9e2d51) + ((((($k1 >= 0 ? $k1 >> 16 : (($k1 & 0x7fffffff) >> 16) | 0x8000))
+				   * 0xcc9e2d51) & 0xffff) << 16)) & 0xffffffff;
+			  $k1 = $k1 << 15 | ($k1 >= 0 ? $k1 >> 17 : (($k1 & 0x7fffffff) >> 17) | 0x4000);
+			  $k1 = ((($k1 & 0xffff) * 0x1b873593) + ((((($k1 >= 0 ? $k1 >> 16 : (($k1 & 0x7fffffff) >> 16) | 0x8000))
+				   * 0x1b873593) & 0xffff) << 16)) & 0xffffffff;
+			  $h1 ^= $k1;
 		}
 		$h1 ^= $klen;
 		$h1 ^= ($h1 >= 0 ? $h1 >> 16 : (($h1 & 0x7fffffff) >> 16) | 0x8000);

Spacing +9 added lines, -9 removed lines

@@ -69,33 +69,33 @@ 
 
 	public static function uuid($type = 4, $namespace = '', $name = '') {
 		switch ($type) {
-		case 3:if (preg_match('/^\{?[0-9a-f]{8}\-?[0-9a-f]{4}\-?[0-9a-f]{4}\-?' .
+		case 3:if (preg_match('/^\{?[0-9a-f]{8}\-?[0-9a-f]{4}\-?[0-9a-f]{4}\-?'.
 				'[0-9a-f]{4}\-?[0-9a-f]{12}\}?$/Si', $namespace) !== 1) {
 				return false;
 			}
 
 			$nhex = str_replace(array('-', '{', '}'), '', $namespace);
-			$nstr = '';for ($i = 0; $i < strlen($nhex); $i += 2) {
-				$nstr .= chr(hexdec($nhex[$i] . $nhex[$i + 1]));
+			$nstr = '';for ($i = 0;$i < strlen($nhex);$i += 2) {
+				$nstr .= chr(hexdec($nhex[$i].$nhex[$i + 1]));
 			}
 
-			$hash = md5($nstr . $name);
+			$hash = md5($nstr.$name);
 			return sprintf('%08s-%04s-%04x-%04x-%12s',
 				substr($hash, 0, 8), substr($hash, 8, 4),
 				(hexdec(substr($hash, 12, 4)) & 0x0fff) | 0x3000,
 				(hexdec(substr($hash, 16, 4)) & 0x3fff) | 0x8000,
 				substr($hash, 20, 12));
-		case 5:if (preg_match('/^\{?[0-9a-f]{8}\-?[0-9a-f]{4}\-?[0-9a-f]{4}\-?' .
+		case 5:if (preg_match('/^\{?[0-9a-f]{8}\-?[0-9a-f]{4}\-?[0-9a-f]{4}\-?'.
 				'[0-9a-f]{4}\-?[0-9a-f]{12}\}?$/Si', $namespace) !== 1) {
 				return false;
 			}
 
 			$nhex = str_replace(array('-', '{', '}'), '', $namespace);
-			$nstr = '';for ($i = 0; $i < strlen($nhex); $i += 2) {
-				$nstr .= chr(hexdec($nhex[$i] . $nhex[$i + 1]));
+			$nstr = '';for ($i = 0;$i < strlen($nhex);$i += 2) {
+				$nstr .= chr(hexdec($nhex[$i].$nhex[$i + 1]));
 			}
 
-			$hash = sha1($nstr . $name);
+			$hash = sha1($nstr.$name);
 			return sprintf('%08s-%04s-%04x-%04x-%12s',
 				substr($hash, 0, 8), substr($hash, 8, 4),
 				(hexdec(substr($hash, 12, 4)) & 0x0fff) | 0x5000,
@@ -112,7 +112,7 @@ 
 		$key = (string) $key;
 		$klen = strlen($key);
 		$h1 = $seed;
-		for ($i = 0, $bytes = $klen - ($remainder = $klen & 3); $i < $bytes;) {
+		for ($i = 0, $bytes = $klen - ($remainder = $klen & 3);$i < $bytes;) {
 			$k1 = ((ord($key[$i]) & 0xff))
 			 | ((ord($key[++$i]) & 0xff) << 8)
 			 | ((ord($key[++$i]) & 0xff) << 16)

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/View/Adapter.php

Spacing +3 added lines, -3 removed lines

@@ -13,9 +13,9 @@
 namespace View;
 
 interface Adapter {
-    public function __construct($path=null, $options=[]);
-    public function render($template,$data=[]);
+    public function __construct($path = null, $options = []);
+    public function render($template, $data = []);
     public static function exists($path);
-    public static function addGlobal($key,$val);
+    public static function addGlobal($key, $val);
     public static function addGlobals(array $defs);
 }

classes/Deferred.php

Indentation +7 added lines, -7 removed lines

@@ -12,12 +12,12 @@ 
 
 class Deferred {
 
-	protected $callback,
+  protected $callback,
             $enabled = true;
 
-	public function __construct( callable $callback ) {
-		$this->callback = $callback;
-	}
+  public function __construct( callable $callback ) {
+    $this->callback = $callback;
+  }
 
   public function disarm() {
     $this->enabled = false;
@@ -27,8 +27,8 @@ 
     $this->enabled = true;
   }
 
-	public function __destruct() {
-		if ( $this->enabled ) call_user_func( $this->callback );
-	}
+  public function __destruct() {
+    if ( $this->enabled ) call_user_func( $this->callback );
+  }
 
 }
\ No newline at end of file

Spacing +2 added lines, -2 removed lines

@@ -15,7 +15,7 @@ 
 	protected $callback,
             $enabled = true;
 
-	public function __construct( callable $callback ) {
+	public function __construct(callable $callback) {
 		$this->callback = $callback;
 	}
 
@@ -28,7 +28,7 @@ 
   }
 
 	public function __destruct() {
-		if ( $this->enabled ) call_user_func( $this->callback );
+		if ($this->enabled) call_user_func($this->callback);
 	}
 
 }
\ No newline at end of file

Braces +3 added lines, -1 removed lines

@@ -28,7 +28,9 @@
   }
 
 	public function __destruct() {
-		if ( $this->enabled ) call_user_func( $this->callback );
+		if ( $this->enabled ) {
+		  call_user_func( $this->callback );
+		}
 	}
 
 }
\ No newline at end of file