diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2013-11-26 17:40:27 +0100 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2013-11-26 17:40:27 +0100 |
| commit | b2f2ebcf877061a3e9cbc568cad0f4f97ce63c93 (patch) | |
| tree | dd7e3ab02d080c2a28e6ce3fe2b4b9d5baf3f369 /Core/Tests/Encoder/BasePasswordEncoderTest.php | |
| parent | ae15924e93eed91f743582fcbd2b48b11a4b8973 (diff) | |
| parent | d195e94d9bdc366116887ee9c5eee04eb9dc1a76 (diff) | |
| download | symfony-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/BasePasswordEncoderTest.php')
| -rw-r--r-- | Core/Tests/Encoder/BasePasswordEncoderTest.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Core/Tests/Encoder/BasePasswordEncoderTest.php b/Core/Tests/Encoder/BasePasswordEncoderTest.php index 81f3d3c..14c488b 100644 --- a/Core/Tests/Encoder/BasePasswordEncoderTest.php +++ b/Core/Tests/Encoder/BasePasswordEncoderTest.php @@ -46,7 +46,7 @@ class BasePasswordEncoderTest extends \PHPUnit_Framework_TestCase } /** - * @expectedException InvalidArgumentException + * @expectedException \InvalidArgumentException */ public function testMergePasswordAndSaltWithException() { |