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

2015-08-03 16:16:03 +09:30
parent 0dfcc2541a
commit d74b7e424f
7 changed files with 43 additions and 8 deletions
@@ -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;