Polarising / bcrypt

src/Bcrypt.php

Doc Comments +5 added lines

@@ -21,6 +21,11 @@
 		return crypt($plaintext, $ciphertext) == $ciphertext;
 	}
 
+	/**
+	 * @param integer $cost
+	 * @param integer $length
+	 * @param string $bcrypt_version
+	 */
 	public static function generate_salt($cost, $length, $bcrypt_version){
 		//make sure adding the cost in two digits
 		$cost = sprintf('%02d', $cost);

Indentation +5 added lines, -5 removed lines

@@ -10,7 +10,7 @@ 
 		$salt = self::generate_salt($cost, 17, $bcrypt_version);
 		$ciphertext = crypt($plaintext, $salt);
 
-    return $ciphertext;
+	return $ciphertext;
 	}
 
 	public static function verify($plaintext, $ciphertext)
@@ -32,7 +32,7 @@ 
          */
 	 $bytes = openssl_random_pseudo_bytes($length);
    if ($bytes === false){
-       throw new RuntimeException('Unable to generate a random string');
+	   throw new RuntimeException('Unable to generate a random string');
 	 }
 	 $salt=substr(base64_encode($bytes),0,22);
 
@@ -41,12 +41,12 @@ 
          * anything about the '=', as this only occurs when the b64 string is
          * padded, which is always after the first 22 characters.
          */
-        $salt=str_replace("+",".",$salt);
+		$salt=str_replace("+",".",$salt);
 
-        /* Create a string that will be passed to crypt, containing all
+		/* Create a string that will be passed to crypt, containing all
          * of the settings, separated by dollar signs
          */
-        $salt='$'.implode('$',[$bcrypt_version, $cost, $salt]);
+		$salt='$'.implode('$',[$bcrypt_version, $cost, $salt]);
 				return $salt;
 	}
 }

Spacing +7 added lines, -7 removed lines

@@ -5,7 +5,7 @@ 
 {
 	const VERSION = '1.0.0';
 
-	public static function encrypt($plaintext, $bcrypt_version="2y", $cost=10)
+	public static function encrypt($plaintext, $bcrypt_version = "2y", $cost = 10)
 	{
 		$salt = self::generate_salt($cost, 17, $bcrypt_version);
 		$ciphertext = crypt($plaintext, $salt);
@@ -15,13 +15,13 @@ 
 
 	public static function verify($plaintext, $ciphertext)
 	{
-		if(version_compare(PHP_VERSION, '5.6.0', '>=')){
+		if (version_compare(PHP_VERSION, '5.6.0', '>=')) {
 			return hash_equals($ciphertext, crypt($plaintext, $ciphertext));
 		}
 		return crypt($plaintext, $ciphertext) == $ciphertext;
 	}
 
-	public static function generate_salt($cost, $length, $bcrypt_version){
+	public static function generate_salt($cost, $length, $bcrypt_version) {
 		//make sure adding the cost in two digits
 		$cost = sprintf('%02d', $cost);
 
@@ -31,22 +31,22 @@ 
          * 22 base64 characters
          */
 	 $bytes = openssl_random_pseudo_bytes($length);
-   if ($bytes === false){
+   if ($bytes === false) {
        throw new RuntimeException('Unable to generate a random string');
 	 }
-	 $salt=substr(base64_encode($bytes),0,22);
+	 $salt = substr(base64_encode($bytes), 0, 22);
 
 		/* As blowfish takes a salt with the alphabet ./A-Za-z0-9 we have to
          * replace any '+' in the base64 string with '.'. We don't have to do
          * anything about the '=', as this only occurs when the b64 string is
          * padded, which is always after the first 22 characters.
          */
-        $salt=str_replace("+",".",$salt);
+        $salt = str_replace("+", ".", $salt);
 
         /* Create a string that will be passed to crypt, containing all
          * of the settings, separated by dollar signs
          */
-        $salt='$'.implode('$',[$bcrypt_version, $cost, $salt]);
+        $salt = '$'.implode('$', [$bcrypt_version, $cost, $salt]);
 				return $salt;
 	}
 }

Braces +4 added lines, -3 removed lines

@@ -15,13 +15,14 @@ 
 
 	public static function verify($plaintext, $ciphertext)
 	{
-		if(version_compare(PHP_VERSION, '5.6.0', '>=')){
+		if(version_compare(PHP_VERSION, '5.6.0', '>=')) {
 			return hash_equals($ciphertext, crypt($plaintext, $ciphertext));
 		}
 		return crypt($plaintext, $ciphertext) == $ciphertext;
 	}
 
-	public static function generate_salt($cost, $length, $bcrypt_version){
+	public static function generate_salt($cost, $length, $bcrypt_version)
+	{
 		//make sure adding the cost in two digits
 		$cost = sprintf('%02d', $cost);
 
@@ -31,7 +32,7 @@ 
          * 22 base64 characters
          */
 	 $bytes = openssl_random_pseudo_bytes($length);
-   if ($bytes === false){
+   if ($bytes === false) {
        throw new RuntimeException('Unable to generate a random string');
 	 }
 	 $salt=substr(base64_encode($bytes),0,22);