diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2014-12-02 21:19:50 +0100 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2014-12-02 21:19:50 +0100 |
| commit | b7b837e189058e1009b94203146042069ec85982 (patch) | |
| tree | be4839d423a5f981f29965be478a5be027f7abe5 /Core/Encoder/Pbkdf2PasswordEncoder.php | |
| parent | 44b26749a2ce179b973e1619739c6ada79fb26ff (diff) | |
| parent | 95579d91a123f8b2af6709bcf1e4b2157a65c6ce (diff) | |
| download | symfony-security-b7b837e189058e1009b94203146042069ec85982.zip symfony-security-b7b837e189058e1009b94203146042069ec85982.tar.gz symfony-security-b7b837e189058e1009b94203146042069ec85982.tar.bz2 | |
Merge branch '2.6' into 2.7
* 2.6:
Configure firewall's kernel exception listener with configured entry point or a default entry point
PSR-2 fixes
[DependencyInjection] make paths relative to __DIR__ in the generated container
[FrameworkBundle][Router Cmd] use debug namespace.
[FrameworkBundle] Update deprecated service call
Removed a dev annotation from a version constraint
Fixed the syntax of a composer.json file
Fixed the symfony/config version constraint
Tweaked the password-compat version constraint
Docblock fixes
[Filesystem] fix lock file permissions
Remove dialog usage
define constant only if it wasn't defined before
Fix incorrect spanish translation
Fixed typos
Fixed a docblock
bumped Symfony version to 2.6.1
updated VERSION for 2.6.0
updated CHANGELOG for 2.6.0
removed unneeded check
Conflicts:
src/Symfony/Component/HttpKernel/Kernel.php
Diffstat (limited to 'Core/Encoder/Pbkdf2PasswordEncoder.php')
| -rw-r--r-- | Core/Encoder/Pbkdf2PasswordEncoder.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Core/Encoder/Pbkdf2PasswordEncoder.php b/Core/Encoder/Pbkdf2PasswordEncoder.php index 55b5261..dac1cad 100644 --- a/Core/Encoder/Pbkdf2PasswordEncoder.php +++ b/Core/Encoder/Pbkdf2PasswordEncoder.php @@ -36,10 +36,10 @@ class Pbkdf2PasswordEncoder extends BasePasswordEncoder /** * Constructor. * - * @param string $algorithm The digest algorithm to use - * @param bool $encodeHashAsBase64 Whether to base64 encode the password hash - * @param int $iterations The number of iterations to use to stretch the password hash - * @param int $length Length of derived key to create + * @param string $algorithm The digest algorithm to use + * @param bool $encodeHashAsBase64 Whether to base64 encode the password hash + * @param int $iterations The number of iterations to use to stretch the password hash + * @param int $length Length of derived key to create */ public function __construct($algorithm = 'sha512', $encodeHashAsBase64 = true, $iterations = 1000, $length = 40) { |