fixed CS

fabpot · fabpot · commit 9367a7cd8eb8 · 2013-02-05T11:25:15.000+01:00
diff --git a/src/Symfony/Component/Security/Core/Encoder/BCryptPasswordEncoder.php b/src/Symfony/Component/Security/Core/Encoder/BCryptPasswordEncoder.php
@@ -16,7 +16,7 @@
 
 /**
  * @author Elnur Abdurrakhimov <elnur@elnur.pro>
- * @author Terje Bråten <terje@braten.be>
+ * @author Terje Bråten <terje@braten.be>
  */
 class BCryptPasswordEncoder extends BasePasswordEncoder
 {
@@ -33,8 +33,10 @@ class BCryptPasswordEncoder extends BasePasswordEncoder
     private static $prefix = null;
 
     /**
-     * @param SecureRandomInterface $secureRandom
-     * @param int                   $cost
+     * Constructor.
+     *
+     * @param SecureRandomInterface $secureRandom A SecureRandomInterface instance
+     * @param integer               $cost         The algorithmic cost that should be used
      *
      * @throws \InvalidArgumentException if cost is out of range
      */
@@ -44,13 +46,12 @@ public function __construct(SecureRandomInterface $secureRandom, $cost)
 
         $cost = (int) $cost;
         if ($cost < 4 || $cost > 31) {
-            throw new \InvalidArgumentException('Cost must be in the range of 4-31');
+            throw new \InvalidArgumentException('Cost must be in the range of 4-31.');
         }
-        $this->cost = sprintf("%02d", $cost);
+        $this->cost = sprintf('%02d', $cost);
 
         if (!self::$prefix) {
-            self::$prefix = '$'.(version_compare(phpversion(), '5.3.7', '>=')
-                                 ? '2y' : '2a').'$';
+            self::$prefix = '$'.(version_compare(phpversion(), '5.3.7', '>=') ? '2y' : '2a').'$';
         }
     }
 
@@ -63,8 +64,7 @@ public function encodePassword($raw, $salt = null)
             return password_hash($raw, PASSWORD_BCRYPT, array('cost' => $this->cost));
         }
 
-        $salt = self::$prefix.$this->cost.'$'.
-            $this->encodeSalt($this->getRawSalt());
+        $salt = self::$prefix.$this->cost.'$'.$this->encodeSalt($this->getRawSalt());
         $encoded = crypt($raw, $salt);
         if (!is_string($encoded) || strlen($encoded) <= 13) {
             return false;
@@ -91,7 +91,8 @@ public function isPasswordValid($encoded, $raw, $salt = null)
     }
 
     /**
-     * Correctly encode the salt to be used by Bcrypt.
+     * Encodes the salt to be used by Bcrypt.
+     *
      * The blowfish/bcrypt algorithm used by PHP crypt expects a different
      * set and order of characters than the usual base64_encode function.
      * Regular b64: ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/
@@ -104,6 +105,7 @@ public function isPasswordValid($encoded, $raw, $salt = null)
      * of entropy.
      *
      * @param  bytes  $random a string of 16 random bytes
+     *
      * @return string Properly encoded salt to use with php crypt function
      *
      * @throws \InvalidArgumentException if string of random bytes is too short
@@ -112,7 +114,7 @@ protected function encodeSalt($random)
     {
         $len = strlen($random);
         if ($len < 16) {
-            throw new \InvalidArgumentException('The bcrypt salt needs 16 random bytes');
+            throw new \InvalidArgumentException('The bcrypt salt needs 16 random bytes.');
         }
         if ($len > 16) {
             $random = substr($random, 0, 16);
@@ -121,7 +123,7 @@ protected function encodeSalt($random)
         $base64raw = str_replace('+', '.', base64_encode($random));
         $salt128bit = substr($base64raw, 0, 21);
         $lastchar = substr($base64raw, 21, 1);
-        $lastchar = strtr($lastchar, 'AQgw','.Oeu');
+        $lastchar = strtr($lastchar, 'AQgw', '.Oeu');
         $salt128bit .= $lastchar;
 
         return $salt128bit;
