Merge "Revert "Use display name in category page subheadings if provided""

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

diff --git a/maintenance/orphans.php b/maintenance/orphans.php
index 24ead60..e4f3e91 100644 (file)
--- a/maintenance/orphans.php
+++ b/maintenance/orphans.php
@@ -56,15 +56,15 @@ class Orphans extends Maintenance {
 
        /**
         * Lock the appropriate tables for the script
-        * @param DatabaseBase $db
+        * @param Database $db
         * @param string $extraTable The name of any extra tables to lock (eg: text)
         */
-       private function lockTables( $db, $extraTable = array() ) {
-               $tbls = array( 'page', 'revision', 'redirect' );
+       private function lockTables( $db, $extraTable = [] ) {
+               $tbls = [ 'page', 'revision', 'redirect' ];
                if ( $extraTable ) {
                        $tbls = array_merge( $tbls, $extraTable );
                }
-               $db->lockTables( array(), $tbls, __METHOD__, false );
+               $db->lockTables( [], $tbls, __METHOD__, false );
        }
 
        /**
@@ -108,7 +108,7 @@ class Orphans extends Maintenance {
                                        $wgContLang->truncate( $row->rev_user_text, 17 ),
                                        $comment ) );
                                if ( $fix ) {
-                                       $dbw->delete( 'revision', array( 'rev_id' => $row->rev_id ) );
+                                       $dbw->delete( 'revision', [ 'rev_id' => $row->rev_id ] );
                                }
                        }
                        if ( !$fix ) {
@@ -156,7 +156,7 @@ class Orphans extends Maintenance {
                                        $row->page_namespace,
                                        $row->page_title );
                                if ( $fix ) {
-                                       $dbw->delete( 'page', array( 'page_id' => $row->page_id ) );
+                                       $dbw->delete( 'page', [ 'page_id' => $row->page_id ] );
                                }
                        }
                        if ( !$fix ) {
@@ -181,7 +181,7 @@ class Orphans extends Maintenance {
                $revision = $dbw->tableName( 'revision' );
 
                if ( $fix ) {
-                       $this->lockTables( $dbw, array( 'user', 'text' ) );
+                       $this->lockTables( $dbw, [ 'user', 'text' ] );
                }
 
                $this->output( "\nChecking for pages whose page_latest links are incorrect... "
@@ -215,9 +215,9 @@ class Orphans extends Maintenance {
                                                $maxId = $dbw->selectField(
                                                        'revision',
                                                        'rev_id',
-                                                       array(
+                                                       [
                                                                'rev_page' => $row->page_id,
-                                                               'rev_timestamp' => $row2->max_timestamp ) );
+                                                               'rev_timestamp' => $row2->max_timestamp ] );
                                                $this->output( "... updating to revision $maxId\n" );
                                                $maxRev = Revision::newFromId( $maxId );
                                                $title = Title::makeTitle( $row->page_namespace, $row->page_title );