$maintClass = false;
+// Some extensions rely on MW_INSTALL_PATH to find core files to include. Setting it here helps them
+// if they're included by a core script (like DatabaseUpdater) after Maintenance.php has already
+// been run.
+if ( strval( getenv( 'MW_INSTALL_PATH' ) ) === '' ) {
+ putenv( 'MW_INSTALL_PATH=' . realpath( __DIR__ . '/..' ) );
+}
+
use Wikimedia\Rdbms\IDatabase;
use MediaWiki\Logger\LoggerFactory;
use MediaWiki\MediaWikiServices;
* their own constructors
*/
public function __construct() {
- // Setup $IP, using MW_INSTALL_PATH if it exists
global $IP;
- $IP = strval( getenv( 'MW_INSTALL_PATH' ) ) !== ''
- ? getenv( 'MW_INSTALL_PATH' )
- : realpath( __DIR__ . '/..' );
+ $IP = getenv( 'MW_INSTALL_PATH' );
$this->addDefaultParams();
register_shutdown_function( [ $this, 'outputChanneled' ], false );
* @return bool
*/
protected function hasArg( $argId = 0 ) {
+ if ( func_num_args() === 0 ) {
+ wfDeprecated( __METHOD__ . ' without an $argId', '1.33' );
+ }
+
return isset( $this->mArgs[$argId] );
}
* @return mixed
*/
protected function getArg( $argId = 0, $default = null ) {
+ if ( func_num_args() === 0 ) {
+ wfDeprecated( __METHOD__ . ' without an $argId', '1.33' );
+ }
+
return $this->hasArg( $argId ) ? $this->mArgs[$argId] : $default;
}
}
/**
- * @var $child Maintenance
+ * @var Maintenance $child
*/
$child = new $maintClass();
$child->loadParamsAndArgs( $this->mSelf, $this->mOptions, $this->mArgs );
if ( $wgDBservers ) {
/**
- * @var $wgDBservers array
+ * @var array $wgDBservers
*/
foreach ( $wgDBservers as $i => $server ) {
$wgDBservers[$i]['user'] = $wgDBuser;
$bash = ExecutableFinder::findInDefaultPaths( 'bash' );
if ( !wfIsWindows() && $bash ) {
$retval = false;
- $encPrompt = wfEscapeShellArg( $prompt );
+ $encPrompt = Shell::escape( $prompt );
$command = "read -er -p $encPrompt && echo \"\$REPLY\"";
- $encCommand = wfEscapeShellArg( $command );
- $line = wfShellExec( "$bash -c $encCommand", $retval, [], [ 'walltime' => 0 ] );
+ $encCommand = Shell::escape( $command );
+ $line = Shell::escape( "$bash -c $encCommand", $retval, [], [ 'walltime' => 0 ] );
if ( $retval == 0 ) {
return $line;