Skip to content

Commit 99f894a

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 ea89b1a + b671312 commit 99f894a

File tree

2 files changed

+4
-8
lines changed

2 files changed

+4
-8
lines changed

Test/ConstraintValidatorTestCase.php

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -140,12 +140,8 @@ protected function createContext()
140140
'validatePropertyValue',
141141
'getViolations',
142142
];
143-
// PHPUnit 10 removed MockBuilder::setMethods()
144-
if (method_exists($contextualValidatorMockBuilder, 'onlyMethods')) {
145-
$contextualValidatorMockBuilder->onlyMethods($contextualValidatorMethods);
146-
} else {
147-
$contextualValidatorMockBuilder->setMethods($contextualValidatorMethods);
148-
}
143+
144+
$contextualValidatorMockBuilder->onlyMethods($contextualValidatorMethods);
149145
$contextualValidator = $contextualValidatorMockBuilder->getMock();
150146
$contextualValidator->expects($this->any())
151147
->method('atPath')

Tests/Validator/RecursiveValidatorTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2085,7 +2085,7 @@ public function testEmptyGroupsArrayDoesNotTriggerDeprecation()
20852085
$validator = $this
20862086
->getMockBuilder(RecursiveValidator::class)
20872087
->disableOriginalConstructor()
2088-
->setMethods(['startContext'])
2088+
->onlyMethods(['startContext'])
20892089
->getMock();
20902090
$validator
20912091
->expects($this->once())
@@ -2119,7 +2119,7 @@ public function testRelationBetweenChildAAndChildB()
21192119
$validator = $this
21202120
->getMockBuilder(RecursiveValidator::class)
21212121
->disableOriginalConstructor()
2122-
->setMethods(['startContext'])
2122+
->onlyMethods(['startContext'])
21232123
->getMock();
21242124
$validator
21252125
->expects($this->once())

0 commit comments

Comments
 (0)