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 /Http | |
| 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 'Http')
| -rw-r--r-- | Http/Tests/Firewall/LogoutListenerTest.php | 2 | ||||
| -rw-r--r-- | Http/Tests/Firewall/X509AuthenticationListenerTest.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Http/Tests/Firewall/LogoutListenerTest.php b/Http/Tests/Firewall/LogoutListenerTest.php index c279523..29ce114 100644 --- a/Http/Tests/Firewall/LogoutListenerTest.php +++ b/Http/Tests/Firewall/LogoutListenerTest.php @@ -122,7 +122,7 @@ class LogoutListenerTest extends \PHPUnit_Framework_TestCase } /** - * @expectedException RuntimeException + * @expectedException \RuntimeException */ public function testSuccessHandlerReturnsNonResponse() { diff --git a/Http/Tests/Firewall/X509AuthenticationListenerTest.php b/Http/Tests/Firewall/X509AuthenticationListenerTest.php index 1724591..7725f4b 100644 --- a/Http/Tests/Firewall/X509AuthenticationListenerTest.php +++ b/Http/Tests/Firewall/X509AuthenticationListenerTest.php @@ -57,7 +57,7 @@ class X509AuthenticationListenerTest extends \PHPUnit_Framework_TestCase } /** - * @expectedException Symfony\Component\Security\Core\Exception\BadCredentialsException + * @expectedException \Symfony\Component\Security\Core\Exception\BadCredentialsException */ public function testGetPreAuthenticatedDataNoUser() { |