Merge "Declare visibility on class properties of LoginForm"

diff --combined includes/specials/SpecialUserlogin.php
index ec7bfa4,8304db0..e6ff8bc
--- 1/includes/specials/SpecialUserlogin.php
--- 2/includes/specials/SpecialUserlogin.php
+++ b/includes/specials/SpecialUserlogin.php
@@@ -43,26 -43,38 +43,38 @@@ class LoginForm extends SpecialPage 
        const NEED_TOKEN = 12;
        const WRONG_TOKEN = 13;
  
-       var $mUsername, $mPassword, $mRetype, $mReturnTo, $mCookieCheck, $mPosted;
-       var $mAction, $mCreateaccount, $mCreateaccountMail;
-       var $mLoginattempt, $mRemember, $mEmail, $mDomain, $mLanguage;
-       var $mSkipCookieCheck, $mReturnToQuery, $mToken, $mStickHTTPS;
-       var $mType, $mReason, $mRealName;
-       var $mAbortLoginErrorMsg = null;
+       public $mAbortLoginErrorMsg = null;
+ 
+       protected $mUsername;
+       protected $mPassword;
+       protected $mRetype;
+       protected $mReturnTo;
+       protected $mCookieCheck;
+       protected $mPosted;
+       protected $mAction;
+       protected $mCreateaccount;
+       protected $mCreateaccountMail;
+       protected $mLoginattempt;
+       protected $mRemember;
+       protected $mEmail;
+       protected $mDomain;
+       protected $mLanguage;
+       protected $mSkipCookieCheck;
+       protected $mReturnToQuery;
+       protected $mToken;
+       protected $mStickHTTPS;
+       protected $mType;
+       protected $mReason;
+       protected $mRealName;
+ 
        private $mTempPasswordUsed;
        private $mLoaded = false;
        private $mSecureLoginUrl;
  
-       /**
-        * @ var WebRequest
-        */
+       /** @var WebRequest */
        private $mOverrideRequest = null;
  
-       /**
-        * Effective request; set at the beginning of load
-        *
-        * @var WebRequest $mRequest
-        */
+       /** @var WebRequest Effective request; set at the beginning of load */
        private $mRequest = null;
  
        /**
@@@ -101,7 -113,7 +113,7 @@@
                $this->mCookieCheck = $request->getVal( 'wpCookieCheck' );
                $this->mPosted = $request->wasPosted();
                $this->mCreateaccountMail = $request->getCheck( 'wpCreateaccountMail' )
 -                                                                      && $wgEnableEmail;
 +                      && $wgEnableEmail;
                $this->mCreateaccount = $request->getCheck( 'wpCreateaccount' ) && !$this->mCreateaccountMail;
                $this->mLoginattempt = $request->getCheck( 'wpLoginattempt' );
                $this->mAction = $request->getVal( 'action' );
@@@ -134,10 -146,9 +146,10 @@@
                # 2. Do not return to PasswordReset after a successful password change
                #    but goto Wiki start page (Main_Page) instead ( bug 33997 )
                $returnToTitle = Title::newFromText( $this->mReturnTo );
 -              if ( is_object( $returnToTitle ) && (
 -                      $returnToTitle->isSpecial( 'Userlogout' )
 -                      || $returnToTitle->isSpecial( 'PasswordReset' ) ) ) {
 +              if ( is_object( $returnToTitle )
 +                      && ( $returnToTitle->isSpecial( 'Userlogout' )
 +                              || $returnToTitle->isSpecial( 'PasswordReset' ) )
 +              ) {
                        $this->mReturnTo = '';
                        $this->mReturnToQuery = '';
                }
@@@ -184,7 -195,6 +196,7 @@@
                                $this->getOutput()->redirect( $url );
                                // Since we only do this redir to change proto, always vary
                                $this->getOutput()->addVaryHeader( 'X-Forwarded-Proto' );
 +
                                return;
                        } else {
                                // A wiki without HTTPS login support should set $wgServer to
@@@ -198,20 -208,16 +210,20 @@@
  
                if ( !is_null( $this->mCookieCheck ) ) {
                        $this->onCookieRedirectCheck( $this->mCookieCheck );
 +
                        return;
                } elseif ( $this->mPosted ) {
                        if ( $this->mCreateaccount ) {
                                $this->addNewAccount();
 +
                                return;
                        } elseif ( $this->mCreateaccountMail ) {
                                $this->addNewAccountMailPassword();
 +
                                return;
                        } elseif ( ( 'submitlogin' == $this->mAction ) || $this->mLoginattempt ) {
                                $this->processLogin();
 +
                                return;
                        }
                }
@@@ -224,7 -230,6 +236,7 @@@
        function addNewAccountMailPassword() {
                if ( $this->mEmail == '' ) {
                        $this->mainLoginForm( $this->msg( 'noemailcreate' )->escaped() );
 +
                        return;
                }
  
@@@ -232,7 -237,6 +244,7 @@@
                if ( !$status->isGood() ) {
                        $error = $status->getMessage();
                        $this->mainLoginForm( $error->toString() );
 +
                        return;
                }
  
@@@ -269,7 -273,6 +281,7 @@@
                if ( !$status->isGood() ) {
                        $error = $status->getMessage();
                        $this->mainLoginForm( $error->toString() );
 +
                        return false;
                }
  
@@@ -333,7 -336,6 +345,7 @@@
                        wfRunHooks( 'AddNewAccount', array( $u, false ) );
                        $u->addNewUserLogEntry( 'create2', $this->mReason );
                }
 +
                return true;
        }
  
@@@ -376,7 -378,6 +388,7 @@@
                # Request forgery checks.
                if ( !self::getCreateaccountToken() ) {
                        self::setCreateaccountToken();
 +
                        return Status::newFatal( 'nocookiesfornew' );
                }
  
@@@ -398,7 -399,6 +410,7 @@@
                } elseif ( $creationBlock instanceof Block ) {
                        // Throws an ErrorPageError.
                        $this->userBlockedMessage( $creationBlock );
 +
                        // This should never be reached.
                        return false;
                }
@@@ -406,7 -406,7 +418,7 @@@
                # Include checks that will include GlobalBlocking (Bug 38333)
                $permErrors = $this->getPageTitle()->getUserPermissionsErrors( 'createaccount', $currentUser, true );
                if ( count( $permErrors ) ) {
 -                              throw new PermissionsError( 'createaccount', $permErrors );
 +                      throw new PermissionsError( 'createaccount', $permErrors );
                }
  
                $ip = $this->getRequest()->getIP();
@@@ -444,7 -444,6 +456,7 @@@
                                if ( !is_array( $valid ) ) {
                                        $valid = array( $valid, $wgMinimalPasswordLength );
                                }
 +
                                return call_user_func_array( 'Status::newFatal', $valid );
                        }
                }
@@@ -476,7 -475,6 +488,7 @@@
                                // To return a different error code, return a Status object.
                                $abortError = new Message( 'createaccount-hook-aborted', array( $abortError ) );
                                $abortError->text();
 +
                                return Status::newFatal( $abortError );
                        } else {
                                // For MediaWiki 1.23+ and updated hooks, return the Status object
@@@ -507,7 -505,6 +519,7 @@@
                }
  
                self::clearCreateaccountToken();
 +
                return $this->initUser( $u, false );
        }
  
@@@ -575,7 -572,6 +587,7 @@@
                // If the user doesn't have a login token yet, set one.
                if ( !self::getLoginToken() ) {
                        self::setLoginToken();
 +
                        return self::NEED_TOKEN;
                }
                // If the user didn't pass a login token, tell them we need one
@@@ -601,7 -597,6 +613,7 @@@
                // will effectively be using stale data.
                if ( $this->getUser()->getName() === $this->mUsername ) {
                        wfDebug( __METHOD__ . ": already logged in as {$this->mUsername}\n" );
 +
                        return self::SUCCESS;
                }
  
@@@ -627,7 -622,6 +639,7 @@@
                $msg = null;
                if ( !wfRunHooks( 'AbortLogin', array( $u, $this->mPassword, &$abort, &$msg ) ) ) {
                        $this->mAbortLoginErrorMsg = $msg;
 +
                        return $abort;
                }
  
@@@ -692,7 -686,6 +704,7 @@@
                        $retval = self::SUCCESS;
                }
                wfRunHooks( 'LoginAuthenticateAudit', array( $u, $this->mPassword, $retval ) );
 +
                return $retval;
        }
  
@@@ -751,23 -744,17 +763,23 @@@
  
                if ( $this->getUser()->isBlockedFromCreateAccount() ) {
                        wfDebug( __METHOD__ . ": user is blocked from account creation\n" );
 +
                        return self::CREATE_BLOCKED;
                }
 +
                if ( !$wgAuth->autoCreate() ) {
                        return self::NOT_EXISTS;
                }
 +
                if ( !$wgAuth->userExists( $user->getName() ) ) {
                        wfDebug( __METHOD__ . ": user does not exist\n" );
 +
                        return self::NOT_EXISTS;
                }
 +
                if ( !$wgAuth->authenticate( $user->getName(), $this->mPassword ) ) {
                        wfDebug( __METHOD__ . ": \$wgAuth->authenticate() returned false, aborting\n" );
 +
                        return self::WRONG_PLUGIN_PASS;
                }
  
@@@ -776,7 -763,6 +788,7 @@@
                        // Hook point to add extra creation throttles and blocks
                        wfDebug( "LoginForm::attemptAutoCreate: a hook blocked creation: $abortError\n" );
                        $this->mAbortLoginErrorMsg = $abortError;
 +
                        return self::ABORTED;
                }
  
@@@ -786,7 -772,6 +798,7 @@@
                if ( !$status->isOK() ) {
                        $errors = $status->getErrorsByType( 'error' );
                        $this->mAbortLoginErrorMsg = $errors[0]['message'];
 +
                        return self::ABORTED;
                }
  
@@@ -795,7 -780,7 +807,7 @@@
  
        function processLogin() {
                global $wgMemc, $wgLang, $wgSecureLogin, $wgPasswordAttemptThrottle,
 -                      $wgInvalidPasswordReset;
 +                         $wgInvalidPasswordReset;
  
                switch ( $this->authenticateUserData() ) {
                        case self::SUCCESS:
@@@ -897,8 -882,8 +909,8 @@@
                        case self::THROTTLED:
                                $error = $this->mAbortLoginErrorMsg ?: 'login-throttled';
                                $this->mainLoginForm( $this->msg( $error )
 -                              ->params ( $this->getLanguage()->formatDuration( $wgPasswordAttemptThrottle['seconds'] ) )
 -                              ->text()
 +                                      ->params( $this->getLanguage()->formatDuration( $wgPasswordAttemptThrottle['seconds'] ) )
 +                                      ->text()
                                );
                                break;
                        case self::USER_BLOCKED:
@@@ -1160,7 -1145,6 +1172,7 @@@
                                throw new PermissionsError( 'createaccount', $permErrors );
                        } elseif ( $user->isBlockedFromCreateAccount() ) {
                                $this->userBlockedMessage( $user->isBlockedFromCreateAccount() );
 +
                                return;
                        } elseif ( wfReadOnly() ) {
                                throw new ReadOnlyError;
@@@ -1352,7 -1336,6 +1364,7 @@@
         */
        function hasSessionCookie() {
                global $wgDisableCookieCheck;
 +
                return $wgDisableCookieCheck ? true : $this->getRequest()->checkSessionCookie();
        }
  
@@@ -1362,7 -1345,6 +1374,7 @@@
         */
        public static function getLoginToken() {
                global $wgRequest;
 +
                return $wgRequest->getSessionData( 'wsLoginToken' );
        }
  
@@@ -1390,7 -1372,6 +1402,7 @@@
         */
        public static function getCreateaccountToken() {
                global $wgRequest;
 +
                return $wgRequest->getSessionData( 'wsCreateaccountToken' );
        }
  
@@@ -1473,7 -1454,6 +1485,7 @@@
                                        $links[] = $this->makeLanguageSelectorLink( $parts[0], trim( $parts[1] ) );
                                }
                        }
 +
                        return count( $links ) > 0 ? $this->msg( 'loginlanguagelabel' )->rawParams(
                                $this->getLanguage()->pipeList( $links ) )->escaped() : '';
                } else {