summaryrefslogtreecommitdiffstats
path: root/Core/Encoder/BasePasswordEncoder.php
diff options
context:
space:
mode:
authorFlorin Patan <florinpatan@gmail.com>2012-12-16 14:02:54 +0200
committerFabien Potencier <fabien.potencier@gmail.com>2012-12-19 08:09:49 +0100
commit1849d1e5d8f925c671ba44ce461859c730298edb (patch)
treea493feeaccda5fc0f8c891b081957676c7a0dbe1 /Core/Encoder/BasePasswordEncoder.php
parent2b733ec2d017d7f02f2c034950337e36015acf99 (diff)
downloadsymfony-security-1849d1e5d8f925c671ba44ce461859c730298edb.zip
symfony-security-1849d1e5d8f925c671ba44ce461859c730298edb.tar.gz
symfony-security-1849d1e5d8f925c671ba44ce461859c730298edb.tar.bz2
Fixed most of the docblocks/unused namespaces
Diffstat (limited to 'Core/Encoder/BasePasswordEncoder.php')
-rw-r--r--Core/Encoder/BasePasswordEncoder.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/Core/Encoder/BasePasswordEncoder.php b/Core/Encoder/BasePasswordEncoder.php
index 1ef134b..c26c9ce 100644
--- a/Core/Encoder/BasePasswordEncoder.php
+++ b/Core/Encoder/BasePasswordEncoder.php
@@ -52,6 +52,8 @@ abstract class BasePasswordEncoder implements PasswordEncoderInterface
* @param string $salt the salt to be used
*
* @return string a merged password and salt
+ *
+ * @throws \InvalidArgumentException
*/
protected function mergePasswordAndSalt($password, $salt)
{