test: Removed pre-checking of tests that were skipped in the PHPUnit version since the minimum version is now 9.5.

This commit is contained in:
Koji Tanaka 2022-12-28 18:46:38 +09:00 committed by Kamil Wylegala
parent a1ed2f91b3
commit b1229c9107
2 changed files with 0 additions and 15 deletions

View file

@ -230,10 +230,6 @@ class CakeEventManagerTest extends CakeTestCase {
* @triggers fake.event * @triggers fake.event
*/ */
public function testDispatchReturnValue() { public function testDispatchReturnValue() {
$this->skipIf(
version_compare(PHPUnit_Runner_Version::id(), '3.7', '<'),
'These tests fail in PHPUnit 3.6'
);
$manager = new CakeEventManager(); $manager = new CakeEventManager();
$listener = $this->getMock('CakeEventTestListener'); $listener = $this->getMock('CakeEventTestListener');
$anotherListener = $this->getMock('CakeEventTestListener'); $anotherListener = $this->getMock('CakeEventTestListener');
@ -258,11 +254,6 @@ class CakeEventManagerTest extends CakeTestCase {
* @triggers fake.event * @triggers fake.event
*/ */
public function testDispatchFalseStopsEvent() { public function testDispatchFalseStopsEvent() {
$this->skipIf(
version_compare(PHPUnit_Runner_Version::id(), '3.7', '<'),
'These tests fail in PHPUnit 3.6'
);
$manager = new CakeEventManager(); $manager = new CakeEventManager();
$listener = $this->getMock('CakeEventTestListener'); $listener = $this->getMock('CakeEventTestListener');
$anotherListener = $this->getMock('CakeEventTestListener'); $anotherListener = $this->getMock('CakeEventTestListener');

View file

@ -761,12 +761,6 @@ abstract class CakeTestCase extends \PHPUnit\Framework\TestCase {
$callOriginalMethods = false, $callOriginalMethods = false,
$proxyTarget = null $proxyTarget = null
) { ) {
$phpUnitVersion = PHPUnit_Runner_Version::id();
if (version_compare($phpUnitVersion, '5.7.0', '<')) {
return parent::getMock($originalClassName, $methods, $arguments,
$mockClassName, $callOriginalConstructor, $callOriginalClone,
$callAutoload, $cloneArguments, $callOriginalMethods, $proxyTarget);
}
if ($cloneArguments) { if ($cloneArguments) {
throw new InvalidArgumentException('$cloneArguments parameter is not supported'); throw new InvalidArgumentException('$cloneArguments parameter is not supported');
} }