Merge branch '5.4' into 6.2

* 5.4:
  [Tests] Replace `setMethods()` by `onlyMethods()` and `addMethods()`

Author: nicolas-grekas

Tests/Authentication/Token/Storage/UsageTrackingTokenStorageTest.php

@@ -31,7 +31,7 @@ public function testGetSetToken()
 
             $request = new Request();
             $request->setSession($session);
-            $requestStack = $this->getMockBuilder(RequestStack::class)->setMethods(['getSession'])->getMock();
+            $requestStack = $this->getMockBuilder(RequestStack::class)->onlyMethods(['getSession'])->getMock();
             $requestStack->push($request);
             $requestStack->expects($this->any())->method('getSession')->willReturnCallback(function () use ($session, &$sessionAccess) {
                 ++$sessionAccess;

Tests/Authorization/TraceableAccessDecisionManagerTest.php

@@ -178,17 +178,17 @@ public function testAccessDecisionManagerCalledByVoter()
     {
         $voter1 = $this
             ->getMockBuilder(VoterInterface::class)
-            ->setMethods(['vote'])
+            ->onlyMethods(['vote'])
             ->getMock();
 
         $voter2 = $this
             ->getMockBuilder(VoterInterface::class)
-            ->setMethods(['vote'])
+            ->onlyMethods(['vote'])
             ->getMock();
 
         $voter3 = $this
             ->getMockBuilder(VoterInterface::class)
-            ->setMethods(['vote'])
+            ->onlyMethods(['vote'])
             ->getMock();
 
         $sut = new TraceableAccessDecisionManager(new AccessDecisionManager([$voter1, $voter2, $voter3]));