Merge ""spellcheck" attribute for HTMLForm "text" and "textarea""

[lhc/web/wiklou.git] / tests / phpunit / phpunit.php

diff --git a/tests/phpunit/phpunit.php b/tests/phpunit/phpunit.php
index 1125504..34e3fb4 100755 (executable)
--- 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
@@ -214,7 +220,9 @@ foreach ( array(
        'PHPUnit/Runner/Version.php',
        'PHPUnit/Autoload.php'
 ) as $includePath ) {
+       // @codingStandardsIgnoreStart
        @include_once $includePath;
+       // @codingStandardsIgnoreEnd
        if ( class_exists( 'PHPUnit_TextUI_Command' ) ) {
                $ok = true;
                break;
@@ -222,12 +230,14 @@ foreach ( array(
 }
 
 if ( !$ok ) {
-       die( "Couldn't find a usable PHPUnit.\n" );
+       echo "Couldn't find a usable PHPUnit.\n";
+       exit( 1 );
 }
 
 $puVersion = PHPUnit_Runner_Version::id();
 if ( $puVersion !== '@package_version@' && version_compare( $puVersion, '3.7.0', '<' ) ) {
-       die( "PHPUnit 3.7.0 or later required; you have {$puVersion}.\n" );
+       echo "PHPUnit 3.7.0 or later required; you have {$puVersion}.\n";
+       exit( 1 );
 }
 
 PHPUnit_TextUI_Command::main();