diff options
| author | Pierre Schmitz <pierre@archlinux.de> | 2015-06-04 07:31:04 +0200 |
|---|---|---|
| committer | Pierre Schmitz <pierre@archlinux.de> | 2015-06-04 07:58:39 +0200 |
| commit | f6d65e533c62f6deb21342d4901ece24497b433e (patch) | |
| tree | f28adf0362d14bcd448f7b65a7aaf38650f923aa /tests/phpunit/phpunit.php | |
| parent | c27b2e832fe25651ef2410fae85b41072aae7519 (diff) | |
Update to MediaWiki 1.25.1
Diffstat (limited to 'tests/phpunit/phpunit.php')
| -rw-r--r-- | tests/phpunit/phpunit.php | 6 |
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 |