Merge "Don’t write to stderr when testing"

diff --combined maintenance/Maintenance.php
index 86336cf,69284ac..527e6cb
--- 1/maintenance/Maintenance.php
--- 2/maintenance/Maintenance.php
+++ b/maintenance/Maintenance.php
@@@ -414,7 -414,10 +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;
@@@ -1207,9 -1210,6 +1210,9 @@@
                                "must exist and be readable in the source directory.\n" .
                                "Use --conf to specify it." );
                }
 +              if ( isset( $this->mOptions['server'] ) ) {
 +                      $_SERVER['SERVER_NAME'] = $this->mOptions['server'];
 +              }
                $wgCommandLineMode = true;
  
                return $settingsFile;