L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-52284 core: compatibility with Exception/Throwable changes in PHP7

Browse Source
This commit is contained in:
Tony Levi
2015-12-10 10:49:36 +08:00
committed by Marina Glancy
parent 0dfcc2541a
commit d74b7e424f
7 changed files with 43 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/phpunit/classes/advanced_testcase.php
+7 -1
View File
@@ -88,7 +88,13 @@ abstract class advanced_testcase extends base_testcase {
trigger_error('Unexpected debugging() call detected.', E_USER_NOTICE);
}
} catch (Exception $e) {
} catch (Exception $ex) {
$e = $ex;
} catch (Throwable $ex) {
$e = $ex; // PHP7.
}
if (isset($e)) {
// cleanup after failed expectation
self::resetAllData();
throw $e;
lib/phpunit/classes/basic_testcase.php
+8 -1
View File
@@ -62,7 +62,14 @@ abstract class basic_testcase extends base_testcase {
try {
parent::runBare();
} catch (Exception $e) {
} catch (Exception $ex) {
$e = $ex;
} catch (Throwable $ex) {
$e = $ex; // PHP7.
}
if (isset($e)) {
// cleanup after failed expectation
phpunit_util::reset_all_data();
throw $e;
lib/phpunit/classes/database_driver_testcase.php
+7 -1
View File
@@ -142,7 +142,13 @@ abstract class database_driver_testcase extends base_testcase {
try {
parent::runBare();
} catch (Exception $e) {
} catch (Exception $ex) {
$e = $ex;
} catch (Throwable $ex) {
$e = $ex; // PHP7.
}
if (isset($e)) {
if ($this->tdb->is_transaction_started()) {
$this->tdb->force_transaction_rollback();
}