diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2013-11-25 15:49:41 +0100 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2013-11-25 15:49:41 +0100 |
| commit | d195e94d9bdc366116887ee9c5eee04eb9dc1a76 (patch) | |
| tree | 7ea2af12b3eb0230e7a4486ede21bde43c097d33 /Tests/Core/Encoder | |
| parent | 79b21cbc2358461695473de6a5b4e6a92ae18674 (diff) | |
| parent | 5a8f9cd093782a8827fdccd2f2ed1ff790cb35a3 (diff) | |
| download | symfony-security-d195e94d9bdc366116887ee9c5eee04eb9dc1a76.zip symfony-security-d195e94d9bdc366116887ee9c5eee04eb9dc1a76.tar.gz symfony-security-d195e94d9bdc366116887ee9c5eee04eb9dc1a76.tar.bz2 | |
Merge branch '2.2' into 2.3v2.3.8
* 2.2:
fixed some typos
fixed @expectedException class names
Conflicts:
src/Symfony/Component/Config/Tests/Definition/ArrayNodeTest.php
src/Symfony/Component/Console/Tests/Command/CommandTest.php
src/Symfony/Component/Locale/Tests/Stub/StubLocaleTest.php
src/Symfony/Component/Locale/Tests/Stub/StubNumberFormatterTest.php
Diffstat (limited to 'Tests/Core/Encoder')
| -rw-r--r-- | Tests/Core/Encoder/BasePasswordEncoderTest.php | 2 | ||||
| -rw-r--r-- | Tests/Core/Encoder/MessageDigestPasswordEncoderTest.php | 2 | ||||
| -rw-r--r-- | Tests/Core/Encoder/Pbkdf2PasswordEncoderTest.php | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Tests/Core/Encoder/BasePasswordEncoderTest.php b/Tests/Core/Encoder/BasePasswordEncoderTest.php index 762f6ab..702efb0 100644 --- a/Tests/Core/Encoder/BasePasswordEncoderTest.php +++ b/Tests/Core/Encoder/BasePasswordEncoderTest.php @@ -46,7 +46,7 @@ class BasePasswordEncoderTest extends \PHPUnit_Framework_TestCase } /** - * @expectedException InvalidArgumentException + * @expectedException \InvalidArgumentException */ public function testMergePasswordAndSaltWithException() { diff --git a/Tests/Core/Encoder/MessageDigestPasswordEncoderTest.php b/Tests/Core/Encoder/MessageDigestPasswordEncoderTest.php index 117b8ba..f37d3bc 100644 --- a/Tests/Core/Encoder/MessageDigestPasswordEncoderTest.php +++ b/Tests/Core/Encoder/MessageDigestPasswordEncoderTest.php @@ -35,7 +35,7 @@ class MessageDigestPasswordEncoderTest extends \PHPUnit_Framework_TestCase } /** - * @expectedException LogicException + * @expectedException \LogicException */ public function testEncodePasswordAlgorithmDoesNotExist() { diff --git a/Tests/Core/Encoder/Pbkdf2PasswordEncoderTest.php b/Tests/Core/Encoder/Pbkdf2PasswordEncoderTest.php index e303708..ca16f02 100644 --- a/Tests/Core/Encoder/Pbkdf2PasswordEncoderTest.php +++ b/Tests/Core/Encoder/Pbkdf2PasswordEncoderTest.php @@ -35,7 +35,7 @@ class Pbkdf2PasswordEncoderTest extends \PHPUnit_Framework_TestCase } /** - * @expectedException LogicException + * @expectedException \LogicException */ public function testEncodePasswordAlgorithmDoesNotExist() { |