Make test suites compatible with PHPUnit 4.8

cakephp · Mar 25, 2017 · 23080c4 · 23080c4
1 parent 31a1837
commit 23080c4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/lib/Cake/TestSuite/CakeTestRunner.php b/lib/Cake/TestSuite/CakeTestRunner.php
@@ -15,7 +15,7 @@
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
 
-if (!defined('__PHPUNIT_PHAR__')) {
+if (!class_exists('PHPUnit_TextUI_TestRunner')) {
 	require_once 'PHPUnit/TextUI/TestRunner.php';
 }
 
@@ -52,7 +52,11 @@ public function doRun(PHPUnit_Framework_Test $suite, array $arguments = array())
 		}
 
 		$fixture = $this->_getFixtureManager($arguments);
-		foreach ($suite->getIterator() as $test) {
+		$iterator = $suite->getIterator();
+		if ($iterator instanceof RecursiveIterator) {
+			$iterator = new RecursiveIteratorIterator($iterator);
+		}
+		foreach ($iterator as $test) {
 			if ($test instanceof CakeTestCase) {
 				$fixture->fixturize($test);
 				$test->fixtureManager = $fixture;

diff --git a/lib/Cake/TestSuite/CakeTestSuiteCommand.php b/lib/Cake/TestSuite/CakeTestSuiteCommand.php
@@ -16,7 +16,7 @@
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
 
-if (!defined('__PHPUNIT_PHAR__')) {
+if (!class_exists('PHPUnit_TextUI_Command')) {
 	require_once 'PHPUnit/TextUI/Command.php';
 }
 

diff --git a/lib/Cake/TestSuite/Reporter/CakeBaseReporter.php b/lib/Cake/TestSuite/Reporter/CakeBaseReporter.php
@@ -15,7 +15,7 @@
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
 
-if (!defined('__PHPUNIT_PHAR__')) {
+if (!class_exists('PHPUnit_TextUI_ResultPrinter')) {
 	require_once 'PHPUnit/TextUI/ResultPrinter.php';
 }