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

2015-12-10 10:50:12 +08:00
parent 6ace0f59ae
commit 3f45d8fece
7 changed files with 43 additions and 8 deletions
@@ -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();
            }