r72249 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r72248‎ | r72249 | r72250 >
Date:00:41, 3 September 2010
Author:tparscal
Status:ok
Tags:
Comment:
Fixed PHPUnit < 3.5 compatibiliy breaking change r72248, now we automatically use the new/old way by checking for 'PHPUnit/Autoload.php'.
Modified paths:
  • /trunk/phase3/maintenance/tests/phpunit (modified) (history)

Diff [purge]

Index: trunk/phase3/maintenance/tests/phpunit
@@ -2,7 +2,14 @@
33 <?php
44
55 require( dirname( __FILE__ ) . '/../commandLine.inc' );
6 -require_once 'PHPUnit/Autoload.php';
 6+// XXX: This can go away if everyone switches to PHPUnit 3.5
 7+if ( file_exists( get_include_path() . '/PHPUnit/Autoload.php' ) ) {
 8+ // Works for PHPUnit >= 3.5
 9+ require_once 'PHPUnit/Autoload.php';
 10+} else {
 11+ // Works for PHPUnit < 3.5
 12+ require_once 'PHPUnit/TextUI/Command';
 13+}
714 define( 'MW_PHPUNIT_TEST', 1 );
815
916 $wgLocaltimezone = 'UTC';

Follow-up revisions

RevisionCommit summaryAuthorDate
r72250Actually does what r72249 claimed to do.tparscal00:48, 3 September 2010

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r72248Using PHPUnit/Autoload.php instead of trying to include everything by hand al...tparscal00:32, 3 September 2010

Status & tagging log