X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2Fshell.php;h=c8a8a4527fa4f524e53bb5ef923a4ee7ce53f86b;hb=cf02a19cdb114049f209bec637e07a0c97ae8fca;hp=47ef8045b13dba71662d04cc3e01a27a4a928f8b;hpb=bdfa96eb726c9997a010f5a194eec71925bfddc2;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/shell.php b/maintenance/shell.php
index 47ef8045b1..c8a8a4527f 100644
--- a/maintenance/shell.php
+++ b/maintenance/shell.php
@@ -34,6 +34,10 @@
  * @author Gergő Tisza <tgr.huwiki@gmail.com>
  */
 
+use MediaWiki\Logger\LoggerFactory;
+use MediaWiki\Logger\ConsoleSpi;
+use MediaWiki\MediaWikiServices;
+
 require_once __DIR__ . '/Maintenance.php';
 
 /**
@@ -46,15 +50,15 @@ class MediaWikiShell extends Maintenance {
 		parent::__construct();
 		$this->addOption( 'd',
 			'For back compatibility with eval.php. ' .
-			'0 send debug to stdout. ' .
-			'With 1 additionally initialize database with debugging ',
+			'1 send debug to stderr. ' .
+			'With 2 additionally initialize database with debugging ',
 			false, true
 		);
 	}
 
 	public function execute() {
 		if ( !class_exists( \Psy\Shell::class ) ) {
-			$this->error( 'PsySH not found. Please run composer with the --dev option.', 1 );
+			$this->fatalError( 'PsySH not found. Please run composer with the --dev option.' );
 		}
 
 		$traverser = new \PhpParser\NodeTraverser();
@@ -77,26 +81,20 @@ class MediaWikiShell extends Maintenance {
 	 * For back compatibility with eval.php
 	 */
 	protected function setupLegacy() {
-		global $wgDebugLogFile;
-
 		$d = intval( $this->getOption( 'd' ) );
 		if ( $d > 0 ) {
-			$wgDebugLogFile = 'php://stdout';
+			LoggerFactory::registerProvider( new ConsoleSpi );
+			// Some services hold Logger instances in object properties
+			MediaWikiServices::resetGlobalInstance();
 		}
 		if ( $d > 1 ) {
 			# Set DBO_DEBUG (equivalent of $wgDebugDumpSql)
-			# XXX copy pasted from eval.php :(
-			$lb = wfGetLB();
-			$serverCount = $lb->getServerCount();
-			for ( $i = 0; $i < $serverCount; $i++ ) {
-				$server = $lb->getServerInfo( $i );
-				$server['flags'] |= DBO_DEBUG;
-				$lb->setServerInfo( $i, $server );
-			}
+			wfGetDB( DB_MASTER )->setFlag( DBO_DEBUG );
+			wfGetDB( DB_REPLICA )->setFlag( DBO_DEBUG );
 		}
 	}
 
 }
 
-$maintClass = 'MediaWikiShell';
+$maintClass = MediaWikiShell::class;
 require_once RUN_MAINTENANCE_IF_MAIN;