From: Max Semenik <maxsem@users.mediawiki.org>
Date: Tue, 10 May 2011 19:45:47 +0000 (+0000)
Subject: To prevent creepy errors like bug 28908, raised PHPUnit requirement to 3.5
X-Git-Tag: 1.31.0-rc.0~30293
X-Git-Url: http://git.cyclocoop.org/%28?a=commitdiff_plain;h=6016958c3c1c39ba6bc2a51c7a9fa92ef49c0b7c;p=lhc%2Fweb%2Fwiklou.git

To prevent creepy errors like bug 28908, raised PHPUnit requirement to 3.5
---

diff --git a/tests/phpunit/phpunit.php b/tests/phpunit/phpunit.php
index 7acc79ca12..39cccf8074 100755
--- a/tests/phpunit/phpunit.php
+++ b/tests/phpunit/phpunit.php
@@ -51,13 +51,10 @@ if( !in_array( '--configuration', $_SERVER['argv'] ) ) {
 }
 
 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( version_compare( PHPUnit_Runner_Version::id(), '3.5.0', '<' ) ) {
+	die( 'PHPUnit 3.5 or later required, you have ' . PHPUnit_Runner_Version::id() . ".\n" );
 }
+require_once( 'PHPUnit/Autoload.php' );
 
 require_once( "$IP/tests/TestsAutoLoader.php" );
 MediaWikiPHPUnitCommand::main();