Merge "Add some trailing full stops"

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

diff --git a/tests/phpunit/bootstrap.php b/tests/phpunit/bootstrap.php
index 81beb2b..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,38 +28,5 @@ dependencies.
 EOF;
 }
 
-global $wgLocalisationCacheConf, $wgMainCacheType, $wgMessageCacheType, $wgParserCacheType;
-global $wgMessageCache, $messageMemc, $wgUseDatabaseMessages, $wgMsgCacheExpiry;
-$wgLocalisationCacheConf['storeClass'] =  'LCStore_Null';
-$wgMainCacheType = CACHE_NONE;
-$wgMessageCacheType = CACHE_NONE;
-$wgParserCacheType = CACHE_NONE;
-$wgUseDatabaseMessages = false; # Set for future resets
-
-# The message cache was already created in Setup.php
-$wgMessageCache = new StubObject( 'wgMessageCache', 'MessageCache',
-       array( $messageMemc, $wgUseDatabaseMessages, $wgMsgCacheExpiry ) );
-
-/* Classes */
-
-abstract class MediaWikiTestSetup extends PHPUnit_Framework_TestCase {
-       protected $suite;
-       public $regex = '';
-       public $runDisabled = false;
-
-       function __construct( PHPUnit_Framework_TestSuite $suite = null ) {
-               if ( null !== $suite ) {
-                       $this->suite = $suite;
-               }
-       }
-
-       function __call( $func, $args ) {
-               if ( method_exists( $this->suite, $func ) ) {
-                       return call_user_func_array( array( $this->suite, $func ), $args);
-               } else {
-                       throw new MWException( "Called non-existant $func method on "
-                               . get_class( $this ) );
-               }
-       }
-}
-
+/** @todo Check if this is really needed */
+MessageCache::destroyInstance();