adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-02-07 12:36:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make test suites compatible with PHPUnit 4.8

Browse source
This commit is contained in:
chinpei215 2017-03-11 07:24:41 +09:00
parent 31a1837c1d
commit 23080c443e
3 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/Cake/TestSuite/CakeTestRunner.php
View file

@ -15,7 +15,7 @@
* @license http://www.opensource.org/licenses/mit-license.php MIT License * @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'; require_once 'PHPUnit/TextUI/TestRunner.php';
} }
@ -52,7 +52,11 @@ class CakeTestRunner extends PHPUnit_TextUI_TestRunner {
} }
$fixture = $this->_getFixtureManager($arguments); $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) { if ($test instanceof CakeTestCase) {
$fixture->fixturize($test); $fixture->fixturize($test);
$test->fixtureManager = $fixture; $test->fixtureManager = $fixture;

2
lib/Cake/TestSuite/CakeTestSuiteCommand.php
View file

@ -16,7 +16,7 @@
* @license http://www.opensource.org/licenses/mit-license.php MIT License * @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'; require_once 'PHPUnit/TextUI/Command.php';
} }

2
lib/Cake/TestSuite/Reporter/CakeBaseReporter.php
View file

@ -15,7 +15,7 @@
* @license http://www.opensource.org/licenses/mit-license.php MIT License * @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'; require_once 'PHPUnit/TextUI/ResultPrinter.php';
} }