From c4372dd38a4d109b4f3881ea63b667e33adbe503 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Thu, 26 Apr 2012 18:23:31 +0200
Subject: Update to MediaWiki 1.18.3

---
 extensions/Gadgets/Gadgets_tests.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'extensions/Gadgets/Gadgets_tests.php')

diff --git a/extensions/Gadgets/Gadgets_tests.php b/extensions/Gadgets/Gadgets_tests.php
index 58cb2a3e..2b1e6a70 100644
--- a/extensions/Gadgets/Gadgets_tests.php
+++ b/extensions/Gadgets/Gadgets_tests.php
@@ -1,14 +1,14 @@
 <?php
-
 /**
  * @group Gadgets
  */
-class GadgetsTest extends PHPUnit_Framework_TestCase {
 
+class GadgetsTest extends PHPUnit_Framework_TestCase {
 	private function create( $line ) {
 		$g = Gadget::newFromDefinition( $line );
 		// assertInstanceOf() is available since PHPUnit 3.5
 		$this->assertEquals( 'Gadget', get_class( $g ) );
+
 		return $g;
 	}
 
@@ -34,7 +34,7 @@ class GadgetsTest extends PHPUnit_Framework_TestCase {
 		$g = $this->create( '*foo [ResourceLoader]|foo.js|foo.css' );
 		$this->assertEquals( 'foo', $g->getName() );
 		$this->assertTrue( $g->supportsResourceLoader() );
-		$this->assertEquals(0, count( $g->getLegacyScripts() ) );
+		$this->assertEquals( 0, count( $g->getLegacyScripts() ) );
 	}
 
 	function testDependencies() {
@@ -45,12 +45,11 @@ class GadgetsTest extends PHPUnit_Framework_TestCase {
 	}
 
 	function testPreferences() {
-		global $wgUser;
+		global $wgUser, $wgOut, $wgTitle;
 
 		// This test makes call to the parser which requires valids Outputpage
 		// and Title objects. Set them up there, they will be released at the
 		// end of the test.
-		global $wgOut, $wgTitle;
 		$old_wgOut = $wgOut;
 		$old_wgTitle = $wgTitle;
 		$wgTitle = Title::newFromText( 'Parser test for Gadgets extension' );
-- 
cgit v1.2.3-54-g00ecf