Documentation and explicit variable definitions

Followup r80069, swap private to protected

diff --git a/includes/HTMLCacheUpdate.php b/includes/HTMLCacheUpdate.php
index 594b85c..d571d94 100644 (file)
--- a/includes/HTMLCacheUpdate.php
+++ b/includes/HTMLCacheUpdate.php
@@ -25,7 +25,12 @@
  */
 class HTMLCacheUpdate
 {
-       public $mTitle, $mTable, $mPrefix, $mStart, $mEnd;
+       /**
+        * @var Title
+        */
+       public $mTitle;
+
+       public $mTable, $mPrefix, $mStart, $mEnd;
        public $mRowsPerJob, $mRowsPerQuery;
 
        function __construct( $titleTo, $table, $start = false, $end = false ) {

diff --git a/includes/HTMLFileCache.php b/includes/HTMLFileCache.php
index 26cb147..20224b0 100644 (file)
--- a/includes/HTMLFileCache.php
+++ b/includes/HTMLFileCache.php
@@ -20,7 +20,12 @@
  * @ingroup Cache
  */
 class HTMLFileCache {
-       var $mTitle, $mFileCache, $mType;
+
+       /**
+        * @var Title
+        */
+       var $mTitle;
+       var $mFileCache, $mType;
 
        public function __construct( &$title, $type = 'view' ) {
                $this->mTitle = $title;

diff --git a/includes/User.php b/includes/User.php
index 4ddc841..892de83 100644 (file)
--- a/includes/User.php
+++ b/includes/User.php
@@ -173,10 +173,20 @@ class User {
        /**
         * Lazy-initialized variables, invalidated with clearInstanceCache
         */
-       var $mNewtalk, $mDatePreference, $mBlockedby, $mHash, $mSkin, $mRights,
-               $mBlockreason, $mBlock, $mEffectiveGroups, $mBlockedGlobally,
+       var $mNewtalk, $mDatePreference, $mBlockedby, $mHash, $mRights,
+               $mBlockreason, $mEffectiveGroups, $mBlockedGlobally,
                $mLocked, $mHideName, $mOptions;
 
+       /**
+        * @var Skin
+        */
+       var $mSkin;
+
+       /**
+        * @var Block
+        */
+       var $mBlock;
+
        static $idCacheByName = array();
 
        /**
@@ -3774,8 +3784,4 @@ class User {
 
                return $ret;
        }
-
-
-
-
 }

diff --git a/includes/api/ApiQueryAllimages.php b/includes/api/ApiQueryAllimages.php
index e68bc91..89cc9db 100644 (file)
--- a/includes/api/ApiQueryAllimages.php
+++ b/includes/api/ApiQueryAllimages.php
@@ -38,7 +38,7 @@ if ( !defined( 'MEDIAWIKI' ) ) {
  */
 class ApiQueryAllimages extends ApiQueryGeneratorBase {
 
-       private $mRepo;
+       protected $mRepo;
 
        public function __construct( $query, $moduleName ) {
                parent::__construct( $query, $moduleName, 'ai' );

diff --git a/includes/specials/SpecialUserlogin.php b/includes/specials/SpecialUserlogin.php
index a82e25d..461817a 100644 (file)
--- a/includes/specials/SpecialUserlogin.php
+++ b/includes/specials/SpecialUserlogin.php
@@ -47,10 +47,17 @@ class LoginForm extends SpecialPage {
        var $mAction, $mCreateaccount, $mCreateaccountMail, $mMailmypassword;
        var $mLoginattempt, $mRemember, $mEmail, $mDomain, $mLanguage;
        var $mSkipCookieCheck, $mReturnToQuery, $mToken, $mStickHTTPS;
+       var $mType, $mReason, $mRealName;
        var $mAbortLoginErrorMsg = 'login-abort-generic';
 
+       /**
+        * @var ExternalUser
+        */
        private $mExtUser = null;
 
+       /**
+        * @param WebRequest $request
+        */
        public function __construct( $request = null ) {
                parent::__construct( 'Userlogin' );
 
@@ -261,7 +268,8 @@ class LoginForm extends SpecialPage {
                // create a local account and login as any domain user). We only need
                // to check this for domains that aren't local.
                if( 'local' != $this->mDomain && $this->mDomain != '' ) {
-                       if( !$wgAuth->canCreateAccounts() && ( !$wgAuth->userExists( $this->mUsername ) || !$wgAuth->authenticate( $this->mUsername, $this->mPassword ) ) ) {
+                       if( !$wgAuth->canCreateAccounts() && ( !$wgAuth->userExists( $this->mUsername )
+                               || !$wgAuth->authenticate( $this->mUsername, $this->mPassword ) ) ) {
                                $this->mainLoginForm( wfMsg( 'wrongpassword' ) );
                                return false;
                        }