From: jenkins-bot Date: Tue, 1 Jan 2019 14:29:49 +0000 (+0000) Subject: Merge "Mark constructors of IndexPager subclasses as public" X-Git-Tag: 1.34.0-rc.0~3174 X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22messagerie%22%29%20.%20%22?a=commitdiff_plain;h=be33fee8260d8aae2aa58e485463b25064f94ecb;hp=ae0bfd2e030b5fa584b5b4bd389e93104f0a1b5c;p=lhc%2Fweb%2Fwiklou.git Merge "Mark constructors of IndexPager subclasses as public" --- diff --git a/includes/actions/HistoryAction.php b/includes/actions/HistoryAction.php index 140ca2e2e8..d6b80570ed 100644 --- a/includes/actions/HistoryAction.php +++ b/includes/actions/HistoryAction.php @@ -415,7 +415,13 @@ class HistoryPager extends ReverseChronologicalPager { * @param string $tagFilter * @param array $conds */ - function __construct( $historyPage, $year = '', $month = '', $tagFilter = '', $conds = [] ) { + public function __construct( + HistoryAction $historyPage, + $year = '', + $month = '', + $tagFilter = '', + array $conds = [] + ) { parent::__construct( $historyPage->getContext() ); $this->historyPage = $historyPage; $this->tagFilter = $tagFilter; diff --git a/includes/specials/pagers/ActiveUsersPager.php b/includes/specials/pagers/ActiveUsersPager.php index 50f1d6b8b0..fee7740be4 100644 --- a/includes/specials/pagers/ActiveUsersPager.php +++ b/includes/specials/pagers/ActiveUsersPager.php @@ -47,7 +47,7 @@ class ActiveUsersPager extends UsersPager { * @param IContextSource|null $context * @param FormOptions $opts */ - function __construct( IContextSource $context = null, FormOptions $opts ) { + public function __construct( IContextSource $context = null, FormOptions $opts ) { parent::__construct( $context ); $this->RCMaxAge = $this->getConfig()->get( 'ActiveUserDays' ); diff --git a/includes/specials/pagers/AllMessagesTablePager.php b/includes/specials/pagers/AllMessagesTablePager.php index bde7559f46..e3c0d6da0d 100644 --- a/includes/specials/pagers/AllMessagesTablePager.php +++ b/includes/specials/pagers/AllMessagesTablePager.php @@ -44,7 +44,7 @@ class AllMessagesTablePager extends TablePager { */ public $custom; - function __construct( $page, $conds, Language $langObj = null ) { + public function __construct( $page, $conds, Language $langObj = null ) { parent::__construct( $page->getContext() ); $this->mIndexField = 'am_title'; $this->mPage = $page; diff --git a/includes/specials/pagers/BlockListPager.php b/includes/specials/pagers/BlockListPager.php index e8a7d2d69d..a0b14d2cdb 100644 --- a/includes/specials/pagers/BlockListPager.php +++ b/includes/specials/pagers/BlockListPager.php @@ -43,7 +43,7 @@ class BlockListPager extends TablePager { * @param SpecialPage $page * @param array $conds */ - function __construct( $page, $conds ) { + public function __construct( $page, $conds ) { $this->page = $page; $this->conds = $conds; $this->mDefaultDirection = IndexPager::DIR_DESCENDING; diff --git a/includes/specials/pagers/DeletedContribsPager.php b/includes/specials/pagers/DeletedContribsPager.php index c69a18321b..7a8f2974ab 100644 --- a/includes/specials/pagers/DeletedContribsPager.php +++ b/includes/specials/pagers/DeletedContribsPager.php @@ -40,7 +40,7 @@ class DeletedContribsPager extends IndexPager { */ protected $mNavigationBar; - function __construct( IContextSource $context, $target, $namespace = false ) { + public function __construct( IContextSource $context, $target, $namespace = false ) { parent::__construct( $context ); $msgs = [ 'deletionlog', 'undeleteviewlink', 'diff' ]; foreach ( $msgs as $msg ) { diff --git a/includes/specials/pagers/ImageListPager.php b/includes/specials/pagers/ImageListPager.php index a10c32f98b..3ddbe08d52 100644 --- a/includes/specials/pagers/ImageListPager.php +++ b/includes/specials/pagers/ImageListPager.php @@ -50,7 +50,7 @@ class ImageListPager extends TablePager { protected $mTableName = 'image'; - function __construct( IContextSource $context, $userName = null, $search = '', + public function __construct( IContextSource $context, $userName = null, $search = '', $including = false, $showAll = false ) { $this->setContext( $context ); diff --git a/includes/specials/pagers/MergeHistoryPager.php b/includes/specials/pagers/MergeHistoryPager.php index 3dbec6a2be..9415cea12b 100644 --- a/includes/specials/pagers/MergeHistoryPager.php +++ b/includes/specials/pagers/MergeHistoryPager.php @@ -30,7 +30,7 @@ class MergeHistoryPager extends ReverseChronologicalPager { /** @var array */ public $mConds; - function __construct( SpecialMergeHistory $form, $conds, Title $source, Title $dest ) { + public function __construct( SpecialMergeHistory $form, $conds, Title $source, Title $dest ) { $this->mForm = $form; $this->mConds = $conds; $this->title = $source; diff --git a/includes/specials/pagers/NewFilesPager.php b/includes/specials/pagers/NewFilesPager.php index 6e16e7962e..8bac2c4493 100644 --- a/includes/specials/pagers/NewFilesPager.php +++ b/includes/specials/pagers/NewFilesPager.php @@ -40,7 +40,7 @@ class NewFilesPager extends RangeChronologicalPager { * @param IContextSource $context * @param FormOptions $opts */ - function __construct( IContextSource $context, FormOptions $opts ) { + public function __construct( IContextSource $context, FormOptions $opts ) { parent::__construct( $context ); $this->opts = $opts; diff --git a/includes/specials/pagers/NewPagesPager.php b/includes/specials/pagers/NewPagesPager.php index 0c95b7e434..2b094b1d40 100644 --- a/includes/specials/pagers/NewPagesPager.php +++ b/includes/specials/pagers/NewPagesPager.php @@ -32,7 +32,7 @@ class NewPagesPager extends ReverseChronologicalPager { */ protected $mForm; - function __construct( $form, FormOptions $opts ) { + public function __construct( $form, FormOptions $opts ) { parent::__construct( $form->getContext() ); $this->mForm = $form; $this->opts = $opts; diff --git a/includes/specials/pagers/ProtectedPagesPager.php b/includes/specials/pagers/ProtectedPagesPager.php index 3e97923faf..f457d2f1e5 100644 --- a/includes/specials/pagers/ProtectedPagesPager.php +++ b/includes/specials/pagers/ProtectedPagesPager.php @@ -44,7 +44,7 @@ class ProtectedPagesPager extends TablePager { * @param bool $noredirect * @param LinkRenderer $linkRenderer */ - function __construct( $form, $conds, $type, $level, $namespace, + public function __construct( $form, $conds, $type, $level, $namespace, $sizetype, $size, $indefonly, $cascadeonly, $noredirect, LinkRenderer $linkRenderer ) { diff --git a/includes/specials/pagers/ProtectedTitlesPager.php b/includes/specials/pagers/ProtectedTitlesPager.php index d17e3c617b..49055af44d 100644 --- a/includes/specials/pagers/ProtectedTitlesPager.php +++ b/includes/specials/pagers/ProtectedTitlesPager.php @@ -26,7 +26,7 @@ class ProtectedTitlesPager extends AlphabeticPager { public $mForm, $mConds; - function __construct( $form, $conds, $type, $level, $namespace, + public function __construct( $form, $conds, $type, $level, $namespace, $sizetype = '', $size = 0 ) { $this->mForm = $form; diff --git a/includes/specials/pagers/UsersPager.php b/includes/specials/pagers/UsersPager.php index 391c3132e2..8dd6e23431 100644 --- a/includes/specials/pagers/UsersPager.php +++ b/includes/specials/pagers/UsersPager.php @@ -43,7 +43,7 @@ class UsersPager extends AlphabeticPager { * @param bool|null $including Whether this page is being transcluded in * another page */ - function __construct( IContextSource $context = null, $par = null, $including = null ) { + public function __construct( IContextSource $context = null, $par = null, $including = null ) { if ( $context ) { $this->setContext( $context ); }