diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2016-12-19 16:53:49 +0100 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2016-12-19 16:53:49 +0100 |
| commit | a57c25800dcd39387a9a831ef8f436a6bebb8e72 (patch) | |
| tree | 536a2ddb082b1cd251fdc04ff8d9e5700593f805 /Core/Tests/Authentication/Token/RememberMeTokenTest.php | |
| parent | 05b01b879902a75c64b610a28d1f0dc0bee58c91 (diff) | |
| parent | 674b38ff1ae98e993fd18e599120ead43705c4bc (diff) | |
| download | symfony-security-a57c25800dcd39387a9a831ef8f436a6bebb8e72.zip symfony-security-a57c25800dcd39387a9a831ef8f436a6bebb8e72.tar.gz symfony-security-a57c25800dcd39387a9a831ef8f436a6bebb8e72.tar.bz2 | |
Merge branch '2.8' into 3.1
* 2.8:
fixed obsolete getMock() usage
fixed obsolete getMock() usage
[WebProfilerBundle] Display multiple HTTP headers in WDT
do not remove the Twig ExceptionController service
removed obsolete condition
do not try to register incomplete definitions
Diffstat (limited to 'Core/Tests/Authentication/Token/RememberMeTokenTest.php')
| -rw-r--r-- | Core/Tests/Authentication/Token/RememberMeTokenTest.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Core/Tests/Authentication/Token/RememberMeTokenTest.php b/Core/Tests/Authentication/Token/RememberMeTokenTest.php index b83de4a..882f222 100644 --- a/Core/Tests/Authentication/Token/RememberMeTokenTest.php +++ b/Core/Tests/Authentication/Token/RememberMeTokenTest.php @@ -54,7 +54,7 @@ class RememberMeTokenTest extends \PHPUnit_Framework_TestCase protected function getUser($roles = array('ROLE_FOO')) { - $user = $this->getMock('Symfony\Component\Security\Core\User\UserInterface'); + $user = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserInterface')->getMock(); $user ->expects($this->once()) ->method('getRoles') |