Revert "merged master"

[lhc/web/wiklou.git] / tests / phpunit / bootstrap.php

diff --git a/tests/phpunit/bootstrap.php b/tests/phpunit/bootstrap.php
index 46d2534..08eb50f 100644 (file)
--- a/tests/phpunit/bootstrap.php
+++ b/tests/phpunit/bootstrap.php
@@ -15,11 +15,11 @@ EOF;
 }
 
 // Output a notice when running with older versions of PHPUnit
-if ( !version_compare( PHPUnit_Runner_Version::id(), "3.4.1", ">" ) ) {
+if ( version_compare( PHPUnit_Runner_Version::id(), "3.6.7", "<" ) ) {
   echo <<<EOF
 ********************************************************************************
 
-These tests run best with version PHPUnit 3.4.2 or better. Earlier versions may
+These tests run best with version PHPUnit 3.6.7 or better. Earlier versions may
 show failures because earlier versions of PHPUnit do not properly implement
 dependencies.
 
@@ -28,14 +28,5 @@ dependencies.
 EOF;
 }
 
-global $wgMainCacheType, $wgMessageCacheType, $wgParserCacheType;
-global $wgMessageCache, $messageMemc, $wgUseDatabaseMessages, $wgMsgCacheExpiry, $wgMemc;
-$wgMainCacheType = CACHE_NONE;
-$wgMessageCacheType = CACHE_NONE;
-$wgParserCacheType = CACHE_NONE;
-$wgUseDatabaseMessages = false; # Set for future resets
-$wgMemc = new FakeMemCachedClient;
-
-# The message cache was already created in Setup.php
-$wgMessageCache = new StubObject( 'wgMessageCache', 'MessageCache',
-       array( $messageMemc, $wgUseDatabaseMessages, $wgMsgCacheExpiry ) );
+/** @todo Check if this is really needed */
+MessageCache::destroyInstance();