summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabien Potencier <fabien.potencier@gmail.com>2014-02-24 17:20:54 +0100
committerFabien Potencier <fabien.potencier@gmail.com>2014-02-24 17:20:54 +0100
commitdff8771fe6ccd17bf1385b1d35c71b0a70fa4b44 (patch)
treede19f0f34d7b967667eb5e367fb144dc8e1bb800
parentae020b9dc10e6438dc4033103c16bae7d46a4dd6 (diff)
parent2a0c07ee32ab4ee7f82834707eaa5dcd662e5705 (diff)
downloadsymfony-security-dff8771fe6ccd17bf1385b1d35c71b0a70fa4b44.zip
symfony-security-dff8771fe6ccd17bf1385b1d35c71b0a70fa4b44.tar.gz
symfony-security-dff8771fe6ccd17bf1385b1d35c71b0a70fa4b44.tar.bz2
Merge branch '2.3' into 2.4
* 2.3: [Process] minor fixes Improve performance of getNextEmbedBlock by removing unnecessary preg_match and function calls. Avoid unnecessary line indentation calculation. Optimise Inline::evaluateScalar() for parsing strings. fixed CS fixed parsing Mongo DSN and added Test for it () is also a valid delimiter Adding PHP 5.6 to travis-ci tests Update BCryptPasswordEncoder.php [Validator] Removed PHP <5.3.3 specific code which is not officially supported. Fixed wrong redirect url if path contains some query parameters
-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 9a3ecdb..5a0f122 100644
--- a/Core/Encoder/BCryptPasswordEncoder.php
+++ b/Core/Encoder/BCryptPasswordEncoder.php
@@ -29,6 +29,7 @@ class BCryptPasswordEncoder extends BasePasswordEncoder
*
* @param integer $cost The algorithmic cost that should be used
*
+ * @throws \RuntimeException When no BCrypt encoder is available
* @throws \InvalidArgumentException if cost is out of range
*/
public function __construct($cost)