Style fixes

aaronschmitz · Aug 20, 2012 · fce7e02 · fce7e02
1 parent be4b42a
commit fce7e02
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 13 deletions.
diff --git a/libraries/joomla/crypt/password.php b/libraries/joomla/crypt/password.php
@@ -41,8 +41,8 @@ public function create($password, $prefix = '$2a$');
 	/**
 	 * Verifies a password hash
 	 *
-	 * @param   string   $password  The password to verify.
-	 * @param   string   $hash      The password hash to check.
+	 * @param   string  $password  The password to verify.
+	 * @param   string  $hash      The password hash to check.
 	 *
 	 * @return  boolean  True if the password is valid, false otherwise.
 	 *

diff --git a/libraries/joomla/crypt/password/simple.php b/libraries/joomla/crypt/password/simple.php
@@ -28,7 +28,7 @@ class JCryptPasswordSimple implements JCryptPassword
 	 * Creates a password hash
 	 *
 	 * @param   string  $password  The password to hash.
-	 * @param   string  $prefix    The prefix of the hashing function.
+	 * @param   string  $type      The hash type.
 	 *
 	 * @return  string  The hashed password.
 	 *
@@ -52,22 +52,19 @@ public function create($password, $type = JCryptPassword::BLOWFISH)
 
 				$salt = $prefix . str_pad($this->cost, 2, '0', STR_PAD_LEFT) . '$' . $this->getSalt(22);
 
-				return crypt($password, $salt);
-				break;
+			return crypt($password, $salt);
 
 			case JCryptPassword::MD5:
 				$salt = $this->getSalt(12);
 
 				$salt = '$1$' . $salt;
 
-				return crypt($password, $salt);
-				break;
-
+			return crypt($password, $salt);
+
 			case JCryptPassword::JOOMLA:
 				$salt = $this->getSalt(32);
 
-				return md5($password . $salt) . ':' . $salt;
-				break;
+			return md5($password . $salt) . ':' . $salt;
 
 			default:
 				throw new InvalidArgumentException(sprintf('Hash type %s is not supported', $type));
@@ -94,7 +91,7 @@ public function setCost($cost)
 	 *
 	 * @param   integer  $length  The number of characters to return.
 	 *
-	 * @return  string   The string of random characters.
+	 * @return  string  The string of random characters.
 	 *
 	 * @since   12.2
 	 */
@@ -110,8 +107,8 @@ protected function getSalt($length)
 	/**
 	 * Verifies a password hash
 	 *
-	 * @param   string   $password  The password to verify.
-	 * @param   string   $hash      The password hash to check.
+	 * @param   string  $password  The password to verify.
+	 * @param   string  $hash      The password hash to check.
 	 *
 	 * @return  boolean  True if the password is valid, false otherwise.
 	 *