X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2Fshell.php;h=f5ebc025ee96e9b9ee16cb2f4fecf9a5824832a9;hb=9d31e46d0f4dc6d68ad38b09816bea2b447f8b50;hp=c8a8a4527fa4f524e53bb5ef923a4ee7ce53f86b;hpb=07a791ffd1d80c6a8f2ca4dfdbc3f2002ac869fe;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/shell.php b/maintenance/shell.php
index c8a8a4527f..f5ebc025ee 100644
--- a/maintenance/shell.php
+++ b/maintenance/shell.php
@@ -67,8 +67,12 @@ class MediaWikiShell extends Maintenance {
 		// add this after initializing the code cleaner so all the default passes get added first
 		$traverser->addVisitor( new CodeCleanerGlobalsPass() );
 
-		$config = new \Psy\Configuration( [ 'codeCleaner' => $codeCleaner ] );
+		$config = new \Psy\Configuration();
+		$config->setCodeCleaner( $codeCleaner );
 		$config->setUpdateCheck( \Psy\VersionUpdater\Checker::NEVER );
+		// prevent https://github.com/bobthecow/psysh/issues/443 when using sudo -E
+		$config->setRuntimeDir( wfTempDir() );
+
 		$shell = new \Psy\Shell( $config );
 		if ( $this->hasOption( 'd' ) ) {
 			$this->setupLegacy();
@@ -89,8 +93,8 @@ class MediaWikiShell extends Maintenance {
 		}
 		if ( $d > 1 ) {
 			# Set DBO_DEBUG (equivalent of $wgDebugDumpSql)
-			wfGetDB( DB_MASTER )->setFlag( DBO_DEBUG );
-			wfGetDB( DB_REPLICA )->setFlag( DBO_DEBUG );
+			$this->getDB( DB_MASTER )->setFlag( DBO_DEBUG );
+			$this->getDB( DB_REPLICA )->setFlag( DBO_DEBUG );
 		}
 	}