From 430d420b0f5676ac22b8e937a3852bafe8bfe4dc Mon Sep 17 00:00:00 2001 From: Daimona Eaytoy Date: Tue, 10 Sep 2019 14:30:41 +0200 Subject: [PATCH] specials: Declare dynamic properties And also remove a couple of unused properties. Change-Id: I66ed64627dc475dc85da9d858a19317435d05532 --- .../specialpage/LoginSignupSpecialPage.php | 8 ++--- includes/specials/SpecialLinkSearch.php | 6 ++++ includes/specials/SpecialUndelete.php | 34 ++++++++++++------- includes/specials/pagers/ActiveUsersPager.php | 6 ++++ .../specials/pagers/AllMessagesTablePager.php | 5 +++ .../specials/pagers/MergeHistoryPager.php | 7 +++- .../specials/pagers/ProtectedTitlesPager.php | 9 +++-- includes/specials/pagers/UsersPager.php | 18 ++++++++++ 8 files changed, 73 insertions(+), 20 deletions(-) diff --git a/includes/specialpage/LoginSignupSpecialPage.php b/includes/specialpage/LoginSignupSpecialPage.php index ce80c1a311..e5a28d9307 100644 --- a/includes/specialpage/LoginSignupSpecialPage.php +++ b/includes/specialpage/LoginSignupSpecialPage.php @@ -95,9 +95,8 @@ abstract class LoginSignupSpecialPage extends AuthManagerSpecialPage { /** * Load basic request parameters for this Special page. - * @param string $subPage */ - private function loadRequestParameters( $subPage ) { + private function loadRequestParameters() { if ( $this->mLoadedRequest ) { return; } @@ -105,7 +104,6 @@ abstract class LoginSignupSpecialPage extends AuthManagerSpecialPage { $request = $this->getRequest(); $this->mPosted = $request->wasPosted(); - $this->mIsReturn = $subPage === 'return'; $this->mAction = $request->getVal( 'action' ); $this->mFromHTTP = $request->getBool( 'fromhttp', false ) || $request->getBool( 'wpFromhttp', false ); @@ -124,7 +122,7 @@ abstract class LoginSignupSpecialPage extends AuthManagerSpecialPage { protected function load( $subPage ) { global $wgSecureLogin; - $this->loadRequestParameters( $subPage ); + $this->loadRequestParameters(); if ( $this->mLoaded ) { return; } @@ -203,7 +201,7 @@ abstract class LoginSignupSpecialPage extends AuthManagerSpecialPage { protected function beforeExecute( $subPage ) { // finish initializing the class before processing the request - T135924 - $this->loadRequestParameters( $subPage ); + $this->loadRequestParameters(); return parent::beforeExecute( $subPage ); } diff --git a/includes/specials/SpecialLinkSearch.php b/includes/specials/SpecialLinkSearch.php index f2a3f80df1..60aeddaf84 100644 --- a/includes/specials/SpecialLinkSearch.php +++ b/includes/specials/SpecialLinkSearch.php @@ -32,6 +32,12 @@ use Wikimedia\Rdbms\IDatabase; class SpecialLinkSearch extends QueryPage { /** @var array|bool */ private $mungedQuery = false; + /** @var string|null */ + private $mQuery; + /** @var int|null */ + private $mNs; + /** @var string|null */ + private $mProt; function setParams( $params ) { $this->mQuery = $params['query']; diff --git a/includes/specials/SpecialUndelete.php b/includes/specials/SpecialUndelete.php index 075b5df0c2..fe629dba8b 100644 --- a/includes/specials/SpecialUndelete.php +++ b/includes/specials/SpecialUndelete.php @@ -33,18 +33,28 @@ use Wikimedia\Rdbms\IResultWrapper; * @ingroup SpecialPage */ class SpecialUndelete extends SpecialPage { - private $mAction; - private $mTarget; - private $mTimestamp; - private $mRestore; - private $mRevdel; - private $mInvert; - private $mFilename; - private $mTargetTimestamp; - private $mAllowed; - private $mCanView; - private $mComment; - private $mToken; + private $mAction; + private $mTarget; + private $mTimestamp; + private $mRestore; + private $mRevdel; + private $mInvert; + private $mFilename; + private $mTargetTimestamp; + private $mAllowed; + private $mCanView; + private $mComment; + private $mToken; + /** @var bool|null */ + private $mPreview; + /** @var bool|null */ + private $mDiff; + /** @var bool|null */ + private $mDiffOnly; + /** @var bool|null */ + private $mUnsuppress; + /** @var int[]|null */ + private $mFileVersions; /** @var Title */ private $mTargetObj; diff --git a/includes/specials/pagers/ActiveUsersPager.php b/includes/specials/pagers/ActiveUsersPager.php index 0f5355d383..0abe842e79 100644 --- a/includes/specials/pagers/ActiveUsersPager.php +++ b/includes/specials/pagers/ActiveUsersPager.php @@ -43,6 +43,12 @@ class ActiveUsersPager extends UsersPager { */ private $blockStatusByUid; + /** @var int */ + private $RCMaxAge; + + /** @var string[] */ + private $excludegroups; + /** * @param IContextSource|null $context * @param FormOptions $opts diff --git a/includes/specials/pagers/AllMessagesTablePager.php b/includes/specials/pagers/AllMessagesTablePager.php index c804b091a3..6b8b93b90a 100644 --- a/includes/specials/pagers/AllMessagesTablePager.php +++ b/includes/specials/pagers/AllMessagesTablePager.php @@ -46,6 +46,11 @@ class AllMessagesTablePager extends TablePager { */ protected $prefix; + /** + * @var string + */ + protected $suffix; + /** * @var Language */ diff --git a/includes/specials/pagers/MergeHistoryPager.php b/includes/specials/pagers/MergeHistoryPager.php index 9415cea12b..81c3ffb74c 100644 --- a/includes/specials/pagers/MergeHistoryPager.php +++ b/includes/specials/pagers/MergeHistoryPager.php @@ -30,10 +30,15 @@ class MergeHistoryPager extends ReverseChronologicalPager { /** @var array */ public $mConds; + /** @var int */ + private $articleID; + + /** @var int */ + private $maxTimestamp; + public function __construct( SpecialMergeHistory $form, $conds, Title $source, Title $dest ) { $this->mForm = $form; $this->mConds = $conds; - $this->title = $source; $this->articleID = $source->getArticleID(); $dbr = wfGetDB( DB_REPLICA ); diff --git a/includes/specials/pagers/ProtectedTitlesPager.php b/includes/specials/pagers/ProtectedTitlesPager.php index 296fe1112d..a00b37125c 100644 --- a/includes/specials/pagers/ProtectedTitlesPager.php +++ b/includes/specials/pagers/ProtectedTitlesPager.php @@ -34,6 +34,12 @@ class ProtectedTitlesPager extends AlphabeticPager { */ public $mConds; + /** @var string|null */ + private $level; + + /** @var int|null */ + private $namespace; + /** * @param SpecialProtectedtitles $form * @param array $conds @@ -50,7 +56,6 @@ class ProtectedTitlesPager extends AlphabeticPager { $this->mConds = $conds; $this->level = $level; $this->namespace = $namespace; - $this->size = intval( $size ); parent::__construct( $form->getContext() ); } @@ -90,7 +95,7 @@ class ProtectedTitlesPager extends AlphabeticPager { $conds['pt_create_perm'] = $this->level; } - if ( !is_null( $this->namespace ) ) { + if ( $this->namespace !== null ) { $conds[] = 'pt_namespace=' . $this->mDb->addQuotes( $this->namespace ); } diff --git a/includes/specials/pagers/UsersPager.php b/includes/specials/pagers/UsersPager.php index 57b575b8ec..ba078e9f3c 100644 --- a/includes/specials/pagers/UsersPager.php +++ b/includes/specials/pagers/UsersPager.php @@ -37,6 +37,24 @@ class UsersPager extends AlphabeticPager { */ protected $userGroupCache; + /** @var string */ + protected $requestedGroup; + + /** @var bool */ + protected $editsOnly; + + /** @var bool */ + protected $temporaryGroupsOnly; + + /** @var bool */ + protected $creationSort; + + /** @var bool|null */ + protected $including; + + /** @var string */ + protected $requestedUser; + /** * @param IContextSource|null $context * @param array|null $par (Default null) -- 2.20.1