diff options
| author | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-11-05 11:29:45 +0100 |
|---|---|---|
| committer | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-11-05 11:29:45 +0100 |
| commit | a24ab6c7c436dfbb3b690e28425b8f0af8b65e6d (patch) | |
| tree | 9c0c5a631c1573ec9cce61e718e2fa52f236a85a | |
| parent | e2d07f929db58f70c0f556b390010ed10dda0764 (diff) | |
| parent | 18ad89207b012a47457f4d0d7c6aaa57cb1f926c (diff) | |
| download | symfony-security-a24ab6c7c436dfbb3b690e28425b8f0af8b65e6d.zip symfony-security-a24ab6c7c436dfbb3b690e28425b8f0af8b65e6d.tar.gz symfony-security-a24ab6c7c436dfbb3b690e28425b8f0af8b65e6d.tar.bz2 | |
Merge branch '2.8'
* 2.8:
Fix tests when no Intl extension
[VarDumper] Fix casting for ReflectionParameter
[HttpKernel] Keep 3.0 compat by not using ContainerAware
[DI] Clean a phpdoc
[Security\Core] Deprecate passing $salt to BCryptPasswordEncoder::encodePassword()
Conflicts:
src/Symfony/Component/DependencyInjection/ContainerAware.php
src/Symfony/Component/HttpKernel/Bundle/Bundle.php
src/Symfony/Component/Intl/Tests/DateFormatter/AbstractIntlDateFormatterTest.php
src/Symfony/Component/VarDumper/Tests/Caster/ReflectionCasterTest.php
src/Symfony/Component/VarDumper/Tests/Test/VarDumperTestTraitTest.php
| -rw-r--r-- | Core/Encoder/BCryptPasswordEncoder.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Core/Encoder/BCryptPasswordEncoder.php b/Core/Encoder/BCryptPasswordEncoder.php index c0c8fe0..d19c462 100644 --- a/Core/Encoder/BCryptPasswordEncoder.php +++ b/Core/Encoder/BCryptPasswordEncoder.php @@ -71,7 +71,7 @@ class BCryptPasswordEncoder extends BasePasswordEncoder $options = array('cost' => $this->cost); if ($salt) { - $options['salt'] = $salt; + // Ignore $salt, the auto-generated one is always the best } return password_hash($raw, PASSWORD_BCRYPT, $options); |