caffeina-core / core

classes/Hash.php

Indentation +141 added lines, -141 removed lines

@@ -11,151 +11,151 @@
  */
 
 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 = (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 $as_integer ? $h1 : base_convert($h1 ,10, 32);
-	}
+    $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 $as_integer ? $h1 : base_convert($h1 ,10, 32);
+  }
 
   public static function random($bytes=9){
     return strtr(base64_encode(random_bytes($bytes)),'+/=','-_');

Switch Indentation +45 added lines, -45 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));
 		}
 	}
 
@@ -135,15 +135,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);

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')) {

Spacing +16 added lines, -16 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) {
+  public static function murmur($key, $seed = 0, $as_integer = false) {
 		$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)
@@ -154,14 +154,14 @@ 
 			 * 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);

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

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