diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2016-12-19 16:38:44 +0100 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2016-12-19 16:38:44 +0100 |
| commit | b61218eac019add58b6eaf5bd0bdf331fb375ffb (patch) | |
| tree | 81d5e0ad1bc52ea5cb4bcc570556e886c29fdc8c /Core/Tests/Encoder/EncoderFactoryTest.php | |
| parent | 8a7bf02f6038110dbf43a6c7dbf247acccac9817 (diff) | |
| parent | 0582ad240b9aa4b86945b3fdee0f84b20eb0856f (diff) | |
| download | symfony-security-b61218eac019add58b6eaf5bd0bdf331fb375ffb.zip symfony-security-b61218eac019add58b6eaf5bd0bdf331fb375ffb.tar.gz symfony-security-b61218eac019add58b6eaf5bd0bdf331fb375ffb.tar.bz2 | |
Merge branch '2.7' into 2.8
* 2.7:
fixed obsolete getMock() usage
[WebProfilerBundle] Display multiple HTTP headers in WDT
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', '')); |