summaryrefslogtreecommitdiffstats
path: root/Core/Encoder
diff options
context:
space:
mode:
authorFabien Potencier <fabien.potencier@gmail.com>2013-09-27 16:07:49 +0200
committerFabien Potencier <fabien.potencier@gmail.com>2013-09-27 16:07:49 +0200
commita940d57cac60a12146e2fd1cd543c59109105ad9 (patch)
tree77293d4fa1273bd94b6b9db4d52f3d0eb7686d4d /Core/Encoder
parent76e8abad8efbc5a988c1aa566b072d62e083faa9 (diff)
parent83cd64d415724127bd0db09ef1431e19a53afdea (diff)
downloadsymfony-security-a940d57cac60a12146e2fd1cd543c59109105ad9.zip
symfony-security-a940d57cac60a12146e2fd1cd543c59109105ad9.tar.gz
symfony-security-a940d57cac60a12146e2fd1cd543c59109105ad9.tar.bz2
Merge branch '2.3'
* 2.3: bumped Symfony version to 2.3.6 updated VERSION for 2.3.5 updated CHANGELOG for 2.3.5 Set cost type to integer bumped Symfony version to 2.2.9 updated VERSION for 2.2.8 updated CHANGELOG for 2.2.8 bumped the version fixed typo updated VERSION for 2.2.7 update CONTRIBUTORS for 2.2.7 updated CHANGELOG for 2.2.7 bugix: CookieJar returns cookies with domain "domain.com" for domain "foodomain.com" fixed HTML5 form attribute handling XPath query Removed old way of building icu data. Conflicts: src/Symfony/Component/HttpKernel/Kernel.php
Diffstat (limited to 'Core/Encoder')
-rw-r--r--Core/Encoder/BCryptPasswordEncoder.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/Core/Encoder/BCryptPasswordEncoder.php b/Core/Encoder/BCryptPasswordEncoder.php
index f96bb4f..e8b2632 100644
--- a/Core/Encoder/BCryptPasswordEncoder.php
+++ b/Core/Encoder/BCryptPasswordEncoder.php
@@ -42,7 +42,7 @@ class BCryptPasswordEncoder extends BasePasswordEncoder
throw new \InvalidArgumentException('Cost must be in the range of 4-31.');
}
- $this->cost = sprintf('%02d', $cost);
+ $this->cost = $cost;
}
/**