adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #13311 from tenkoma/2.x-exec-fixture-shutdown-phpunit5.2

Browse source 
[2.x]Fix When PHPUnit 5.2.0+, test ends before calling FixtureManager::shutdown()
This commit is contained in:
Mark Story 2019-06-02 21:54:29 -04:00 committed by GitHub
commit 396e342601
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -53,6 +53,7 @@ class CakeTestRunner extends PHPUnit_TextUI_TestRunner {
* @param PHPUnit_Framework_Test $suite The test suite to run * @param PHPUnit_Framework_Test $suite The test suite to run
* @param array $arguments The CLI arguments * @param array $arguments The CLI arguments
* @param bool $exit Exits by default or returns the results * @param bool $exit Exits by default or returns the results
* This argument is ignored if >PHPUnit5.2.0
* @return void * @return void
*/ */
public function doRun(PHPUnit_Framework_Test $suite, array $arguments = array(), $exit = true) { public function doRun(PHPUnit_Framework_Test $suite, array $arguments = array(), $exit = true) {
@ -72,7 +73,7 @@ class CakeTestRunner extends PHPUnit_TextUI_TestRunner {
} }
} }
$return = parent::doRun($suite, $arguments); $return = parent::doRun($suite, $arguments, $exit);
$fixture->shutdown(); $fixture->shutdown();
return $return; return $return;
} }

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

@ -95,7 +95,7 @@ class CakeTestSuiteCommand extends PHPUnit_TextUI_Command {
unset($this->arguments['testFile']); unset($this->arguments['testFile']);
try { try {
$result = $runner->doRun($suite, $this->arguments); $result = $runner->doRun($suite, $this->arguments, false);
} catch (PHPUnit_Framework_Exception $e) { } catch (PHPUnit_Framework_Exception $e) {
print $e->getMessage() . "\n"; print $e->getMessage() . "\n";
} }