Follow-up r74628: convert two remaining calls of patchPath()

diff --git a/maintenance/patchSql.php b/maintenance/patchSql.php
index ddfabbb..9c59d6a 100644 (file)
--- a/maintenance/patchSql.php
+++ b/maintenance/patchSql.php
@@ -39,8 +39,8 @@ class PatchSql extends Maintenance {
                foreach ( $this->mArgs as $arg ) {
                        $files = array(
                                $arg,
-                               DatabaseBase::patchPath( $arg ),
-                               DatabaseBase::patchPath( "patch-$arg.sql" ),
+                               $dbw->patchPath( $arg ),
+                               $dbw->patchPath( "patch-$arg.sql" ),
                        );
                        foreach ( $files as $file ) {
                                if ( file_exists( $file ) ) {

diff --git a/maintenance/tests/phpunit/phpunit.php b/maintenance/tests/phpunit/phpunit.php
index 759c9b5..c643a44 100755 (executable)
--- a/maintenance/tests/phpunit/phpunit.php
+++ b/maintenance/tests/phpunit/phpunit.php
@@ -23,12 +23,6 @@ $wgLocaltimezone = 'UTC';
 // To prevent tests from failing with SQLite, we need to turn database caching off
 $wgCaches[CACHE_DB] = false;
 
-$targetFile = wfIsWindows() ? 'phpunit.php' : 'phpunit';
-$pathSeparator = wfIsWindows() ? ';' : ':';
-
-$folders = explode( $pathSeparator, getenv('PATH') );
-
 require_once( 'PHPUnit/TextUI/Command.php' );
-define( 'PHPUnit_MAIN_METHOD', 'PHPUnit_TextUI_Command::main' );
 PHPUnit_TextUI_Command::main();