From b1229c9107b5b5db0a64ce47f3f5998262714fa3 Mon Sep 17 00:00:00 2001 From: Koji Tanaka Date: Wed, 28 Dec 2022 18:46:38 +0900 Subject: [PATCH] test: Removed pre-checking of tests that were skipped in the PHPUnit version since the minimum version is now 9.5. --- lib/Cake/Test/Case/Event/CakeEventManagerTest.php | 9 --------- lib/Cake/TestSuite/CakeTestCase.php | 6 ------ 2 files changed, 15 deletions(-) diff --git a/lib/Cake/Test/Case/Event/CakeEventManagerTest.php b/lib/Cake/Test/Case/Event/CakeEventManagerTest.php index 47f1c3c1c..93ce23b80 100644 --- a/lib/Cake/Test/Case/Event/CakeEventManagerTest.php +++ b/lib/Cake/Test/Case/Event/CakeEventManagerTest.php @@ -230,10 +230,6 @@ class CakeEventManagerTest extends CakeTestCase { * @triggers fake.event */ public function testDispatchReturnValue() { - $this->skipIf( - version_compare(PHPUnit_Runner_Version::id(), '3.7', '<'), - 'These tests fail in PHPUnit 3.6' - ); $manager = new CakeEventManager(); $listener = $this->getMock('CakeEventTestListener'); $anotherListener = $this->getMock('CakeEventTestListener'); @@ -258,11 +254,6 @@ class CakeEventManagerTest extends CakeTestCase { * @triggers fake.event */ public function testDispatchFalseStopsEvent() { - $this->skipIf( - version_compare(PHPUnit_Runner_Version::id(), '3.7', '<'), - 'These tests fail in PHPUnit 3.6' - ); - $manager = new CakeEventManager(); $listener = $this->getMock('CakeEventTestListener'); $anotherListener = $this->getMock('CakeEventTestListener'); diff --git a/lib/Cake/TestSuite/CakeTestCase.php b/lib/Cake/TestSuite/CakeTestCase.php index c7d54fc9b..0672d350d 100644 --- a/lib/Cake/TestSuite/CakeTestCase.php +++ b/lib/Cake/TestSuite/CakeTestCase.php @@ -761,12 +761,6 @@ abstract class CakeTestCase extends \PHPUnit\Framework\TestCase { $callOriginalMethods = false, $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) { throw new InvalidArgumentException('$cloneArguments parameter is not supported'); }