Merge "BaseTemplate: Handle `$this->data['language_urls'] === false` specially"

[lhc/web/wiklou.git] / maintenance / populateLogUsertext.php

diff --git a/maintenance/populateLogUsertext.php b/maintenance/populateLogUsertext.php
index fa9d512..dd120fe 100644 (file)
--- a/maintenance/populateLogUsertext.php
+++ b/maintenance/populateLogUsertext.php
@@ -24,7 +24,7 @@
  * @ingroup Maintenance
  */
 
-require_once( __DIR__ . '/Maintenance.php' );
+require_once __DIR__ . '/Maintenance.php';
 
 /**
  * Maintenance script that makes the required database updates for
@@ -35,7 +35,7 @@ require_once( __DIR__ . '/Maintenance.php' );
 class PopulateLogUsertext extends LoggedUpdateMaintenance {
        public function __construct() {
                parent::__construct();
-               $this->mDescription = "Populates the log_user_text field";
+               $this->addDescription( 'Populates the log_user_text field' );
                $this->setBatchSize( 100 );
        }
 
@@ -52,6 +52,7 @@ class PopulateLogUsertext extends LoggedUpdateMaintenance {
                $start = $db->selectField( 'logging', 'MIN(log_id)', false, __METHOD__ );
                if ( !$start ) {
                        $this->output( "Nothing to do.\n" );
+
                        return true;
                }
                $end = $db->selectField( 'logging', 'MAX(log_id)', false, __METHOD__ );
@@ -63,23 +64,24 @@ class PopulateLogUsertext extends LoggedUpdateMaintenance {
                while ( $blockEnd <= $end ) {
                        $this->output( "...doing log_id from $blockStart to $blockEnd\n" );
                        $cond = "log_id BETWEEN $blockStart AND $blockEnd AND log_user = user_id";
-                       $res = $db->select( array( 'logging', 'user' ),
-                               array( 'log_id', 'user_name' ), $cond, __METHOD__ );
+                       $res = $db->select( [ 'logging', 'user' ],
+                               [ 'log_id', 'user_name' ], $cond, __METHOD__ );
 
-                       $db->begin( __METHOD__ );
+                       $this->beginTransaction( $db, __METHOD__ );
                        foreach ( $res as $row ) {
-                               $db->update( 'logging', array( 'log_user_text' => $row->user_name ),
-                                       array( 'log_id' => $row->log_id ), __METHOD__ );
+                               $db->update( 'logging', [ 'log_user_text' => $row->user_name ],
+                                       [ 'log_id' => $row->log_id ], __METHOD__ );
                        }
-                       $db->commit( __METHOD__ );
+                       $this->commitTransaction( $db, __METHOD__ );
                        $blockStart += $this->mBatchSize;
                        $blockEnd += $this->mBatchSize;
                        wfWaitForSlaves();
                }
                $this->output( "Done populating log_user_text field.\n" );
+
                return true;
        }
 }
 
 $maintClass = "PopulateLogUsertext";
-require_once( RUN_MAINTENANCE_IF_MAIN );
+require_once RUN_MAINTENANCE_IF_MAIN;