Merge "Few more message parameter type hints"

diff --combined includes/specials/SpecialUserlogin.php
index ddd57c3,c2a4947..9362385
--- 1/includes/specials/SpecialUserlogin.php
--- 2/includes/specials/SpecialUserlogin.php
+++ b/includes/specials/SpecialUserlogin.php
@@@ -201,7 -201,7 +201,7 @@@ class LoginForm extends SpecialPage 
                if( !$status->isGood() ) {
                        $error = $this->getOutput()->parse( $status->getWikiText() );
                        $this->mainLoginForm( $error );
-                       return false;
+                       return;
                }
  
                $u = $status->getValue();
@@@ -604,7 -604,7 +604,7 @@@
                                // faces etc will probably just fail cleanly here.
                                $retval = self::RESET_PASS;
                        } else {
 -                              $retval = ( $this->mPassword  == '' ) ? self::EMPTY_PASS : self::WRONG_PASS;
 +                              $retval = ( $this->mPassword == '' ) ? self::EMPTY_PASS : self::WRONG_PASS;
                        }
                } elseif ( $wgBlockDisablesLogin && $u->isBlocked() ) {
                        // If we've enabled it, make it so that a blocked user cannot login
@@@ -831,6 -831,9 +831,9 @@@
                }
        }
  
+       /**
+        * @param $error string
+        */
        function resetLoginForm( $error ) {
                $this->getOutput()->addHTML( Xml::element( 'p', array( 'class' => 'error' ), $error ) );
                $reset = new SpecialChangePassword();
@@@ -870,6 -873,7 +873,6 @@@
                return $result;
        }
  
 -
        /**
         * Run any hooks registered for logins, then HTTP redirect to
         * $this->mReturnTo (or Main Page if that's undefined).  Formerly we had a
@@@ -944,6 -948,7 +947,7 @@@
         * User::isBlockedFromCreateAccount(), which gets this block, ignores the 'hardblock'
         * setting on blocks (bug 13611).
         * @param $block Block the block causing this error
+        * @throws ErrorPageError
         */
        function userBlockedMessage( Block $block ) {
                # Let's be nice about this, it's likely that this feature will be used
@@@ -1333,8 -1338,8 +1337,8 @@@
         * Create a language selector link for a particular language
         * Links back to this page preserving type and returnto
         *
-        * @param $text Link text
-        * @param $lang Language code
+        * @param $text string Link text
+        * @param $lang string Language code
         * @return string
         */
        function makeLanguageSelectorLink( $text, $lang ) {