codemasher / php-base32

src/Base32.php

Spacing +20 added lines, -20 removed lines

@@ -49,7 +49,7 @@ 
  * Provides Base32 conversion
  *
  */
-class Base32{
+class Base32 {
 
 	/**
 	 * RFC3548
@@ -110,11 +110,11 @@ 
 	 *
 	 * @throws \Exception
 	 */
-	public static function setCharset($charset = self::RFC3548){
-		if(strlen($charset) === 32){
+	public static function setCharset($charset = self::RFC3548) {
+		if (strlen($charset) === 32) {
 			self::$charset = strtoupper($charset);
 		}
-		else{
+		else {
 			throw new Exception('Length must be exactly 32');
 		}
 	}
@@ -128,7 +128,7 @@ 
 	 *
 	 * @return string String of 0's and 1's
 	 */
-	public static function str2bin($str){
+	public static function str2bin($str) {
 		$chrs = unpack('C*', $str);
 
 		return vsprintf(str_repeat('%08b', count($chrs)), $chrs);
@@ -144,12 +144,12 @@ 
 	 * @return string The ascii output
 	 * @throws \Exception
 	 */
-	public static function bin2str($str){
-		if(strlen($str) % 8 > 0){
+	public static function bin2str($str) {
+		if (strlen($str) % 8 > 0) {
 			throw new Exception('Length must be divisible by 8');
 		}
 
-		if(!preg_match('/^[01]+$/', $str)){
+		if (!preg_match('/^[01]+$/', $str)) {
 			throw new Exception('Only 0\'s and 1\'s are permitted');
 		}
 
@@ -172,12 +172,12 @@ 
 	 * @return string String encoded as base32
 	 * @throws exception
 	 */
-	public static function fromBin($str){
-		if(strlen($str) % 8 > 0){
+	public static function fromBin($str) {
+		if (strlen($str) % 8 > 0) {
 			throw new Exception('Length must be divisible by 8');
 		}
 
-		if(!preg_match('/^[01]+$/', $str)){
+		if (!preg_match('/^[01]+$/', $str)) {
 			throw new Exception('Only 0\'s and 1\'s are permitted');
 		}
 
@@ -188,7 +188,7 @@ 
 		$length = strlen($str);
 		$rbits = $length&7;
 
-		if($rbits > 0){
+		if ($rbits > 0) {
 			// Excessive bits need to be padded
 			$ebits = substr($str, $length - $rbits);
 			$str = substr($str, 0, $length - $rbits).'000'.$ebits.str_repeat('0', 5 - strlen($ebits));
@@ -196,7 +196,7 @@ 
 
 		preg_match_all('/.{8}/', $str, $chrs);
 
-		$chrs = array_map(function($str){
+		$chrs = array_map(function($str) {
 			return self::$charset[bindec($str)];
 		}, $chrs[0]);
 
@@ -213,13 +213,13 @@ 
 	 * @return string Ascii binary string
 	 * @throws \Exception
 	 */
-	public static function toBin($str){
-		if(!preg_match('/^['.self::$charset.']+$/', $str)){
+	public static function toBin($str) {
+		if (!preg_match('/^['.self::$charset.']+$/', $str)) {
 			throw new Exception('Must match character set');
 		}
 
 		// Convert the base32 string back to a binary string
-		$str = array_map(function ($chr){
+		$str = array_map(function($chr) {
 			return sprintf('%08b', strpos(self::$charset, $chr));
 		}, str_split($str));
 
@@ -230,7 +230,7 @@ 
 		$length = strlen($str);
 		$rbits = $length&7;
 
-		if($rbits > 0){
+		if ($rbits > 0) {
 			$str = substr($str, 0, $length - $rbits);
 		}
 
@@ -247,7 +247,7 @@ 
 	 *
 	 * @return string The converted base32 string
 	 */
-	public static function fromString($str){
+	public static function fromString($str) {
 		return self::fromBin(self::str2bin($str));
 	}
 
@@ -261,11 +261,11 @@ 
 	 *
 	 * @return string The normal string
 	 */
-	public static function toString($str){
+	public static function toString($str) {
 		$str = strtoupper($str);
 
 		// csSave actually has to be able to consider extra characters
-		if(self::$charset === self::csSafe){
+		if (self::$charset === self::csSafe) {
 			$str = str_replace('O', '0', $str);
 			$str = str_replace(['I', 'L'], '1', $str);
 		}

Braces +1 added lines, -2 removed lines

@@ -113,8 +113,7 @@
 	public static function setCharset($charset = self::RFC3548){
 		if(strlen($charset) === 32){
 			self::$charset = strtoupper($charset);
-		}
-		else{
+		} else{
 			throw new Exception('Length must be exactly 32');
 		}
 	}