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

2015-12-10 10:49:36 +08:00
parent 0dfcc2541a
commit d74b7e424f
7 changed files with 43 additions and 8 deletions
@@ -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;