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/Authorization/DebugAccessDecisionManagerTest.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/Authorization/DebugAccessDecisionManagerTest.php')
| -rw-r--r-- | Core/Tests/Authorization/DebugAccessDecisionManagerTest.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Core/Tests/Authorization/DebugAccessDecisionManagerTest.php b/Core/Tests/Authorization/DebugAccessDecisionManagerTest.php index 16661f7..14b0685 100644 --- a/Core/Tests/Authorization/DebugAccessDecisionManagerTest.php +++ b/Core/Tests/Authorization/DebugAccessDecisionManagerTest.php @@ -23,7 +23,7 @@ class DebugAccessDecisionManagerTest extends \PHPUnit_Framework_TestCase public function testDecideLog($expectedLog, $object) { $adm = new DebugAccessDecisionManager(new AccessDecisionManager()); - $adm->decide($this->getMock(TokenInterface::class), array('ATTRIBUTE_1'), $object); + $adm->decide($this->getMockBuilder(TokenInterface::class)->getMock(), array('ATTRIBUTE_1'), $object); $this->assertSame($expectedLog, $adm->getDecisionLog()); } |