SECURITY: blacklist CSS var()

[lhc/web/wiklou.git] / tests / common / TestSetup.php

diff --git a/tests/common/TestSetup.php b/tests/common/TestSetup.php
index 38f56d2..e24c4c5 100644 (file)
--- 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.
        }
 
 }