Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Fix MaintenanceRunner test failures on Windows"

Browse source
This commit is contained in:
jenkins-bot 2024-05-03 11:46:33 +00:00 committed by Gerrit Code Review
commit 0bf0b4d118
1 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
maintenance/includes/MaintenanceRunner.php
View file

@ -356,15 +356,14 @@ class MaintenanceRunner {
return;
}
$scriptClass = $this->expandScriptClass( $scriptName, null );
$scriptFile = $this->expandScriptFile( $scriptName, null );
$scriptClass = null;
if ( file_exists( $scriptFile ) ) {
$scriptClass = $this->loadScriptFile( $scriptFile );
}
if ( !$scriptClass ) {
$scriptClass = $this->expandScriptClass( $scriptName, null );
if ( !class_exists( $scriptClass ) && file_exists( $scriptFile ) ) {
$scriptFileClass = $this->loadScriptFile( $scriptFile );
if ( $scriptFileClass ) {
$scriptClass = $scriptFileClass;
}
}
// NOTE: class_exists will trigger auto-loading, so file-level code in the script file will run.
@ -414,15 +413,14 @@ class MaintenanceRunner {
$extension = null;
}
$scriptClass = $this->expandScriptClass( $scriptName, $extension );
$scriptFile = $this->expandScriptFile( $scriptName, $extension );
$scriptClass = null;
if ( file_exists( $scriptFile ) ) {
$scriptClass = $this->loadScriptFile( $scriptFile );
}
if ( !$scriptClass ) {
$scriptClass = $this->expandScriptClass( $scriptName, $extension );
if ( !class_exists( $scriptClass ) && file_exists( $scriptFile ) ) {
$scriptFileClass = $this->loadScriptFile( $scriptFile );
if ( $scriptFileClass ) {
$scriptClass = $scriptFileClass;
}
}
if ( !class_exists( $scriptClass ) ) {