caffeina-core / core

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

Braces +78 added lines, -46 removed lines

@@ -38,7 +38,7 @@ 
      * @param string $method The HTTP method for which the route must respond.
      * @return Route
      */
-    public function __construct($URLPattern, $callback = null, $method='get'){
+    public function __construct($URLPattern, $callback = null, $method='get') {
         $this->URLPattern = rtrim(implode('',static::$prefix),'/') . '/' . trim($URLPattern,'/')?:'/';
         $this->URLPattern = $this->URLPattern != '/' ? rtrim($this->URLPattern,'/') : $this->URLPattern;
         $this->dynamic    = $this->isDynamic($this->URLPattern);
@@ -56,19 +56,23 @@ 
      * @param  string $method The HTTP Method to check against.
      * @return boolean
      */
-    public function match($URL,$method='get'){
+    public function match($URL,$method='get') {
         $method = strtolower($method);
 
         // * is an http method wildcard
-        if (empty($this->methods[$method]) && empty($this->methods['*'])) return false;
+        if (empty($this->methods[$method]) && empty($this->methods['*'])) {
+          return false;
+        }
         $URL = rtrim($URL,'/');
         $args = [];
         if ( $this->dynamic
                ? preg_match($this->pattern,$URL,$args)
                : $URL == rtrim($this->pattern,'/')
-        ){
+        ) {
             foreach ($args as $key => $value) {
-              if ( false === is_string($key) ) unset($args[$key]);
+              if ( false === is_string($key) ) {
+                unset($args[$key]);
+              }
             }
             return $args;
         }
@@ -81,7 +85,7 @@ 
      * @param  string $method The HTTP Method requested.
      * @return array The callback response.
      */
-    public function run(array $args,$method='get'){
+    public function run(array $args,$method='get') {
         $method = strtolower($method);
         $this->response 			 		= '';
         $this->response_object 		= null;
@@ -150,7 +154,7 @@ 
 
         Event::trigger('core.route.after', $this);
 
-        if ( $this->response_is_object ){
+        if ( $this->response_is_object ) {
 					$this->response = Response::json($this->response_object);
         } else {
 					Response::add($this->response);
@@ -167,7 +171,7 @@ 
      * @param  string $method The HTTP Method to check against.
      * @return array The callback response.
      */
-    public function runIfMatch($URL, $method='get'){
+    public function runIfMatch($URL, $method='get') {
         return ($args = $this->match($URL,$method)) ? $this->run($args,$method) : null;
     }
 
@@ -177,7 +181,7 @@ 
      * @param  $callback The callback to be invoked (with variables extracted from the route if present) when the route match the request URI.
      * @return Route
      */
-    public static function on($URLPattern, $callback = null){
+    public static function on($URLPattern, $callback = null) {
         return new Route($URLPattern,$callback);
     }
 
@@ -187,7 +191,7 @@ 
      * @param  $callback The callback to be invoked (with variables extracted from the route if present) when the route match the request URI.
      * @return Route
      */
-    public static function any($URLPattern, $callback = null){
+    public static function any($URLPattern, $callback = null) {
         return (new Route($URLPattern,$callback))->via('*');
     }
 
@@ -233,7 +237,7 @@ 
      */
     public function & via(){
         $this->methods = [];
-        foreach (func_get_args() as $method){
+        foreach (func_get_args() as $method) {
             $this->methods[strtolower($method)] = true;
         }
         return $this;
@@ -255,7 +259,7 @@ 
      * @return Route
      */
     public function & rules(array $rules){
-        foreach ((array)$rules as $varname => $rule){
+        foreach ((array)$rules as $varname => $rule) {
             $this->rules[$varname] = $rule;
         }
         $this->pattern = $this->compilePatternAsRegex($this->URLPattern,$this->rules);
@@ -284,7 +288,9 @@ 
         $route->callback = [];
         foreach ($callbacks as $method => $callback) {
            $method = strtolower($method);
-           if (Request::method() !== $method) continue;
+           if (Request::method() !== $method) {
+             continue;
+           }
            $route->callback[$method] = $callback;
            $route->methods[$method]  = 1;
         }
@@ -296,8 +302,8 @@ 
      * @param  string $pattern The URL schema.
      * @return string The compiled PREG RegEx.
      */
-    protected static function compilePatternAsRegex($pattern, $rules=[]){
-        return '#^'.preg_replace_callback('#:([a-zA-Z]\w*)#S',function($g) use (&$rules){
+    protected static function compilePatternAsRegex($pattern, $rules=[]) {
+        return '#^'.preg_replace_callback('#:([a-zA-Z]\w*)#S',function($g) use (&$rules) {
             return '(?<' . $g[1] . '>' . (isset($rules[$g[1]])?$rules[$g[1]]:'[^/]+') .')';
         },str_replace(['.',')','*'],['\.',')?','.+'],$pattern)).'$#';
     }
@@ -309,12 +315,16 @@ 
      * @param  boolean $cut If true don't limit the matching to the whole URL (used for group pattern extraction)
      * @return array The extracted variables
      */
-    protected static function extractVariablesFromURL($pattern, $URL=null, $cut=false){
+    protected static function extractVariablesFromURL($pattern, $URL=null, $cut=false) {
         $URL     = $URL ?: Request::URI();
         $pattern = $cut ? str_replace('$#','',$pattern).'#' : $pattern;
-        if ( !preg_match($pattern,$URL,$args) ) return false;
+        if ( !preg_match($pattern,$URL,$args) ) {
+          return false;
+        }
         foreach ($args as $key => $value) {
-            if (false === is_string($key)) unset($args[$key]);
+            if (false === is_string($key)) {
+              unset($args[$key]);
+            }
         }
         return $args;
     }
@@ -324,7 +334,7 @@ 
      * @param  string  $pattern The URL schema.
      * @return boolean
      */
-    protected static function isDynamic($pattern){
+    protected static function isDynamic($pattern) {
       return strlen($pattern) != strcspn($pattern,':(?[*+');
     }
 
@@ -333,8 +343,10 @@ 
      * @param Route $r
      * @return Route
      */
-    public static function add($r){
-        if ( isset(static::$group[0]) ) static::$group[0]->add($r);
+    public static function add($r) {
+        if ( isset(static::$group[0]) ) {
+          static::$group[0]->add($r);
+        }
         return static::$routes[implode('',static::$prefix)][] = $r;
     }
 
@@ -343,41 +355,55 @@ 
      * @param  string $prefix The url prefix for the internal route definitions.
      * @param  string $callback This callback is invoked on $prefix match of the current request URI.
      */
-    public static function group($prefix,$callback=null){
+    public static function group($prefix,$callback=null) {
 
         // Skip definition if current request doesn't match group.
 
         $prefix_complete = rtrim(implode('',static::$prefix),'/') . $prefix;
 
-        if ( static::isDynamic($prefix) ){
+        if ( static::isDynamic($prefix) ) {
 
             // Dynamic group, capture vars
             $vars = static::extractVariablesFromURL(static::compilePatternAsRegex($prefix_complete),null,true);
 
             // Errors in compile pattern or variable extraction, aborting.
-            if (false === $vars) return;
+            if (false === $vars) {
+              return;
+            }
 
             static::$prefix[] = $prefix;
-            if (empty(static::$group)) static::$group = [];
+            if (empty(static::$group)) {
+              static::$group = [];
+            }
             array_unshift(static::$group, new RouteGroup());
-            if ($callback) call_user_func_array($callback,$vars);
+            if ($callback) {
+              call_user_func_array($callback,$vars);
+            }
             $group = static::$group[0];
             array_shift(static::$group);
             array_pop(static::$prefix);
-            if (empty(static::$prefix)) static::$prefix=[''];
+            if (empty(static::$prefix)) {
+              static::$prefix=[''];
+            }
             return $group;
 
-        } else if ( 0 === strpos(Request::URI(), $prefix_complete) ){
+        } else if ( 0 === strpos(Request::URI(), $prefix_complete) ) {
 
             // Static group
             static::$prefix[] = $prefix;
-            if (empty(static::$group)) static::$group = [];
+            if (empty(static::$group)) {
+              static::$group = [];
+            }
             array_unshift(static::$group, new RouteGroup());
-            if ($callback) call_user_func($callback);
+            if ($callback) {
+              call_user_func($callback);
+            }
             $group = static::$group[0];
             array_shift(static::$group);
             array_pop(static::$prefix);
-            if (empty(static::$prefix)) static::$prefix=[''];
+            if (empty(static::$prefix)) {
+              static::$prefix=[''];
+            }
             return $group;
         } else {
 
@@ -387,7 +413,7 @@ 
 
     }
 
-    public static function exitWithError($code,$message="Application Error"){
+    public static function exitWithError($code,$message="Application Error") {
     	Response::error($code,$message);
     	Response::send();
     	exit;
@@ -398,15 +424,19 @@ 
      * @param  string $URL The URL to match onto.
      * @return boolean true if a route callback was executed.
      */
-    public static function dispatch($URL=null,$method=null){
-        if (!$URL)     $URL     = Request::URI();
-        if (!$method)  $method  = Request::method();
+    public static function dispatch($URL=null,$method=null) {
+        if (!$URL) {
+          $URL     = Request::URI();
+        }
+        if (!$method) {
+          $method  = Request::method();
+        }
 
         $__deferred_send = new Deferred('Response::send');
 
-        foreach ((array)static::$routes as $group => $routes){
+        foreach ((array)static::$routes as $group => $routes) {
             foreach ($routes as $route) {
-                if (is_a($route, 'Route') && false !== ($args = $route->match($URL,$method))){
+                if (is_a($route, 'Route') && false !== ($args = $route->match($URL,$method))) {
                     $route->run($args,$method);
                     return true;
                 }
@@ -421,34 +451,36 @@ 
 class RouteGroup {
   protected $routes;
 
-  public function __construct(){
+  public function __construct() {
     $this->routes = new SplObjectStorage;
     return Route::add($this);
   }
 
-  public function has($r){
+  public function has($r) {
     return $this->routes->contains($r);
   }
 
-  public function add($r){
+  public function add($r) {
     $this->routes->attach($r);
     return $this;
   }
 
-  public function remove($r){
-    if ($this->routes->contains($r)) $this->routes->detach($r);
+  public function remove($r) {
+    if ($this->routes->contains($r)) {
+      $this->routes->detach($r);
+    }
     return $this;
   }
 
-  public function before($callbacks){
-    foreach ($this->routes as $route){
+  public function before($callbacks) {
+    foreach ($this->routes as $route) {
       $route->before($callbacks);
     }
     return $this;
   }
 
-  public function after($callbacks){
-    foreach ($this->routes as $route){
+  public function after($callbacks) {
+    foreach ($this->routes as $route) {
       $route->after($callbacks);
     }
     return $this;

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

Spacing +43 added lines, -43 removed lines

@@ -32,12 +32,12 @@ 
                      $sent        = false;
 
 
-    public static function charset($charset){
+    public static function charset($charset) {
         static::$charset = $charset;
     }
 
-    public static function type($mime){
-        static::header('Content-Type',$mime . (static::$charset ? '; charset='.static::$charset : ''));
+    public static function type($mime) {
+        static::header('Content-Type', $mime.(static::$charset ? '; charset='.static::$charset : ''));
     }
 
     /**
@@ -45,39 +45,39 @@ 
      * @param  string/bool $filename Pass a falsy value to disable download or pass a filename for exporting content
      * @return [type]        [description]
      */
-    public static function download($filename){
+    public static function download($filename) {
         static::$force_dl = $filename;
     }
 
     /**
      * Start capturing output
      */
-    public static function start(){
+    public static function start() {
         static::$buffer = ob_start();
     }
 
     /**
      * Enable CORS HTTP headers.
      */
-    public static function enableCORS(){
+    public static function enableCORS() {
 
         // Allow from any origin
-        if ($origin = filter_input(INPUT_SERVER,'HTTP_ORIGIN')) {
+        if ($origin = filter_input(INPUT_SERVER, 'HTTP_ORIGIN')) {
           static::header('Access-Control-Allow-Origin', $origin);
           static::header('Access-Control-Allow-Credentials', 'true');
           static::header('Access-Control-Max-Age', 86400);
         }
 
         // Access-Control headers are received during OPTIONS requests
-        if (filter_input(INPUT_SERVER,'REQUEST_METHOD') == 'OPTIONS') {
+        if (filter_input(INPUT_SERVER, 'REQUEST_METHOD') == 'OPTIONS') {
             static::clean();
 
-            if (filter_input(INPUT_SERVER,'HTTP_ACCESS_CONTROL_REQUEST_METHOD')) {
+            if (filter_input(INPUT_SERVER, 'HTTP_ACCESS_CONTROL_REQUEST_METHOD')) {
               static::header('Access-Control-Allow-Methods',
                 'GET, POST, PUT, DELETE, OPTIONS, HEAD, CONNECT, PATCH, TRACE');
             }
-            if ($req_h = filter_input(INPUT_SERVER,'HTTP_ACCESS_CONTROL_REQUEST_HEADERS')) {
-              static::header('Access-Control-Allow-Headers',$req_h);
+            if ($req_h = filter_input(INPUT_SERVER, 'HTTP_ACCESS_CONTROL_REQUEST_HEADERS')) {
+              static::header('Access-Control-Allow-Headers', $req_h);
             }
 
             static::send();
@@ -93,8 +93,8 @@ 
      * Finish the output buffer capturing.
      * @return string The captured buffer
      */
-    public static function end(){
-        if (static::$buffer){
+    public static function end() {
+        if (static::$buffer) {
             static::$payload[] = ob_get_contents();
             ob_end_clean();
             static::$buffer = null;
@@ -106,14 +106,14 @@ 
      * Check if an response output buffering is active.
      * @return boolean
      */
-    public static function isBuffering(){
+    public static function isBuffering() {
         return static::$buffer;
     }
 
     /**
      * Clear the response body
      */
-    public static function clean(){
+    public static function clean() {
         static::$payload = [];
     }
 
@@ -121,74 +121,74 @@ 
      * Append a JSON object to the buffer.
      * @param  mixed $payload Data to append to the response buffer
      */
-    public static function json($payload){
+    public static function json($payload) {
         static::type(static::TYPE_JSON);
-        static::$payload[] = json_encode($payload, Options::get('core.response.json_flags',JSON_NUMERIC_CHECK));
+        static::$payload[] = json_encode($payload, Options::get('core.response.json_flags', JSON_NUMERIC_CHECK));
     }
 
     /**
      * Append a text to the buffer.
      * @param  mixed $payload Text to append to the response buffer
      */
-    public static function text(){
+    public static function text() {
         static::type(static::TYPE_TEXT);
-        static::$payload[] = implode('',func_get_args());
+        static::$payload[] = implode('', func_get_args());
     }
 
     /**
      * Append an XML string to the buffer.
      * @param  mixed $payload Data to append to the response buffer
      */
-    public static function xml(){
+    public static function xml() {
         static::type(static::TYPE_XML);
-        static::$payload[] = implode('',func_get_args());
+        static::$payload[] = implode('', func_get_args());
     }
 
     /**
      * Append a SVG string to the buffer.
      * @param  mixed $payload Data to append to the response buffer
      */
-    public static function svg(){
+    public static function svg() {
         static::type(static::TYPE_SVG);
-        static::$payload[] = implode('',func_get_args());
+        static::$payload[] = implode('', func_get_args());
     }
 
     /**
      * Append an HTML string to the buffer.
      * @param  mixed $payload Data to append to the response buffer
      */
-    public static function html(){
+    public static function html() {
         static::type(static::TYPE_HTML);
-        static::$payload[] = implode('',func_get_args());
+        static::$payload[] = implode('', func_get_args());
     }
 
     /**
      * Append a raw string to the buffer.
      * @param  mixed $payload Data to append to the response buffer
      */
-    public static function add(){
-        static::$payload[] = implode('',func_get_args());
+    public static function add() {
+        static::$payload[] = implode('', func_get_args());
     }
 
-    public static function status($code,$message=''){
-        static::header('Status',$message?:$code,$code);
+    public static function status($code, $message = '') {
+        static::header('Status', $message ?: $code, $code);
     }
 
-    public static function header($name,$value,$code=null){
-        static::$headers[$name] = [$value,$code];
+    public static function header($name, $value, $code = null) {
+        static::$headers[$name] = [$value, $code];
     }
 
-    public static function error($code=500,$message='Application Error'){
-        Event::trigger('core.response.error',$code,$message);
-        static::status($code,$message);
+    public static function error($code = 500, $message = 'Application Error') {
+        Event::trigger('core.response.error', $code, $message);
+        static::status($code, $message);
     }
 
-    public static function body($setBody=null){
+    public static function body($setBody = null) {
       if ($setBody) static::$payload = [$setBody];
-      return Filter::with('core.response.body',is_array(static::$payload)?implode('',static::$payload):static::$payload);
+      return Filter::with('core.response.body', is_array(static::$payload) ? implode('', static::$payload) : static::$payload);
     }
 
-    public static function headers($setHeaders=null){
+    public static function headers($setHeaders = null) {
        if ($setHeaders) static::$headers = $setHeaders;
        return static::$headers;
     }
@@ -200,7 +200,7 @@ 
      *
      * @return array Headers and body of the response
      */
-    public static function save(){
+    public static function save() {
         return [
           'head' => static::$headers,
           'body' => static::body(),
@@ -214,13 +214,13 @@ 
      *
      * @param  array $data head/body saved state
      */
-    public static function load($data){
-      $data = (object)$data;
+    public static function load($data) {
+      $data = (object) $data;
       if (isset($data->head)) static::headers($data->head);
       if (isset($data->body)) static::body($data->body);
     }
 
-    public static function send($force = false){
+    public static function send($force = false) {
       if (!static::$sent || $force) {
         static::$sent = true;
         Event::trigger('core.response.send');
@@ -233,8 +233,8 @@ 
                 $code  = null;
             }
 
-            if ($value == 'Status'){
-              if (function_exists('http_response_code')){
+            if ($value == 'Status') {
+              if (function_exists('http_response_code')) {
                 http_response_code($code);
               } else {
                 header("Status: $code", true, $code);

Braces +43 added lines, -31 removed lines

@@ -32,11 +32,11 @@ 
                      $sent        = false;
 
 
-    public static function charset($charset){
+    public static function charset($charset) {
         static::$charset = $charset;
     }
 
-    public static function type($mime){
+    public static function type($mime) {
         static::header('Content-Type',$mime . (static::$charset ? '; charset='.static::$charset : ''));
     }
 
@@ -45,21 +45,21 @@ 
      * @param  string/bool $filename Pass a falsy value to disable download or pass a filename for exporting content
      * @return [type]        [description]
      */
-    public static function download($filename){
+    public static function download($filename) {
         static::$force_dl = $filename;
     }
 
     /**
      * Start capturing output
      */
-    public static function start(){
+    public static function start() {
         static::$buffer = ob_start();
     }
 
     /**
      * Enable CORS HTTP headers.
      */
-    public static function enableCORS(){
+    public static function enableCORS() {
 
         // Allow from any origin
         if ($origin = filter_input(INPUT_SERVER,'HTTP_ORIGIN')) {
@@ -93,8 +93,8 @@ 
      * Finish the output buffer capturing.
      * @return string The captured buffer
      */
-    public static function end(){
-        if (static::$buffer){
+    public static function end() {
+        if (static::$buffer) {
             static::$payload[] = ob_get_contents();
             ob_end_clean();
             static::$buffer = null;
@@ -106,14 +106,14 @@ 
      * Check if an response output buffering is active.
      * @return boolean
      */
-    public static function isBuffering(){
+    public static function isBuffering() {
         return static::$buffer;
     }
 
     /**
      * Clear the response body
      */
-    public static function clean(){
+    public static function clean() {
         static::$payload = [];
     }
 
@@ -121,7 +121,7 @@ 
      * Append a JSON object to the buffer.
      * @param  mixed $payload Data to append to the response buffer
      */
-    public static function json($payload){
+    public static function json($payload) {
         static::type(static::TYPE_JSON);
         static::$payload[] = json_encode($payload, Options::get('core.response.json_flags',JSON_NUMERIC_CHECK));
     }
@@ -130,7 +130,7 @@ 
      * Append a text to the buffer.
      * @param  mixed $payload Text to append to the response buffer
      */
-    public static function text(){
+    public static function text() {
         static::type(static::TYPE_TEXT);
         static::$payload[] = implode('',func_get_args());
     }
@@ -139,7 +139,7 @@ 
      * Append an XML string to the buffer.
      * @param  mixed $payload Data to append to the response buffer
      */
-    public static function xml(){
+    public static function xml() {
         static::type(static::TYPE_XML);
         static::$payload[] = implode('',func_get_args());
     }
@@ -148,7 +148,7 @@ 
      * Append a SVG string to the buffer.
      * @param  mixed $payload Data to append to the response buffer
      */
-    public static function svg(){
+    public static function svg() {
         static::type(static::TYPE_SVG);
         static::$payload[] = implode('',func_get_args());
     }
@@ -157,7 +157,7 @@ 
      * Append an HTML string to the buffer.
      * @param  mixed $payload Data to append to the response buffer
      */
-    public static function html(){
+    public static function html() {
         static::type(static::TYPE_HTML);
         static::$payload[] = implode('',func_get_args());
     }
@@ -166,30 +166,34 @@ 
      * Append a raw string to the buffer.
      * @param  mixed $payload Data to append to the response buffer
      */
-    public static function add(){
+    public static function add() {
         static::$payload[] = implode('',func_get_args());
     }
 
-    public static function status($code,$message=''){
+    public static function status($code,$message='') {
         static::header('Status',$message?:$code,$code);
     }
 
-    public static function header($name,$value,$code=null){
+    public static function header($name,$value,$code=null) {
         static::$headers[$name] = [$value,$code];
     }
 
-    public static function error($code=500,$message='Application Error'){
+    public static function error($code=500,$message='Application Error') {
         Event::trigger('core.response.error',$code,$message);
         static::status($code,$message);
     }
 
-    public static function body($setBody=null){
-      if ($setBody) static::$payload = [$setBody];
+    public static function body($setBody=null) {
+      if ($setBody) {
+        static::$payload = [$setBody];
+      }
       return Filter::with('core.response.body',is_array(static::$payload)?implode('',static::$payload):static::$payload);
     }
 
-    public static function headers($setHeaders=null){
-       if ($setHeaders) static::$headers = $setHeaders;
+    public static function headers($setHeaders=null) {
+       if ($setHeaders) {
+         static::$headers = $setHeaders;
+       }
        return static::$headers;
     }
 
@@ -200,7 +204,7 @@ 
      *
      * @return array Headers and body of the response
      */
-    public static function save(){
+    public static function save() {
         return [
           'head' => static::$headers,
           'body' => static::body(),
@@ -214,27 +218,33 @@ 
      *
      * @param  array $data head/body saved state
      */
-    public static function load($data){
+    public static function load($data) {
       $data = (object)$data;
-      if (isset($data->head)) static::headers($data->head);
-      if (isset($data->body)) static::body($data->body);
+      if (isset($data->head)) {
+        static::headers($data->head);
+      }
+      if (isset($data->body)) {
+        static::body($data->body);
+      }
     }
 
-    public static function send($force = false){
+    public static function send($force = false) {
       if (!static::$sent || $force) {
         static::$sent = true;
         Event::trigger('core.response.send');
-        if (false === headers_sent()) foreach (static::$headers as $name => $value_code) {
+        if (false === headers_sent()) {
+          foreach (static::$headers as $name => $value_code) {
 
             if (is_array($value_code)) {
                 list($value, $code) = (count($value_code) > 1) ? $value_code : [current($value_code), 200];
+        }
             } else {
                 $value = $value_code;
                 $code  = null;
             }
 
-            if ($value == 'Status'){
-              if (function_exists('http_response_code')){
+            if ($value == 'Status') {
+              if (function_exists('http_response_code')) {
                 http_response_code($code);
               } else {
                 header("Status: $code", true, $code);
@@ -246,7 +256,9 @@ 
                 : header("$name: $value", true);
             }
         }
-        if (static::$force_dl) header('Content-Disposition: attachment; filename="'.static::$force_dl.'"');
+        if (static::$force_dl) {
+          header('Content-Disposition: attachment; filename="'.static::$force_dl.'"');
+        }
         echo static::body();
       }
     }