summaryrefslogtreecommitdiff
path: root/tests/phpunit/phpunit.php
diff options
context:
space:
mode:
Diffstat (limited to 'tests/phpunit/phpunit.php')
-rw-r--r--tests/phpunit/phpunit.php6
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/phpunit/phpunit.php b/tests/phpunit/phpunit.php
index 11255043..e59b5063 100644
--- a/tests/phpunit/phpunit.php
+++ b/tests/phpunit/phpunit.php
@@ -93,6 +93,12 @@ class PHPUnitMaintClass extends Maintenance {
public function execute() {
global $IP;
+ // Deregister handler from MWExceptionHandler::installHandle so that PHPUnit's own handler
+ // stays in tact.
+ // Has to in execute() instead of finalSetup(), because finalSetup() runs before
+ // doMaintenance.php includes Setup.php, which calls MWExceptionHandler::installHandle().
+ restore_error_handler();
+
$this->forceFormatServerArgv();
# Make sure we have --configuration or PHPUnit might complain