summaryrefslogtreecommitdiffstats
path: root/Core/Encoder/BCryptPasswordEncoder.php
diff options
context:
space:
mode:
authorFabien Potencier <fabien.potencier@gmail.com>2014-12-22 17:45:18 +0100
committerFabien Potencier <fabien.potencier@gmail.com>2014-12-22 17:45:18 +0100
commit79e6ddaa570c264ade4e6d19e84f9b98d22b5acc (patch)
tree24836ae0cbfc9c67ea68fe3dfd4c3b124c4a5501 /Core/Encoder/BCryptPasswordEncoder.php
parent178e160ba5022168854176deaad4c81f45ae2288 (diff)
parent080ac3294fac8b217afe620230600fb427bd2f51 (diff)
downloadsymfony-security-79e6ddaa570c264ade4e6d19e84f9b98d22b5acc.zip
symfony-security-79e6ddaa570c264ade4e6d19e84f9b98d22b5acc.tar.gz
symfony-security-79e6ddaa570c264ade4e6d19e84f9b98d22b5acc.tar.bz2
Merge branch '2.6' into 2.7
* 2.6: [2.3] CS And DocBlock Fixes [2.3] CS Fixes [FrameworkBundle] Fixed Translation loader and update translation command. [Console] remove « use » statement for PHP built-in exception classes. [SecurityBundle] adds unit tests suite for SecurityDataCollector class. Conflicts: src/Symfony/Bundle/SecurityBundle/DataCollector/SecurityDataCollector.php
Diffstat (limited to 'Core/Encoder/BCryptPasswordEncoder.php')
-rw-r--r--Core/Encoder/BCryptPasswordEncoder.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/Core/Encoder/BCryptPasswordEncoder.php b/Core/Encoder/BCryptPasswordEncoder.php
index f62e8f5..d2b0319 100644
--- a/Core/Encoder/BCryptPasswordEncoder.php
+++ b/Core/Encoder/BCryptPasswordEncoder.php
@@ -52,6 +52,7 @@ class BCryptPasswordEncoder extends BasePasswordEncoder
* It doesn't work with PHP versions lower than 5.3.7, since
* the password compat library uses CRYPT_BLOWFISH hash type with
* the "$2y$" salt prefix (which is not available in the early PHP versions).
+ *
* @see https://github.com/ircmaxell/password_compat/issues/10#issuecomment-11203833
*
* It is almost best to **not** pass a salt and let PHP generate one for you.