X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2FwrapOldPasswords.php;h=2ce19e54867cafd5beaa72f68eb0577ac2886cb7;hb=a465d1dbeb220610bf856228b88b72e6b756a700;hp=37272a018f0d3728815fdbf14b988788a71a2260;hpb=abb5869cba1cca1c7d9bedfda6d3831bf2fc11a0;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/wrapOldPasswords.php b/maintenance/wrapOldPasswords.php
index 37272a018f..2ce19e5486 100644
--- a/maintenance/wrapOldPasswords.php
+++ b/maintenance/wrapOldPasswords.php
@@ -32,7 +32,7 @@ require_once __DIR__ . '/Maintenance.php';
 class WrapOldPasswords extends Maintenance {
 	public function __construct() {
 		parent::__construct();
-		$this->mDescription = "Wrap all passwords of a certain type in a new layered type";
+		$this->addDescription( 'Wrap all passwords of a certain type in a new layered type' );
 		$this->addOption( 'type',
 			'Password type to wrap passwords in (must inherit LayeredParameterizedPassword)', true, true );
 		$this->addOption( 'verbose', 'Enables verbose output', false, false, 'v' );
@@ -72,24 +72,24 @@ class WrapOldPasswords extends Maintenance {
 
 		$minUserId = 0;
 		do {
-			$dbw->begin();
+			$this->beginTransaction( $dbw, __METHOD__ );
 
 			$res = $dbw->select( 'user',
-				array( 'user_id', 'user_name', 'user_password' ),
-				array(
+				[ 'user_id', 'user_name', 'user_password' ],
+				[
 					'user_id > ' . $dbw->addQuotes( $minUserId ),
 					$typeCond
-				),
+				],
 				__METHOD__,
-				array(
+				[
 					'ORDER BY' => 'user_id',
 					'LIMIT' => $this->mBatchSize,
 					'LOCK IN SHARE MODE',
-				)
+				]
 			);
 
 			/** @var User[] $updateUsers */
-			$updateUsers = array();
+			$updateUsers = [];
 			foreach ( $res as $row ) {
 				if ( $this->hasOption( 'verbose' ) ) {
 					$this->output( "Updating password for user {$row->user_name} ({$row->user_id}).\n" );
@@ -104,15 +104,15 @@ class WrapOldPasswords extends Maintenance {
 
 				$updateUsers[] = $user;
 				$dbw->update( 'user',
-					array( 'user_password' => $layeredPassword->toString() ),
-					array( 'user_id' => $row->user_id ),
+					[ 'user_password' => $layeredPassword->toString() ],
+					[ 'user_id' => $row->user_id ],
 					__METHOD__
 				);
 
 				$minUserId = $row->user_id;
 			}
 
-			$dbw->commit();
+			$this->commitTransaction( $dbw, __METHOD__ );
 
 			// Clear memcached so old passwords are wiped out
 			foreach ( $updateUsers as $user ) {