X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2FcleanupWatchlist.php;h=9728ac5ded89eb75118647e88c6b030ab9eb1ab4;hb=0977b6c1f6a0886803831aa2012895d8c847d0c9;hp=94e90db67a326929755f505b0e5dbbc2116dde88;hpb=16a5102765b883ade759e0eb25d0a2bc02aab02a;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/cleanupWatchlist.php b/maintenance/cleanupWatchlist.php
index 94e90db67a..9728ac5ded 100644
--- a/maintenance/cleanupWatchlist.php
+++ b/maintenance/cleanupWatchlist.php
@@ -37,16 +37,16 @@ require_once __DIR__ . '/cleanupTable.inc';
  * @ingroup Maintenance
  */
 class WatchlistCleanup extends TableCleanup {
-	protected $defaultParams = array(
+	protected $defaultParams = [
 		'table' => 'watchlist',
-		'index' => array( 'wl_user', 'wl_namespace', 'wl_title' ),
-		'conds' => array(),
+		'index' => [ 'wl_user', 'wl_namespace', 'wl_title' ],
+		'conds' => [],
 		'callback' => 'processRow'
-	);
+	];
 
 	public function __construct() {
 		parent::__construct();
-		$this->mDescription = "Script to remove broken, unparseable titles in the Watchlist";
+		$this->addDescription( 'Script to remove broken, unparseable titles in the Watchlist' );
 		$this->addOption( 'fix', 'Actually remove entries; without will only report.' );
 	}
 
@@ -65,9 +65,11 @@ class WatchlistCleanup extends TableCleanup {
 		$title = Title::newFromText( $verified );
 
 		if ( $row->wl_user == 0 || is_null( $title ) || !$title->equals( $current ) ) {
-			$this->output( "invalid watch by {$row->wl_user} for ({$row->wl_namespace}, \"{$row->wl_title}\")\n" );
+			$this->output( "invalid watch by {$row->wl_user} for "
+				. "({$row->wl_namespace}, \"{$row->wl_title}\")\n" );
 			$updated = $this->removeWatch( $row );
 			$this->progress( $updated );
+
 			return;
 		}
 		$this->progress( 0 );
@@ -75,13 +77,17 @@ class WatchlistCleanup extends TableCleanup {
 
 	private function removeWatch( $row ) {
 		if ( !$this->dryrun && $this->hasOption( 'fix' ) ) {
-			$dbw = wfGetDB( DB_MASTER );
-			$dbw->delete( 'watchlist', array(
+			$dbw = $this->getDB( DB_MASTER );
+			$dbw->delete(
+				'watchlist', [
 				'wl_user' => $row->wl_user,
 				'wl_namespace' => $row->wl_namespace,
-				'wl_title' => $row->wl_title ),
-			__METHOD__ );
+				'wl_title' => $row->wl_title ],
+				__METHOD__
+			);
+
 			$this->output( "- removed\n" );
+
 			return 1;
 		} else {
 			return 0;