summaryrefslogtreecommitdiffstats
path: root/Core/Tests/Encoder/Pbkdf2PasswordEncoderTest.php
diff options
context:
space:
mode:
authorFabien Potencier <fabien.potencier@gmail.com>2013-11-26 17:40:27 +0100
committerFabien Potencier <fabien.potencier@gmail.com>2013-11-26 17:40:27 +0100
commitb2f2ebcf877061a3e9cbc568cad0f4f97ce63c93 (patch)
treedd7e3ab02d080c2a28e6ce3fe2b4b9d5baf3f369 /Core/Tests/Encoder/Pbkdf2PasswordEncoderTest.php
parentae15924e93eed91f743582fcbd2b48b11a4b8973 (diff)
parentd195e94d9bdc366116887ee9c5eee04eb9dc1a76 (diff)
downloadsymfony-security-b2f2ebcf877061a3e9cbc568cad0f4f97ce63c93.zip
symfony-security-b2f2ebcf877061a3e9cbc568cad0f4f97ce63c93.tar.gz
symfony-security-b2f2ebcf877061a3e9cbc568cad0f4f97ce63c93.tar.bz2
Merge branch '2.3' into 2.4v2.4.0
* 2.3: Fixed mistake in upgrade docu Container::camelize also takes backslashes into consideration fixed typos fixed @expectedException class names fixed some typos fixed @expectedException class names Typo and better wording for german validator translation
Diffstat (limited to 'Core/Tests/Encoder/Pbkdf2PasswordEncoderTest.php')
-rw-r--r--Core/Tests/Encoder/Pbkdf2PasswordEncoderTest.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/Core/Tests/Encoder/Pbkdf2PasswordEncoderTest.php b/Core/Tests/Encoder/Pbkdf2PasswordEncoderTest.php
index fdc400a..3e9452b 100644
--- a/Core/Tests/Encoder/Pbkdf2PasswordEncoderTest.php
+++ b/Core/Tests/Encoder/Pbkdf2PasswordEncoderTest.php
@@ -35,7 +35,7 @@ class Pbkdf2PasswordEncoderTest extends \PHPUnit_Framework_TestCase
}
/**
- * @expectedException LogicException
+ * @expectedException \LogicException
*/
public function testEncodePasswordAlgorithmDoesNotExist()
{