diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2013-11-26 17:42:52 +0100 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2013-11-26 17:42:52 +0100 |
| commit | 9062ccc6c49e848d15ec68b1be22f4ea1905d3b8 (patch) | |
| tree | d1fc53b0f7258c46b04ecc23852e99462424bdc9 /Core/Tests/Encoder | |
| parent | 37274eb86b62a9948f8860349ec2242f2bb5710c (diff) | |
| parent | b2f2ebcf877061a3e9cbc568cad0f4f97ce63c93 (diff) | |
| download | symfony-security-9062ccc6c49e848d15ec68b1be22f4ea1905d3b8.zip symfony-security-9062ccc6c49e848d15ec68b1be22f4ea1905d3b8.tar.gz symfony-security-9062ccc6c49e848d15ec68b1be22f4ea1905d3b8.tar.bz2 | |
Merge branch '2.4'
* 2.4:
[HttpKernel] fixed regression introduced in 2.4 in the base DataCollector class. Added more unit tests coverage for the RequestDataCollector object.
Fixed mistake in upgrade docu
bumped Symfony version to 2.4.0
updated VERSION for 2.4.0-RC1
updated CHANGELOG for 2.4.0-RC1
Container::camelize also takes backslashes into consideration
fixed typos
fixed @expectedException class names
Fix an issue when overriding Client::setServerParameters() and using the getContainer() method in it.
fixed some typos
fixed @expectedException class names
Typo and better wording for german validator translation
Diffstat (limited to 'Core/Tests/Encoder')
| -rw-r--r-- | Core/Tests/Encoder/BasePasswordEncoderTest.php | 2 | ||||
| -rw-r--r-- | Core/Tests/Encoder/MessageDigestPasswordEncoderTest.php | 2 | ||||
| -rw-r--r-- | Core/Tests/Encoder/Pbkdf2PasswordEncoderTest.php | 2 |
3 files changed, 3 insertions, 3 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() { diff --git a/Core/Tests/Encoder/MessageDigestPasswordEncoderTest.php b/Core/Tests/Encoder/MessageDigestPasswordEncoderTest.php index ada5ccf..5189fff 100644 --- a/Core/Tests/Encoder/MessageDigestPasswordEncoderTest.php +++ b/Core/Tests/Encoder/MessageDigestPasswordEncoderTest.php @@ -35,7 +35,7 @@ class MessageDigestPasswordEncoderTest extends \PHPUnit_Framework_TestCase } /** - * @expectedException LogicException + * @expectedException \LogicException */ public function testEncodePasswordAlgorithmDoesNotExist() { 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() { |