caffeina-core / core

classes/Hash.php

Indentation +134 added lines, -134 removed lines

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

Switch Indentation +41 added lines, -41 removed lines

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

Spacing +9 added lines, -9 removed lines

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

classes/FileSystem/ZIP.php

Spacing +15 added lines, -15 removed lines

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

Braces +15 added lines, -11 removed lines

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

classes/View/Adapter.php

Spacing +3 added lines, -3 removed lines

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