Fix phpcs issues from LanguageConverter patches

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

diff --git a/maintenance/migrateUserGroup.php b/maintenance/migrateUserGroup.php
index df6665a..ad82542 100644 (file)
--- a/maintenance/migrateUserGroup.php
+++ b/maintenance/migrateUserGroup.php
@@ -42,17 +42,18 @@ class MigrateUserGroup extends Maintenance {
                $oldGroup = $this->getArg( 0 );
                $newGroup = $this->getArg( 1 );
                $dbw = $this->getDB( DB_MASTER );
+               $batchSize = $this->getBatchSize();
                $start = $dbw->selectField( 'user_groups', 'MIN(ug_user)',
-                       array( 'ug_group' => $oldGroup ), __FUNCTION__ );
+                       [ 'ug_group' => $oldGroup ], __FUNCTION__ );
                $end = $dbw->selectField( 'user_groups', 'MAX(ug_user)',
-                       array( 'ug_group' => $oldGroup ), __FUNCTION__ );
+                       [ 'ug_group' => $oldGroup ], __FUNCTION__ );
                if ( $start === null ) {
                        $this->error( "Nothing to do - no users in the '$oldGroup' group", true );
                }
                # Do remaining chunk
-               $end += $this->mBatchSize - 1;
+               $end += $batchSize - 1;
                $blockStart = $start;
-               $blockEnd = $start + $this->mBatchSize - 1;
+               $blockEnd = $start + $batchSize - 1;
                // Migrate users over in batches...
                while ( $blockEnd <= $end ) {
                        $affected = 0;
@@ -60,11 +61,11 @@ class MigrateUserGroup extends Maintenance {
 
                        $this->beginTransaction( $dbw, __METHOD__ );
                        $dbw->update( 'user_groups',
-                               array( 'ug_group' => $newGroup ),
-                               array( 'ug_group' => $oldGroup,
-                                       "ug_user BETWEEN $blockStart AND $blockEnd" ),
+                               [ 'ug_group' => $newGroup ],
+                               [ 'ug_group' => $oldGroup,
+                                       "ug_user BETWEEN $blockStart AND $blockEnd" ],
                                __METHOD__,
-                               array( 'IGNORE' )
+                               [ 'IGNORE' ]
                        );
                        $affected += $dbw->affectedRows();
                        // Delete rows that the UPDATE operation above had to ignore.
@@ -72,20 +73,20 @@ class MigrateUserGroup extends Maintenance {
                        // Updating the row for the old group membership failed since
                        // user/group is UNIQUE.
                        $dbw->delete( 'user_groups',
-                               array( 'ug_group' => $oldGroup,
-                                       "ug_user BETWEEN $blockStart AND $blockEnd" ),
+                               [ 'ug_group' => $oldGroup,
+                                       "ug_user BETWEEN $blockStart AND $blockEnd" ],
                                __METHOD__
                        );
                        $affected += $dbw->affectedRows();
                        $this->commitTransaction( $dbw, __METHOD__ );
 
-                       // Clear cache for the affected users (bug 40340)
+                       // Clear cache for the affected users (T42340)
                        if ( $affected > 0 ) {
                                // XXX: This also invalidates cache of unaffected users that
                                // were in the new group and not in the group.
                                $res = $dbw->select( 'user_groups', 'ug_user',
-                                       array( 'ug_group' => $newGroup,
-                                               "ug_user BETWEEN $blockStart AND $blockEnd" ),
+                                       [ 'ug_group' => $newGroup,
+                                               "ug_user BETWEEN $blockStart AND $blockEnd" ],
                                        __METHOD__
                                );
                                if ( $res !== false ) {
@@ -97,8 +98,8 @@ class MigrateUserGroup extends Maintenance {
                        }
 
                        $count += $affected;
-                       $blockStart += $this->mBatchSize;
-                       $blockEnd += $this->mBatchSize;
+                       $blockStart += $batchSize;
+                       $blockEnd += $batchSize;
                        wfWaitForSlaves();
                }
                $this->output( "Done! $count users in group '$oldGroup' are now in '$newGroup' instead.\n" );