X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2FMaintenance.php;h=d919249030ba0b9f5a4670bfbd44ef27c8fcb69c;hb=6dab8d553e7661fe07e47ee91fe0e96c66f4bbc1;hp=80fd7b9f70aaa961510c632017532c3810c30884;hpb=e9ed100496b388a31ac2af0deabcc9754984d09d;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/Maintenance.php b/maintenance/Maintenance.php
index 80fd7b9f70..d919249030 100644
--- a/maintenance/Maintenance.php
+++ b/maintenance/Maintenance.php
@@ -203,7 +203,7 @@ abstract class Maintenance {
 	/**
 	 * Do the actual work. All child classes will need to implement this
 	 *
-	 * @return bool|null True for success, false for failure. Not returning
+	 * @return bool|null|void True for success, false for failure. Not returning
 	 *   a value, or returning null, is also interpreted as success. Returning
 	 *   false for failure will cause doMaintenance.php to exit the process
 	 *   with a non-zero exit status.
@@ -253,7 +253,7 @@ abstract class Maintenance {
 	 * this will return an array.
 	 *
 	 * @param string $name The name of the param
-	 * @param mixed $default Anything you want, default null
+	 * @param mixed|null $default Anything you want, default null
 	 * @return mixed
 	 */
 	protected function getOption( $name, $default = null ) {
@@ -309,7 +309,7 @@ abstract class Maintenance {
 	/**
 	 * Get an argument.
 	 * @param int $argId The integer value (from zero) for the arg
-	 * @param mixed $default The default if it doesn't exist
+	 * @param mixed|null $default The default if it doesn't exist
 	 * @return mixed
 	 */
 	protected function getArg( $argId = 0, $default = null ) {
@@ -359,7 +359,7 @@ abstract class Maintenance {
 
 	/**
 	 * Return input from stdin.
-	 * @param int $len The number of bytes to read. If null, just return the handle.
+	 * @param int|null $len The number of bytes to read. If null, just return the handle.
 	 *   Maintenance::STDIN_ALL returns the full length
 	 * @return mixed
 	 */
@@ -388,7 +388,7 @@ abstract class Maintenance {
 	 * Throw some output to the user. Scripts can call this with no fears,
 	 * as we handle all --quiet stuff here
 	 * @param string $out The text to show to the user
-	 * @param mixed $channel Unique identifier for the channel. See function outputChanneled.
+	 * @param mixed|null $channel Unique identifier for the channel. See function outputChanneled.
 	 */
 	protected function output( $out, $channel = null ) {
 		// This is sometimes called very early, before Setup.php is included.
@@ -464,7 +464,7 @@ abstract class Maintenance {
 	 * same channel are concatenated, but any intervening messages in another
 	 * channel start a new line.
 	 * @param string $msg The message without trailing newline
-	 * @param string $channel Channel identifier or null for no
+	 * @param string|null $channel Channel identifier or null for no
 	 *     channel. Channel comparison uses ===.
 	 */
 	public function outputChanneled( $msg, $channel = null ) {
@@ -538,6 +538,7 @@ abstract class Maintenance {
 		if ( $this->getDbType() > 0 ) {
 			$this->addOption( 'dbuser', 'The DB user to use for this script', false, true );
 			$this->addOption( 'dbpass', 'The password to use for this script', false, true );
+			$this->addOption( 'dbgroupdefault', 'The default DB group to use.', false, true );
 		}
 
 		# Save additional script dependant options to display
@@ -660,7 +661,7 @@ abstract class Maintenance {
 	 * Run a child maintenance script. Pass all of the current arguments
 	 * to it.
 	 * @param string $maintClass A name of a child maintenance class
-	 * @param string $classFile Full path of where the child is
+	 * @param string|null $classFile Full path of where the child is
 	 * @return Maintenance
 	 */
 	public function runChild( $maintClass, $classFile = null ) {
@@ -921,9 +922,9 @@ abstract class Maintenance {
 	 * $mOptions becomes an array with keys set to the option names
 	 * $mArgs becomes a zero-based array containing the non-option arguments
 	 *
-	 * @param string $self The name of the script, if any
-	 * @param array $opts An array of options, in form of key=>value
-	 * @param array $args An array of command line arguments
+	 * @param string|null $self The name of the script, if any
+	 * @param array|null $opts An array of options, in form of key=>value
+	 * @param array|null $args An array of command line arguments
 	 */
 	public function loadParamsAndArgs( $self = null, $opts = null, $args = null ) {
 		# If we were given opts or args, set those and return early
@@ -1117,8 +1118,8 @@ abstract class Maintenance {
 	 * Handle some last-minute setup here.
 	 */
 	public function finalSetup() {
-		global $wgCommandLineMode, $wgShowSQLErrors, $wgServer;
-		global $wgDBadminuser, $wgDBadminpassword;
+		global $wgCommandLineMode, $wgServer, $wgShowExceptionDetails, $wgShowHostnames;
+		global $wgDBadminuser, $wgDBadminpassword, $wgDBDefaultGroup;
 		global $wgDBuser, $wgDBpassword, $wgDBservers, $wgLBFactoryConf;
 
 		# Turn off output buffering again, it might have been turned on in the settings files
@@ -1140,6 +1141,11 @@ abstract class Maintenance {
 		if ( $this->mDbPass ) {
 			$wgDBadminpassword = $this->mDbPass;
 		}
+		if ( $this->hasOption( 'dbgroupdefault' ) ) {
+			$wgDBDefaultGroup = $this->getOption( 'dbgroupdefault', null );
+
+			MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->destroy();
+		}
 
 		if ( $this->getDbType() == self::DB_ADMIN && isset( $wgDBadminuser ) ) {
 			$wgDBuser = $wgDBadminuser;
@@ -1171,7 +1177,8 @@ abstract class Maintenance {
 
 		$this->afterFinalSetup();
 
-		$wgShowSQLErrors = true;
+		$wgShowExceptionDetails = true;
+		$wgShowHostnames = true;
 
 		Wikimedia\suppressWarnings();
 		set_time_limit( 0 );
@@ -1600,6 +1607,9 @@ abstract class Maintenance {
 		if ( wfIsWindows() ) {
 			return $default;
 		}
+		if ( Shell::isDisabled() ) {
+			return $default;
+		}
 		// It's possible to get the screen size with VT-100 terminal escapes,
 		// but reading the responses is not possible without setting raw mode
 		// (unless you want to require the user to press enter), and that