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/User | |
| 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/User')
| -rw-r--r-- | Core/Tests/User/InMemoryProviderTest.php | 2 | ||||
| -rw-r--r-- | Core/Tests/User/UserTest.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Core/Tests/User/InMemoryProviderTest.php b/Core/Tests/User/InMemoryProviderTest.php index 5d6cadc..eccb596 100644 --- a/Core/Tests/User/InMemoryProviderTest.php +++ b/Core/Tests/User/InMemoryProviderTest.php @@ -42,7 +42,7 @@ class InMemoryUserProviderTest extends \PHPUnit_Framework_TestCase } /** - * @expectedException LogicException + * @expectedException \LogicException */ public function testCreateUserAlreadyExist() { diff --git a/Core/Tests/User/UserTest.php b/Core/Tests/User/UserTest.php index 7d4cf95..2fe6daa 100644 --- a/Core/Tests/User/UserTest.php +++ b/Core/Tests/User/UserTest.php @@ -17,7 +17,7 @@ class UserTest extends \PHPUnit_Framework_TestCase { /** * @covers Symfony\Component\Security\Core\User\User::__construct - * @expectedException InvalidArgumentException + * @expectedException \InvalidArgumentException */ public function testConstructorException() { |