From ef46373d70b00fcee42442de874a3d13ef71917f Mon Sep 17 00:00:00 2001
From: umherirrender <umherirrender_de.wp@web.de>
Date: Wed, 15 Oct 2014 17:05:04 +0200
Subject: [PATCH] Refactor hook handling in ResourceLoaderTest

No need to set a global $wgHooks, just set it for the current test.

Change-Id: Ic3e82608efa617a5a7f7c31365d748222bc6d6da
---
 .../resourceloader/ResourceLoaderTest.php     | 33 ++++++++-----------
 1 file changed, 14 insertions(+), 19 deletions(-)

diff --git a/tests/phpunit/includes/resourceloader/ResourceLoaderTest.php b/tests/phpunit/includes/resourceloader/ResourceLoaderTest.php
index 7664d5b1d6..5cdfa77d04 100644
--- a/tests/phpunit/includes/resourceloader/ResourceLoaderTest.php
+++ b/tests/phpunit/includes/resourceloader/ResourceLoaderTest.php
@@ -2,8 +2,6 @@
 
 class ResourceLoaderTest extends ResourceLoaderTestCase {
 
-	protected static $resourceLoaderRegisterModulesHook;
-
 	protected function setUp() {
 		parent::setUp();
 
@@ -30,17 +28,6 @@ class ResourceLoaderTest extends ResourceLoaderTestCase {
 		) );
 	}
 
-	/* Hook Methods */
-
-	/**
-	 * ResourceLoaderRegisterModules hook
-	 */
-	public static function resourceLoaderRegisterModules( &$resourceLoader ) {
-		self::$resourceLoaderRegisterModulesHook = true;
-
-		return true;
-	}
-
 	/* Provider Methods */
 	public static function provideValidModules() {
 		return array(
@@ -56,9 +43,21 @@ class ResourceLoaderTest extends ResourceLoaderTestCase {
 	 * @covers ResourceLoader::__construct
 	 */
 	public function testCreatingNewResourceLoaderCallsRegistrationHook() {
-		self::$resourceLoaderRegisterModulesHook = false;
+		$resourceLoaderRegisterModulesHook = false;
+
+		$this->setMwGlobals( 'wgHooks', array(
+			'ResourceLoaderRegisterModules' => array(
+				function ( &$resourceLoader ) use ( &$resourceLoaderRegisterModulesHook ) {
+					$resourceLoaderRegisterModulesHook = true;
+				}
+			)
+		) );
+
 		$resourceLoader = new ResourceLoader();
-		$this->assertTrue( self::$resourceLoaderRegisterModulesHook );
+		$this->assertTrue(
+			$resourceLoaderRegisterModulesHook,
+			'Hook ResourceLoaderRegisterModules called'
+		);
 
 		return $resourceLoader;
 	}
@@ -242,7 +241,3 @@ class ResourceLoaderTest extends ResourceLoaderTestCase {
 		}
 	}
 }
-
-/* Hooks */
-global $wgHooks;
-$wgHooks['ResourceLoaderRegisterModules'][] = 'ResourceLoaderTest::resourceLoaderRegisterModules';
-- 
2.20.1