diff options
| author | Tobias Schultze <webmaster@tubo-world.de> | 2015-09-09 20:05:45 +0200 |
|---|---|---|
| committer | Tobias Schultze <webmaster@tubo-world.de> | 2015-09-09 20:05:45 +0200 |
| commit | da308625d391f2c0d5df061fb2e13119a40c8729 (patch) | |
| tree | f08c0cefc74b326ef5f1148477e4498a7e0a66ac /Http/Tests/RememberMe | |
| parent | cf33857bd2015ff7a2d9d444272c4a4b307b74ed (diff) | |
| parent | 7bfeb0feb9661a7c4bdcd86241868c8485e6b361 (diff) | |
| download | symfony-security-da308625d391f2c0d5df061fb2e13119a40c8729.zip symfony-security-da308625d391f2c0d5df061fb2e13119a40c8729.tar.gz symfony-security-da308625d391f2c0d5df061fb2e13119a40c8729.tar.bz2 | |
Merge branch '2.7' into 2.8
Conflicts:
src/Symfony/Component/HttpKernel/Kernel.php
Diffstat (limited to 'Http/Tests/RememberMe')
| -rw-r--r-- | Http/Tests/RememberMe/AbstractRememberMeServicesTest.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Http/Tests/RememberMe/AbstractRememberMeServicesTest.php b/Http/Tests/RememberMe/AbstractRememberMeServicesTest.php index 5a6a839..d3daa35 100644 --- a/Http/Tests/RememberMe/AbstractRememberMeServicesTest.php +++ b/Http/Tests/RememberMe/AbstractRememberMeServicesTest.php @@ -250,7 +250,7 @@ class AbstractRememberMeServicesTest extends \PHPUnit_Framework_TestCase } /** - * @expectedException InvalidArgumentException + * @expectedException \InvalidArgumentException * @expectedExceptionMessage cookie delimiter */ public function testThereShouldBeNoCookieDelimiterInCookieParts() |