From: umherirrender <umherirrender_de.wp@web.de>
Date: Wed, 15 Oct 2014 15:50:36 +0000 (+0200)
Subject: Fix setting hooks in ApiQueryTest
X-Git-Tag: 1.31.0-rc.0~13502^2
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/exercices/cloturer.php?a=commitdiff_plain;h=d52b3935921031d8ed832b1f4703d7ebb0f968d8;p=lhc%2Fweb%2Fwiklou.git

Fix setting hooks in ApiQueryTest

Also fix the comment

Change-Id: I4245a5f515980c743965996aecc67b42b616b50c
---

diff --git a/tests/phpunit/includes/api/query/ApiQueryTest.php b/tests/phpunit/includes/api/query/ApiQueryTest.php
index bba22c77f7..200027d778 100644
--- a/tests/phpunit/includes/api/query/ApiQueryTest.php
+++ b/tests/phpunit/includes/api/query/ApiQueryTest.php
@@ -7,32 +7,21 @@
  * @covers ApiQuery
  */
 class ApiQueryTest extends ApiTestCase {
-	/**
-	 * @var array Storage for $wgHooks
-	 */
-	protected $hooks;
-
 	protected function setUp() {
-		global $wgHooks;
-
 		parent::setUp();
 		$this->doLogin();
 
-		// Setup en: as interwiki prefix
-		$this->hooks = $wgHooks;
-		$wgHooks['InterwikiLoadPrefix'][] = function ( $prefix, &$data ) {
-			if ( $prefix == 'apiquerytestiw' ) {
-				$data = array( 'iw_url' => 'wikipedia' );
-			}
-			return false;
-		};
-	}
-
-	protected function tearDown() {
-		global $wgHooks;
-		$wgHooks = $this->hooks;
-
-		parent::tearDown();
+		// Setup apiquerytestiw: as interwiki prefix
+		$this->setMwGlobals( 'wgHooks', array(
+			'InterwikiLoadPrefix' => array(
+				function ( $prefix, &$data ) {
+					if ( $prefix == 'apiquerytestiw' ) {
+						$data = array( 'iw_url' => 'wikipedia' );
+					}
+					return false;
+				}
+			)
+		) );
 	}
 
 	public function testTitlesGetNormalized() {