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 /Csrf | |
| 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 'Csrf')
| -rw-r--r-- | Csrf/Tests/CsrfTokenManagerTest.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Csrf/Tests/CsrfTokenManagerTest.php b/Csrf/Tests/CsrfTokenManagerTest.php index 3112038..16baec1 100644 --- a/Csrf/Tests/CsrfTokenManagerTest.php +++ b/Csrf/Tests/CsrfTokenManagerTest.php @@ -36,8 +36,8 @@ class CsrfTokenManagerTest extends \PHPUnit_Framework_TestCase protected function setUp() { - $this->generator = $this->getMock('Symfony\Component\Security\Csrf\TokenGenerator\TokenGeneratorInterface'); - $this->storage = $this->getMock('Symfony\Component\Security\Csrf\TokenStorage\TokenStorageInterface'); + $this->generator = $this->getMockBuilder('Symfony\Component\Security\Csrf\TokenGenerator\TokenGeneratorInterface')->getMock(); + $this->storage = $this->getMockBuilder('Symfony\Component\Security\Csrf\TokenStorage\TokenStorageInterface')->getMock(); $this->manager = new CsrfTokenManager($this->generator, $this->storage); } |