X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2FpurgeChangedPages.php;h=cb4f85d382e144f512b9707036f9d42dc7048dbe;hb=49748181dd56ec97e7ba7c13e684a16abceb3cc0;hp=31500c9ce05b82c6ee16bffce6fb82ed93411b9f;hpb=f6a7f38a000f7b390f85c52ac9c14fe381949c37;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/purgeChangedPages.php b/maintenance/purgeChangedPages.php
index 31500c9ce0..cf65c69315 100644
--- a/maintenance/purgeChangedPages.php
+++ b/maintenance/purgeChangedPages.php
@@ -23,6 +23,8 @@
 
 require_once __DIR__ . '/Maintenance.php';
 
+use Wikimedia\Rdbms\ResultWrapper;
+
 /**
  * Maintenance script that sends purge requests for pages edited in a date
  * range to squid/varnish.
@@ -36,7 +38,7 @@ class PurgeChangedPages extends Maintenance {
 
 	public function __construct() {
 		parent::__construct();
-		$this->mDescription = 'Send purge requests for edits in date range to squid/varnish';
+		$this->addDescription( 'Send purge requests for edits in date range to squid/varnish' );
 		$this->addOption( 'starttime', 'Starting timestamp', true, true );
 		$this->addOption( 'endtime', 'Ending timestamp', true, true );
 		$this->addOption( 'htcp-dest', 'HTCP announcement destination (IP:port)', false, true );
@@ -57,15 +59,15 @@ class PurgeChangedPages extends Maintenance {
 			}
 
 			// Route all HTCP messages to provided host:port
-			$wgHTCPRouting = array(
-				'' => array( 'host' => $parts[0], 'port' => $parts[1] ),
-			);
+			$wgHTCPRouting = [
+				'' => [ 'host' => $parts[0], 'port' => $parts[1] ],
+			];
 			if ( $this->hasOption( 'verbose' ) ) {
 				$this->output( "HTCP broadcasts to {$parts[0]}:{$parts[1]}\n" );
 			}
 		}
 
-		$dbr = $this->getDB( DB_SLAVE );
+		$dbr = $this->getDB( DB_REPLICA );
 		$minTime = $dbr->timestamp( $this->getOption( 'starttime' ) );
 		$maxTime = $dbr->timestamp( $this->getOption( 'endtime' ) );
 
@@ -80,25 +82,25 @@ class PurgeChangedPages extends Maintenance {
 			$bSize = $this->mBatchSize + ( $stuckCount * $this->mBatchSize );
 
 			$res = $dbr->select(
-				array( 'page', 'revision' ),
-				array(
+				[ 'page', 'revision' ],
+				[
 					'rev_timestamp',
 					'page_namespace',
 					'page_title',
-				),
-				array(
+				],
+				[
 					"rev_timestamp > " . $dbr->addQuotes( $minTime ),
 					"rev_timestamp <= " . $dbr->addQuotes( $maxTime ),
 					// Only get rows where the revision is the latest for the page.
 					// Other revisions would be duplicate and we don't need to purge if
 					// there has been an edit after the interesting time window.
 					"page_latest = rev_id",
-				),
+				],
 				__METHOD__,
-				array( 'ORDER BY' => 'rev_timestamp', 'LIMIT' => $bSize ),
-				array(
-					'page' => array( 'INNER JOIN', 'rev_page=page_id' ),
-				)
+				[ 'ORDER BY' => 'rev_timestamp', 'LIMIT' => $bSize ],
+				[
+					'page' => [ 'INNER JOIN', 'rev_page=page_id' ],
+				]
 			);
 
 			if ( !$res->numRows() ) {
@@ -121,7 +123,7 @@ class PurgeChangedPages extends Maintenance {
 			$minTime = $lastTime;
 
 			// Create list of URLs from page_namespace + page_title
-			$urls = array();
+			$urls = [];
 			foreach ( $rows as $row ) {
 				$title = Title::makeTitle( $row->page_namespace, $row->page_title );
 				$urls[] = $title->getInternalURL();
@@ -170,9 +172,9 @@ class PurgeChangedPages extends Maintenance {
 		$rows = iterator_to_array( $res, false );
 		$count = count( $rows );
 		if ( !$count ) {
-			return array( array(), null ); // nothing to do
+			return [ [], null ]; // nothing to do
 		} elseif ( $count < $limit ) {
-			return array( $rows, $rows[$count - 1]->$column ); // no more rows left
+			return [ $rows, $rows[$count - 1]->$column ]; // no more rows left
 		}
 		$lastValue = $rows[$count - 1]->$column; // should be the highest
 		for ( $i = $count - 1; $i >= 0; --$i ) {
@@ -184,7 +186,7 @@ class PurgeChangedPages extends Maintenance {
 		}
 		$lastValueLeft = count( $rows ) ? $rows[count( $rows ) - 1]->$column : null;
 
-		return array( $rows, $lastValueLeft );
+		return [ $rows, $lastValueLeft ];
 	}
 }