X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=tests%2Fcommon%2FTestSetup.php;h=e24c4c544253c0520ac2a790a05b36bb31d66d33;hb=214b37ff07f3fde89430297b2a857750a56ae205;hp=38f56d20a1778e1e6cff0bc39c7bb9681e17e34c;hpb=8601e33125630ff391f01a028ee9d7d94a983174;p=lhc%2Fweb%2Fwiklou.git

diff --git a/tests/common/TestSetup.php b/tests/common/TestSetup.php
index 38f56d20a1..e24c4c5442 100644
--- a/tests/common/TestSetup.php
+++ b/tests/common/TestSetup.php
@@ -17,7 +17,7 @@ class TestSetup {
 		global $wgDevelopmentWarnings;
 		global $wgSessionProviders, $wgSessionPbkdf2Iterations;
 		global $wgJobTypeConf;
-		global $wgAuthManagerConfig, $wgAuth;
+		global $wgAuthManagerConfig;
 
 		// wfWarn should cause tests to fail
 		$wgDevelopmentWarnings = true;
@@ -39,7 +39,7 @@ class TestSetup {
 		$wgMainStash = 'hash';
 		// Use memory job queue
 		$wgJobTypeConf = [
-			'default' => [ 'class' => 'JobQueueMemory', 'order' => 'fifo' ],
+			'default' => [ 'class' => JobQueueMemory::class, 'order' => 'fifo' ],
 		];
 
 		$wgUseDatabaseMessages = false; # Set for future resets
@@ -47,10 +47,10 @@ class TestSetup {
 		// Assume UTC for testing purposes
 		$wgLocaltimezone = 'UTC';
 
-		$wgLocalisationCacheConf['storeClass'] = 'LCStoreNull';
+		$wgLocalisationCacheConf['storeClass'] = LCStoreNull::class;
 
 		// Do not bother updating search tables
-		$wgSearchType = 'SearchEngineDummy';
+		$wgSearchType = SearchEngineDummy::class;
 
 		// Generic MediaWiki\Session\SessionManager configuration for tests
 		// We use CookieSessionProvider because things might be expecting
@@ -87,9 +87,8 @@ class TestSetup {
 			],
 			'secondaryauth' => [],
 		];
-		$wgAuth = new MediaWiki\Auth\AuthManagerAuthPlugin();
 
-		// Bug 44192 Do not attempt to send a real e-mail
+		// T46192 Do not attempt to send a real e-mail
 		Hooks::clear( 'AlternateUserMailer' );
 		Hooks::register(
 			'AlternateUserMailer',
@@ -104,10 +103,6 @@ class TestSetup {
 		// may break testing against floating point values
 		// treated with PHP's serialize()
 		ini_set( 'serialize_precision', 17 );
-
-		// TODO: we should call MediaWikiTestCase::prepareServices( new GlobalVarConfig() ) here.
-		// But PHPUnit may not be loaded yet, so we have to wait until just
-		// before PHPUnit_TextUI_Command::main() is executed.
 	}
 
 }