Merge "Mark protected IndexPager properties also as protected in subclasses"

diff --git a/includes/actions/HistoryAction.php b/includes/actions/HistoryAction.php
index 7d6b548..140ca2e 100644 (file)
--- a/includes/actions/HistoryAction.php
+++ b/includes/actions/HistoryAction.php
@@ -492,7 +492,7 @@ class HistoryPager extends ReverseChronologicalPager {
                return $s;
        }
 
-       function doBatchLookups() {
+       protected function doBatchLookups() {
                if ( !Hooks::run( 'PageHistoryPager::doBatchLookups', [ $this, $this->mResult ] ) ) {
                        return;
                }
@@ -523,7 +523,7 @@ class HistoryPager extends ReverseChronologicalPager {
         *
         * @return string HTML output
         */
-       function getStartBody() {
+       protected function getStartBody() {
                $this->lastRow = false;
                $this->counter = 1;
                $this->oldIdChecked = 0;
@@ -585,7 +585,7 @@ class HistoryPager extends ReverseChronologicalPager {
                return $element;
        }
 
-       function getEndBody() {
+       protected function getEndBody() {
                if ( $this->lastRow ) {
                        $latest = $this->counter == 1 && $this->mIsFirst;
                        $firstInList = $this->counter == 1;

diff --git a/includes/logging/LogPager.php b/includes/logging/LogPager.php
index e7096c4..b31f165 100644 (file)
--- a/includes/logging/LogPager.php
+++ b/includes/logging/LogPager.php
@@ -365,7 +365,7 @@ class LogPager extends ReverseChronologicalPager {
                return 'log_timestamp';
        }
 
-       public function getStartBody() {
+       protected function getStartBody() {
                # Do a link batch query
                if ( $this->getNumRows() > 0 ) {
                        $lb = new LinkBatch;

diff --git a/includes/pager/TablePager.php b/includes/pager/TablePager.php
index f38ed27..e99c33b 100644 (file)
--- a/includes/pager/TablePager.php
+++ b/includes/pager/TablePager.php
@@ -110,7 +110,7 @@ abstract class TablePager extends IndexPager {
         * @protected
         * @return string
         */
-       function getStartBody() {
+       protected function getStartBody() {
                $sortClass = $this->getSortHeaderClass();
 
                $s = '';
@@ -162,7 +162,7 @@ abstract class TablePager extends IndexPager {
         * @protected
         * @return string
         */
-       function getEndBody() {
+       protected function getEndBody() {
                return "</tbody></table>\n";
        }
 

diff --git a/includes/specials/pagers/ActiveUsersPager.php b/includes/specials/pagers/ActiveUsersPager.php
index 506cd3c..50f1d6b 100644 (file)
--- a/includes/specials/pagers/ActiveUsersPager.php
+++ b/includes/specials/pagers/ActiveUsersPager.php
@@ -136,7 +136,7 @@ class ActiveUsersPager extends UsersPager {
                ];
        }
 
-       function doBatchLookups() {
+       protected function doBatchLookups() {
                parent::doBatchLookups();
 
                $uids = [];

diff --git a/includes/specials/pagers/AllMessagesTablePager.php b/includes/specials/pagers/AllMessagesTablePager.php
index 8363e56..bde7559 100644 (file)
--- a/includes/specials/pagers/AllMessagesTablePager.php
+++ b/includes/specials/pagers/AllMessagesTablePager.php
@@ -276,7 +276,7 @@ class AllMessagesTablePager extends TablePager {
                return $result;
        }
 
-       function getStartBody() {
+       protected function getStartBody() {
                $tableClass = $this->getTableClass();
                return Xml::openElement( 'table', [
                        'class' => "mw-datatable $tableClass",

diff --git a/includes/specials/pagers/ContribsPager.php b/includes/specials/pagers/ContribsPager.php
index 59f26a2..ca13f3d 100644 (file)
--- a/includes/specials/pagers/ContribsPager.php
+++ b/includes/specials/pagers/ContribsPager.php
@@ -429,7 +429,7 @@ class ContribsPager extends RangeChronologicalPager {
                return [ 'rev_id' ];
        }
 
-       function doBatchLookups() {
+       protected function doBatchLookups() {
                # Do a link batch query
                $this->mResult->seek( 0 );
                $parentRevIds = [];
@@ -465,14 +465,14 @@ class ContribsPager extends RangeChronologicalPager {
        /**
         * @return string
         */
-       function getStartBody() {
+       protected function getStartBody() {
                return "<ul class=\"mw-contributions-list\">\n";
        }
 
        /**
         * @return string
         */
-       function getEndBody() {
+       protected function getEndBody() {
                return "</ul>\n";
        }
 

diff --git a/includes/specials/pagers/DeletedContribsPager.php b/includes/specials/pagers/DeletedContribsPager.php
index ee7eb3e..c69a183 100644 (file)
--- a/includes/specials/pagers/DeletedContribsPager.php
+++ b/includes/specials/pagers/DeletedContribsPager.php
@@ -139,11 +139,11 @@ class DeletedContribsPager extends IndexPager {
                return 'ar_timestamp';
        }
 
-       function getStartBody() {
+       protected function getStartBody() {
                return "<ul>\n";
        }
 
-       function getEndBody() {
+       protected function getEndBody() {
                return "</ul>\n";
        }
 

diff --git a/includes/specials/pagers/ImageListPager.php b/includes/specials/pagers/ImageListPager.php
index ab38e1a..a10c32f 100644 (file)
--- a/includes/specials/pagers/ImageListPager.php
+++ b/includes/specials/pagers/ImageListPager.php
@@ -422,7 +422,7 @@ class ImageListPager extends TablePager {
                }
        }
 
-       function doBatchLookups() {
+       protected function doBatchLookups() {
                $userIds = [];
                $this->mResult->seek( 0 );
                foreach ( $this->mResult as $row ) {

diff --git a/includes/specials/pagers/MergeHistoryPager.php b/includes/specials/pagers/MergeHistoryPager.php
index 6a8f7da..3dbec6a 100644 (file)
--- a/includes/specials/pagers/MergeHistoryPager.php
+++ b/includes/specials/pagers/MergeHistoryPager.php
@@ -48,7 +48,7 @@ class MergeHistoryPager extends ReverseChronologicalPager {
                parent::__construct( $form->getContext() );
        }
 
-       function getStartBody() {
+       protected function getStartBody() {
                # Do a link batch query
                $this->mResult->seek( 0 );
                $batch = new LinkBatch();

diff --git a/includes/specials/pagers/NewFilesPager.php b/includes/specials/pagers/NewFilesPager.php
index 6b7e4b8..6e16e79 100644 (file)
--- a/includes/specials/pagers/NewFilesPager.php
+++ b/includes/specials/pagers/NewFilesPager.php
@@ -168,7 +168,7 @@ class NewFilesPager extends RangeChronologicalPager {
                return 'img_timestamp';
        }
 
-       function getStartBody() {
+       protected function getStartBody() {
                if ( !$this->gallery ) {
                        // Note that null for mode is taken to mean use default.
                        $mode = $this->getRequest()->getVal( 'gallerymode', null );
@@ -183,7 +183,7 @@ class NewFilesPager extends RangeChronologicalPager {
                return '';
        }
 
-       function getEndBody() {
+       protected function getEndBody() {
                return $this->gallery->toHTML();
        }
 

diff --git a/includes/specials/pagers/NewPagesPager.php b/includes/specials/pagers/NewPagesPager.php
index b85bc2f..0c95b7e 100644 (file)
--- a/includes/specials/pagers/NewPagesPager.php
+++ b/includes/specials/pagers/NewPagesPager.php
@@ -132,7 +132,7 @@ class NewPagesPager extends ReverseChronologicalPager {
                return $this->mForm->formatRow( $row );
        }
 
-       function getStartBody() {
+       protected function getStartBody() {
                # Do a batch existence check on pages
                $linkBatch = new LinkBatch();
                foreach ( $this->mResult as $row ) {
@@ -145,7 +145,7 @@ class NewPagesPager extends ReverseChronologicalPager {
                return '<ul>';
        }
 
-       function getEndBody() {
+       protected function getEndBody() {
                return '</ul>';
        }
 }

diff --git a/includes/specials/pagers/ProtectedTitlesPager.php b/includes/specials/pagers/ProtectedTitlesPager.php
index ed437be..d17e3c6 100644 (file)
--- a/includes/specials/pagers/ProtectedTitlesPager.php
+++ b/includes/specials/pagers/ProtectedTitlesPager.php
@@ -37,7 +37,7 @@ class ProtectedTitlesPager extends AlphabeticPager {
                parent::__construct( $form->getContext() );
        }
 
-       function getStartBody() {
+       protected function getStartBody() {
                # Do a link batch query
                $this->mResult->seek( 0 );
                $lb = new LinkBatch;

diff --git a/includes/specials/pagers/UsersPager.php b/includes/specials/pagers/UsersPager.php
index fbf179d..391c313 100644 (file)
--- a/includes/specials/pagers/UsersPager.php
+++ b/includes/specials/pagers/UsersPager.php
@@ -225,7 +225,7 @@ class UsersPager extends AlphabeticPager {
                return Html::rawElement( 'li', [], "{$item}{$edits}{$created}{$blocked}" );
        }
 
-       function doBatchLookups() {
+       protected function doBatchLookups() {
                $batch = new LinkBatch();
                $userIds = [];
                # Give some pointers to make user links