Merge branch '5.4' into 6.2

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

Author: nicolas-grekas

Test/ConstraintValidatorTestCase.php

@@ -142,12 +142,8 @@ protected function createContext()
             'validatePropertyValue',
             'getViolations',
         ];
-        // PHPUnit 10 removed MockBuilder::setMethods()
-        if (method_exists($contextualValidatorMockBuilder, 'onlyMethods')) {
-            $contextualValidatorMockBuilder->onlyMethods($contextualValidatorMethods);
-        } else {
-            $contextualValidatorMockBuilder->setMethods($contextualValidatorMethods);
-        }
+
+        $contextualValidatorMockBuilder->onlyMethods($contextualValidatorMethods);
         $contextualValidator = $contextualValidatorMockBuilder->getMock();
         $contextualValidator->expects($this->any())
             ->method('atPath')

Tests/Validator/RecursiveValidatorTest.php

@@ -2085,7 +2085,7 @@ public function testEmptyGroupsArrayDoesNotTriggerDeprecation()
         $validator = $this
             ->getMockBuilder(RecursiveValidator::class)
             ->disableOriginalConstructor()
-            ->setMethods(['startContext'])
+            ->onlyMethods(['startContext'])
             ->getMock();
         $validator
             ->expects($this->once())
@@ -2119,7 +2119,7 @@ public function testRelationBetweenChildAAndChildB()
         $validator = $this
             ->getMockBuilder(RecursiveValidator::class)
             ->disableOriginalConstructor()
-            ->setMethods(['startContext'])
+            ->onlyMethods(['startContext'])
             ->getMock();
         $validator
             ->expects($this->once())