Move $wgLocalisationCacheConf disabling from bootstrap.php to phpunit.php

diff --git a/tests/phpunit/bootstrap.php b/tests/phpunit/bootstrap.php
index 101418f..46d2534 100644 (file)
--- a/tests/phpunit/bootstrap.php
+++ b/tests/phpunit/bootstrap.php
@@ -28,9 +28,8 @@ dependencies.
 EOF;
 }
 
-global $wgLocalisationCacheConf, $wgMainCacheType, $wgMessageCacheType, $wgParserCacheType;
+global $wgMainCacheType, $wgMessageCacheType, $wgParserCacheType;
 global $wgMessageCache, $messageMemc, $wgUseDatabaseMessages, $wgMsgCacheExpiry, $wgMemc;
-$wgLocalisationCacheConf['storeClass'] =  'LCStore_Null';
 $wgMainCacheType = CACHE_NONE;
 $wgMessageCacheType = CACHE_NONE;
 $wgParserCacheType = CACHE_NONE;

diff --git a/tests/phpunit/phpunit.php b/tests/phpunit/phpunit.php
index e89c442..d196c1a 100755 (executable)
--- a/tests/phpunit/phpunit.php
+++ b/tests/phpunit/phpunit.php
@@ -20,6 +20,8 @@ require_once( "$IP/maintenance/commandLine.inc" );
 // Assume UTC for testing purposes
 $wgLocaltimezone = 'UTC';
 
+$wgLocalisationCacheConf['storeClass'] =  'LCStore_Null';
+
 if( !in_array( '--configuration', $_SERVER['argv'] ) ) {
        //Hack to eliminate the need to use the Makefile (which sucks ATM)
        $_SERVER['argv'][] = '--configuration';