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/Authentication | |
| 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/Authentication')
3 files changed, 3 insertions, 3 deletions
diff --git a/Core/Tests/Authentication/AuthenticationProviderManagerTest.php b/Core/Tests/Authentication/AuthenticationProviderManagerTest.php index f3aaa85..b053d73 100644 --- a/Core/Tests/Authentication/AuthenticationProviderManagerTest.php +++ b/Core/Tests/Authentication/AuthenticationProviderManagerTest.php @@ -20,7 +20,7 @@ use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken; class AuthenticationProviderManagerTest extends \PHPUnit_Framework_TestCase { /** - * @expectedException InvalidArgumentException + * @expectedException \InvalidArgumentException */ public function testAuthenticateWithoutProviders() { diff --git a/Core/Tests/Authentication/Token/RememerMeTokenTest.php b/Core/Tests/Authentication/Token/RememerMeTokenTest.php index 60d88c2..691f54c 100644 --- a/Core/Tests/Authentication/Token/RememerMeTokenTest.php +++ b/Core/Tests/Authentication/Token/RememerMeTokenTest.php @@ -53,7 +53,7 @@ class RememberMeTokenTest extends \PHPUnit_Framework_TestCase } /** - * @expectedException PHPUnit_Framework_Error + * @expectedException \PHPUnit_Framework_Error * @dataProvider getUserArguments */ public function testConstructorUserCannotBeNull($user) diff --git a/Core/Tests/Authentication/Token/UsernamePasswordTokenTest.php b/Core/Tests/Authentication/Token/UsernamePasswordTokenTest.php index 99830c7..0297eff 100644 --- a/Core/Tests/Authentication/Token/UsernamePasswordTokenTest.php +++ b/Core/Tests/Authentication/Token/UsernamePasswordTokenTest.php @@ -28,7 +28,7 @@ class UsernamePasswordTokenTest extends \PHPUnit_Framework_TestCase } /** - * @expectedException LogicException + * @expectedException \LogicException */ public function testSetAuthenticatedToTrue() { |