diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2016-12-19 17:07:36 +0100 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2016-12-19 17:07:36 +0100 |
| commit | 7a9b11f3428243d368690b9485098e2d531703e7 (patch) | |
| tree | 07877047d607cee71ae0312b36c80bbbd040f19f /Core/Tests/Encoder/EncoderFactoryTest.php | |
| parent | 946bae1b15cb634ea9705476f4bb34fbede6fd2b (diff) | |
| parent | b6686776ba39726bafa6435319ba0b3686e41498 (diff) | |
| download | symfony-security-7a9b11f3428243d368690b9485098e2d531703e7.zip symfony-security-7a9b11f3428243d368690b9485098e2d531703e7.tar.gz symfony-security-7a9b11f3428243d368690b9485098e2d531703e7.tar.bz2 | |
Merge branch '3.1' into 3.2
* 3.1:
fixed obsolete getMock() usage
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/Encoder/EncoderFactoryTest.php')
| -rw-r--r-- | Core/Tests/Encoder/EncoderFactoryTest.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Core/Tests/Encoder/EncoderFactoryTest.php b/Core/Tests/Encoder/EncoderFactoryTest.php index 21aaae4..191a4d8 100644 --- a/Core/Tests/Encoder/EncoderFactoryTest.php +++ b/Core/Tests/Encoder/EncoderFactoryTest.php @@ -26,7 +26,7 @@ class EncoderFactoryTest extends \PHPUnit_Framework_TestCase 'arguments' => array('sha512', true, 5), ))); - $encoder = $factory->getEncoder($this->getMock('Symfony\Component\Security\Core\User\UserInterface')); + $encoder = $factory->getEncoder($this->getMockBuilder('Symfony\Component\Security\Core\User\UserInterface')->getMock()); $expectedEncoder = new MessageDigestPasswordEncoder('sha512', true, 5); $this->assertEquals($expectedEncoder->encodePassword('foo', 'moo'), $encoder->encodePassword('foo', 'moo')); @@ -38,7 +38,7 @@ class EncoderFactoryTest extends \PHPUnit_Framework_TestCase 'Symfony\Component\Security\Core\User\UserInterface' => new MessageDigestPasswordEncoder('sha1'), )); - $encoder = $factory->getEncoder($this->getMock('Symfony\Component\Security\Core\User\UserInterface')); + $encoder = $factory->getEncoder($this->getMockBuilder('Symfony\Component\Security\Core\User\UserInterface')->getMock()); $expectedEncoder = new MessageDigestPasswordEncoder('sha1'); $this->assertEquals($expectedEncoder->encodePassword('foo', ''), $encoder->encodePassword('foo', '')); |