Skip to content

Commit 8c5505f

Browse files
committed
AbstractFilterTestCase: remove work-around for change to PHPUnit getMockBuilder()
1 parent 5f94ae4 commit 8c5505f

File tree

1 file changed

+7
-16
lines changed

1 file changed

+7
-16
lines changed

tests/Core/Filters/AbstractFilterTestCase.php

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -96,24 +96,15 @@ protected function getMockedClass($className, array $constructorArgs=[], $method
9696
{
9797
$mockedObj = $this->getMockBuilder($className);
9898

99-
if (method_exists($mockedObj, 'onlyMethods') === true) {
100-
// PHPUnit 8+.
101-
if (is_array($methodsToMock) === true) {
102-
return $mockedObj
103-
->setConstructorArgs($constructorArgs)
104-
->onlyMethods($methodsToMock)
105-
->getMock();
106-
}
107-
108-
return $mockedObj->getMock()
109-
->setConstructorArgs($constructorArgs);
99+
if (is_array($methodsToMock) === true) {
100+
return $mockedObj
101+
->setConstructorArgs($constructorArgs)
102+
->onlyMethods($methodsToMock)
103+
->getMock();
110104
}
111105

112-
// PHPUnit < 8.
113-
return $mockedObj
114-
->setConstructorArgs($constructorArgs)
115-
->setMethods($methodsToMock)
116-
->getMock();
106+
return $mockedObj->getMock()
107+
->setConstructorArgs($constructorArgs);
117108

118109
}//end getMockedClass()
119110

0 commit comments

Comments
 (0)