X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=tests%2Fphpunit%2Fphpunit.php;h=61a20f1b1fb3b87c9b048e17b3f984bdfc856fc9;hb=6eaf1cfed3d2fe15d81686c2578fc1b14da35b07;hp=d70f7530ff218e41607bf35bd19b6a465566b9e6;hpb=439b5a4f658395d9ac61aa32dcccad45f01930ae;p=lhc%2Fweb%2Fwiklou.git

diff --git a/tests/phpunit/phpunit.php b/tests/phpunit/phpunit.php
index d70f7530ff..61a20f1b1f 100755
--- a/tests/phpunit/phpunit.php
+++ b/tests/phpunit/phpunit.php
@@ -15,27 +15,89 @@ $IP = dirname( dirname( dirname( __FILE__ ) ) );
 define( 'MW_PHPUNIT_TEST', true );
 
 // Start up MediaWiki in command-line mode
-require_once( "$IP/maintenance/commandLine.inc" );
+require_once( "$IP/maintenance/Maintenance.php" );
 
-// Assume UTC for testing purposes
-$wgLocaltimezone = 'UTC';
+class PHPUnitMaintClass extends Maintenance {
 
-if( !in_array( '--configuration', $_SERVER['argv'] ) ) {
-	//Hack to eliminate the need to use the Makefile (which sucks ATM)
-	$_SERVER['argv'][] = '--configuration';
-	$_SERVER['argv'][] = $IP . '/tests/phpunit/suite.xml';
+	function __construct() {
+		parent::__construct();
+		$this->addOption( 'with-phpunitdir'
+			, 'Directory to include PHPUnit from, for example when using a git fetchout from upstream. Path will be prepended to PHP `include_path`.'
+			, false # not required
+			, true  # need arg
+		);
+	}
+
+	public function finalSetup() {
+		parent::finalSetup();
+
+		global $wgMainCacheType, $wgMessageCacheType, $wgParserCacheType;
+		global $wgLanguageConverterCacheType, $wgUseDatabaseMessages;
+		global $wgLocaltimezone, $wgLocalisationCacheConf;
+
+		$wgMainCacheType = CACHE_NONE;
+		$wgMessageCacheType = CACHE_NONE;
+		$wgParserCacheType = CACHE_NONE;
+		$wgLanguageConverterCacheType = CACHE_NONE;
+
+		$wgUseDatabaseMessages = false; # Set for future resets
+
+		// Assume UTC for testing purposes
+		$wgLocaltimezone = 'UTC';
+
+		$wgLocalisationCacheConf['storeClass'] =  'LCStore_Null';
+	}
+
+	public function execute() {
+		global $IP;
+
+		# Make sure we have --configuration or PHPUnit might complain
+		if( !in_array( '--configuration', $_SERVER['argv'] ) ) {
+			//Hack to eliminate the need to use the Makefile (which sucks ATM)
+			array_splice( $_SERVER['argv'], 1, 0,
+				array( '--configuration', $IP . '/tests/phpunit/suite.xml' ) );
+		}
+
+		# --with-phpunitdir let us override the default PHPUnit version
+		if( $phpunitDir = $this->getOption( 'with-phpunitdir' ) ) {
+			# Sanity checks
+			if( !is_dir($phpunitDir) ) {
+				$this->error( "--with-phpunitdir should be set to an existing directory", 1 );
+			}
+			if( !is_readable( $phpunitDir."/PHPUnit/Runner/Version.php" ) ) {
+				$this->error( "No usable PHPUnit installation in $phpunitDir.\nAborting.\n", 1 );
+			}
+
+			# Now prepends provided PHPUnit directory
+			$this->output( "Will attempt loading PHPUnit from `$phpunitDir`\n" );
+			set_include_path( $phpunitDir
+				. PATH_SEPARATOR . get_include_path() );
+
+			# Cleanup $args array so the option and its value do not
+			# pollute PHPUnit
+			$key = array_search( '--with-phpunitdir', $_SERVER['argv'] );
+			unset( $_SERVER['argv'][$key]   ); // the option
+			unset( $_SERVER['argv'][$key+1] ); // its value
+			$_SERVER['argv'] = array_values( $_SERVER['argv'] );
+
+		}
+	}
+
+	public function getDbType() {
+		return Maintenance::DB_ADMIN;
+	}
 }
 
+$maintClass = 'PHPUnitMaintClass';
+require( RUN_MAINTENANCE_IF_MAIN );
+
 require_once( 'PHPUnit/Runner/Version.php' );
-if( version_compare( PHPUnit_Runner_Version::id(), '3.5.0', '>=' ) ) {
-	# PHPUnit 3.5.0 introduced a nice autoloader based on class name
-	require_once( 'PHPUnit/Autoload.php' );
-} else {
-	# Keep the old pre PHPUnit 3.5.0 behaviour for compatibility
-	require_once( 'PHPUnit/TextUI/Command.php' );
+
+if( PHPUnit_Runner_Version::id() !== '@package_version@'
+   && version_compare( PHPUnit_Runner_Version::id(), '3.6.7', '<' ) ) {
+	die( 'PHPUnit 3.6.7 or later required, you have ' . PHPUnit_Runner_Version::id() . ".\n" );
 }
+require_once( 'PHPUnit/Autoload.php' );
 
-require_once( "$IP/tests/phpunit/MediaWikiPHPUnitCommand.php" );
-require_once( "$IP/tests/phpunit/MediaWikiTestCase.php" );
+require_once( "$IP/tests/TestsAutoLoader.php" );
 MediaWikiPHPUnitCommand::main();
-