Skip to content

Commit 58a1e07

Browse files
Merge branch '6.2' into 6.3
* 6.2: [Security] remove deprecated conditions in supports and authenticate methods from AccessListener class [Tests] Replace `setMethods()` by `onlyMethods()` and `addMethods()`
2 parents cccb5d9 + ad421ff commit 58a1e07

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Tests/Authentication/Token/Storage/UsageTrackingTokenStorageTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public function testGetSetToken()
3131

3232
$request = new Request();
3333
$request->setSession($session);
34-
$requestStack = $this->getMockBuilder(RequestStack::class)->setMethods(['getSession'])->getMock();
34+
$requestStack = $this->getMockBuilder(RequestStack::class)->onlyMethods(['getSession'])->getMock();
3535
$requestStack->push($request);
3636
$requestStack->expects($this->any())->method('getSession')->willReturnCallback(function () use ($session, &$sessionAccess) {
3737
++$sessionAccess;

Tests/Authorization/TraceableAccessDecisionManagerTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -178,17 +178,17 @@ public function testAccessDecisionManagerCalledByVoter()
178178
{
179179
$voter1 = $this
180180
->getMockBuilder(VoterInterface::class)
181-
->setMethods(['vote'])
181+
->onlyMethods(['vote'])
182182
->getMock();
183183

184184
$voter2 = $this
185185
->getMockBuilder(VoterInterface::class)
186-
->setMethods(['vote'])
186+
->onlyMethods(['vote'])
187187
->getMock();
188188

189189
$voter3 = $this
190190
->getMockBuilder(VoterInterface::class)
191-
->setMethods(['vote'])
191+
->onlyMethods(['vote'])
192192
->getMock();
193193

194194
$sut = new TraceableAccessDecisionManager(new AccessDecisionManager([$voter1, $voter2, $voter3]));

0 commit comments

Comments
 (0)