Merge branch 'archwiki'

Conflicts:
	extensions/FluxBBAuthPlugin.php
	extensions/SyntaxHighlight_GeSHi/README
	extensions/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.class.php
	extensions/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.i18n.php
	extensions/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.php
	extensions/SyntaxHighlight_GeSHi/geshi/docs/CHANGES
	extensions/SyntaxHighlight_GeSHi/geshi/docs/THANKS
	extensions/SyntaxHighlight_GeSHi/geshi/docs/TODO
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/AbstractClass.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/AbstractClass_logo.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/AbstractMethod.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/AbstractPrivateClass.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/AbstractPrivateClass_logo.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/AbstractPrivateMethod.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Class.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Class_logo.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Constant.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Constructor.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Destructor.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Function.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Global.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/I.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Index.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Interface.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Interface_logo.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/L.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Lminus.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Lplus.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Method.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Page.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Page_logo.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/PrivateClass.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/PrivateClass_logo.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/PrivateMethod.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/PrivateVariable.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/StaticMethod.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/StaticVariable.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/T.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Tminus.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Tplus.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Variable.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/blank.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/class_folder.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/file.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/folder.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/function_folder.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/next_button.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/next_button_disabled.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/package.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/package_folder.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/previous_button.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/previous_button_disabled.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/private_class_logo.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/tutorial.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/tutorial_folder.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/up_button.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/geshi-doc.html
	extensions/SyntaxHighlight_GeSHi/geshi/docs/geshi-doc.txt
	extensions/SyntaxHighlight_GeSHi/geshi/geshi.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/4cs.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/6502acme.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/6502kickass.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/6502tasm.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/68000devpac.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/abap.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/actionscript.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/actionscript3.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/ada.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/algol68.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/apache.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/applescript.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/apt_sources.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/asm.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/asp.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/autoconf.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/autohotkey.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/autoit.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/avisynth.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/awk.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/bascomavr.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/bash.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/basic4gl.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/bf.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/bibtex.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/blitzbasic.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/bnf.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/boo.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/c.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/c_loadrunner.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/c_mac.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/caddcl.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/cadlisp.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/cfdg.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/cfm.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/chaiscript.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/cil.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/clojure.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/cmake.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/cobol.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/coffeescript.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/cpp-qt.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/cpp.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/csharp.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/css.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/cuesheet.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/d.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/dcs.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/delphi.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/diff.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/div.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/dos.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/dot.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/e.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/ecmascript.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/eiffel.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/email.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/epc.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/erlang.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/euphoria.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/f1.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/falcon.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/fo.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/fortran.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/freebasic.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/fsharp.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/gambas.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/gdb.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/genero.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/genie.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/gettext.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/glsl.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/gml.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/gnuplot.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/go.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/groovy.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/gwbasic.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/haskell.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/hicest.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/hq9plus.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/html4strict.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/html5.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/icon.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/idl.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/ini.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/inno.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/intercal.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/io.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/j.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/java.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/java5.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/javascript.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/jquery.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/kixtart.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/klonec.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/klonecpp.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/latex.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/lb.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/lisp.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/llvm.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/locobasic.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/logtalk.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/lolcode.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/lotusformulas.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/lotusscript.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/lscript.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/lsl2.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/lua.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/m68k.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/magiksf.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/make.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/mapbasic.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/matlab.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/mirc.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/mmix.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/modula2.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/modula3.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/mpasm.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/mxml.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/mysql.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/newlisp.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/nsis.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/oberon2.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/objc.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/objeck.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/ocaml-brief.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/ocaml.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/oobas.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/oracle11.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/oracle8.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/oxygene.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/oz.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/pascal.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/pcre.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/per.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/perl.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/perl6.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/pf.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/php-brief.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/php.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/pic16.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/pike.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/pixelbender.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/pli.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/plsql.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/postgresql.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/povray.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/powerbuilder.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/powershell.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/proftpd.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/progress.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/prolog.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/properties.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/providex.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/purebasic.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/pycon.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/python.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/q.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/qbasic.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/rails.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/rebol.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/reg.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/robots.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/rpmspec.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/rsplus.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/ruby.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/sas.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/scala.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/scheme.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/scilab.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/sdlbasic.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/smalltalk.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/smarty.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/sql.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/systemverilog.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/tcl.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/teraterm.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/text.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/thinbasic.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/tsql.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/typoscript.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/unicon.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/uscript.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/vala.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/vb.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/vbnet.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/verilog.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/vhdl.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/vim.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/visualfoxpro.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/visualprolog.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/whitespace.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/whois.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/winbatch.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/xbasic.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/xml.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/xorg_conf.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/xpp.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/yaml.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/z80.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/zxbasic.php

1 files changed, 117 insertions, 113 deletions

diff --git a/tests/phpunit/maintenance/MaintenanceTest.php b/tests/phpunit/maintenance/MaintenanceTest.php
index 4a6f08fa..318ce0da 100644
--- a/tests/phpunit/maintenance/MaintenanceTest.php
+++ b/tests/phpunit/maintenance/MaintenanceTest.php
@@ -43,7 +43,7 @@ class MaintenanceFixup extends Maintenance {
 	private $testCase;
 
 	/**
-	 * shutdownSimulated === true iff simulateShutdown has done it's work
+	 * shutdownSimulated === true if simulateShutdown has done it's work
 	 *
 	 * @var bool
 	 */
@@ -81,22 +81,23 @@ class MaintenanceFixup extends Maintenance {
 			return;
 		}
 
-		return call_user_func_array ( array( "parent", __FUNCTION__ ), func_get_args() );
+		return call_user_func_array( array( "parent", __FUNCTION__ ), func_get_args() );
 	}
 
 	/**
 	 * Safety net around register_shutdown_function of Maintenance.php
 	 */
 	public function __destruct() {
-		if ( ( ! $this->shutdownSimulated ) && ( ! $this->testCase->hasFailed() ) ) {
+		if ( !$this->shutdownSimulated ) {
 			// Someone generated a MaintenanceFixup instance without calling
 			// simulateShutdown. We'd have to raise a PHPUnit exception to correctly
 			// flag this illegal usage. However, we are already in a destruktor, which
-			// would trigger undefined behaviour. Hence, we can only report to the
+			// would trigger undefined behavior. Hence, we can only report to the
 			// error output :( Hopefully people read the PHPUnit output.
-			fwrite( STDERR, "ERROR! Instance of " . __CLASS__ . " destructed without "
-				. "calling simulateShutdown method. Call simulateShutdown on the "
-				. "instance before it gets destructed." );
+			$name = $this->testCase->getName();
+			fwrite( STDERR, "ERROR! Instance of " . __CLASS__ . " for test $name "
+				. "destructed without calling simulateShutdown method. Call "
+				. "simulateShutdown on the instance before it gets destructed." );
 		}
 
 		// The following guard is required, as PHP does not offer default destructors :(
@@ -111,7 +112,6 @@ class MaintenanceFixup extends Maintenance {
 	}
 
 
-
 	// --- Making protected functions visible for test
 
 	public function output( $out, $channel = null ) {
@@ -119,17 +119,15 @@ class MaintenanceFixup extends Maintenance {
 		// Maintenance::output signature. However, we do not use (or rely on)
 		// those variables. Instead we pass to Maintenance::output whatever we
 		// receive at runtime.
-		return call_user_func_array ( array( "parent", __FUNCTION__ ), func_get_args() );
+		return call_user_func_array( array( "parent", __FUNCTION__ ), func_get_args() );
 	}
 
 
-
 	// --- Requirements for getting instance of abstract class
 
 	public function execute() {
 		$this->testCase->fail( __METHOD__ . " called unexpectedly" );
 	}
-
 }
 
 class MaintenanceTest extends MediaWikiTestCase {
@@ -148,6 +146,14 @@ class MaintenanceTest extends MediaWikiTestCase {
 		$this->m = new MaintenanceFixup( $this );
 	}
 
+	protected function tearDown() {
+		if ( $this->m ) {
+			$this->m->simulateShutdown();
+			$this->m = null;
+		}
+		parent::tearDown();
+	}
+
 
 	/**
 	 * asserts the output before and after simulating shutdown
@@ -164,9 +170,10 @@ class MaintenanceTest extends MediaWikiTestCase {
 	private function assertOutputPrePostShutdown( $preShutdownOutput, $expectNLAppending ) {
 
 		$this->assertEquals( $preShutdownOutput, $this->getActualOutput(),
-				"Output before shutdown simulation" );
+			"Output before shutdown simulation" );
 
 		$this->m->simulateShutdown();
+		$this->m = null;
 
 		$postShutdownOutput = $preShutdownOutput . ( $expectNLAppending ? "\n" : "" );
 		$this->expectOutputString( $postShutdownOutput );
@@ -176,49 +183,48 @@ class MaintenanceTest extends MediaWikiTestCase {
 	// Although the following tests do not seem to be too consistent (compare for
 	// example the newlines within the test.*StringString tests, or the
 	// test.*Intermittent.* tests), the objective of these tests is not to describe
-	// consistent behaviour, but rather currently existing behaviour.
-
+	// consistent behavior, but rather currently existing behavior.
 
 	function testOutputEmpty() {
 		$this->m->output( "" );
-		$this->assertOutputPrePostShutdown( "", False );
+		$this->assertOutputPrePostShutdown( "", false );
 	}
 
 	function testOutputString() {
 		$this->m->output( "foo" );
-		$this->assertOutputPrePostShutdown( "foo", False );
+		$this->assertOutputPrePostShutdown( "foo", false );
 	}
 
 	function testOutputStringString() {
 		$this->m->output( "foo" );
 		$this->m->output( "bar" );
-		$this->assertOutputPrePostShutdown( "foobar", False );
+		$this->assertOutputPrePostShutdown( "foobar", false );
 	}
 
 	function testOutputStringNL() {
 		$this->m->output( "foo\n" );
-		$this->assertOutputPrePostShutdown( "foo\n", False );
+		$this->assertOutputPrePostShutdown( "foo\n", false );
 	}
 
 	function testOutputStringNLNL() {
 		$this->m->output( "foo\n\n" );
-		$this->assertOutputPrePostShutdown( "foo\n\n", False );
+		$this->assertOutputPrePostShutdown( "foo\n\n", false );
 	}
 
 	function testOutputStringNLString() {
 		$this->m->output( "foo\nbar" );
-		$this->assertOutputPrePostShutdown( "foo\nbar", False );
+		$this->assertOutputPrePostShutdown( "foo\nbar", false );
 	}
 
 	function testOutputStringNLStringNL() {
 		$this->m->output( "foo\nbar\n" );
-		$this->assertOutputPrePostShutdown( "foo\nbar\n", False );
+		$this->assertOutputPrePostShutdown( "foo\nbar\n", false );
 	}
 
 	function testOutputStringNLStringNLLinewise() {
 		$this->m->output( "foo\n" );
 		$this->m->output( "bar\n" );
-		$this->assertOutputPrePostShutdown( "foo\nbar\n", False );
+		$this->assertOutputPrePostShutdown( "foo\nbar\n", false );
 	}
 
 	function testOutputStringNLStringNLArbitrary() {
@@ -229,7 +235,7 @@ class MaintenanceTest extends MediaWikiTestCase {
 		$this->m->output( "ba" );
 		$this->m->output( "" );
 		$this->m->output( "r\n" );
-		$this->assertOutputPrePostShutdown( "foo\nbar\n", False );
+		$this->assertOutputPrePostShutdown( "foo\nbar\n", false );
 	}
 
 	function testOutputStringNLStringNLArbitraryAgain() {
@@ -240,49 +246,49 @@ class MaintenanceTest extends MediaWikiTestCase {
 		$this->m->output( "a" );
 		$this->m->output( "" );
 		$this->m->output( "r\n" );
-		$this->assertOutputPrePostShutdown( "foo\nbar\n", False );
+		$this->assertOutputPrePostShutdown( "foo\nbar\n", false );
 	}
 
 	function testOutputWNullChannelEmpty() {
 		$this->m->output( "", null );
-		$this->assertOutputPrePostShutdown( "", False );
+		$this->assertOutputPrePostShutdown( "", false );
 	}
 
 	function testOutputWNullChannelString() {
 		$this->m->output( "foo", null );
-		$this->assertOutputPrePostShutdown( "foo", False );
+		$this->assertOutputPrePostShutdown( "foo", false );
 	}
 
 	function testOutputWNullChannelStringString() {
 		$this->m->output( "foo", null );
 		$this->m->output( "bar", null );
-		$this->assertOutputPrePostShutdown( "foobar", False );
+		$this->assertOutputPrePostShutdown( "foobar", false );
 	}
 
 	function testOutputWNullChannelStringNL() {
 		$this->m->output( "foo\n", null );
-		$this->assertOutputPrePostShutdown( "foo\n", False );
+		$this->assertOutputPrePostShutdown( "foo\n", false );
 	}
 
 	function testOutputWNullChannelStringNLNL() {
 		$this->m->output( "foo\n\n", null );
-		$this->assertOutputPrePostShutdown( "foo\n\n", False );
+		$this->assertOutputPrePostShutdown( "foo\n\n", false );
 	}
 
 	function testOutputWNullChannelStringNLString() {
 		$this->m->output( "foo\nbar", null );
-		$this->assertOutputPrePostShutdown( "foo\nbar", False );
+		$this->assertOutputPrePostShutdown( "foo\nbar", false );
 	}
 
 	function testOutputWNullChannelStringNLStringNL() {
 		$this->m->output( "foo\nbar\n", null );
-		$this->assertOutputPrePostShutdown( "foo\nbar\n", False );
+		$this->assertOutputPrePostShutdown( "foo\nbar\n", false );
 	}
 
 	function testOutputWNullChannelStringNLStringNLLinewise() {
 		$this->m->output( "foo\n", null );
 		$this->m->output( "bar\n", null );
-		$this->assertOutputPrePostShutdown( "foo\nbar\n", False );
+		$this->assertOutputPrePostShutdown( "foo\nbar\n", false );
 	}
 
 	function testOutputWNullChannelStringNLStringNLArbitrary() {
@@ -293,7 +299,7 @@ class MaintenanceTest extends MediaWikiTestCase {
 		$this->m->output( "ba", null );
 		$this->m->output( "", null );
 		$this->m->output( "r\n", null );
-		$this->assertOutputPrePostShutdown( "foo\nbar\n", False );
+		$this->assertOutputPrePostShutdown( "foo\nbar\n", false );
 	}
 
 	function testOutputWNullChannelStringNLStringNLArbitraryAgain() {
@@ -304,17 +310,17 @@ class MaintenanceTest extends MediaWikiTestCase {
 		$this->m->output( "a", null );
 		$this->m->output( "", null );
 		$this->m->output( "r\n", null );
-		$this->assertOutputPrePostShutdown( "foo\nbar\n", False );
+		$this->assertOutputPrePostShutdown( "foo\nbar\n", false );
 	}
 
 	function testOutputWChannelString() {
 		$this->m->output( "foo", "bazChannel" );
-		$this->assertOutputPrePostShutdown( "foo", True );
+		$this->assertOutputPrePostShutdown( "foo", true );
 	}
 
 	function testOutputWChannelStringNL() {
 		$this->m->output( "foo\n", "bazChannel" );
-		$this->assertOutputPrePostShutdown( "foo", True );
+		$this->assertOutputPrePostShutdown( "foo", true );
 	}
 
 	function testOutputWChannelStringNLNL() {
@@ -323,23 +329,23 @@ class MaintenanceTest extends MediaWikiTestCase {
 		// outputChanneled with a string ending in a nl ... which is not allowed
 		// according to the documentation of outputChanneled)
 		$this->m->output( "foo\n\n", "bazChannel" );
-		$this->assertOutputPrePostShutdown( "foo\n", True );
+		$this->assertOutputPrePostShutdown( "foo\n", true );
 	}
 
 	function testOutputWChannelStringNLString() {
 		$this->m->output( "foo\nbar", "bazChannel" );
-		$this->assertOutputPrePostShutdown( "foo\nbar", True );
+		$this->assertOutputPrePostShutdown( "foo\nbar", true );
 	}
 
 	function testOutputWChannelStringNLStringNL() {
 		$this->m->output( "foo\nbar\n", "bazChannel" );
-		$this->assertOutputPrePostShutdown( "foo\nbar", True );
+		$this->assertOutputPrePostShutdown( "foo\nbar", true );
 	}
 
 	function testOutputWChannelStringNLStringNLLinewise() {
 		$this->m->output( "foo\n", "bazChannel" );
 		$this->m->output( "bar\n", "bazChannel" );
-		$this->assertOutputPrePostShutdown( "foobar", True );
+		$this->assertOutputPrePostShutdown( "foobar", true );
 	}
 
 	function testOutputWChannelStringNLStringNLArbitrary() {
@@ -350,7 +356,7 @@ class MaintenanceTest extends MediaWikiTestCase {
 		$this->m->output( "ba", "bazChannel" );
 		$this->m->output( "", "bazChannel" );
 		$this->m->output( "r\n", "bazChannel" );
-		$this->assertOutputPrePostShutdown( "foobar", True );
+		$this->assertOutputPrePostShutdown( "foobar", true );
 	}
 
 	function testOutputWChannelStringNLStringNLArbitraryAgain() {
@@ -361,7 +367,7 @@ class MaintenanceTest extends MediaWikiTestCase {
 		$this->m->output( "a", "bazChannel" );
 		$this->m->output( "", "bazChannel" );
 		$this->m->output( "r\n", "bazChannel" );
-		$this->assertOutputPrePostShutdown( "foo\nbar", True );
+		$this->assertOutputPrePostShutdown( "foo\nbar", true );
 	}
 
 	function testOutputWMultipleChannelsChannelChange() {
@@ -369,7 +375,7 @@ class MaintenanceTest extends MediaWikiTestCase {
 		$this->m->output( "bar", "bazChannel" );
 		$this->m->output( "qux", "quuxChannel" );
 		$this->m->output( "corge", "bazChannel" );
-		$this->assertOutputPrePostShutdown( "foobar\nqux\ncorge", True );
+		$this->assertOutputPrePostShutdown( "foobar\nqux\ncorge", true );
 	}
 
 	function testOutputWMultipleChannelsChannelChangeNL() {
@@ -377,7 +383,7 @@ class MaintenanceTest extends MediaWikiTestCase {
 		$this->m->output( "bar\n", "bazChannel" );
 		$this->m->output( "qux\n", "quuxChannel" );
 		$this->m->output( "corge", "bazChannel" );
-		$this->assertOutputPrePostShutdown( "foobar\nqux\ncorge", True );
+		$this->assertOutputPrePostShutdown( "foobar\nqux\ncorge", true );
 	}
 
 	function testOutputWAndWOChannelStringStartWO() {
@@ -385,7 +391,7 @@ class MaintenanceTest extends MediaWikiTestCase {
 		$this->m->output( "bar", "bazChannel" );
 		$this->m->output( "qux" );
 		$this->m->output( "quux", "bazChannel" );
-		$this->assertOutputPrePostShutdown( "foobar\nquxquux", True );
+		$this->assertOutputPrePostShutdown( "foobar\nquxquux", true );
 	}
 
 	function testOutputWAndWOChannelStringStartW() {
@@ -393,27 +399,27 @@ class MaintenanceTest extends MediaWikiTestCase {
 		$this->m->output( "bar" );
 		$this->m->output( "qux", "bazChannel" );
 		$this->m->output( "quux" );
-		$this->assertOutputPrePostShutdown( "foo\nbarqux\nquux", False );
+		$this->assertOutputPrePostShutdown( "foo\nbarqux\nquux", false );
 	}
 
 	function testOutputWChannelTypeSwitch() {
 		$this->m->output( "foo", 1 );
 		$this->m->output( "bar", 1.0 );
-		$this->assertOutputPrePostShutdown( "foo\nbar", True );
+		$this->assertOutputPrePostShutdown( "foo\nbar", true );
 	}
 
 	function testOutputIntermittentEmpty() {
 		$this->m->output( "foo" );
 		$this->m->output( "" );
 		$this->m->output( "bar" );
-		$this->assertOutputPrePostShutdown( "foobar", False );
+		$this->assertOutputPrePostShutdown( "foobar", false );
 	}
 
 	function testOutputIntermittentFalse() {
 		$this->m->output( "foo" );
 		$this->m->output( false );
 		$this->m->output( "bar" );
-		$this->assertOutputPrePostShutdown( "foobar", False );
+		$this->assertOutputPrePostShutdown( "foobar", false );
 	}
 
 	function testOutputIntermittentFalseAfterOtherChannel() {
@@ -421,35 +427,35 @@ class MaintenanceTest extends MediaWikiTestCase {
 		$this->m->output( "foo" );
 		$this->m->output( false );
 		$this->m->output( "bar" );
-		$this->assertOutputPrePostShutdown( "qux\nfoobar", False );
+		$this->assertOutputPrePostShutdown( "qux\nfoobar", false );
 	}
 
 	function testOutputWNullChannelIntermittentEmpty() {
 		$this->m->output( "foo", null );
 		$this->m->output( "", null );
 		$this->m->output( "bar", null );
-		$this->assertOutputPrePostShutdown( "foobar", False );
+		$this->assertOutputPrePostShutdown( "foobar", false );
 	}
 
 	function testOutputWNullChannelIntermittentFalse() {
 		$this->m->output( "foo", null );
 		$this->m->output( false, null );
 		$this->m->output( "bar", null );
-		$this->assertOutputPrePostShutdown( "foobar", False );
+		$this->assertOutputPrePostShutdown( "foobar", false );
 	}
 
 	function testOutputWChannelIntermittentEmpty() {
 		$this->m->output( "foo", "bazChannel" );
 		$this->m->output( "", "bazChannel" );
 		$this->m->output( "bar", "bazChannel" );
-		$this->assertOutputPrePostShutdown( "foobar", True );
+		$this->assertOutputPrePostShutdown( "foobar", true );
 	}
 
 	function testOutputWChannelIntermittentFalse() {
 		$this->m->output( "foo", "bazChannel" );
 		$this->m->output( false, "bazChannel" );
 		$this->m->output( "bar", "bazChannel" );
-		$this->assertOutputPrePostShutdown( "foobar", True );
+		$this->assertOutputPrePostShutdown( "foobar", true );
 	}
 
 	// Note that (per documentation) outputChanneled does take strings that end
@@ -457,23 +463,23 @@ class MaintenanceTest extends MediaWikiTestCase {
 
 	function testOutputChanneledEmpty() {
 		$this->m->outputChanneled( "" );
-		$this->assertOutputPrePostShutdown( "\n", False );
+		$this->assertOutputPrePostShutdown( "\n", false );
 	}
 
 	function testOutputChanneledString() {
 		$this->m->outputChanneled( "foo" );
-		$this->assertOutputPrePostShutdown( "foo\n", False );
+		$this->assertOutputPrePostShutdown( "foo\n", false );
 	}
 
 	function testOutputChanneledStringString() {
 		$this->m->outputChanneled( "foo" );
 		$this->m->outputChanneled( "bar" );
-		$this->assertOutputPrePostShutdown( "foo\nbar\n", False );
+		$this->assertOutputPrePostShutdown( "foo\nbar\n", false );
 	}
 
 	function testOutputChanneledStringNLString() {
 		$this->m->outputChanneled( "foo\nbar" );
-		$this->assertOutputPrePostShutdown( "foo\nbar\n", False );
+		$this->assertOutputPrePostShutdown( "foo\nbar\n", false );
 	}
 
 	function testOutputChanneledStringNLStringNLArbitraryAgain() {
@@ -484,28 +490,28 @@ class MaintenanceTest extends MediaWikiTestCase {
 		$this->m->outputChanneled( "a" );
 		$this->m->outputChanneled( "" );
 		$this->m->outputChanneled( "r" );
-		$this->assertOutputPrePostShutdown( "\nfoo\n\n\nb\na\n\nr\n", False );
+		$this->assertOutputPrePostShutdown( "\nfoo\n\n\nb\na\n\nr\n", false );
 	}
 
 	function testOutputChanneledWNullChannelEmpty() {
 		$this->m->outputChanneled( "", null );
-		$this->assertOutputPrePostShutdown( "\n", False );
+		$this->assertOutputPrePostShutdown( "\n", false );
 	}
 
 	function testOutputChanneledWNullChannelString() {
 		$this->m->outputChanneled( "foo", null );
-		$this->assertOutputPrePostShutdown( "foo\n", False );
+		$this->assertOutputPrePostShutdown( "foo\n", false );
 	}
 
 	function testOutputChanneledWNullChannelStringString() {
 		$this->m->outputChanneled( "foo", null );
 		$this->m->outputChanneled( "bar", null );
-		$this->assertOutputPrePostShutdown( "foo\nbar\n", False );
+		$this->assertOutputPrePostShutdown( "foo\nbar\n", false );
 	}
 
 	function testOutputChanneledWNullChannelStringNLString() {
 		$this->m->outputChanneled( "foo\nbar", null );
-		$this->assertOutputPrePostShutdown( "foo\nbar\n", False );
+		$this->assertOutputPrePostShutdown( "foo\nbar\n", false );
 	}
 
 	function testOutputChanneledWNullChannelStringNLStringNLArbitraryAgain() {
@@ -516,23 +522,23 @@ class MaintenanceTest extends MediaWikiTestCase {
 		$this->m->outputChanneled( "a", null );
 		$this->m->outputChanneled( "", null );
 		$this->m->outputChanneled( "r", null );
-		$this->assertOutputPrePostShutdown( "\nfoo\n\n\nb\na\n\nr\n", False );
+		$this->assertOutputPrePostShutdown( "\nfoo\n\n\nb\na\n\nr\n", false );
 	}
 
 	function testOutputChanneledWChannelString() {
 		$this->m->outputChanneled( "foo", "bazChannel" );
-		$this->assertOutputPrePostShutdown( "foo", True );
+		$this->assertOutputPrePostShutdown( "foo", true );
 	}
 
 	function testOutputChanneledWChannelStringNLString() {
 		$this->m->outputChanneled( "foo\nbar", "bazChannel" );
-		$this->assertOutputPrePostShutdown( "foo\nbar", True );
+		$this->assertOutputPrePostShutdown( "foo\nbar", true );
 	}
 
 	function testOutputChanneledWChannelStringString() {
 		$this->m->outputChanneled( "foo", "bazChannel" );
 		$this->m->outputChanneled( "bar", "bazChannel" );
-		$this->assertOutputPrePostShutdown( "foobar", True );
+		$this->assertOutputPrePostShutdown( "foobar", true );
 	}
 
 	function testOutputChanneledWChannelStringNLStringNLArbitraryAgain() {
@@ -543,7 +549,7 @@ class MaintenanceTest extends MediaWikiTestCase {
 		$this->m->outputChanneled( "a", "bazChannel" );
 		$this->m->outputChanneled( "", "bazChannel" );
 		$this->m->outputChanneled( "r", "bazChannel" );
-		$this->assertOutputPrePostShutdown( "foo\nbar", True );
+		$this->assertOutputPrePostShutdown( "foo\nbar", true );
 	}
 
 	function testOutputChanneledWMultipleChannelsChannelChange() {
@@ -551,7 +557,7 @@ class MaintenanceTest extends MediaWikiTestCase {
 		$this->m->outputChanneled( "bar", "bazChannel" );
 		$this->m->outputChanneled( "qux", "quuxChannel" );
 		$this->m->outputChanneled( "corge", "bazChannel" );
-		$this->assertOutputPrePostShutdown( "foobar\nqux\ncorge", True );
+		$this->assertOutputPrePostShutdown( "foobar\nqux\ncorge", true );
 	}
 
 	function testOutputChanneledWMultipleChannelsChannelChangeEnclosedNull() {
@@ -559,7 +565,7 @@ class MaintenanceTest extends MediaWikiTestCase {
 		$this->m->outputChanneled( "bar", null );
 		$this->m->outputChanneled( "qux", null );
 		$this->m->outputChanneled( "corge", "bazChannel" );
-		$this->assertOutputPrePostShutdown( "foo\nbar\nqux\ncorge", True );
+		$this->assertOutputPrePostShutdown( "foo\nbar\nqux\ncorge", true );
 	}
 
 	function testOutputChanneledWMultipleChannelsChannelAfterNullChange() {
@@ -567,7 +573,7 @@ class MaintenanceTest extends MediaWikiTestCase {
 		$this->m->outputChanneled( "bar", null );
 		$this->m->outputChanneled( "qux", null );
 		$this->m->outputChanneled( "corge", "quuxChannel" );
-		$this->assertOutputPrePostShutdown( "foo\nbar\nqux\ncorge", True );
+		$this->assertOutputPrePostShutdown( "foo\nbar\nqux\ncorge", true );
 	}
 
 	function testOutputChanneledWAndWOChannelStringStartWO() {
@@ -575,7 +581,7 @@ class MaintenanceTest extends MediaWikiTestCase {
 		$this->m->outputChanneled( "bar", "bazChannel" );
 		$this->m->outputChanneled( "qux" );
 		$this->m->outputChanneled( "quux", "bazChannel" );
-		$this->assertOutputPrePostShutdown( "foo\nbar\nqux\nquux", True );
+		$this->assertOutputPrePostShutdown( "foo\nbar\nqux\nquux", true );
 	}
 
 	function testOutputChanneledWAndWOChannelStringStartW() {
@@ -583,114 +589,114 @@ class MaintenanceTest extends MediaWikiTestCase {
 		$this->m->outputChanneled( "bar" );
 		$this->m->outputChanneled( "qux", "bazChannel" );
 		$this->m->outputChanneled( "quux" );
-		$this->assertOutputPrePostShutdown( "foo\nbar\nqux\nquux\n", False );
+		$this->assertOutputPrePostShutdown( "foo\nbar\nqux\nquux\n", false );
 	}
 
 	function testOutputChanneledWChannelTypeSwitch() {
 		$this->m->outputChanneled( "foo", 1 );
 		$this->m->outputChanneled( "bar", 1.0 );
-		$this->assertOutputPrePostShutdown( "foo\nbar", True );
+		$this->assertOutputPrePostShutdown( "foo\nbar", true );
 	}
 
 	function testOutputChanneledWOChannelIntermittentEmpty() {
 		$this->m->outputChanneled( "foo" );
 		$this->m->outputChanneled( "" );
 		$this->m->outputChanneled( "bar" );
-		$this->assertOutputPrePostShutdown( "foo\n\nbar\n", False );
+		$this->assertOutputPrePostShutdown( "foo\n\nbar\n", false );
 	}
 
 	function testOutputChanneledWOChannelIntermittentFalse() {
 		$this->m->outputChanneled( "foo" );
 		$this->m->outputChanneled( false );
 		$this->m->outputChanneled( "bar" );
-		$this->assertOutputPrePostShutdown( "foo\nbar\n", False );
+		$this->assertOutputPrePostShutdown( "foo\nbar\n", false );
 	}
 
 	function testOutputChanneledWNullChannelIntermittentEmpty() {
 		$this->m->outputChanneled( "foo", null );
 		$this->m->outputChanneled( "", null );
 		$this->m->outputChanneled( "bar", null );
-		$this->assertOutputPrePostShutdown( "foo\n\nbar\n", False );
+		$this->assertOutputPrePostShutdown( "foo\n\nbar\n", false );
 	}
 
 	function testOutputChanneledWNullChannelIntermittentFalse() {
 		$this->m->outputChanneled( "foo", null );
 		$this->m->outputChanneled( false, null );
 		$this->m->outputChanneled( "bar", null );
-		$this->assertOutputPrePostShutdown( "foo\nbar\n", False );
+		$this->assertOutputPrePostShutdown( "foo\nbar\n", false );
 	}
 
 	function testOutputChanneledWChannelIntermittentEmpty() {
 		$this->m->outputChanneled( "foo", "bazChannel" );
 		$this->m->outputChanneled( "", "bazChannel" );
 		$this->m->outputChanneled( "bar", "bazChannel" );
-		$this->assertOutputPrePostShutdown( "foobar", True );
+		$this->assertOutputPrePostShutdown( "foobar", true );
 	}
 
 	function testOutputChanneledWChannelIntermittentFalse() {
 		$this->m->outputChanneled( "foo", "bazChannel" );
 		$this->m->outputChanneled( false, "bazChannel" );
 		$this->m->outputChanneled( "bar", "bazChannel" );
-		$this->assertOutputPrePostShutdown( "foo\nbar", True );
+		$this->assertOutputPrePostShutdown( "foo\nbar", true );
 	}
 
 	function testCleanupChanneledClean() {
 		$this->m->cleanupChanneled();
-		$this->assertOutputPrePostShutdown( "", False );
+		$this->assertOutputPrePostShutdown( "", false );
 	}
 
 	function testCleanupChanneledAfterOutput() {
 		$this->m->output( "foo" );
 		$this->m->cleanupChanneled();
-		$this->assertOutputPrePostShutdown( "foo", False );
+		$this->assertOutputPrePostShutdown( "foo", false );
 	}
 
 	function testCleanupChanneledAfterOutputWNullChannel() {
 		$this->m->output( "foo", null );
 		$this->m->cleanupChanneled();
-		$this->assertOutputPrePostShutdown( "foo", False );
+		$this->assertOutputPrePostShutdown( "foo", false );
 	}
 
 	function testCleanupChanneledAfterOutputWChannel() {
 		$this->m->output( "foo", "bazChannel" );
 		$this->m->cleanupChanneled();
-		$this->assertOutputPrePostShutdown( "foo\n", False );
+		$this->assertOutputPrePostShutdown( "foo\n", false );
 	}
 
 	function testCleanupChanneledAfterNLOutput() {
 		$this->m->output( "foo\n" );
 		$this->m->cleanupChanneled();
-		$this->assertOutputPrePostShutdown( "foo\n", False );
+		$this->assertOutputPrePostShutdown( "foo\n", false );
 	}
 
 	function testCleanupChanneledAfterNLOutputWNullChannel() {
 		$this->m->output( "foo\n", null );
 		$this->m->cleanupChanneled();
-		$this->assertOutputPrePostShutdown( "foo\n", False );
+		$this->assertOutputPrePostShutdown( "foo\n", false );
 	}
 
 	function testCleanupChanneledAfterNLOutputWChannel() {
 		$this->m->output( "foo\n", "bazChannel" );
 		$this->m->cleanupChanneled();
-		$this->assertOutputPrePostShutdown( "foo\n", False );
+		$this->assertOutputPrePostShutdown( "foo\n", false );
 	}
 
 	function testCleanupChanneledAfterOutputChanneledWOChannel() {
 		$this->m->outputChanneled( "foo" );
 		$this->m->cleanupChanneled();
-		$this->assertOutputPrePostShutdown( "foo\n", False );
+		$this->assertOutputPrePostShutdown( "foo\n", false );
 	}
 
 	function testCleanupChanneledAfterOutputChanneledWNullChannel() {
 		$this->m->outputChanneled( "foo", null );
 		$this->m->cleanupChanneled();
-		$this->assertOutputPrePostShutdown( "foo\n", False );
+		$this->assertOutputPrePostShutdown( "foo\n", false );
 	}
 
 	function testCleanupChanneledAfterOutputChanneledWChannel() {
 		$this->m->outputChanneled( "foo", "bazChannel" );
 		$this->m->cleanupChanneled();
-		$this->assertOutputPrePostShutdown( "foo\n", False );
+		$this->assertOutputPrePostShutdown( "foo\n", false );
 	}
 
 	function testMultipleMaintenanceObjectsInteractionOutput() {
@@ -700,9 +706,9 @@ class MaintenanceTest extends MediaWikiTestCase {
 		$m2->output( "bar" );
 
 		$this->assertEquals( "foobar", $this->getActualOutput(),
-				"Output before shutdown simulation (m2)" );
+			"Output before shutdown simulation (m2)" );
 		$m2->simulateShutdown();
-		$this->assertOutputPrePostShutdown( "foobar", False );
+		$this->assertOutputPrePostShutdown( "foobar", false );
 	}
 
 	function testMultipleMaintenanceObjectsInteractionOutputWNullChannel() {
@@ -712,9 +718,9 @@ class MaintenanceTest extends MediaWikiTestCase {
 		$m2->output( "bar", null );
 
 		$this->assertEquals( "foobar", $this->getActualOutput(),
-				"Output before shutdown simulation (m2)" );
+			"Output before shutdown simulation (m2)" );
 		$m2->simulateShutdown();
-		$this->assertOutputPrePostShutdown( "foobar", False );
+		$this->assertOutputPrePostShutdown( "foobar", false );
 	}
 
 	function testMultipleMaintenanceObjectsInteractionOutputWChannel() {
@@ -724,9 +730,9 @@ class MaintenanceTest extends MediaWikiTestCase {
 		$m2->output( "bar", "bazChannel" );
 
 		$this->assertEquals( "foobar", $this->getActualOutput(),
-				"Output before shutdown simulation (m2)" );
+			"Output before shutdown simulation (m2)" );
 		$m2->simulateShutdown();
-		$this->assertOutputPrePostShutdown( "foobar\n", True );
+		$this->assertOutputPrePostShutdown( "foobar\n", true );
 	}
 
 	function testMultipleMaintenanceObjectsInteractionOutputWNullChannelNL() {
@@ -736,9 +742,9 @@ class MaintenanceTest extends MediaWikiTestCase {
 		$m2->output( "bar\n", null );
 
 		$this->assertEquals( "foo\nbar\n", $this->getActualOutput(),
-				"Output before shutdown simulation (m2)" );
+			"Output before shutdown simulation (m2)" );
 		$m2->simulateShutdown();
-		$this->assertOutputPrePostShutdown( "foo\nbar\n", False );
+		$this->assertOutputPrePostShutdown( "foo\nbar\n", false );
 	}
 
 	function testMultipleMaintenanceObjectsInteractionOutputWChannelNL() {
@@ -748,9 +754,9 @@ class MaintenanceTest extends MediaWikiTestCase {
 		$m2->output( "bar\n", "bazChannel" );
 
 		$this->assertEquals( "foobar", $this->getActualOutput(),
-				"Output before shutdown simulation (m2)" );
+			"Output before shutdown simulation (m2)" );
 		$m2->simulateShutdown();
-		$this->assertOutputPrePostShutdown( "foobar\n", True );
+		$this->assertOutputPrePostShutdown( "foobar\n", true );
 	}
 
 	function testMultipleMaintenanceObjectsInteractionOutputChanneled() {
@@ -760,9 +766,9 @@ class MaintenanceTest extends MediaWikiTestCase {
 		$m2->outputChanneled( "bar" );
 
 		$this->assertEquals( "foo\nbar\n", $this->getActualOutput(),
-				"Output before shutdown simulation (m2)" );
+			"Output before shutdown simulation (m2)" );
 		$m2->simulateShutdown();
-		$this->assertOutputPrePostShutdown( "foo\nbar\n", False );
+		$this->assertOutputPrePostShutdown( "foo\nbar\n", false );
 	}
 
 	function testMultipleMaintenanceObjectsInteractionOutputChanneledWNullChannel() {
@@ -772,9 +778,9 @@ class MaintenanceTest extends MediaWikiTestCase {
 		$m2->outputChanneled( "bar", null );
 
 		$this->assertEquals( "foo\nbar\n", $this->getActualOutput(),
-				"Output before shutdown simulation (m2)" );
+			"Output before shutdown simulation (m2)" );
 		$m2->simulateShutdown();
-		$this->assertOutputPrePostShutdown( "foo\nbar\n", False );
+		$this->assertOutputPrePostShutdown( "foo\nbar\n", false );
 	}
 
 	function testMultipleMaintenanceObjectsInteractionOutputChanneledWChannel() {
@@ -784,9 +790,9 @@ class MaintenanceTest extends MediaWikiTestCase {
 		$m2->outputChanneled( "bar", "bazChannel" );
 
 		$this->assertEquals( "foobar", $this->getActualOutput(),
-				"Output before shutdown simulation (m2)" );
+			"Output before shutdown simulation (m2)" );
 		$m2->simulateShutdown();
-		$this->assertOutputPrePostShutdown( "foobar\n", True );
+		$this->assertOutputPrePostShutdown( "foobar\n", true );
 	}
 
 	function testMultipleMaintenanceObjectsInteractionCleanupChanneledWChannel() {
@@ -796,17 +802,15 @@ class MaintenanceTest extends MediaWikiTestCase {
 		$m2->outputChanneled( "bar", "bazChannel" );
 
 		$this->assertEquals( "foobar", $this->getActualOutput(),
-				"Output before first cleanup" );
+			"Output before first cleanup" );
 		$this->m->cleanupChanneled();
 		$this->assertEquals( "foobar\n", $this->getActualOutput(),
-				"Output after first cleanup" );
+			"Output after first cleanup" );
 		$m2->cleanupChanneled();
 		$this->assertEquals( "foobar\n\n", $this->getActualOutput(),
-				"Output after second cleanup" );
+			"Output after second cleanup" );
 
 		$m2->simulateShutdown();
-		$this->assertOutputPrePostShutdown( "foobar\n\n", False );
+		$this->assertOutputPrePostShutdown( "foobar\n\n", false );
 	}
-
-
-}
\ No newline at end of file
+}