Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Don’t write to stderr when testing"

Browse source
This commit is contained in:
jenkins-bot 2018-01-26 14:12:46 +00:00 committed by Gerrit Code Review
commit 276e1296ac
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
maintenance/Maintenance.php
View file

@ -414,7 +414,10 @@ abstract class Maintenance {
$this->fatalError( $err, intval( $die ) );
}
$this->outputChanneled( false );
if ( PHP_SAPI == 'cli' || PHP_SAPI == 'phpdbg' ) {
if (
( PHP_SAPI == 'cli' || PHP_SAPI == 'phpdbg' ) &&
!defined( 'MW_PHPUNIT_TEST' )
) {
fwrite( STDERR, $err . "\n" );
} else {
print $err;