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/Http | |
| 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/Http')
| -rw-r--r-- | Tests/Http/Firewall/LogoutListenerTest.php | 2 | ||||
| -rw-r--r-- | Tests/Http/Firewall/X509AuthenticationListenerTest.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Tests/Http/Firewall/LogoutListenerTest.php b/Tests/Http/Firewall/LogoutListenerTest.php index ba94b6e..456b281 100644 --- a/Tests/Http/Firewall/LogoutListenerTest.php +++ b/Tests/Http/Firewall/LogoutListenerTest.php @@ -142,7 +142,7 @@ class LogoutListenerTest extends \PHPUnit_Framework_TestCase } /** - * @expectedException RuntimeException + * @expectedException \RuntimeException */ public function testSuccessHandlerReturnsNonResponse() { diff --git a/Tests/Http/Firewall/X509AuthenticationListenerTest.php b/Tests/Http/Firewall/X509AuthenticationListenerTest.php index 81ac0f7..c48aeac 100644 --- a/Tests/Http/Firewall/X509AuthenticationListenerTest.php +++ b/Tests/Http/Firewall/X509AuthenticationListenerTest.php @@ -64,7 +64,7 @@ class X509AuthenticationListenerTest extends \PHPUnit_Framework_TestCase } /** - * @expectedException Symfony\Component\Security\Core\Exception\BadCredentialsException + * @expectedException \Symfony\Component\Security\Core\Exception\BadCredentialsException */ public function testGetPreAuthenticatedDataNoUser() { |