summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabien Potencier <fabien.potencier@gmail.com>2014-02-24 17:21:51 +0100
committerFabien Potencier <fabien.potencier@gmail.com>2014-02-24 17:21:51 +0100
commitc5626a4f8a9d6830fc08b6d24f372a2328ca7b46 (patch)
tree9c75bd867346ad9e3daab3f297b9949daaec3869
parent7e51986698464365c2adaeb0fdff2e6ec9742db8 (diff)
parentdff8771fe6ccd17bf1385b1d35c71b0a70fa4b44 (diff)
downloadsymfony-security-c5626a4f8a9d6830fc08b6d24f372a2328ca7b46.zip
symfony-security-c5626a4f8a9d6830fc08b6d24f372a2328ca7b46.tar.gz
symfony-security-c5626a4f8a9d6830fc08b6d24f372a2328ca7b46.tar.bz2
Merge branch '2.4'
* 2.4: [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)