X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2Forphans.php;h=7b8f2cd96a1068b844afdec68d888c5a0a7f2ca7;hb=17395ea3d473219259b87de1770c5d3d08961444;hp=7e27107a44db45f4e008aa9187a075bdffdd9523;hpb=05b8af8b91dac965c67571668187d1dc2511ae03;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/orphans.php b/maintenance/orphans.php
index 7e27107a44..7b8f2cd96a 100644
--- a/maintenance/orphans.php
+++ b/maintenance/orphans.php
@@ -39,10 +39,11 @@ require_once __DIR__ . '/Maintenance.php';
 class Orphans extends Maintenance {
 	public function __construct() {
 		parent::__construct();
-		$this->mDescription = "Look for 'orphan' revisions hooked to pages which don't exist\n" .
+		$this->addDescription( "Look for 'orphan' revisions hooked to pages which don't exist\n" .
 			"and 'childless' pages with no revisions\n" .
 			"Then, kill the poor widows and orphans\n" .
-			"Man this is depressing";
+			"Man this is depressing"
+		);
 		$this->addOption( 'fix', 'Actually fix broken entries' );
 	}
 
@@ -58,12 +59,12 @@ class Orphans extends Maintenance {
 	 * @param DatabaseBase $db
 	 * @param string $extraTable The name of any extra tables to lock (eg: text)
 	 */
-	private function lockTables( $db, $extraTable = array() ) {
-		$tbls = array( 'page', 'revision', 'redirect' );
+	private function lockTables( $db, $extraTable = [] ) {
+		$tbls = [ 'page', 'revision', 'redirect' ];
 		if ( $extraTable ) {
 			$tbls = array_merge( $tbls, $extraTable );
 		}
-		$db->lockTables( array(), $tbls, __METHOD__, false );
+		$db->lockTables( [], $tbls, __METHOD__, false );
 	}
 
 	/**
@@ -71,7 +72,7 @@ class Orphans extends Maintenance {
 	 * @param bool $fix Whether to fix broken revisions when found
 	 */
 	private function checkOrphans( $fix ) {
-		$dbw = wfGetDB( DB_MASTER );
+		$dbw = $this->getDB( DB_MASTER );
 		$page = $dbw->tableName( 'page' );
 		$revision = $dbw->tableName( 'revision' );
 
@@ -107,7 +108,7 @@ class Orphans extends Maintenance {
 					$wgContLang->truncate( $row->rev_user_text, 17 ),
 					$comment ) );
 				if ( $fix ) {
-					$dbw->delete( 'revision', array( 'rev_id' => $row->rev_id ) );
+					$dbw->delete( 'revision', [ 'rev_id' => $row->rev_id ] );
 				}
 			}
 			if ( !$fix ) {
@@ -129,7 +130,7 @@ class Orphans extends Maintenance {
 	 *       but valid revisions do exist)
 	 */
 	private function checkWidows( $fix ) {
-		$dbw = wfGetDB( DB_MASTER );
+		$dbw = $this->getDB( DB_MASTER );
 		$page = $dbw->tableName( 'page' );
 		$revision = $dbw->tableName( 'revision' );
 
@@ -155,7 +156,7 @@ class Orphans extends Maintenance {
 					$row->page_namespace,
 					$row->page_title );
 				if ( $fix ) {
-					$dbw->delete( 'page', array( 'page_id' => $row->page_id ) );
+					$dbw->delete( 'page', [ 'page_id' => $row->page_id ] );
 				}
 			}
 			if ( !$fix ) {
@@ -175,12 +176,12 @@ class Orphans extends Maintenance {
 	 * @param bool $fix Whether to fix broken entries
 	 */
 	private function checkSeparation( $fix ) {
-		$dbw = wfGetDB( DB_MASTER );
+		$dbw = $this->getDB( DB_MASTER );
 		$page = $dbw->tableName( 'page' );
 		$revision = $dbw->tableName( 'revision' );
 
 		if ( $fix ) {
-			$this->lockTables( $dbw, array( 'user', 'text' ) );
+			$this->lockTables( $dbw, [ 'user', 'text' ] );
 		}
 
 		$this->output( "\nChecking for pages whose page_latest links are incorrect... "
@@ -214,9 +215,9 @@ class Orphans extends Maintenance {
 						$maxId = $dbw->selectField(
 							'revision',
 							'rev_id',
-							array(
+							[
 								'rev_page' => $row->page_id,
-								'rev_timestamp' => $row2->max_timestamp ) );
+								'rev_timestamp' => $row2->max_timestamp ] );
 						$this->output( "... updating to revision $maxId\n" );
 						$maxRev = Revision::newFromId( $maxId );
 						$title = Title::makeTitle( $row->page_namespace, $row->page_title );