caffeina-core / core

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__) . '/';

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

Spacing +15 added lines, -15 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){
-      return is_file(self::$templatePath . $path . static::EXTENSION);
+  public static function exists($path) {
+      return is_file(self::$templatePath.$path.static::EXTENSION);
   }
 
-  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,'/') . static::EXTENSION;
+  public function render($template, $data = []) {
+      $template_path = self::$templatePath.trim($template, '/').static::EXTENSION;
       $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];
   }
 }

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

classes/Text.php

Indentation +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
    * @param mixed $t  The text template
    * @param mixed $v (default: null)  The array of values exposed in template.
    * @return string
-  */
+   */
   public static function render($t,$v=null){
     if (empty($v)) return preg_replace('/{{[^}]+}}/','',$t);
     for(  // Init

Spacing +5 added lines, -5 removed lines

@@ -27,7 +27,7 @@ 
    * @param mixed $v (default: null)  The array of values exposed in template.
    * @return string
   */
-  public static function render($t,$v=null){
+  public static function render($t, $v = null) {
     if (Options::get('core.text.replace_empties', true)) {
       $replacer = function($c) use ($v){
         return Object::fetch(trim($c[1]), $v);
@@ -38,7 +38,7 @@ 
       };
     }
 
-    return preg_replace_callback("(\{\{([^}]+)\}\})S",$replacer,$t);
+    return preg_replace_callback("(\{\{([^}]+)\}\})S", $replacer, $t);
   }
 
   /**
@@ -53,9 +53,9 @@ 
    * @param  string $text The text to slugify
    * @return string       The slug.
    */
-  public static function slugify($text){
+  public static function slugify($text) {
     return preg_replace(
-      ['(\s+)','([^a-z0-9-])i','(-+)'],['-','','-'],
+      ['(\s+)', '([^a-z0-9-])i', '(-+)'], ['-', '', '-'],
       strtolower(self::removeAccents($text)));
   }
 
@@ -71,7 +71,7 @@ 
    * @param  string $text The text to translit
    * @return string       The translited text
    */
-  public static function removeAccents($text){
+  public static function removeAccents($text) {
     static $diac;
     return strtr(
       utf8_decode($text),

Braces +5 added lines, -5 removed lines

@@ -27,13 +27,13 @@ 
    * @param mixed $v (default: null)  The array of values exposed in template.
    * @return string
   */
-  public static function render($t,$v=null){
+  public static function render($t,$v=null) {
     if (Options::get('core.text.replace_empties', true)) {
-      $replacer = function($c) use ($v){
+      $replacer = function($c) use ($v) {
         return Object::fetch(trim($c[1]), $v);
       };
     } else {
-      $replacer = function($c) use ($v){
+      $replacer = function($c) use ($v) {
         return Object::fetch(trim($c[1]), $v) ?: $c[0];
       };
     }
@@ -53,7 +53,7 @@ 
    * @param  string $text The text to slugify
    * @return string       The slug.
    */
-  public static function slugify($text){
+  public static function slugify($text) {
     return preg_replace(
       ['(\s+)','([^a-z0-9-])i','(-+)'],['-','','-'],
       strtolower(self::removeAccents($text)));
@@ -71,7 +71,7 @@ 
    * @param  string $text The text to translit
    * @return string       The translited text
    */
-  public static function removeAccents($text){
+  public static function removeAccents($text) {
     static $diac;
     return strtr(
       utf8_decode($text),

classes/Dictionary.php

Spacing +11 added lines, -11 removed lines

@@ -27,9 +27,9 @@ 
         return static::$fields->all();
     }
 
-    public static function get($key, $default=null){
+    public static function get($key, $default = null) {
         if (!static::$fields) static::$fields = new Map();
-        if (is_array($key)){
+        if (is_array($key)) {
           $results = [];
           foreach ($key as $_src_key => $_dst_key)
             $results[$_dst_key] = static::$fields->get($_src_key);
@@ -39,46 +39,46 @@ 
         }
     }
 
-    public static function set($key, $value=null){
+    public static function set($key, $value = null) {
         if (!static::$fields) static::$fields = new Map();
         return static::$fields->set($key, $value);
     }
 
-    public static function delete($key, $compact=true){
+    public static function delete($key, $compact = true) {
         if (!static::$fields) static::$fields = new Map();
         static::$fields->delete($key, $compact);
     }
 
-    public static function exists($key){
+    public static function exists($key) {
         if (!static::$fields) static::$fields = new Map();
         return static::$fields->exists($key);
     }
 
-    public static function clear(){
+    public static function clear() {
         if (!static::$fields) static::$fields = new Map();
         static::$fields->clear();
     }
 
-    public static function load($fields){
+    public static function load($fields) {
         if (!static::$fields) static::$fields = new Map();
         static::$fields->load($fields);
     }
 
-    public static function merge(array $array, $merge_back=false){
+    public static function merge(array $array, $merge_back = false) {
         if (!static::$fields) static::$fields = new Map();
         static::$fields->merge($array, $merge_back);
     }
 
-    protected static function compact(){
+    protected static function compact() {
         if (!static::$fields) static::$fields = new Map();
         static::$fields->compact();
     }
 
-    protected static function & find($path, $create=false, callable $operation=null) {
+    protected static function & find($path, $create = false, callable $operation = null) {
         return static::$fields->find($path, $create, $operation);
     }
 
-    public function jsonSerialize(){
+    public function jsonSerialize() {
       if (!static::$fields) static::$fields = new Map();
       return static::$fields->jsonSerialize();
     }

Braces +40 added lines, -20 removed lines

@@ -23,13 +23,17 @@ 
     protected static $fields = null;
 
     public static function & all(){
-        if (!static::$fields) static::$fields = new Map();
+        if (!static::$fields) {
+          static::$fields = new Map();
+        }
         return static::$fields->all();
     }
 
-    public static function get($key, $default=null){
-        if (!static::$fields) static::$fields = new Map();
-        if (is_array($key)){
+    public static function get($key, $default=null) {
+        if (!static::$fields) {
+          static::$fields = new Map();
+        }
+        if (is_array($key)) {
           $results = [];
           foreach ($key as $_src_key => $_dst_key)
             $results[$_dst_key] = static::$fields->get($_src_key);
@@ -39,38 +43,52 @@ 
         }
     }
 
-    public static function set($key, $value=null){
-        if (!static::$fields) static::$fields = new Map();
+    public static function set($key, $value=null) {
+        if (!static::$fields) {
+          static::$fields = new Map();
+        }
         return static::$fields->set($key, $value);
     }
 
-    public static function delete($key, $compact=true){
-        if (!static::$fields) static::$fields = new Map();
+    public static function delete($key, $compact=true) {
+        if (!static::$fields) {
+          static::$fields = new Map();
+        }
         static::$fields->delete($key, $compact);
     }
 
-    public static function exists($key){
-        if (!static::$fields) static::$fields = new Map();
+    public static function exists($key) {
+        if (!static::$fields) {
+          static::$fields = new Map();
+        }
         return static::$fields->exists($key);
     }
 
-    public static function clear(){
-        if (!static::$fields) static::$fields = new Map();
+    public static function clear() {
+        if (!static::$fields) {
+          static::$fields = new Map();
+        }
         static::$fields->clear();
     }
 
-    public static function load($fields){
-        if (!static::$fields) static::$fields = new Map();
+    public static function load($fields) {
+        if (!static::$fields) {
+          static::$fields = new Map();
+        }
         static::$fields->load($fields);
     }
 
-    public static function merge(array $array, $merge_back=false){
-        if (!static::$fields) static::$fields = new Map();
+    public static function merge(array $array, $merge_back=false) {
+        if (!static::$fields) {
+          static::$fields = new Map();
+        }
         static::$fields->merge($array, $merge_back);
     }
 
-    protected static function compact(){
-        if (!static::$fields) static::$fields = new Map();
+    protected static function compact() {
+        if (!static::$fields) {
+          static::$fields = new Map();
+        }
         static::$fields->compact();
     }
 
@@ -78,8 +96,10 @@ 
         return static::$fields->find($path, $create, $operation);
     }
 
-    public function jsonSerialize(){
-      if (!static::$fields) static::$fields = new Map();
+    public function jsonSerialize() {
+      if (!static::$fields) {
+        static::$fields = new Map();
+      }
       return static::$fields->jsonSerialize();
     }
 

classes/Hash.php

Doc Comments +8 added lines

@@ -110,6 +110,9 @@ 
 		}
 	}
 
+  /**
+   * @param string $key
+   */
   public static function murmur($key, $seed = 0, $as_integer=false) {
 		$key = (string) $key;
 		$klen = strlen($key);
@@ -161,6 +164,11 @@ 
     return strtr(base64_encode(static::random_bytes($bytes)),'+/=','-_');
   }
 
+  /**
+   * @param integer $bytes
+   *
+   * @return string
+   */
   public static function random_bytes($bytes){
     static $randf = null;
     if (function_exists('random_bytes')) {

Braces +2 added lines, -2 removed lines

@@ -157,11 +157,11 @@
 		return $as_integer ? $h1 : base_convert($h1 ,10, 32);
 	}
 
-  public static function random($bytes=9){
+  public static function random($bytes=9) {
     return strtr(base64_encode(static::random_bytes($bytes)),'+/=','-_');
   }
 
-  public static function random_bytes($bytes){
+  public static function random_bytes($bytes) {
     static $randf = null;
     if (function_exists('random_bytes')) {
       return \random_bytes($bytes);

Indentation +98 added lines, -98 removed lines

@@ -11,104 +11,104 @@ 
  */
 
 class Hash {
-	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 $method == 'murmur' ? static::murmur(serialize($payload)) : 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;
-	}
-
-	/**
-	 * List registered hashing algorithms
-	 *
-	 * @method methods
-	 *
-	 * @return array   Array containing the list of supported hashing algorithms.
-	 */
-	public static function methods() {
+  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 $method == 'murmur' ? static::murmur(serialize($payload)) : 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;
+  }
+
+  /**
+   * List registered hashing algorithms
+   *
+   * @method methods
+   *
+   * @return array   Array containing the list of supported hashing algorithms.
+   */
+  public static function methods() {
     // Merge PHP provided algos with ours (murmur)
-		return array_merge(hash_algos(), ['murmur','murmurhash3']);
-	}
-
-	/**
-	 * 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 array_merge(hash_algos(), ['murmur','murmurhash3']);
+  }
+
+  /**
+   * 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) {
     // Faster than : in_array(explode(',',implode(',',static::methods())))
-		return strpos(implode(',',static::methods()).',', "$algo,") !== false;
-	}
-
-	/**
-	 * 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;
-			}
-
-			$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;
-			}
-
-			$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));
-		}
-	}
+    return strpos(implode(',',static::methods()).',', "$algo,") !== false;
+  }
+
+  /**
+   * 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;
+      }
+
+      $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;
+      }
+
+      $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));
+    }
+  }
 
   public static function murmur($key, $seed = 0, $as_integer=false) {
     $key  = array_values(unpack('C*',(string) $key));
@@ -145,8 +145,8 @@ 
     $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 $as_integer ? $h1 : base_convert($h1 ,10, 32);
-	}
+    return $as_integer ? $h1 : base_convert($h1 ,10, 32);
+  }
 
   public static function random($bytes=9){
     return strtr(base64_encode(static::random_bytes($bytes)),'+/=','-_');

Switch Indentation +36 added lines, -36 removed lines

@@ -71,42 +71,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;
-			}
-
-			$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;
-			}
-
-			$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));
+		  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]));
+			  }
+
+			  $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]));
+			  }
+
+			  $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));
 		}
 	}
 

Spacing +18 added lines, -18 removed lines

@@ -43,7 +43,7 @@ 
 	 */
 	public static function methods() {
     // Merge PHP provided algos with ours (murmur)
-		return array_merge(hash_algos(), ['murmur','murmurhash3']);
+		return array_merge(hash_algos(), ['murmur', 'murmurhash3']);
 	}
 
 	/**
@@ -57,7 +57,7 @@ 
 	 */
 	public static function can($algo) {
     // Faster than : in_array(explode(',',implode(',',static::methods())))
-		return strpos(implode(',',static::methods()).',', "$algo,") !== false;
+		return strpos(implode(',', static::methods()).',', "$algo,") !== false;
 	}
 
 	/**
@@ -71,33 +71,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,
@@ -110,11 +110,11 @@ 
 		}
 	}
 
-  public static function murmur($key, $seed = 0, $as_integer=false) {
-    $key  = array_values(unpack('C*',(string) $key));
+  public static function murmur($key, $seed = 0, $as_integer = false) {
+    $key  = array_values(unpack('C*', (string) $key));
     $klen = count($key);
-    $h1   = (int)$seed;
-    for ($i=0,$bytes=$klen-($remainder=$klen&3) ; $i<$bytes ; ) {
+    $h1   = (int) $seed;
+    for ($i = 0, $bytes = $klen - ($remainder = $klen & 3);$i < $bytes;) {
       $k1 = $key[$i]
         | ($key[++$i] << 8)
         | ($key[++$i] << 16)
@@ -145,14 +145,14 @@ 
     $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 $as_integer ? $h1 : base_convert($h1 ,10, 32);
+		return $as_integer ? $h1 : base_convert($h1, 10, 32);
 	}
 
-  public static function random($bytes=9){
-    return strtr(base64_encode(static::random_bytes($bytes)),'+/=','-_');
+  public static function random($bytes = 9) {
+    return strtr(base64_encode(static::random_bytes($bytes)), '+/=', '-_');
   }
 
-  public static function random_bytes($bytes){
+  public static function random_bytes($bytes) {
     static $randf = null;
     if (function_exists('random_bytes')) {
       return \random_bytes($bytes);

classes/Email/Proxy.php

Indentation +2 added lines, -2 removed lines

@@ -22,8 +22,8 @@
 
   public function onSend(Envelope $envelope){
     return array_reduce( (array) \Event::trigger($this->listener, $envelope), function($carry, $item) {
-    	 if (is_bool($item)) $carry[] = $item;
-    	 return $carry;
+        if (is_bool($item)) $carry[] = $item;
+        return $carry;
     }, []);
   }
 

Spacing +3 added lines, -3 removed lines

@@ -16,12 +16,12 @@
 
   protected $listener = 'core.email.proxy.send';
 
-  public function onInit($options){
+  public function onInit($options) {
     if (!empty($options['hook'])) $this->listener = $options['hook'];
   }
 
-  public function onSend(Envelope $envelope){
-    return array_reduce( (array) \Event::trigger($this->listener, $envelope), function($carry, $item) {
+  public function onSend(Envelope $envelope) {
+    return array_reduce((array) \Event::trigger($this->listener, $envelope), function($carry, $item) {
     	 if (is_bool($item)) $carry[] = $item;
     	 return $carry;
     }, []);

Braces +8 added lines, -4 removed lines

@@ -16,13 +16,17 @@
 
   protected $listener = 'core.email.proxy.send';
 
-  public function onInit($options){
-    if (!empty($options['hook'])) $this->listener = $options['hook'];
+  public function onInit($options) {
+    if (!empty($options['hook'])) {
+      $this->listener = $options['hook'];
+    }
   }
 
-  public function onSend(Envelope $envelope){
+  public function onSend(Envelope $envelope) {
     return array_reduce( (array) \Event::trigger($this->listener, $envelope), function($carry, $item) {
-    	 if (is_bool($item)) $carry[] = $item;
+    	 if (is_bool($item)) {
+    	   $carry[] = $item;
+    	 }
     	 return $carry;
     }, []);
   }

classes/Map.php

Spacing +23 added lines, -23 removed lines

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

Braces +21 added lines, -15 removed lines

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