Merge commit 'f6d65'

# Conflicts:
#	skins/ArchLinux/ArchLinux.php

4 files changed, 7 insertions, 53 deletions

diff --git a/tests/phpunit/includes/exception/BadTitleErrorTest.php b/tests/phpunit/includes/exception/BadTitleErrorTest.php
index 003efd27..500b7e48 100644
--- a/tests/phpunit/includes/exception/BadTitleErrorTest.php
+++ b/tests/phpunit/includes/exception/BadTitleErrorTest.php
@@ -5,23 +5,8 @@
  */
 class BadTitleErrorTest extends MediaWikiTestCase {
 
-	protected $wgOut;
-
-	protected function setUp() {
-		parent::setUp();
-		global $wgOut;
-		$this->wgOut = clone $wgOut;
-	}
-
-	protected function tearDown() {
-		parent::tearDown();
-		global $wgOut;
-		$wgOut = $this->wgOut;
-	}
-
 	public function testExceptionSetsStatusCode() {
-		global $wgOut;
-		$wgOut = $this->getMockWgOut();
+		$this->setMwGlobals( 'wgOut', $this->getMockWgOut() );
 		try {
 			throw new BadTitleError();
 		} catch ( BadTitleError $e ) {
diff --git a/tests/phpunit/includes/exception/ErrorPageErrorTest.php b/tests/phpunit/includes/exception/ErrorPageErrorTest.php
index 13dcf33b..9c4e4a0b 100644
--- a/tests/phpunit/includes/exception/ErrorPageErrorTest.php
+++ b/tests/phpunit/includes/exception/ErrorPageErrorTest.php
@@ -6,20 +6,6 @@
  */
 class ErrorPageErrorTest extends MediaWikiTestCase {
 
-	private $wgOut;
-
-	protected function setUp() {
-		parent::setUp();
-		global $wgOut;
-		$this->wgOut = clone $wgOut;
-	}
-
-	protected function tearDown() {
-		global $wgOut;
-		$wgOut = $this->wgOut;
-		parent::tearDown();
-	}
-
 	private function getMockMessage() {
 		$mockMessage = $this->getMockBuilder( 'Message' )
 			->disableOriginalConstructor()
@@ -48,20 +34,18 @@ class ErrorPageErrorTest extends MediaWikiTestCase {
 		$title = 'Foo';
 		$params = array( 'Baz' );
 
-		global $wgOut;
-		$wgOut = $this->getMockBuilder( 'OutputPage' )
+		$mock = $this->getMockBuilder( 'OutputPage' )
 			->disableOriginalConstructor()
 			->getMock();
-		$wgOut->expects( $this->once() )
+		$mock->expects( $this->once() )
 			->method( 'showErrorPage' )
 			->with( $title, $mockMessage, $params );
-		$wgOut->expects( $this->once() )
+		$mock->expects( $this->once() )
 			->method( 'output' );
+		$this->setMwGlobals( 'wgOut', $mock );
 
 		$e = new ErrorPageError( $title, $mockMessage, $params );
 		$e->report();
 	}
 
-
-
 }
diff --git a/tests/phpunit/includes/exception/MWExceptionHandlerTest.php b/tests/phpunit/includes/exception/MWExceptionHandlerTest.php
index dc5dc6aa..d73f17d9 100644
--- a/tests/phpunit/includes/exception/MWExceptionHandlerTest.php
+++ b/tests/phpunit/includes/exception/MWExceptionHandlerTest.php
@@ -15,7 +15,7 @@ class MWExceptionHandlerTest extends MediaWikiTestCase {
 		$refvar = 'value';
 		try {
 			$array = array( 'a', 'b' );
-			$object = new StdClass();
+			$object = new stdClass();
 			self::helperThrowAnException( $array, $object, $refvar );
 		} catch ( Exception $e ) {
 		}
diff --git a/tests/phpunit/includes/exception/ThrottledErrorTest.php b/tests/phpunit/includes/exception/ThrottledErrorTest.php
index bdb143fa..a1cf84bc 100644
--- a/tests/phpunit/includes/exception/ThrottledErrorTest.php
+++ b/tests/phpunit/includes/exception/ThrottledErrorTest.php
@@ -6,23 +6,8 @@
  */
 class ThrottledErrorTest extends MediaWikiTestCase {
 
-	protected $wgOut;
-
-	protected function setUp() {
-		parent::setUp();
-		global $wgOut;
-		$this->wgOut = clone $wgOut;
-	}
-
-	protected function tearDown() {
-		parent::tearDown();
-		global $wgOut;
-		$wgOut = $this->wgOut;
-	}
-
 	public function testExceptionSetsStatusCode() {
-		global $wgOut;
-		$wgOut = $this->getMockWgOut();
+		$this->setMwGlobals( 'wgOut', $this->getMockWgOut() );
 		try {
 			throw new ThrottledError();
 		} catch ( ThrottledError $e ) {