X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2FupdateRestrictions.php;h=2f3fc36534e179b6ffe6c5994ef77534d1823c6a;hb=dfafef8e706af54706d2de621b845085604f154d;hp=98d9389f9f4f21e784478b041c55f0d00b48e2b1;hpb=00cef5ba5952d23e315f031a56c08855fd266b98;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/updateRestrictions.php b/maintenance/updateRestrictions.php
index 98d9389f9f..2f3fc36534 100644
--- a/maintenance/updateRestrictions.php
+++ b/maintenance/updateRestrictions.php
@@ -36,7 +36,7 @@ class UpdateRestrictions extends Maintenance {
 	public function __construct() {
 		parent::__construct();
 		$this->addDescription( 'Updates page_restrictions table from old page_restriction column' );
-		$this->setBatchSize( 100 );
+		$this->setBatchSize( 1000 );
 	}
 
 	public function execute() {
@@ -57,17 +57,17 @@ class UpdateRestrictions extends Maintenance {
 		$blockEnd = $start + $this->mBatchSize - 1;
 		$encodedExpiry = 'infinity';
 		while ( $blockEnd <= $end ) {
-			$this->output( "...doing page_id from $blockStart to $blockEnd\n" );
+			$this->output( "...doing page_id from $blockStart to $blockEnd out of $end\n" );
 			$cond = "page_id BETWEEN $blockStart AND $blockEnd AND page_restrictions !=''";
 			$res = $db->select(
 				'page',
-				array( 'page_id', 'page_namespace', 'page_restrictions' ),
+				[ 'page_id', 'page_namespace', 'page_restrictions' ],
 				$cond,
 				__METHOD__
 			);
-			$batch = array();
+			$batch = [];
 			foreach ( $res as $row ) {
-				$oldRestrictions = array();
+				$oldRestrictions = [];
 				foreach ( explode( ':', trim( $row->page_restrictions ) ) as $restrict ) {
 					$temp = explode( '=', trim( $restrict ) );
 					// Make sure we are not settings restrictions to ""
@@ -81,26 +81,26 @@ class UpdateRestrictions extends Maintenance {
 				}
 				# Clear invalid columns
 				if ( $row->page_namespace == NS_MEDIAWIKI ) {
-					$db->update( 'page', array( 'page_restrictions' => '' ),
-						array( 'page_id' => $row->page_id ), __FUNCTION__ );
+					$db->update( 'page', [ 'page_restrictions' => '' ],
+						[ 'page_id' => $row->page_id ], __FUNCTION__ );
 					$this->output( "...removed dead page_restrictions column for page {$row->page_id}\n" );
 				}
 				# Update restrictions table
 				foreach ( $oldRestrictions as $action => $restrictions ) {
-					$batch[] = array(
+					$batch[] = [
 						'pr_page' => $row->page_id,
 						'pr_type' => $action,
 						'pr_level' => $restrictions,
 						'pr_cascade' => 0,
 						'pr_expiry' => $encodedExpiry
-					);
+					];
 				}
 			}
 			# We use insert() and not replace() as Article.php replaces
 			# page_restrictions with '' when protected in the restrictions table
 			if ( count( $batch ) ) {
-				$ok = $db->deadlockLoop( array( $db, 'insert' ), 'page_restrictions',
-					$batch, __FUNCTION__, array( 'IGNORE' ) );
+				$ok = $db->deadlockLoop( [ $db, 'insert' ], 'page_restrictions',
+					$batch, __FUNCTION__, [ 'IGNORE' ] );
 				if ( !$ok ) {
 					throw new MWException( "Deadlock loop failed wtf :(" );
 				}
@@ -111,14 +111,14 @@ class UpdateRestrictions extends Maintenance {
 		}
 		$this->output( "...removing dead rows from page_restrictions\n" );
 		// Kill any broken rows from previous imports
-		$db->delete( 'page_restrictions', array( 'pr_level' => '' ) );
+		$db->delete( 'page_restrictions', [ 'pr_level' => '' ] );
 		// Kill other invalid rows
 		$db->deleteJoin(
 			'page_restrictions',
 			'page',
 			'pr_page',
 			'page_id',
-			array( 'page_namespace' => NS_MEDIAWIKI )
+			[ 'page_namespace' => NS_MEDIAWIKI ]
 		);
 		$this->output( "...Done!\n" );
 	}