From a3983418d5748fbccdda15e0e48af90c50ef1f67 Mon Sep 17 00:00:00 2001
From: umherirrender <umherirrender_de.wp@web.de>
Date: Tue, 22 Apr 2014 13:07:02 +0200
Subject: [PATCH] Fixed some @params documentation (includes/*)

Swapped some "$var type" to "type $var" or added missing types
before the $var. Changed some other types to match the more common
spelling. Makes beginning of some text in captial.
Also added some missing @param.

Change-Id: I0056b4a8df243cfc0c5f25378de48f7a35170aca
---
 includes/AjaxResponse.php              |  24 ++---
 includes/CacheHelper.php               |  26 ++---
 includes/CategoryViewer.php            |  54 +++++-----
 includes/EditPage.php                  |  88 +++++++--------
 includes/Fallback.php                  |  30 +++---
 includes/Feed.php                      |  41 ++++---
 includes/HistoryBlob.php               |  47 ++++----
 includes/Html.php                      |  30 +++---
 includes/HttpFunctions.php             |  66 ++++++------
 includes/ImagePage.php                 |  56 +++++-----
 includes/Linker.php                    | 142 ++++++++++++++-----------
 includes/MagicWord.php                 |  60 +++++------
 includes/Message.php                   |   8 +-
 includes/Pager.php                     | 100 ++++++++---------
 includes/PathRouter.php                |  26 ++---
 includes/PrefixSearch.php              |  46 ++++----
 includes/SiteConfiguration.php         |  32 +++---
 includes/SiteStats.php                 |  30 +++---
 includes/SkinTemplate.php              |  60 ++++++-----
 includes/Status.php                    |  46 ++++----
 includes/UserMailer.php                |  74 ++++++-------
 includes/UserRightsProxy.php           |  60 ++++++-----
 includes/WikiMap.php                   |  56 +++++-----
 includes/profiler/Profiler.php         |   4 +-
 includes/profiler/ProfilerStandard.php |  22 ++--
 25 files changed, 629 insertions(+), 599 deletions(-)

diff --git a/includes/AjaxResponse.php b/includes/AjaxResponse.php
index 4b5ca75eb0..a3808a5496 100644
--- a/includes/AjaxResponse.php
+++ b/includes/AjaxResponse.php
@@ -48,7 +48,7 @@ class AjaxResponse {
 
 	/**
 	 * Date for the HTTP header Last-modified
-	 * @var string|false $mLastModified
+	 * @var string|bool $mLastModified
 	 */
 	private $mLastModified;
 
@@ -71,7 +71,7 @@ class AjaxResponse {
 	private $mText;
 
 	/**
-	 * @param $text string|null
+	 * @param string|null $text
 	 */
 	function __construct( $text = null ) {
 		$this->mCacheDuration = null;
@@ -90,7 +90,7 @@ class AjaxResponse {
 
 	/**
 	 * Set the number of seconds to get the response cached by a proxy
-	 * @param $duration int
+	 * @param int $duration
 	 */
 	function setCacheDuration( $duration ) {
 		$this->mCacheDuration = $duration;
@@ -98,7 +98,7 @@ class AjaxResponse {
 
 	/**
 	 * Set the HTTP Vary header
-	 * @param $vary string
+	 * @param string $vary
 	 */
 	function setVary( $vary ) {
 		$this->mVary = $vary;
@@ -106,7 +106,7 @@ class AjaxResponse {
 
 	/**
 	 * Set the HTTP response code
-	 * @param $code string
+	 * @param string $code
 	 */
 	function setResponseCode( $code ) {
 		$this->mResponseCode = $code;
@@ -114,7 +114,7 @@ class AjaxResponse {
 
 	/**
 	 * Set the HTTP header Content-Type
-	 * @param $type string
+	 * @param string $type
 	 */
 	function setContentType( $type ) {
 		$this->mContentType = $type;
@@ -129,7 +129,7 @@ class AjaxResponse {
 
 	/**
 	 * Add content to the response
-	 * @param $text string
+	 * @param string $text
 	 */
 	function addText( $text ) {
 		if ( ! $this->mDisabled && $text ) {
@@ -206,7 +206,7 @@ class AjaxResponse {
 	 * possible. If successful, the AjaxResponse is disabled so that
 	 * any future call to AjaxResponse::printText() have no effect.
 	 *
-	 * @param $timestamp string
+	 * @param string $timestamp
 	 * @return bool Returns true if the response code was set to 304 Not Modified.
 	 */
 	function checkLastModified( $timestamp ) {
@@ -262,8 +262,8 @@ class AjaxResponse {
 	}
 
 	/**
-	 * @param $mckey string
-	 * @param $touched int
+	 * @param string $mckey
+	 * @param int $touched
 	 * @return bool
 	 */
 	function loadFromMemcached( $mckey, $touched ) {
@@ -290,8 +290,8 @@ class AjaxResponse {
 	}
 
 	/**
-	 * @param $mckey string
-	 * @param $expiry int
+	 * @param string $mckey
+	 * @param int $expiry
 	 * @return bool
 	 */
 	function storeInMemcached( $mckey, $expiry = 86400 ) {
diff --git a/includes/CacheHelper.php b/includes/CacheHelper.php
index cfa4160e4c..695eac3a05 100644
--- a/includes/CacheHelper.php
+++ b/includes/CacheHelper.php
@@ -32,7 +32,7 @@ interface ICacheHelper {
 	 * Sets if the cache should be enabled or not.
 	 *
 	 * @since 1.20
-	 * @param boolean $cacheEnabled
+	 * @param bool $cacheEnabled
 	 */
 	function setCacheEnabled( $cacheEnabled );
 
@@ -42,8 +42,8 @@ interface ICacheHelper {
 	 *
 	 * @since 1.20
 	 *
-	 * @param integer|null $cacheExpiry Sets the cache expiry, either ttl in seconds or unix timestamp.
-	 * @param boolean|null $cacheEnabled Sets if the cache should be enabled or not.
+	 * @param int|null $cacheExpiry Sets the cache expiry, either ttl in seconds or unix timestamp.
+	 * @param bool|null $cacheEnabled Sets if the cache should be enabled or not.
 	 */
 	function startCache( $cacheExpiry = null, $cacheEnabled = null );
 
@@ -77,7 +77,7 @@ interface ICacheHelper {
 	 *
 	 * @since 1.20
 	 *
-	 * @param integer $cacheExpiry
+	 * @param int $cacheExpiry
 	 */
 	function setExpiry( $cacheExpiry );
 }
@@ -105,7 +105,7 @@ class CacheHelper implements ICacheHelper {
 	 * The time to live for the cache, in seconds or a unix timestamp indicating the point of expiry.
 	 *
 	 * @since 1.20
-	 * @var integer
+	 * @var int
 	 */
 	protected $cacheExpiry = 3600;
 
@@ -124,7 +124,7 @@ class CacheHelper implements ICacheHelper {
 	 * Null if this information is not available yet.
 	 *
 	 * @since 1.20
-	 * @var boolean|null
+	 * @var bool|null
 	 */
 	protected $hasCached = null;
 
@@ -132,7 +132,7 @@ class CacheHelper implements ICacheHelper {
 	 * If the cache is enabled or not.
 	 *
 	 * @since 1.20
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $cacheEnabled = true;
 
@@ -156,7 +156,7 @@ class CacheHelper implements ICacheHelper {
 	 * Sets if the cache should be enabled or not.
 	 *
 	 * @since 1.20
-	 * @param boolean $cacheEnabled
+	 * @param bool $cacheEnabled
 	 */
 	public function setCacheEnabled( $cacheEnabled ) {
 		$this->cacheEnabled = $cacheEnabled;
@@ -168,8 +168,8 @@ class CacheHelper implements ICacheHelper {
 	 *
 	 * @since 1.20
 	 *
-	 * @param integer|null $cacheExpiry Sets the cache expiry, either ttl in seconds or unix timestamp.
-	 * @param boolean|null $cacheEnabled Sets if the cache should be enabled or not.
+	 * @param int|null $cacheExpiry Sets the cache expiry, either ttl in seconds or unix timestamp.
+	 * @param bool|null $cacheEnabled Sets if the cache should be enabled or not.
 	 */
 	public function startCache( $cacheExpiry = null, $cacheEnabled = null ) {
 		if ( is_null( $this->hasCached ) ) {
@@ -192,7 +192,7 @@ class CacheHelper implements ICacheHelper {
 	 * @since 1.20
 	 *
 	 * @param IContextSource $context
-	 * @param boolean $includePurgeLink
+	 * @param bool $includePurgeLink
 	 *
 	 * @return string
 	 */
@@ -328,7 +328,7 @@ class CacheHelper implements ICacheHelper {
 	 *
 	 * @since 1.20
 	 *
-	 * @param integer $cacheExpiry
+	 * @param int $cacheExpiry
 	 */
 	public function setExpiry( $cacheExpiry ) {
 		$this->cacheExpiry = $cacheExpiry;
@@ -378,7 +378,7 @@ class CacheHelper implements ICacheHelper {
 	 *
 	 * @since 1.20
 	 *
-	 * @param $handlerFunction
+	 * @param callable $handlerFunction
 	 */
 	public function setOnInitializedHandler( $handlerFunction ) {
 		$this->onInitHandler = $handlerFunction;
diff --git a/includes/CategoryViewer.php b/includes/CategoryViewer.php
index 7f213c352c..cee3f5b37f 100644
--- a/includes/CategoryViewer.php
+++ b/includes/CategoryViewer.php
@@ -29,12 +29,12 @@ class CategoryViewer extends ContextSource {
 		$imgsNoGallery;
 
 	/**
-	 * @var Array
+	 * @var array
 	 */
 	var $nextPage;
 
 	/**
-	 * @var Array
+	 * @var array
 	 */
 	var $flip;
 
@@ -69,12 +69,12 @@ class CategoryViewer extends ContextSource {
 	 * Constructor
 	 *
 	 * @since 1.19 $context is a second, required parameter
-	 * @param $title Title
-	 * @param $context IContextSource
+	 * @param Title $title
+	 * @param IContextSource $context
 	 * @param array $from An array with keys page, subcat,
 	 *        and file for offset of results of each section (since 1.17)
 	 * @param array $until An array with 3 keys for until of each section (since 1.17)
-	 * @param $query Array
+	 * @param array $query
 	 */
 	function __construct( $title, IContextSource $context, $from = array(),
 		$until = array(), $query = array()
@@ -162,9 +162,9 @@ class CategoryViewer extends ContextSource {
 
 	/**
 	 * Add a subcategory to the internal lists, using a Category object
-	 * @param $cat Category
-	 * @param $sortkey
-	 * @param $pageLength
+	 * @param Category $cat
+	 * @param string $sortkey
+	 * @param int $pageLength
 	 */
 	function addSubcategoryObject( Category $cat, $sortkey, $pageLength ) {
 		// Subcategory; strip the 'Category' namespace from the link text.
@@ -210,10 +210,10 @@ class CategoryViewer extends ContextSource {
 
 	/**
 	 * Add a page in the image namespace
-	 * @param $title Title
-	 * @param $sortkey
-	 * @param $pageLength
-	 * @param $isRedirect bool
+	 * @param Title $title
+	 * @param string $sortkey
+	 * @param int $pageLength
+	 * @param bool $isRedirect
 	 */
 	function addImage( Title $title, $sortkey, $pageLength, $isRedirect = false ) {
 		global $wgContLang;
@@ -240,10 +240,10 @@ class CategoryViewer extends ContextSource {
 
 	/**
 	 * Add a miscellaneous page
-	 * @param $title
-	 * @param $sortkey
-	 * @param $pageLength
-	 * @param $isRedirect bool
+	 * @param Title $title
+	 * @param string $sortkey
+	 * @param int $pageLength
+	 * @param bool $isRedirect
 	 */
 	function addPage( $title, $sortkey, $pageLength, $isRedirect = false ) {
 		global $wgContLang;
@@ -474,10 +474,10 @@ class CategoryViewer extends ContextSource {
 	 * Format a list of articles chunked by letter, either as a
 	 * bullet list or a columnar format, depending on the length.
 	 *
-	 * @param $articles Array
-	 * @param $articles_start_char Array
-	 * @param $cutoff Int
-	 * @return String
+	 * @param array $articles
+	 * @param array $articles_start_char
+	 * @param int $cutoff
+	 * @return string
 	 * @private
 	 */
 	function formatList( $articles, $articles_start_char, $cutoff = 6 ) {
@@ -507,9 +507,9 @@ class CategoryViewer extends ContextSource {
 	 * More distant TODO: Scrap this and use CSS columns, whenever IE finally
 	 * supports those.
 	 *
-	 * @param $articles Array
-	 * @param $articles_start_char Array
-	 * @return String
+	 * @param array $articles
+	 * @param array $articles_start_char
+	 * @return string
 	 * @private
 	 */
 	static function columnList( $articles, $articles_start_char ) {
@@ -563,9 +563,9 @@ class CategoryViewer extends ContextSource {
 
 	/**
 	 * Format a list of articles chunked by letter in a bullet list.
-	 * @param $articles Array
-	 * @param $articles_start_char Array
-	 * @return String
+	 * @param array $articles
+	 * @param array $articles_start_char
+	 * @return string
 	 * @private
 	 */
 	static function shortList( $articles, $articles_start_char ) {
@@ -590,7 +590,7 @@ class CategoryViewer extends ContextSource {
 	 * @param string $last The 'from' parameter for the generated URL
 	 * @param string $type A prefix for parameters, 'page' or 'subcat' or
 	 *     'file'
-	 * @return String HTML
+	 * @return string HTML
 	 */
 	private function pagingLinks( $first, $last, $type = '' ) {
 		$prevLink = $this->msg( 'prevn' )->numParams( $this->limit )->escaped();
diff --git a/includes/EditPage.php b/includes/EditPage.php
index c266996082..c2803b69cf 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -225,7 +225,7 @@ class EditPage {
 
 	/**
 	 * Has a summary been preset using GET parameter &summary= ?
-	 * @var Bool
+	 * @var bool
 	 */
 	var $hasPresetSummary = false;
 
@@ -266,7 +266,7 @@ class EditPage {
 	public $allowNonTextContent = false;
 
 	/**
-	 * @param $article Article
+	 * @param Article $article
 	 */
 	public function __construct( Article $article ) {
 		$this->mArticle = $article;
@@ -296,7 +296,7 @@ class EditPage {
 	/**
 	 * Set the context Title object
 	 *
-	 * @param $title Title object or null
+	 * @param Title|null $title Title object or null
 	 */
 	public function setContextTitle( $title ) {
 		$this->mContextTitle = $title;
@@ -307,7 +307,7 @@ class EditPage {
 	 * If not set, $wgTitle will be returned. This behavior might change in
 	 * the future to return $this->mTitle instead.
 	 *
-	 * @return Title object
+	 * @return Title
 	 */
 	public function getContextTitle() {
 		if ( is_null( $this->mContextTitle ) ) {
@@ -487,8 +487,8 @@ class EditPage {
 	 *   "View source for ..." page displaying the source code after the error message.
 	 *
 	 * @since 1.19
-	 * @param array $permErrors of permissions errors, as returned by
-	 *                    Title::getUserPermissionsErrors().
+	 * @param array $permErrors Array of permissions errors, as returned by
+	 *    Title::getUserPermissionsErrors().
 	 * @throws PermissionsError
 	 */
 	protected function displayPermissionsError( array $permErrors ) {
@@ -625,7 +625,7 @@ class EditPage {
 
 	/**
 	 * This function collects the form data and uses it to populate various member variables.
-	 * @param $request WebRequest
+	 * @param WebRequest $request
 	 * @throws ErrorPageError
 	 */
 	function importFormData( &$request ) {
@@ -819,7 +819,7 @@ class EditPage {
 	 * this method should be overridden and return the page text that will be used
 	 * for saving, preview parsing and so on...
 	 *
-	 * @param $request WebRequest
+	 * @param WebRequest $request
 	 */
 	protected function importContentFormData( &$request ) {
 		return; // Don't do anything, EditPage already extracted wpTextbox1
@@ -828,7 +828,7 @@ class EditPage {
 	/**
 	 * Initialise form fields in the object
 	 * Called on the first invocation, e.g. when a user clicks an edit link
-	 * @return bool -- if the requested section is valid
+	 * @return bool If the requested section is valid
 	 */
 	function initialiseForm() {
 		global $wgUser;
@@ -864,8 +864,8 @@ class EditPage {
 	/**
 	 * Fetch initial editing page content.
 	 *
-	 * @param $def_text string|bool
-	 * @return mixed string on success, $def_text for invalid sections
+	 * @param string|bool $def_text
+	 * @return string|bool string on success, $def_text for invalid sections
 	 * @private
 	 * @deprecated since 1.21, get WikiPage::getContent() instead.
 	 */
@@ -887,7 +887,7 @@ class EditPage {
 	/**
 	 * @param Content|null $def_content The default value to return
 	 *
-	 * @return mixed Content on success, $def_content for invalid sections
+	 * @return Content|null Content on success, $def_content for invalid sections
 	 *
 	 * @since 1.21
 	 */
@@ -1074,7 +1074,7 @@ class EditPage {
 	/**
 	 * Use this method before edit() to preload some text into the edit box
 	 *
-	 * @param $text string
+	 * @param string $text
 	 * @deprecated since 1.21, use setPreloadedContent() instead.
 	 */
 	public function setPreloadedText( $text ) {
@@ -1088,7 +1088,7 @@ class EditPage {
 	/**
 	 * Use this method before edit() to preload some content into the edit box
 	 *
-	 * @param $content Content
+	 * @param Content $content
 	 *
 	 * @since 1.21
 	 */
@@ -1102,7 +1102,7 @@ class EditPage {
 	 *
 	 * @param string $preload representing the title to preload from.
 	 *
-	 * @return String
+	 * @return string
 	 *
 	 * @deprecated since 1.21, use getPreloadedContent() instead
 	 */
@@ -1119,8 +1119,8 @@ class EditPage {
 	 * Get the contents to be preloaded into the box, either set by
 	 * an earlier setPreloadText() or by loading the given page.
 	 *
-	 * @param string $preload representing the title to preload from.
-	 * @param Array $params Parameters to use (interface-message style) in the preloaded text
+	 * @param string $preload Representing the title to preload from.
+	 * @param array $params Parameters to use (interface-message style) in the preloaded text
 	 *
 	 * @return Content
 	 *
@@ -1186,7 +1186,7 @@ class EditPage {
 	/**
 	 * Make sure the form isn't faking a user's credentials.
 	 *
-	 * @param $request WebRequest
+	 * @param WebRequest $request
 	 * @return bool
 	 * @private
 	 */
@@ -1345,7 +1345,7 @@ class EditPage {
 	/**
 	 * Run hooks that can filter edits just before they get saved.
 	 *
-	 * @param Content $content the Content to filter.
+	 * @param Content $content The Content to filter.
 	 * @param Status $status For reporting the outcome to the caller
 	 * @param User $user The user performing the edit
 	 *
@@ -1393,14 +1393,14 @@ class EditPage {
 	/**
 	 * Attempt submission (no UI)
 	 *
-	 * @param array $result array to add statuses to, currently with the possible keys:
+	 * @param array $result Array to add statuses to, currently with the possible keys:
 	 *  spam - string - Spam string from content if any spam is detected by matchSpamRegex
 	 *  sectionanchor - string - Section anchor for a section save
 	 *  nullEdit - boolean - Set if doEditContent is OK.  True if null edit, false otherwise.
 	 *  redirect - boolean -  Set if doEditContent is OK.  True if resulting revision is a redirect
 	 * @param bool $bot True if edit is being made under the bot right.
 	 *
-	 * @return Status object, possibly with a message, but always with one of the AS_* constants in $status->value,
+	 * @return Status Status object, possibly with a message, but always with one of the AS_* constants in $status->value,
 	 *
 	 * FIXME: This interface is TERRIBLE, but hard to get rid of due to various error display idiosyncrasies. There are
 	 * also lots of cases where error metadata is set in the object and retrieved later instead of being returned, e.g.
@@ -1866,7 +1866,7 @@ class EditPage {
 	/**
 	 * Attempts to merge text content with base and current revisions
 	 *
-	 * @param $editText string
+	 * @param string $editText
 	 *
 	 * @return bool
 	 * @deprecated since 1.21, use mergeChangesIntoContent() instead
@@ -1892,7 +1892,7 @@ class EditPage {
 	 *
 	 * @since 1.21
 	 *
-	 * @param $editContent
+	 * @param Content $editContent
 	 *
 	 * @return bool
 	 */
@@ -1948,9 +1948,9 @@ class EditPage {
 	/**
 	 * Check given input text against $wgSpamRegex, and return the text of the first match.
 	 *
-	 * @param $text string
+	 * @param string $text
 	 *
-	 * @return string|bool matching string or false
+	 * @return string|bool Matching string or false
 	 */
 	public static function matchSpamRegex( $text ) {
 		global $wgSpamRegex;
@@ -1962,9 +1962,9 @@ class EditPage {
 	/**
 	 * Check given input text against $wgSummarySpamRegex, and return the text of the first match.
 	 *
-	 * @param $text string
+	 * @param string $text
 	 *
-	 * @return string|bool matching string or false
+	 * @return string|bool Matching string or false
 	 */
 	public static function matchSummarySpamRegex( $text ) {
 		global $wgSummarySpamRegex;
@@ -1973,8 +1973,8 @@ class EditPage {
 	}
 
 	/**
-	 * @param $text string
-	 * @param $regexes array
+	 * @param string $text
+	 * @param array $regexes
 	 * @return bool|string
 	 */
 	protected static function matchSpamRegexInternal( $text, $regexes ) {
@@ -2153,7 +2153,7 @@ class EditPage {
 	 * content.
 	 *
 	 * @param Content|null|bool|string $content
-	 * @return String the editable text form of the content.
+	 * @return string The editable text form of the content.
 	 *
 	 * @throws MWException if $content is not an instance of TextContent and $this->allowNonTextContent is not true.
 	 */
@@ -2206,7 +2206,7 @@ class EditPage {
 
 	/**
 	 * Send the edit form and related headers to $wgOut
-	 * @param $formCallback Callback|null that takes an OutputPage parameter; will be called
+	 * @param callable|null $formCallback That takes an OutputPage parameter; will be called
 	 *     during form output near the top, for captchas and the like.
 	 */
 	function showEditForm( $formCallback = null ) {
@@ -2401,7 +2401,7 @@ class EditPage {
 	 * Extract the section title from current section text, if any.
 	 *
 	 * @param string $text
-	 * @return Mixed|string or false
+	 * @return string|bool string or false
 	 */
 	public static function extractSectionTitle( $text ) {
 		preg_match( "/^(=+)(.+)\\1\\s*(\n|$)/i", $text, $matches );
@@ -2576,8 +2576,8 @@ class EditPage {
 	 *
 	 * @param string $summary The value of the summary input
 	 * @param string $labelText The html to place inside the label
-	 * @param array $inputAttrs of attrs to use on the input
-	 * @param array $spanLabelAttrs of attrs to use on the span inside the label
+	 * @param array $inputAttrs Array of attrs to use on the input
+	 * @param array $spanLabelAttrs Array of attrs to use on the span inside the label
 	 *
 	 * @return array An array in the format array( $label, $input )
 	 */
@@ -2637,7 +2637,7 @@ class EditPage {
 	 * @param bool $isSubjectPreview true if this is the section subject/title
 	 *   up top, or false if this is the comment summary
 	 *   down below the textarea
-	 * @param string $summary the text of the summary to display
+	 * @param string $summary The text of the summary to display
 	 * @return string
 	 */
 	protected function getSummaryPreview( $isSubjectPreview, $summary = "" ) {
@@ -2710,8 +2710,8 @@ HTML
 	 * The $textoverride method can be used by subclasses overriding showContentForm
 	 * to pass back to this method.
 	 *
-	 * @param array $customAttribs of html attributes to use in the textarea
-	 * @param string $textoverride optional text to override $this->textarea1 with
+	 * @param array $customAttribs Array of html attributes to use in the textarea
+	 * @param string $textoverride Optional text to override $this->textarea1 with
 	 */
 	protected function showTextbox1( $customAttribs = null, $textoverride = null ) {
 		if ( $this->wasDeletedSinceLastEdit() && $this->formtype == 'save' ) {
@@ -2817,7 +2817,7 @@ HTML
 	 * Append preview output to $wgOut.
 	 * Includes category rendering if this is a category page.
 	 *
-	 * @param string $text the HTML to be output for the preview.
+	 * @param string $text The HTML to be output for the preview.
 	 */
 	protected function showPreview( $text ) {
 		global $wgOut;
@@ -2946,8 +2946,7 @@ HTML
 	 * Get the copyright warning, by default returns wikitext
 	 *
 	 * @param Title $title
-	 * @param string $format output format, valid values are any function of
-	 *                       a Message object
+	 * @param string $format Output format, valid values are any function of a Message object
 	 * @return string
 	 */
 	public static function getCopyrightWarning( $title, $format = 'plain' ) {
@@ -3106,7 +3105,7 @@ HTML
 	 * variable in the constructor is not enough. This can be used when the
 	 * EditPage lives inside of a Special page rather than a custom page action.
 	 *
-	 * @param $title Title object for which is being edited (where we go to for &action= links)
+	 * @param Title $title Title object for which is being edited (where we go to for &action= links)
 	 * @return string
 	 */
 	protected function getActionURL( Title $title ) {
@@ -3118,6 +3117,7 @@ HTML
 	 * Note that we rely on the logging table, which hasn't been always there,
 	 * but that doesn't matter, because this only applies to brand new
 	 * deletes.
+	 * @return bool
 	 */
 	protected function wasDeletedSinceLastEdit() {
 		if ( $this->deletedSinceEdit !== null ) {
@@ -3313,7 +3313,7 @@ HTML
 	}
 
 	/**
-	 * @return Array
+	 * @return array
 	 */
 	function getTemplates() {
 		if ( $this->preview || $this->section != '' ) {
@@ -3494,7 +3494,7 @@ HTML
 	 * minor and watch
 	 *
 	 * @param int $tabindex Current tabindex
-	 * @param array $checked of checkbox => bool, where bool indicates the checked
+	 * @param array $checked Array of checkbox => bool, where bool indicates the checked
 	 *                 status of the checkbox
 	 *
 	 * @return array
@@ -3673,7 +3673,7 @@ HTML
 	/**
 	 * Show "your edit contains spam" page with your diff and text
 	 *
-	 * @param $match string|Array|bool Text (or array of texts) which triggered one or more filters
+	 * @param string|array|bool $match Text (or array of texts) which triggered one or more filters
 	 */
 	public function spamPageWithContent( $match = false ) {
 		global $wgOut, $wgLang;
diff --git a/includes/Fallback.php b/includes/Fallback.php
index cdf6c88ec3..e38bdf1a70 100644
--- a/includes/Fallback.php
+++ b/includes/Fallback.php
@@ -26,9 +26,9 @@
 class Fallback {
 
 	/**
-	 * @param $from
-	 * @param $to
-	 * @param $string
+	 * @param string $from
+	 * @param string $to
+	 * @param string $string
 	 * @return string
 	 */
 	public static function iconv( $from, $to, $string ) {
@@ -57,9 +57,9 @@ class Fallback {
 	 * can be up to 100x slower than native if the text is heavily
 	 * multibyte and we have to slog through a few hundred kb.
 	 *
-	 * @param $str
-	 * @param $start
-	 * @param $count string
+	 * @param string $str
+	 * @param int $start
+	 * @param string $count
 	 *
 	 * @return string
 	 */
@@ -78,8 +78,8 @@ class Fallback {
 	}
 
 	/**
-	 * @param $str
-	 * @param $splitPos
+	 * @param string $str
+	 * @param int $splitPos
 	 * @return int
 	 */
 	public static function mb_substr_split_unicode( $str, $splitPos ) {
@@ -130,7 +130,7 @@ class Fallback {
 	/**
 	 * Fallback implementation of mb_strlen, hardcoded to UTF-8.
 	 * @param string $str
-	 * @param string $enc optional encoding; ignored
+	 * @param string $enc Optional encoding; ignored
 	 * @return int
 	 */
 	public static function mb_strlen( $str, $enc = '' ) {
@@ -151,10 +151,10 @@ class Fallback {
 
 	/**
 	 * Fallback implementation of mb_strpos, hardcoded to UTF-8.
-	 * @param $haystack String
-	 * @param $needle String
-	 * @param string $offset optional start position
-	 * @param string $encoding optional encoding; ignored
+	 * @param string $haystack
+	 * @param string $needle
+	 * @param string $offset Optional start position
+	 * @param string $encoding Optional encoding; ignored
 	 * @return int
 	 */
 	public static function mb_strpos( $haystack, $needle, $offset = 0, $encoding = '' ) {
@@ -172,8 +172,8 @@ class Fallback {
 
 	/**
 	 * Fallback implementation of mb_strrpos, hardcoded to UTF-8.
-	 * @param $haystack String
-	 * @param $needle String
+	 * @param string $haystack
+	 * @param string $needle
 	 * @param string $offset optional start position
 	 * @param string $encoding optional encoding; ignored
 	 * @return int
diff --git a/includes/Feed.php b/includes/Feed.php
index d5a95535f3..1b995195cb 100644
--- a/includes/Feed.php
+++ b/includes/Feed.php
@@ -53,11 +53,11 @@ class FeedItem {
 	 * Constructor
 	 *
 	 * @param string|Title $title Item's title
-	 * @param $description String
+	 * @param string $description
 	 * @param string $url URL uniquely designating the item.
 	 * @param string $date Item's date
 	 * @param string $author Author's user name
-	 * @param $comments String
+	 * @param string $comments
 	 */
 	function __construct( $title, $description, $url, $date = '', $author = '', $comments = '' ) {
 		$this->title = $title;
@@ -72,8 +72,8 @@ class FeedItem {
 	/**
 	 * Encode $string so that it can be safely embedded in a XML document
 	 *
-	 * @param string $string string to encode
-	 * @return String
+	 * @param string $string String to encode
+	 * @return string
 	 */
 	public function xmlEncode( $string ) {
 		$string = str_replace( "\r\n", "\n", $string );
@@ -84,7 +84,7 @@ class FeedItem {
 	/**
 	 * Get the unique id of this item
 	 *
-	 * @return String
+	 * @return string
 	 */
 	public function getUniqueId() {
 		if ( $this->uniqueId ) {
@@ -95,8 +95,8 @@ class FeedItem {
 	/**
 	 * set the unique id of an item
 	 *
-	 * @param string $uniqueId unique id for the item
-	 * @param $rssIsPermalink Boolean: set to true if the guid (unique id) is a permalink (RSS feeds only)
+	 * @param string $uniqueId Unique id for the item
+	 * @param bool $rssIsPermalink Set to true if the guid (unique id) is a permalink (RSS feeds only)
 	 */
 	public function setUniqueId( $uniqueId, $rssIsPermalink = false ) {
 		$this->uniqueId = $uniqueId;
@@ -106,7 +106,7 @@ class FeedItem {
 	/**
 	 * Get the title of this item; already xml-encoded
 	 *
-	 * @return String
+	 * @return string
 	 */
 	public function getTitle() {
 		return $this->xmlEncode( $this->title );
@@ -115,7 +115,7 @@ class FeedItem {
 	/**
 	 * Get the URL of this item; already xml-encoded
 	 *
-	 * @return String
+	 * @return string
 	 */
 	public function getUrl() {
 		return $this->xmlEncode( $this->url );
@@ -124,7 +124,7 @@ class FeedItem {
 	/**
 	 * Get the description of this item; already xml-encoded
 	 *
-	 * @return String
+	 * @return string
 	 */
 	public function getDescription() {
 		return $this->xmlEncode( $this->description );
@@ -133,7 +133,7 @@ class FeedItem {
 	/**
 	 * Get the language of this item
 	 *
-	 * @return String
+	 * @return string
 	 */
 	public function getLanguage() {
 		global $wgLanguageCode;
@@ -143,7 +143,7 @@ class FeedItem {
 	/**
 	 * Get the title of this item
 	 *
-	 * @return String
+	 * @return string
 	 */
 	public function getDate() {
 		return $this->date;
@@ -152,7 +152,7 @@ class FeedItem {
 	/**
 	 * Get the author of this item; already xml-encoded
 	 *
-	 * @return String
+	 * @return string
 	 */
 	public function getAuthor() {
 		return $this->xmlEncode( $this->author );
@@ -161,7 +161,7 @@ class FeedItem {
 	/**
 	 * Get the comment of this item; already xml-encoded
 	 *
-	 * @return String
+	 * @return string
 	 */
 	public function getComments() {
 		return $this->xmlEncode( $this->comments );
@@ -171,7 +171,7 @@ class FeedItem {
 	 * Quickie hack... strip out wikilinks to more legible form from the comment.
 	 *
 	 * @param string $text wikitext
-	 * @return String
+	 * @return string
 	 */
 	public static function stripComment( $text ) {
 		return preg_replace( '/\[\[([^]]*\|)?([^]]+)\]\]/', '\2', $text );
@@ -190,7 +190,6 @@ abstract class ChannelFeed extends FeedItem {
 	 * @code
 	 * print "<feed>";
 	 * @endcode
-	 * @param $item
 	 */
 	abstract public function outHeader();
 
@@ -200,7 +199,7 @@ abstract class ChannelFeed extends FeedItem {
 	 * @code
 	 * print "<item>...</item>";
 	 * @endcode
-	 * @param $item
+	 * @param FeedItem $item
 	 */
 	abstract public function outItem( $item );
 
@@ -274,8 +273,8 @@ class RSSFeed extends ChannelFeed {
 	/**
 	 * Format a date given a timestamp
 	 *
-	 * @param $ts Integer: timestamp
-	 * @return String: date string
+	 * @param int $ts Timestamp
+	 * @return string Date string
 	 */
 	function formatTime( $ts ) {
 		return gmdate( 'D, d M Y H:i:s \G\M\T', wfTimestamp( TS_UNIX, $ts ) );
@@ -301,7 +300,7 @@ class RSSFeed extends ChannelFeed {
 
 	/**
 	 * Output an RSS 2.0 item
-	 * @param $item FeedItem: item to be output
+	 * @param FeedItem $item Item to be output
 	 */
 	function outItem( $item ) {
 	?>
@@ -386,7 +385,7 @@ class AtomFeed extends ChannelFeed {
 
 	/**
 	 * Output a given item.
-	 * @param $item
+	 * @param FeedItem $item
 	 */
 	function outItem( $item ) {
 		global $wgMimeType;
diff --git a/includes/HistoryBlob.php b/includes/HistoryBlob.php
index a3ed7009e5..da54673df5 100644
--- a/includes/HistoryBlob.php
+++ b/includes/HistoryBlob.php
@@ -32,18 +32,18 @@ interface HistoryBlob
 	 * You must call setLocation() on the stub object before storing it to the
 	 * database
 	 *
-	 * @param $text string
+	 * @param string $text
 	 *
-	 * @return String: the key for getItem()
+	 * @return string The key for getItem()
 	 */
 	function addItem( $text );
 
 	/**
 	 * Get item by key, or false if the key is not present
 	 *
-	 * @param $key string
+	 * @param string $key
 	 *
-	 * @return String or false
+	 * @return string|bool
 	 */
 	function getItem( $key );
 
@@ -55,14 +55,14 @@ interface HistoryBlob
 	 *
 	 * Default text is not required for two-part external storage URLs.
 	 *
-	 * @param $text string
+	 * @param string $text
 	 */
 	function setText( $text );
 
 	/**
 	 * Get default text. This is called from Revision::getRevisionText()
 	 *
-	 * @return String
+	 * @return string
 	 */
 	function getText();
 }
@@ -88,7 +88,7 @@ class ConcatenatedGzipHistoryBlob implements HistoryBlob
 	}
 
 	/**
-	 * @param $text string
+	 * @param string $text
 	 * @return string
 	 */
 	public function addItem( $text ) {
@@ -102,7 +102,7 @@ class ConcatenatedGzipHistoryBlob implements HistoryBlob
 	}
 
 	/**
-	 * @param $hash string
+	 * @param string $hash
 	 * @return array|bool
 	 */
 	public function getItem( $hash ) {
@@ -115,7 +115,7 @@ class ConcatenatedGzipHistoryBlob implements HistoryBlob
 	}
 
 	/**
-	 * @param $text string
+	 * @param string $text
 	 * @return void
 	 */
 	public function setText( $text ) {
@@ -134,7 +134,7 @@ class ConcatenatedGzipHistoryBlob implements HistoryBlob
 	/**
 	 * Remove an item
 	 *
-	 * @param $hash string
+	 * @param string $hash
 	 */
 	public function removeItem( $hash ) {
 		$this->mSize -= strlen( $this->mItems[$hash] );
@@ -200,8 +200,8 @@ class HistoryBlobStub {
 	var $mOldId, $mHash, $mRef;
 
 	/**
-	 * @param string $hash the content hash of the text
-	 * @param $oldid Integer the old_id for the CGZ object
+	 * @param string $hash The content hash of the text
+	 * @param int $oldid The old_id for the CGZ object
 	 */
 	function __construct( $hash = '', $oldid = 0 ) {
 		$this->mHash = $hash;
@@ -210,6 +210,7 @@ class HistoryBlobStub {
 	/**
 	 * Sets the location (old_id) of the main object to which this object
 	 * points
+	 * @param int $id
 	 */
 	function setLocation( $id ) {
 		$this->mOldId = $id;
@@ -217,6 +218,7 @@ class HistoryBlobStub {
 
 	/**
 	 * Sets the location (old_id) of the referring object
+	 * @param string $id
 	 */
 	function setReferrer( $id ) {
 		$this->mRef = $id;
@@ -224,6 +226,7 @@ class HistoryBlobStub {
 
 	/**
 	 * Gets the location of the referring object
+	 * @return string
 	 */
 	function getReferrer() {
 		return $this->mRef;
@@ -298,7 +301,7 @@ class HistoryBlobCurStub {
 	var $mCurId;
 
 	/**
-	 * @param $curid Integer: the cur_id pointed to
+	 * @param int $curid The cur_id pointed to
 	 */
 	function __construct( $curid = 0 ) {
 		$this->mCurId = $curid;
@@ -308,7 +311,7 @@ class HistoryBlobCurStub {
 	 * Sets the location (cur_id) of the main object to which this object
 	 * points
 	 *
-	 * @param $id int
+	 * @param int $id
 	 */
 	function setLocation( $id ) {
 		$this->mCurId = $id;
@@ -390,7 +393,7 @@ class DiffHistoryBlob implements HistoryBlob {
 
 	/**
 	 * @throws MWException
-	 * @param $text string
+	 * @param string $text
 	 * @return int
 	 */
 	function addItem( $text ) {
@@ -405,7 +408,7 @@ class DiffHistoryBlob implements HistoryBlob {
 	}
 
 	/**
-	 * @param $key string
+	 * @param string $key
 	 * @return string
 	 */
 	function getItem( $key ) {
@@ -413,7 +416,7 @@ class DiffHistoryBlob implements HistoryBlob {
 	}
 
 	/**
-	 * @param $text string
+	 * @param string $text
 	 */
 	function setText( $text ) {
 		$this->mDefaultKey = $this->addItem( $text );
@@ -502,8 +505,8 @@ class DiffHistoryBlob implements HistoryBlob {
 	}
 
 	/**
-	 * @param $t1
-	 * @param $t2
+	 * @param string $t1
+	 * @param string $t2
 	 * @return string
 	 */
 	function diff( $t1, $t2 ) {
@@ -516,8 +519,8 @@ class DiffHistoryBlob implements HistoryBlob {
 	}
 
 	/**
-	 * @param $base
-	 * @param $diff
+	 * @param string $base
+	 * @param string $diff
 	 * @return bool|string
 	 */
 	function patch( $base, $diff ) {
@@ -580,7 +583,7 @@ class DiffHistoryBlob implements HistoryBlob {
 	 * the bytes backwards and initialised with 0 instead of 1. See bug 34428.
 	 *
 	 * @param string $s
-	 * @return string|bool: false if the hash extension is not available
+	 * @return string|bool false if the hash extension is not available
 	 */
 	function xdiffAdler32( $s ) {
 		if ( !function_exists( 'hash' ) ) {
diff --git a/includes/Html.php b/includes/Html.php
index b1d4f001af..2a8c9b1736 100644
--- a/includes/Html.php
+++ b/includes/Html.php
@@ -139,9 +139,9 @@ class Html {
 	 * Identical to rawElement(), but HTML-escapes $contents (like
 	 * Xml::element()).
 	 *
-	 * @param $element string
-	 * @param $attribs array
-	 * @param $contents string
+	 * @param string $element
+	 * @param array $attribs
+	 * @param string $contents
 	 *
 	 * @return string
 	 */
@@ -158,8 +158,8 @@ class Html {
 	 * Identical to rawElement(), but has no third parameter and omits the end
 	 * tag (and the self-closing '/' in XML mode for empty elements).
 	 *
-	 * @param $element string
-	 * @param $attribs array
+	 * @param string $element
+	 * @param array $attribs
 	 *
 	 * @return string
 	 */
@@ -267,7 +267,7 @@ class Html {
 	 * to the input array (currently per the HTML 5 draft as of 2009-09-06).
 	 *
 	 * @param string $element Name of the element, e.g., 'a'
-	 * @param array $attribs  Associative array of attributes, e.g., array(
+	 * @param array $attribs Associative array of attributes, e.g., array(
 	 *   'href' => 'http://www.mediawiki.org/' ).  See expandAttributes() for
 	 *   further documentation.
 	 * @return array An array of attributes functionally identical to $attribs
@@ -583,7 +583,7 @@ class Html {
 	 * Output a "<script>" tag linking to the given URL, e.g.,
 	 * "<script src=foo.js></script>".
 	 *
-	 * @param $url string
+	 * @param string $url
 	 * @return string Raw HTML
 	 */
 	public static function linkedScript( $url ) {
@@ -598,7 +598,7 @@ class Html {
 	 * contains literal "</style>" (admittedly unlikely).
 	 *
 	 * @param string $contents CSS
-	 * @param $media mixed A media type string, like 'screen'
+	 * @param string $media A media type string, like 'screen'
 	 * @return string Raw HTML
 	 */
 	public static function inlineStyle( $contents, $media = 'all' ) {
@@ -618,8 +618,8 @@ class Html {
 	 * Output a "<link rel=stylesheet>" linking to the given URL for the given
 	 * media type (if any).
 	 *
-	 * @param $url string
-	 * @param $media mixed A media type string, like 'screen'
+	 * @param string $url
+	 * @param string $media A media type string, like 'screen'
 	 * @return string Raw HTML
 	 */
 	public static function linkedStyle( $url, $media = 'all' ) {
@@ -854,11 +854,11 @@ class Html {
 	/**
 	 * Get HTML for an info box with an icon.
 	 *
-	 * @param string $text wikitext, get this with wfMessage()->plain()
-	 * @param string $icon icon name, file in skins/common/images
-	 * @param string $alt alternate text for the icon
-	 * @param string $class additional class name to add to the wrapper div
-	 * @param $useStylePath
+	 * @param string $text Wikitext, get this with wfMessage()->plain()
+	 * @param string $icon Icon name, file in skins/common/images
+	 * @param string $alt Alternate text for the icon
+	 * @param string $class Additional class name to add to the wrapper div
+	 * @param bool $useStylePath
 	 *
 	 * @return string
 	 */
diff --git a/includes/HttpFunctions.php b/includes/HttpFunctions.php
index 1fd437ed1d..c9dd0c067f 100644
--- a/includes/HttpFunctions.php
+++ b/includes/HttpFunctions.php
@@ -55,7 +55,7 @@ class Http {
 	 *		                    to avoid attacks on intranet services accessible by HTTP.
 	 *    - userAgent           A user agent, if you want to override the default
 	 *                          MediaWiki/$wgVersion
-	 * @return Mixed: (bool)false on failure or a string on success
+	 * @return string|bool (bool)false on failure or a string on success
 	 */
 	public static function request( $method, $url, $options = array() ) {
 		wfDebug( "HTTP: $method: $url\n" );
@@ -85,9 +85,9 @@ class Http {
 	 * Simple wrapper for Http::request( 'GET' )
 	 * @see Http::request()
 	 *
-	 * @param $url
-	 * @param $timeout string
-	 * @param $options array
+	 * @param string $url
+	 * @param string $timeout
+	 * @param array $options
 	 * @return string
 	 */
 	public static function get( $url, $timeout = 'default', $options = array() ) {
@@ -99,8 +99,8 @@ class Http {
 	 * Simple wrapper for Http::request( 'POST' )
 	 * @see Http::request()
 	 *
-	 * @param $url
-	 * @param $options array
+	 * @param string $url
+	 * @param array $options
 	 * @return string
 	 */
 	public static function post( $url, $options = array() ) {
@@ -110,8 +110,8 @@ class Http {
 	/**
 	 * Check if the URL can be served by localhost
 	 *
-	 * @param string $url full url to check
-	 * @return Boolean
+	 * @param string $url Full url to check
+	 * @return bool
 	 */
 	public static function isLocalURL( $url ) {
 		global $wgCommandLineMode, $wgConf;
@@ -150,7 +150,7 @@ class Http {
 
 	/**
 	 * A standard user-agent we can use for external requests.
-	 * @return String
+	 * @return string
 	 */
 	public static function userAgent() {
 		global $wgVersion;
@@ -166,8 +166,8 @@ class Http {
 	 *
 	 * @todo FIXME this is wildly inaccurate and fails to actually check most stuff
 	 *
-	 * @param $uri Mixed: URI to check for validity
-	 * @return Boolean
+	 * @param string $uri URI to check for validity
+	 * @return bool
 	 */
 	public static function isValidURI( $uri ) {
 		return preg_match(
@@ -217,7 +217,7 @@ class MWHttpRequest {
 	public $status;
 
 	/**
-	 * @param string $url url to use. If protocol-relative, will be expanded to an http:// URL
+	 * @param string $url Url to use. If protocol-relative, will be expanded to an http:// URL
 	 * @param array $options (optional) extra params to pass (see Http::request())
 	 */
 	protected function __construct( $url, $options = array() ) {
@@ -276,7 +276,7 @@ class MWHttpRequest {
 
 	/**
 	 * Generate a new request object
-	 * @param string $url url to use
+	 * @param string $url Url to use
 	 * @param array $options (optional) extra params to pass (see Http::request())
 	 * @throws MWException
 	 * @return CurlHttpRequest|PhpHttpRequest
@@ -310,7 +310,7 @@ class MWHttpRequest {
 	/**
 	 * Get the body, or content, of the response to the request
 	 *
-	 * @return String
+	 * @return string
 	 */
 	public function getContent() {
 		return $this->content;
@@ -319,7 +319,7 @@ class MWHttpRequest {
 	/**
 	 * Set the parameters of the request
 	 *
-	 * @param $args Array
+	 * @param array $args
 	 * @todo overload the args param
 	 */
 	public function setData( $args ) {
@@ -352,7 +352,7 @@ class MWHttpRequest {
 
 	/**
 	 * Set the user agent
-	 * @param $UA string
+	 * @param string $UA
 	 */
 	public function setUserAgent( $UA ) {
 		$this->setHeader( 'User-Agent', $UA );
@@ -360,8 +360,8 @@ class MWHttpRequest {
 
 	/**
 	 * Set an arbitrary header
-	 * @param $name
-	 * @param $value
+	 * @param string $name
+	 * @param string $value
 	 */
 	public function setHeader( $name, $value ) {
 		// I feel like I should normalize the case here...
@@ -405,7 +405,7 @@ class MWHttpRequest {
 	 * bytes are reported handled than were passed to you, the HTTP fetch
 	 * will be aborted.
 	 *
-	 * @param $callback Callback
+	 * @param callable $callback
 	 * @throws MWException
 	 */
 	public function setCallback( $callback ) {
@@ -419,8 +419,8 @@ class MWHttpRequest {
 	 * A generic callback to read the body of the response from a remote
 	 * server.
 	 *
-	 * @param $fh handle
-	 * @param $content String
+	 * @param resource $fh
+	 * @param string $content
 	 * @return int
 	 */
 	public function read( $fh, $content ) {
@@ -507,7 +507,7 @@ class MWHttpRequest {
 	 * (see RFC2616, section 10, http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html
 	 * for a list of status codes.)
 	 *
-	 * @return Integer
+	 * @return int
 	 */
 	public function getStatus() {
 		if ( !$this->respHeaders ) {
@@ -520,7 +520,7 @@ class MWHttpRequest {
 	/**
 	 * Returns true if the last status code was a redirect.
 	 *
-	 * @return Boolean
+	 * @return bool
 	 */
 	public function isRedirect() {
 		if ( !$this->respHeaders ) {
@@ -542,7 +542,7 @@ class MWHttpRequest {
 	 * (e.g. Set-Cookie) can appear more than once the, each value of
 	 * the associative array is an array of the values given.
 	 *
-	 * @return Array
+	 * @return array
 	 */
 	public function getResponseHeaders() {
 		if ( !$this->respHeaders ) {
@@ -555,8 +555,8 @@ class MWHttpRequest {
 	/**
 	 * Returns the value of the given response header.
 	 *
-	 * @param $header String
-	 * @return String
+	 * @param string $header
+	 * @return string
 	 */
 	public function getResponseHeader( $header ) {
 		if ( !$this->respHeaders ) {
@@ -574,7 +574,7 @@ class MWHttpRequest {
 	/**
 	 * Tells the MWHttpRequest object to use this pre-loaded CookieJar.
 	 *
-	 * @param $jar CookieJar
+	 * @param CookieJar $jar
 	 */
 	public function setCookieJar( $jar ) {
 		$this->cookieJar = $jar;
@@ -598,9 +598,9 @@ class MWHttpRequest {
 	 * cookies. Used internally after a request to parse the
 	 * Set-Cookie headers.
 	 * @see Cookie::set
-	 * @param $name
-	 * @param $value null
-	 * @param $attr null
+	 * @param string $name
+	 * @param mixed $value
+	 * @param array $attr
 	 */
 	public function setCookie( $name, $value = null, $attr = null ) {
 		if ( !$this->cookieJar ) {
@@ -705,8 +705,8 @@ class CurlHttpRequest extends MWHttpRequest {
 	protected $headerText = "";
 
 	/**
-	 * @param $fh
-	 * @param $content
+	 * @param resource $fh
+	 * @param string $content
 	 * @return int
 	 */
 	protected function readHeader( $fh, $content ) {
@@ -821,7 +821,7 @@ class CurlHttpRequest extends MWHttpRequest {
 class PhpHttpRequest extends MWHttpRequest {
 
 	/**
-	 * @param $url string
+	 * @param string $url
 	 * @return string
 	 */
 	protected function urlToTcp( $url ) {
diff --git a/includes/ImagePage.php b/includes/ImagePage.php
index a83217d5a2..8444223a50 100644
--- a/includes/ImagePage.php
+++ b/includes/ImagePage.php
@@ -40,7 +40,7 @@ class ImagePage extends Article {
 	var $mExtraDescription = false;
 
 	/**
-	 * @param $title Title
+	 * @param Title $title
 	 * @return WikiFilePage
 	 */
 	protected function newPage( Title $title ) {
@@ -50,7 +50,7 @@ class ImagePage extends Article {
 
 	/**
 	 * Constructor from a page id
-	 * @param int $id article ID to load
+	 * @param int $id Article ID to load
 	 * @return ImagePage|null
 	 */
 	public static function newFromID( $id ) {
@@ -61,7 +61,7 @@ class ImagePage extends Article {
 	}
 
 	/**
-	 * @param $file File:
+	 * @param File $file
 	 * @return void
 	 */
 	public function setFile( $file ) {
@@ -227,8 +227,8 @@ class ImagePage extends Article {
 	/**
 	 * Create the TOC
 	 *
-	 * @param $metadata Boolean: whether or not to show the metadata link
-	 * @return String
+	 * @param bool $metadata Whether or not to show the metadata link
+	 * @return string
 	 */
 	protected function showTOC( $metadata ) {
 		$r = array(
@@ -250,8 +250,8 @@ class ImagePage extends Article {
 	 *
 	 * @todo FIXME: Bad interface, see note on MediaHandler::formatMetadata().
 	 *
-	 * @param array $metadata the array containing the Exif data
-	 * @return String The metadata table. This is treated as Wikitext (!)
+	 * @param array $metadata The array containing the Exif data
+	 * @return string The metadata table. This is treated as Wikitext (!)
 	 */
 	protected function makeMetadataTable( $metadata ) {
 		$r = "<div class=\"mw-imagepage-section-metadata\">";
@@ -609,8 +609,8 @@ EOT
 	/**
 	 * Creates an thumbnail of specified size and returns an HTML link to it
 	 * @param array $params Scaler parameters
-	 * @param $width int
-	 * @param $height int
+	 * @param int $width
+	 * @param int $height
 	 * @return string
 	 */
 	private function makeSizeLink( $params, $width, $height ) {
@@ -723,8 +723,8 @@ EOT
 	}
 
 	/**
-	 * @param $target
-	 * @param $limit
+	 * @param string $target
+	 * @param int $limit
 	 * @return ResultWrapper
 	 */
 	protected function queryImageLinks( $target, $limit ) {
@@ -916,7 +916,7 @@ EOT
 	/**
 	 * Display an error with a wikitext description
 	 *
-	 * @param $description String
+	 * @param string $description
 	 */
 	function showError( $description ) {
 		$out = $this->getContext()->getOutput();
@@ -931,9 +931,9 @@ EOT
 	 * Callback for usort() to do link sorts by (namespace, title)
 	 * Function copied from Title::compare()
 	 *
-	 * @param $a object page to compare with
-	 * @param $b object page to compare with
-	 * @return Integer: result of string comparison, or namespace comparison
+	 * @param object $a Object page to compare with
+	 * @param object $b Object page to compare with
+	 * @return int Result of string comparison, or namespace comparison
 	 */
 	protected function compare( $a, $b ) {
 		if ( $a->page_namespace == $b->page_namespace ) {
@@ -946,7 +946,7 @@ EOT
 	/**
 	 * Returns the corresponding $wgImageLimits entry for the selected user option
 	 *
-	 * @param $user User
+	 * @param User $user
 	 * @param string $optionName Name of a option to check, typically imagesize or thumbsize
 	 * @return array
 	 * @since 1.21
@@ -974,10 +974,10 @@ EOT
 	/**
 	 * Output a drop-down box for language options for the file
 	 *
-	 * @param Array $langChoices Array of string language codes
-	 * @param String $curLang Language code file is being viewed in.
-	 * @param String $defaultLang Language code that image is rendered in by default
-	 * @return String HTML to insert underneath image.
+	 * @param array $langChoices Array of string language codes
+	 * @param string $curLang Language code file is being viewed in.
+	 * @param string $defaultLang Language code that image is rendered in by default
+	 * @return string HTML to insert underneath image.
 	 */
 	protected function doRenderLangOpt( array $langChoices, $curLang, $defaultLang ) {
 		global $wgScript;
@@ -1096,7 +1096,7 @@ class ImageHistoryList extends ContextSource {
 	}
 
 	/**
-	 * @param $navLinks string
+	 * @param string $navLinks
 	 * @return string
 	 */
 	public function beginImageHistoryList( $navLinks = '' ) {
@@ -1116,7 +1116,7 @@ class ImageHistoryList extends ContextSource {
 	}
 
 	/**
-	 * @param $navLinks string
+	 * @param string $navLinks
 	 * @return string
 	 */
 	public function endImageHistoryList( $navLinks = '' ) {
@@ -1124,8 +1124,8 @@ class ImageHistoryList extends ContextSource {
 	}
 
 	/**
-	 * @param $iscur
-	 * @param $file File
+	 * @param bool $iscur
+	 * @param File $file
 	 * @return string
 	 */
 	public function imageHistoryLine( $iscur, $file ) {
@@ -1285,7 +1285,7 @@ class ImageHistoryList extends ContextSource {
 	}
 
 	/**
-	 * @param $file File
+	 * @param File $file
 	 * @return string
 	 */
 	protected function getThumbForLine( $file ) {
@@ -1320,7 +1320,7 @@ class ImageHistoryList extends ContextSource {
 	}
 
 	/**
-	 * @param $enable bool
+	 * @param bool $enable
 	 */
 	protected function preventClickjacking( $enable = true ) {
 		$this->preventClickjacking = $enable;
@@ -1379,7 +1379,7 @@ class ImageHistoryPseudoPager extends ReverseChronologicalPager {
 	}
 
 	/**
-	 * @param $row object
+	 * @param object $row
 	 * @return string
 	 */
 	function formatRow( $row ) {
@@ -1493,7 +1493,7 @@ class ImageHistoryPseudoPager extends ReverseChronologicalPager {
 	}
 
 	/**
-	 * @param $enable bool
+	 * @param bool $enable
 	 */
 	protected function preventClickjacking( $enable = true ) {
 		$this->preventClickjacking = $enable;
diff --git a/includes/Linker.php b/includes/Linker.php
index 0805f70345..cfa0158f4d 100644
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -41,7 +41,7 @@ class Linker {
 	 * Get the appropriate HTML attributes to add to the "a" element of an
 	 * external link, as created by [wikisyntax].
 	 *
-	 * @param string $class the contents of the class attribute; if an empty
+	 * @param string $class The contents of the class attribute; if an empty
 	 *   string is passed, which is the default value, defaults to 'external'.
 	 * @return string
 	 * @deprecated since 1.18 Just pass the external class directly to something using Html::expandAttributes
@@ -54,10 +54,10 @@ class Linker {
 	/**
 	 * Get the appropriate HTML attributes to add to the "a" element of an interwiki link.
 	 *
-	 * @param string $title the title text for the link, URL-encoded (???) but
+	 * @param string $title The title text for the link, URL-encoded (???) but
 	 *   not HTML-escaped
-	 * @param string $unused unused
-	 * @param string $class the contents of the class attribute; if an empty
+	 * @param string $unused Unused
+	 * @param string $class The contents of the class attribute; if an empty
 	 *   string is passed, which is the default value, defaults to 'external'.
 	 * @return string
 	 */
@@ -76,10 +76,10 @@ class Linker {
 	/**
 	 * Get the appropriate HTML attributes to add to the "a" element of an internal link.
 	 *
-	 * @param string $title the title text for the link, URL-encoded (???) but
+	 * @param string $title The title text for the link, URL-encoded (???) but
 	 *   not HTML-escaped
-	 * @param string $unused unused
-	 * @param string $class the contents of the class attribute, default none
+	 * @param string $unused Unused
+	 * @param string $class The contents of the class attribute, default none
 	 * @return string
 	 */
 	static function getInternalLinkAttributes( $title, $unused = null, $class = '' ) {
@@ -92,7 +92,7 @@ class Linker {
 	 * Get the appropriate HTML attributes to add to the "a" element of an internal
 	 * link, given the Title object for the page we want to link to.
 	 *
-	 * @param $nt Title
+	 * @param Title $nt
 	 * @param string $unused Unused
 	 * @param string $class The contents of the class attribute, default none
 	 * @param string|bool $title Optional (unescaped) string to use in the title
@@ -109,8 +109,8 @@ class Linker {
 	/**
 	 * Common code for getLinkAttributesX functions
 	 *
-	 * @param $title string
-	 * @param $class string
+	 * @param string $title
+	 * @param string $class
 	 *
 	 * @return string
 	 */
@@ -271,10 +271,10 @@ class Linker {
 	/**
 	 * Returns the Url used to link to a Title
 	 *
-	 * @param $target Title
+	 * @param Title $target
 	 * @param array $query query parameters
-	 * @param $options Array
-	 * @return String
+	 * @param array $options
+	 * @return string
 	 */
 	private static function linkUrl( $target, $query, $options ) {
 		wfProfileIn( __METHOD__ );
@@ -310,9 +310,9 @@ class Linker {
 	/**
 	 * Returns the array of attributes used when linking to the Title $target
 	 *
-	 * @param $target Title
-	 * @param $attribs
-	 * @param $options
+	 * @param Title $target
+	 * @param array $attribs
+	 * @param array $options
 	 *
 	 * @return array
 	 */
@@ -374,7 +374,7 @@ class Linker {
 	/**
 	 * Default text of the links to the Title $target
 	 *
-	 * @param $target Title
+	 * @param Title $target
 	 *
 	 * @return string
 	 */
@@ -397,7 +397,7 @@ class Linker {
 	 * as the bold link text. The calling sequence is the same as the other make*LinkObj static functions,
 	 * despite $query not being used.
 	 *
-	 * @param $nt Title
+	 * @param Title $nt
 	 * @param string $html [optional]
 	 * @param string $query [optional]
 	 * @param string $trail [optional]
@@ -419,7 +419,7 @@ class Linker {
 	 * This should be called after a method like Title::makeTitleSafe() returned
 	 * a value indicating that the title object is invalid.
 	 *
-	 * @param $context IContextSource context to use to get the messages
+	 * @param IContextSource $context Context to use to get the messages
 	 * @param int $namespace Namespace number
 	 * @param string $title Text of the title, without the namespace part
 	 * @return string
@@ -441,7 +441,7 @@ class Linker {
 	}
 
 	/**
-	 * @param $title Title
+	 * @param Title $title
 	 * @return Title
 	 */
 	static function normaliseSpecialPage( Title $title ) {
@@ -461,7 +461,7 @@ class Linker {
 	 * Returns the filename part of an url.
 	 * Used as alternative text for external images.
 	 *
-	 * @param $url string
+	 * @param string $url
 	 *
 	 * @return string
 	 */
@@ -479,8 +479,8 @@ class Linker {
 	 * Return the code for images which were added via external links,
 	 * via Parser::maybeMakeExternalImage().
 	 *
-	 * @param $url
-	 * @param $alt
+	 * @param string $url
+	 * @param string $alt
 	 *
 	 * @return string
 	 */
@@ -504,10 +504,10 @@ class Linker {
 	 * Given parameters derived from [[Image:Foo|options...]], generate the
 	 * HTML that that syntax inserts in the page.
 	 *
-	 * @param $parser Parser object
-	 * @param $title Title object of the file (not the currently viewed page)
-	 * @param $file File object, or false if it doesn't exist
-	 * @param array $frameParams associative array of parameters external to the media handler.
+	 * @param Parser $parser
+	 * @param Title $title Title object of the file (not the currently viewed page)
+	 * @param File $file File object, or false if it doesn't exist
+	 * @param array $frameParams Associative array of parameters external to the media handler.
 	 *     Boolean parameters are indicated by presence or absence, the value is arbitrary and
 	 *     will often be false.
 	 *          thumbnail       If present, downscale and frame
@@ -713,15 +713,15 @@ class Linker {
 
 	/**
 	 * Make HTML for a thumbnail including image, border and caption
-	 * @param $title Title object
-	 * @param $file File object or false if it doesn't exist
-	 * @param $label String
-	 * @param $alt String
-	 * @param $align String
-	 * @param $params Array
-	 * @param $framed Boolean
-	 * @param $manualthumb String
-	 * @return mixed
+	 * @param Title $title
+	 * @param File|bool $file File object or false if it doesn't exist
+	 * @param string $label
+	 * @param string $alt
+	 * @param string $align
+	 * @param array $params
+	 * @param bool $framed
+	 * @param string $manualthumb
+	 * @return string
 	 */
 	public static function makeThumbLinkObj( Title $title, $file, $label = '', $alt,
 		$align = 'right', $params = array(), $framed = false, $manualthumb = ""
@@ -741,13 +741,13 @@ class Linker {
 	}
 
 	/**
-	 * @param $title Title
-	 * @param $file File
+	 * @param Title $title
+	 * @param File $file
 	 * @param array $frameParams
 	 * @param array $handlerParams
 	 * @param bool $time
 	 * @param string $query
-	 * @return mixed
+	 * @return string
 	 */
 	public static function makeThumbLink2( Title $title, $file, $frameParams = array(),
 		$handlerParams = array(), $time = false, $query = ""
@@ -874,7 +874,7 @@ class Linker {
 	 *
 	 * @param File $file
 	 * @param MediaTransformOutput $thumb
-	 * @param array $hp image parameters
+	 * @param array $hp Image parameters
 	 */
 	public static function processResponsiveImages( $file, $thumb, $hp ) {
 		global $wgResponsiveImages;
@@ -903,11 +903,11 @@ class Linker {
 	 * Make a "broken" link to an image
 	 *
 	 * @param Title $title
-	 * @param string $label link label (plain text)
-	 * @param string $query query string
+	 * @param string $label Link label (plain text)
+	 * @param string $query Query string
 	 * @param string $unused1 Unused parameter kept for b/c
 	 * @param string $unused2 Unused parameter kept for b/c
-	 * @param bool $time a file of a certain timestamp was requested
+	 * @param bool $time A file of a certain timestamp was requested
 	 * @return string
 	 */
 	public static function makeBrokenImageLinkObj( $title, $label = '', $query = '', $unused1 = '', $unused2 = '', $time = false ) {
@@ -1025,6 +1025,8 @@ class Linker {
 	 * a message key from the link text.
 	 * Usage example: Linker::specialLink( 'Recentchanges' )
 	 *
+	 * @param string $name
+	 * @param string $key
 	 * @return string
 	 */
 	public static function specialLink( $name, $key = '' ) {
@@ -1209,7 +1211,7 @@ class Linker {
 	 * Generate a user link if the current user is allowed to view it
 	 * @param Revision $rev
 	 * @param bool $isPublic Show only if all users can see it
-	 * @return String HTML fragment
+	 * @return string HTML fragment
 	 */
 	public static function revUserLink( $rev, $isPublic = false ) {
 		if ( $rev->isDeleted( Revision::DELETED_USER ) && $isPublic ) {
@@ -1265,7 +1267,7 @@ class Linker {
 	 * @param string $comment
 	 * @param Title|null $title Title object (to generate link to the section in autocomment) or null
 	 * @param bool $local Whether section links should refer to local page
-	 * @return mixed|String
+	 * @return mixed|string
 	 */
 	public static function formatComment( $comment, $title = null, $local = false ) {
 		wfProfileIn( __METHOD__ );
@@ -1317,7 +1319,7 @@ class Linker {
 
 	/**
 	 * Helper function for Linker::formatAutocomments
-	 * @param $match
+	 * @param array $match
 	 * @return string
 	 */
 	private static function formatAutocommentsCallback( $match ) {
@@ -1410,7 +1412,7 @@ class Linker {
 	}
 
 	/**
-	 * @param $match
+	 * @param array $match
 	 * @return mixed
 	 */
 	protected static function formatLinksInCommentCallback( $match ) {
@@ -1482,9 +1484,9 @@ class Linker {
 	}
 
 	/**
-	 * @param $contextTitle Title
-	 * @param $target
-	 * @param $text
+	 * @param Title $contextTitle
+	 * @param string $target
+	 * @param string $text
 	 * @return string
 	 */
 	public static function normalizeSubpageLink( $contextTitle, $target, &$text ) {
@@ -1610,7 +1612,7 @@ class Linker {
 	}
 
 	/**
-	 * @param $size
+	 * @param int $size
 	 * @return string
 	 */
 	public static function formatRevisionSize( $size ) {
@@ -1635,6 +1637,7 @@ class Linker {
 	/**
 	 * Finish one or more sublevels on the Table of Contents
 	 *
+	 * @param int $level
 	 * @return string
 	 */
 	public static function tocUnindent( $level ) {
@@ -1644,6 +1647,11 @@ class Linker {
 	/**
 	 * parameter level defines if we are on an indentation level
 	 *
+	 * @param string $anchor
+	 * @param string $tocline
+	 * @param string $tocnumber
+	 * @param string $level
+	 * @param string|bool $sectionIndex
 	 * @return string
 	 */
 	public static function tocLine( $anchor, $tocline, $tocnumber, $level, $sectionIndex = false ) {
@@ -1720,10 +1728,10 @@ class Linker {
 	 * @param string $attribs Any attributes for the headline, starting with
 	 *   a space and ending with '>'
 	 *   This *must* be at least '>' for no attribs
-	 * @param string $anchor the anchor to give the headline (the bit after the #)
-	 * @param string $html html for the text of the header
+	 * @param string $anchor The anchor to give the headline (the bit after the #)
+	 * @param string $html Html for the text of the header
 	 * @param string $link HTML to add for the section edit link
-	 * @param bool|string $legacyAnchor a second, optional anchor to give for
+	 * @param bool|string $legacyAnchor A second, optional anchor to give for
 	 *   backward compatibility (false to omit)
 	 *
 	 * @return string HTML headline
@@ -1742,6 +1750,7 @@ class Linker {
 	/**
 	 * Split a link trail, return the "inside" portion and the remainder of the trail
 	 * as a two-element array
+	 * @param string $trail
 	 * @return array
 	 */
 	static function splitTrail( $trail ) {
@@ -1778,9 +1787,9 @@ class Linker {
 	 *
 	 * If the option noBrackets is set the rollback link wont be enclosed in []
 	 *
-	 * @param $rev Revision object
-	 * @param $context IContextSource context to use or null for the main context.
-	 * @param $options array
+	 * @param Revision $rev
+	 * @param IContextSource $context Context to use or null for the main context.
+	 * @param array $options
 	 * @return string
 	 */
 	public static function generateRollback( $rev, IContextSource $context = null, $options = array( 'verify' ) ) {
@@ -1815,9 +1824,9 @@ class Linker {
 	 * Returns null if $wgShowRollbackEditCount is disabled or false if $verify
 	 * is set and the user is the only contributor of the page.
 	 *
-	 * @param $rev Revision object
+	 * @param Revision $rev
 	 * @param bool $verify Try to verify that this revision can really be rolled back
-	 * @return integer|bool|null
+	 * @return int|bool|null
 	 */
 	public static function getRollbackEditCount( $rev, $verify ) {
 		global $wgShowRollbackEditCount;
@@ -2040,7 +2049,7 @@ class Linker {
 	 *
 	 * @param array $hiddencats Array of hidden categories from Article::getHiddenCategories
 	 *   or similar
-	 * @return String HTML output
+	 * @return string HTML output
 	 */
 	public static function formatHiddenCategories( $hiddencats ) {
 		wfProfileIn( __METHOD__ );
@@ -2066,7 +2075,7 @@ class Linker {
 	 * unit (B, KB, MB or GB) according to the magnitude in question
 	 *
 	 * @param int $size Size to format
-	 * @return String
+	 * @return string
 	 */
 	public static function formatSize( $size ) {
 		global $wgLang;
@@ -2080,7 +2089,7 @@ class Linker {
 	 * element than the id, for reverse-compatibility, etc.)
 	 *
 	 * @param string $name Id of the element, minus prefixes.
-	 * @param string|null $options null or the string 'withaccess' to add an access-
+	 * @param string|null $options Null or the string 'withaccess' to add an access-
 	 *   key hint
 	 * @return string Contents of the title attribute (which you must HTML-
 	 *   escape), or false for no title attribute
@@ -2244,11 +2253,11 @@ class Linker {
 	 *
 	 * @param Title $nt The title object to make the link from, e.g. from Title::newFromText.
 	 * @param string $text Link text
-	 * @param string $query optional query part
-	 * @param string $trail optional trail. Alphabetic characters at the start of this string will
+	 * @param string $query Optional query part
+	 * @param string $trail Optional trail. Alphabetic characters at the start of this string will
 	 *   be included in the link text. Other characters will be appended after
 	 *   the end of the link.
-	 * @param string $prefix optional prefix. As trail, only before instead of after.
+	 * @param string $prefix Optional prefix. As trail, only before instead of after.
 	 * @return string
 	 */
 	static function makeLinkObj( $nt, $text = '', $query = '', $trail = '', $prefix = '' ) {
@@ -2309,6 +2318,7 @@ class Linker {
 
 	/**
 	 * Returns the attributes for the tooltip and access key.
+	 * @param string $name
 	 * @return array
 	 */
 	public static function tooltipAndAccesskeyAttribs( $name ) {
@@ -2330,6 +2340,8 @@ class Linker {
 
 	/**
 	 * Returns raw bits of HTML, use titleAttrib()
+	 * @param string $name
+	 * @param array|null $options
 	 * @return null|string
 	 */
 	public static function tooltip( $name, $options = null ) {
diff --git a/includes/MagicWord.php b/includes/MagicWord.php
index e301ceadc9..56786f1371 100644
--- a/includes/MagicWord.php
+++ b/includes/MagicWord.php
@@ -231,7 +231,7 @@ class MagicWord {
 	/**
 	 * Factory: creates an object representing an ID
 	 *
-	 * @param $id
+	 * @param int $id
 	 *
 	 * @return MagicWord
 	 */
@@ -269,7 +269,7 @@ class MagicWord {
 	/**
 	 * Allow external reads of TTL array
 	 *
-	 * @param $id int
+	 * @param int $id
 	 * @return array
 	 */
 	static function getCacheTTL( $id ) {
@@ -304,7 +304,7 @@ class MagicWord {
 	/**
 	 * Initialises this object with an ID
 	 *
-	 * @param $id
+	 * @param int $id
 	 * @throws MWException
 	 */
 	function load( $id ) {
@@ -351,8 +351,8 @@ class MagicWord {
 	 * first string is longer, the same length or shorter than the second
 	 * string.
 	 *
-	 * @param $s1 string
-	 * @param $s2 string
+	 * @param string $s1
+	 * @param string $s2
 	 *
 	 * @return int
 	 */
@@ -435,7 +435,7 @@ class MagicWord {
 	/**
 	 * Returns true if the text contains the word
 	 *
-	 * @param $text string
+	 * @param string $text
 	 *
 	 * @return bool
 	 */
@@ -446,7 +446,7 @@ class MagicWord {
 	/**
 	 * Returns true if the text starts with the word
 	 *
-	 * @param $text string
+	 * @param string $text
 	 *
 	 * @return bool
 	 */
@@ -457,7 +457,7 @@ class MagicWord {
 	/**
 	 * Returns true if the text matched the word
 	 *
-	 * @param $text string
+	 * @param string $text
 	 *
 	 * @return bool
 	 * @since 1.23
@@ -472,7 +472,7 @@ class MagicWord {
 	 * part in the regex and the matched variable part ($1) if there
 	 * is one.
 	 *
-	 * @param $text string
+	 * @param string $text
 	 *
 	 * @return string
 	 */
@@ -501,7 +501,7 @@ class MagicWord {
 	 * Returns true if the text matches the word, and alters the
 	 * input string, removing all instances of the word
 	 *
-	 * @param $text string
+	 * @param string $text
 	 *
 	 * @return bool
 	 */
@@ -512,7 +512,7 @@ class MagicWord {
 	}
 
 	/**
-	 * @param $text
+	 * @param string $text
 	 * @return bool
 	 */
 	function matchStartAndRemove( &$text ) {
@@ -534,9 +534,9 @@ class MagicWord {
 	/**
 	 * Replaces the word with something else
 	 *
-	 * @param $replacement
-	 * @param $subject
-	 * @param $limit int
+	 * @param string $replacement
+	 * @param string $subject
+	 * @param int $limit
 	 *
 	 * @return string
 	 */
@@ -551,8 +551,8 @@ class MagicWord {
 	 * Calls back a function to determine what to replace xxx with
 	 * Input word must contain $1
 	 *
-	 * @param $text string
-	 * @param $callback
+	 * @param string $text
+	 * @param callable $callback
 	 *
 	 * @return string
 	 */
@@ -589,7 +589,7 @@ class MagicWord {
 	/**
 	 * Accesses the synonym list directly
 	 *
-	 * @param $i int
+	 * @param int $i
 	 *
 	 * @return string
 	 */
@@ -621,9 +621,9 @@ class MagicWord {
 	 * $result. The return value is true if something was replaced.
 	 * @todo Should this be static? It doesn't seem to be used at all
 	 *
-	 * @param $magicarr
-	 * @param $subject
-	 * @param $result
+	 * @param array $magicarr
+	 * @param string $subject
+	 * @param string $result
 	 *
 	 * @return bool
 	 */
@@ -644,8 +644,8 @@ class MagicWord {
 	 * Adds all the synonyms of this MagicWord to an array, to allow quick
 	 * lookup in a list of magic words
 	 *
-	 * @param $array
-	 * @param $value
+	 * @param array $array
+	 * @param string $value
 	 */
 	function addToArray( &$array, $value ) {
 		global $wgContLang;
@@ -680,7 +680,7 @@ class MagicWordArray {
 	var $matches;
 
 	/**
-	 * @param $names array
+	 * @param array $names
 	 */
 	function __construct( $names = array() ) {
 		$this->names = $names;
@@ -689,7 +689,7 @@ class MagicWordArray {
 	/**
 	 * Add a magic word by name
 	 *
-	 * @param $name string
+	 * @param string $name
 	 */
 	public function add( $name ) {
 		$this->names[] = $name;
@@ -699,7 +699,7 @@ class MagicWordArray {
 	/**
 	 * Add a number of magic words by name
 	 *
-	 * @param $names array
+	 * @param array $names
 	 */
 	public function addArray( $names ) {
 		$this->names = array_merge( $this->names, array_values( $names ) );
@@ -824,7 +824,7 @@ class MagicWordArray {
 	 * Returns array(magic word ID, parameter value)
 	 * If there is no parameter value, that element will be false.
 	 *
-	 * @param $m array
+	 * @param array $m
 	 *
 	 * @throws MWException
 	 * @return array
@@ -855,7 +855,7 @@ class MagicWordArray {
 	 * parameter in the second element.
 	 * Both elements are false if there was no match.
 	 *
-	 * @param $text string
+	 * @param string $text
 	 *
 	 * @return array
 	 */
@@ -876,7 +876,7 @@ class MagicWordArray {
 	 * Match some text, without parameter capture
 	 * Returns the magic word name, or false if there was no capture
 	 *
-	 * @param $text string
+	 * @param string $text
 	 *
 	 * @return string|bool False on failure
 	 */
@@ -897,7 +897,7 @@ class MagicWordArray {
 	 * Returns an associative array, ID => param value, for all items that match
 	 * Removes the matched items from the input string (passed by reference)
 	 *
-	 * @param $text string
+	 * @param string $text
 	 *
 	 * @return array
 	 */
@@ -924,7 +924,7 @@ class MagicWordArray {
 	 * Return false if no match found and $text is not modified.
 	 * Does not match parameters.
 	 *
-	 * @param $text string
+	 * @param string $text
 	 *
 	 * @return int|bool False on failure
 	 */
diff --git a/includes/Message.php b/includes/Message.php
index f46c872c79..31fbb07733 100644
--- a/includes/Message.php
+++ b/includes/Message.php
@@ -443,7 +443,7 @@ class Message {
 	 *
 	 * @since 1.22
 	 *
-	 * @param number|number[] [$param,...] Time period parameters, or a single argument that is
+	 * @param int|int[] [$param,...] Time period parameters, or a single argument that is
 	 * an array of time period parameters.
 	 *
 	 * @return Message $this
@@ -508,7 +508,7 @@ class Message {
 	 *
 	 * @since 1.19
 	 *
-	 * @param $context IContextSource
+	 * @param IContextSource $context
 	 *
 	 * @return Message $this
 	 */
@@ -604,7 +604,7 @@ class Message {
 	 *
 	 * @since 1.18
 	 *
-	 * @param $title Title object
+	 * @param Title $title
 	 *
 	 * @return Message $this
 	 */
@@ -890,7 +890,7 @@ class Message {
 	 * @param string $message The message text.
 	 * @param string $type Either "before" or "after".
 	 *
-	 * @return String
+	 * @return string
 	 */
 	protected function replaceParameters( $message, $type = 'before' ) {
 		$replacementKeys = array();
diff --git a/includes/Pager.php b/includes/Pager.php
index 747d2c1beb..33bf067bad 100644
--- a/includes/Pager.php
+++ b/includes/Pager.php
@@ -244,7 +244,7 @@ abstract class IndexPager extends ContextSource implements Pager {
 	/**
 	 * Set the offset from an other source than the request
 	 *
-	 * @param $offset Int|String
+	 * @param int|string $offset
 	 */
 	function setOffset( $offset ) {
 		$this->mOffset = $offset;
@@ -255,7 +255,7 @@ abstract class IndexPager extends ContextSource implements Pager {
 	 *
 	 * Verifies limit is between 1 and 5000
 	 *
-	 * @param $limit Int|String
+	 * @param int|string $limit
 	 */
 	function setLimit( $limit ) {
 		$limit = (int)$limit;
@@ -282,7 +282,7 @@ abstract class IndexPager extends ContextSource implements Pager {
 	 * in the result or not. By default this is not the case, but when the
 	 * offset is user-supplied this might be wanted.
 	 *
-	 * @param $include bool
+	 * @param bool $include
 	 */
 	public function setIncludeOffset( $include ) {
 		$this->mIncludeOffset = $include;
@@ -292,10 +292,10 @@ abstract class IndexPager extends ContextSource implements Pager {
 	 * Extract some useful data from the result object for use by
 	 * the navigation bar, put it into $this
 	 *
-	 * @param $isFirst bool: False if there are rows before those fetched (i.e.
+	 * @param bool $isFirst False if there are rows before those fetched (i.e.
 	 *     if a "previous" link would make sense)
-	 * @param $limit Integer: exact query limit
-	 * @param $res ResultWrapper
+	 * @param int $limit Exact query limit
+	 * @param ResultWrapper $res
 	 */
 	function extractResultInfo( $isFirst, $limit, ResultWrapper $res ) {
 		$numRows = $res->numRows();
@@ -349,7 +349,7 @@ abstract class IndexPager extends ContextSource implements Pager {
 	/**
 	 * Get some text to go in brackets in the "function name" part of the SQL comment
 	 *
-	 * @return String
+	 * @return string
 	 */
 	function getSqlComment() {
 		return get_class( $this );
@@ -359,9 +359,9 @@ abstract class IndexPager extends ContextSource implements Pager {
 	 * Do a query with specified parameters, rather than using the object
 	 * context
 	 *
-	 * @param string $offset index offset, inclusive
-	 * @param $limit Integer: exact query limit
-	 * @param $descending Boolean: query direction, false for ascending, true for descending
+	 * @param string $offset Index offset, inclusive
+	 * @param int $limit Exact query limit
+	 * @param bool $descending Query direction, false for ascending, true for descending
 	 * @return ResultWrapper
 	 */
 	public function reallyDoQuery( $offset, $limit, $descending ) {
@@ -372,9 +372,9 @@ abstract class IndexPager extends ContextSource implements Pager {
 	/**
 	 * Build variables to use by the database wrapper.
 	 *
-	 * @param string $offset index offset, inclusive
-	 * @param $limit Integer: exact query limit
-	 * @param $descending Boolean: query direction, false for ascending, true for descending
+	 * @param string $offset Index offset, inclusive
+	 * @param int $limit Exact query limit
+	 * @param bool $descending Query direction, false for ascending, true for descending
 	 * @return array
 	 */
 	protected function buildQueryInfo( $offset, $limit, $descending ) {
@@ -407,7 +407,7 @@ abstract class IndexPager extends ContextSource implements Pager {
 	/**
 	 * Pre-process results; useful for performing batch existence checks, etc.
 	 *
-	 * @param $result ResultWrapper
+	 * @param ResultWrapper $result
 	 */
 	protected function preprocessResults( $result ) {}
 
@@ -415,7 +415,7 @@ abstract class IndexPager extends ContextSource implements Pager {
 	 * Get the formatted result list. Calls getStartBody(), formatRow() and
 	 * getEndBody(), concatenates the results and returns them.
 	 *
-	 * @return String
+	 * @return string
 	 */
 	public function getBody() {
 		if ( !$this->mQueryDone ) {
@@ -455,11 +455,11 @@ abstract class IndexPager extends ContextSource implements Pager {
 	/**
 	 * Make a self-link
 	 *
-	 * @param string $text text displayed on the link
-	 * @param array $query associative array of parameter to be in the query string
-	 * @param string $type value of the "rel" attribute
+	 * @param string $text Text displayed on the link
+	 * @param array $query Associative array of parameter to be in the query string
+	 * @param string $type Value of the "rel" attribute
 	 *
-	 * @return String: HTML fragment
+	 * @return string HTML fragment
 	 */
 	function makeLink( $text, array $query = null, $type = null ) {
 		if ( $query === null ) {
@@ -497,7 +497,7 @@ abstract class IndexPager extends ContextSource implements Pager {
 	 * Hook into getBody(), allows text to be inserted at the start. This
 	 * will be called even if there are no rows in the result set.
 	 *
-	 * @return String
+	 * @return string
 	 */
 	protected function getStartBody() {
 		return '';
@@ -506,7 +506,7 @@ abstract class IndexPager extends ContextSource implements Pager {
 	/**
 	 * Hook into getBody() for the end of the list
 	 *
-	 * @return String
+	 * @return string
 	 */
 	protected function getEndBody() {
 		return '';
@@ -516,7 +516,7 @@ abstract class IndexPager extends ContextSource implements Pager {
 	 * Hook into getBody(), for the bit between the start and the
 	 * end when there are no rows
 	 *
-	 * @return String
+	 * @return string
 	 */
 	protected function getEmptyBody() {
 		return '';
@@ -546,7 +546,7 @@ abstract class IndexPager extends ContextSource implements Pager {
 	/**
 	 * Get the number of rows in the result set
 	 *
-	 * @return Integer
+	 * @return int
 	 */
 	function getNumRows() {
 		if ( !$this->mQueryDone ) {
@@ -558,7 +558,7 @@ abstract class IndexPager extends ContextSource implements Pager {
 	/**
 	 * Get a URL query array for the prev, next, first and last links.
 	 *
-	 * @return Array
+	 * @return array
 	 */
 	function getPagingQueries() {
 		if ( !$this->mQueryDone ) {
@@ -597,7 +597,7 @@ abstract class IndexPager extends ContextSource implements Pager {
 	/**
 	 * Returns whether to show the "navigation bar"
 	 *
-	 * @return Boolean
+	 * @return bool
 	 */
 	function isNavigationBarShown() {
 		if ( !$this->mQueryDone ) {
@@ -613,9 +613,9 @@ abstract class IndexPager extends ContextSource implements Pager {
 	 * $linkTexts will be used. Both $linkTexts and $disabledTexts are arrays
 	 * of HTML.
 	 *
-	 * @param $linkTexts Array
-	 * @param $disabledTexts Array
-	 * @return Array
+	 * @param array $linkTexts
+	 * @param array $disabledTexts
+	 * @return array
 	 */
 	function getPagingLinks( $linkTexts, $disabledTexts = array() ) {
 		$queries = $this->getPagingQueries();
@@ -675,7 +675,7 @@ abstract class IndexPager extends ContextSource implements Pager {
 	 *    options => option array
 	 *    join_conds => JOIN conditions
 	 *
-	 * @return Array
+	 * @return array
 	 */
 	abstract function getQueryInfo();
 
@@ -689,7 +689,7 @@ abstract class IndexPager extends ContextSource implements Pager {
 	 * Needless to say, it's really not a good idea to use a non-unique index
 	 * for this!  That won't page right.
 	 *
-	 * @return string|Array
+	 * @return string|array
 	 */
 	abstract function getIndexField();
 
@@ -707,7 +707,7 @@ abstract class IndexPager extends ContextSource implements Pager {
 	 * page_len,page_id avoids temp tables (given a page_len index). This would
 	 * also work if page_id was non-unique but we had a page_len,page_id index.
 	 *
-	 * @return Array
+	 * @return array
 	 */
 	protected function getExtraSortFields() {
 		return array();
@@ -730,7 +730,7 @@ abstract class IndexPager extends ContextSource implements Pager {
 	 * particular instantiation, which is a single value.  This is the set of
 	 * all defaults for the class.
 	 *
-	 * @return Boolean
+	 * @return bool
 	 */
 	protected function getDefaultDirections() {
 		return false;
@@ -747,7 +747,7 @@ abstract class AlphabeticPager extends IndexPager {
 	 * Shamelessly stolen bits from ReverseChronologicalPager,
 	 * didn't want to do class magic as may be still revamped
 	 *
-	 * @return String HTML
+	 * @return string HTML
 	 */
 	function getNavigationBar() {
 		if ( !$this->isNavigationBarShown() ) {
@@ -816,7 +816,7 @@ abstract class AlphabeticPager extends IndexPager {
 	 * array whose keys must exactly match the keys of the array returned
 	 * by getIndexField(), and whose values are message keys.
 	 *
-	 * @return Array
+	 * @return array
 	 */
 	protected function getOrderTypeMessages() {
 		return null;
@@ -1024,7 +1024,7 @@ abstract class TablePager extends IndexPager {
 	/**
 	 * @protected
 	 * @param stdClass $row
-	 * @return String HTML
+	 * @return string HTML
 	 */
 	function formatRow( $row ) {
 		$this->mCurrentRow = $row; // In case formatValue etc need to know
@@ -1052,8 +1052,8 @@ abstract class TablePager extends IndexPager {
 	 *
 	 * @protected
 	 *
-	 * @param $row Object: the database result row
-	 * @return String
+	 * @param object $row The database result row
+	 * @return string
 	 */
 	function getRowClass( $row ) {
 		return '';
@@ -1064,8 +1064,8 @@ abstract class TablePager extends IndexPager {
 	 *
 	 * @protected
 	 *
-	 * @param $row Object: the database result row
-	 * @return Array of attribute => value
+	 * @param object $row The database result row
+	 * @return array Array of attribute => value
 	 */
 	function getRowAttrs( $row ) {
 		$class = $this->getRowClass( $row );
@@ -1086,7 +1086,7 @@ abstract class TablePager extends IndexPager {
 	 *
 	 * @param string $field The column
 	 * @param string $value The cell contents
-	 * @return Array of attr => value
+	 * @return array Array of attr => value
 	 */
 	function getCellAttrs( $field, $value ) {
 		return array( 'class' => 'TablePager_col_' . $field );
@@ -1126,7 +1126,7 @@ abstract class TablePager extends IndexPager {
 
 	/**
 	 * A navigation bar with images
-	 * @return String HTML
+	 * @return string HTML
 	 */
 	public function getNavigationBar() {
 		global $wgStylePath;
@@ -1184,8 +1184,8 @@ abstract class TablePager extends IndexPager {
 	/**
 	 * Get a "<select>" element which has options for each of the allowed limits
 	 *
-	 * @param $attribs String: Extra attributes to set
-	 * @return String: HTML fragment
+	 * @param string $attribs Extra attributes to set
+	 * @return string HTML fragment
 	 */
 	public function getLimitSelect( $attribs = array() ) {
 		$select = new XmlSelect( 'limit', false, $this->mLimit );
@@ -1232,8 +1232,8 @@ abstract class TablePager extends IndexPager {
 	 * Resubmits all defined elements of the query string, except for a
 	 * blacklist, passed in the $blacklist parameter.
 	 *
-	 * @param array $blacklist parameters from the request query which should not be resubmitted
-	 * @return String: HTML fragment
+	 * @param array $blacklist Parameters from the request query which should not be resubmitted
+	 * @return string HTML fragment
 	 */
 	function getHiddenFields( $blacklist = array() ) {
 		$blacklist = (array)$blacklist;
@@ -1251,7 +1251,7 @@ abstract class TablePager extends IndexPager {
 	/**
 	 * Get a form containing a limit selection dropdown
 	 *
-	 * @return String: HTML fragment
+	 * @return string HTML fragment
 	 */
 	function getLimitForm() {
 		global $wgScript;
@@ -1285,7 +1285,7 @@ abstract class TablePager extends IndexPager {
 	 * Return true if the named field should be sortable by the UI, false
 	 * otherwise
 	 *
-	 * @param $field String
+	 * @param string $field
 	 */
 	abstract function isFieldSortable( $field );
 
@@ -1298,8 +1298,8 @@ abstract class TablePager extends IndexPager {
 	 *
 	 * @protected
 	 *
-	 * @param string $name the database field name
-	 * @param string $value the value retrieved from the database
+	 * @param string $name The database field name
+	 * @param string $value The value retrieved from the database
 	 */
 	abstract function formatValue( $name, $value );
 
@@ -1317,7 +1317,7 @@ abstract class TablePager extends IndexPager {
 	 * field name, for use in the table header. The description should be plain
 	 * text, it will be HTML-escaped later.
 	 *
-	 * @return Array
+	 * @return array
 	 */
 	abstract function getFieldNames();
 }
diff --git a/includes/PathRouter.php b/includes/PathRouter.php
index d367e4da3a..e5979b8dbd 100644
--- a/includes/PathRouter.php
+++ b/includes/PathRouter.php
@@ -82,10 +82,10 @@ class PathRouter {
 	 * This is in a separate method so that add() can handle the difference between
 	 * a single string $path and an array() $path that contains multiple path
 	 * patterns each with an associated $key to pass on.
-	 * @param $path string
-	 * @param $params array
-	 * @param $options array
-	 * @param $key null|string
+	 * @param string $path
+	 * @param array $params
+	 * @param array $options
+	 * @param null|string $key
 	 */
 	protected function doAdd( $path, $params, $options, $key = null ) {
 		// Make sure all paths start with a /
@@ -170,9 +170,9 @@ class PathRouter {
 	/**
 	 * Add a new path pattern to the path router with the strict option on
 	 * @see self::add
-	 * @param $path string|array
-	 * @param $params array
-	 * @param $options array
+	 * @param string|array $path
+	 * @param array $params
+	 * @param array $options
 	 */
 	public function addStrict( $path, $params = array(), $options = array() ) {
 		$options['strict'] = true;
@@ -192,7 +192,7 @@ class PathRouter {
 	}
 
 	/**
-	 * @param $pattern object
+	 * @param object $pattern
 	 * @return float|int
 	 */
 	protected static function makeWeight( $pattern ) {
@@ -233,7 +233,7 @@ class PathRouter {
 	 * Parse a path and return the query matches for the path
 	 *
 	 * @param string $path The path to parse
-	 * @return Array The array of matches for the path
+	 * @return array The array of matches for the path
 	 */
 	public function parse( $path ) {
 		// Make sure our patterns are sorted by weight so the most specific
@@ -257,8 +257,8 @@ class PathRouter {
 	}
 
 	/**
-	 * @param $path string
-	 * @param $pattern string
+	 * @param string $path
+	 * @param string $pattern
 	 * @return array|null
 	 */
 	protected static function extractTitle( $path, $pattern ) {
@@ -363,7 +363,7 @@ class PathRouterPatternReplacer {
 	 * We do this inside of a replacement callback because after replacement we can't tell the
 	 * difference between a $1 that was not replaced and a $1 that was part of
 	 * the content a $1 was replaced with.
-	 * @param $value string
+	 * @param string $value
 	 * @return string
 	 */
 	public function replace( $value ) {
@@ -376,7 +376,7 @@ class PathRouterPatternReplacer {
 	}
 
 	/**
-	 * @param $m array
+	 * @param array $m
 	 * @return string
 	 */
 	protected function callback( $m ) {
diff --git a/includes/PrefixSearch.php b/includes/PrefixSearch.php
index a9179eb1e4..c5dd698940 100644
--- a/includes/PrefixSearch.php
+++ b/includes/PrefixSearch.php
@@ -31,10 +31,10 @@ abstract class PrefixSearch {
 	 * Do a prefix search of titles and return a list of matching page names.
 	 * @deprecated: Since 1.23, use TitlePrefixSearch or StringPrefixSearch classes
 	 *
-	 * @param $search String
-	 * @param $limit Integer
-	 * @param array $namespaces used if query is not explicitly prefixed
-	 * @return Array of strings
+	 * @param string $search
+	 * @param int $limit
+	 * @param array $namespaces Used if query is not explicitly prefixed
+	 * @return array Array of strings
 	 */
 	public static function titleSearch( $search, $limit, $namespaces = array() ) {
 		$prefixSearch = new StringPrefixSearch;
@@ -44,10 +44,10 @@ abstract class PrefixSearch {
 	/**
 	 * Do a prefix search of titles and return a list of matching page names.
 	 *
-	 * @param $search String
-	 * @param $limit Integer
-	 * @param array $namespaces used if query is not explicitly prefixed
-	 * @return Array of strings or Title objects
+	 * @param string $search
+	 * @param int $limit
+	 * @param array $namespaces Used if query is not explicitly prefixed
+	 * @return array Array of strings or Title objects
 	 */
 	public function search( $search, $limit, $namespaces = array() ) {
 		$search = trim( $search );
@@ -82,8 +82,8 @@ abstract class PrefixSearch {
 
 	/**
 	 * Do a prefix search for all possible variants of the prefix
-	 * @param $search String
-	 * @param $limit Integer
+	 * @param string $search
+	 * @param int $limit
 	 * @param array $namespaces
 	 *
 	 * @return array
@@ -135,10 +135,10 @@ abstract class PrefixSearch {
 
 	/**
 	 * Do a prefix search of titles and return a list of matching page names.
-	 * @param $namespaces Array
-	 * @param $search String
-	 * @param $limit Integer
-	 * @return Array of strings
+	 * @param array $namespaces
+	 * @param string $search
+	 * @param int $limit
+	 * @return array Array of strings
 	 */
 	protected function searchBackend( $namespaces, $search, $limit ) {
 		if ( count( $namespaces ) == 1 ) {
@@ -159,9 +159,9 @@ abstract class PrefixSearch {
 	/**
 	 * Prefix search special-case for Special: namespace.
 	 *
-	 * @param string $search term
-	 * @param $limit Integer: max number of items to return
-	 * @return Array
+	 * @param string $search Term
+	 * @param int $limit Max number of items to return
+	 * @return array
 	 */
 	protected function specialSearch( $search, $limit ) {
 		global $wgContLang;
@@ -213,10 +213,10 @@ abstract class PrefixSearch {
 	 * be automatically capitalized by Title::secureAndSpit()
 	 * later on depending on $wgCapitalLinks)
 	 *
-	 * @param array $namespaces namespaces to search in
-	 * @param string $search term
-	 * @param $limit Integer: max number of items to return
-	 * @return Array of Title objects
+	 * @param array $namespaces Namespaces to search in
+	 * @param string $search Term
+	 * @param int $limit Max number of items to return
+	 * @return array Array of Title objects
 	 */
 	protected function defaultSearchBackend( $namespaces, $search, $limit ) {
 		$ns = array_shift( $namespaces ); // support only one namespace
@@ -246,8 +246,8 @@ abstract class PrefixSearch {
 	/**
 	 * Validate an array of numerical namespace indexes
 	 *
-	 * @param $namespaces Array
-	 * @return Array (default: contains only NS_MAIN)
+	 * @param array $namespaces
+	 * @return array (default: contains only NS_MAIN)
 	 */
 	protected function validateNamespaces( $namespaces ) {
 		global $wgContLang;
diff --git a/includes/SiteConfiguration.php b/includes/SiteConfiguration.php
index fa871fe0b3..d750ca8d54 100644
--- a/includes/SiteConfiguration.php
+++ b/includes/SiteConfiguration.php
@@ -174,7 +174,7 @@ class SiteConfiguration {
 	 * @param string $suffix The suffix of the wiki in question.
 	 * @param array $params List of parameters. $.'key' is replaced by $value in all returned data.
 	 * @param array $wikiTags The tags assigned to the wiki.
-	 * @return Mixed the value of the setting requested.
+	 * @return mixed The value of the setting requested.
 	 */
 	public function get( $settingName, $wiki, $suffix = null, $params = array(), $wikiTags = array() ) {
 		$params = $this->mergeParams( $wiki, $suffix, $params, $wikiTags );
@@ -186,8 +186,8 @@ class SiteConfiguration {
 	 *
 	 * @param string $settingName ID of the setting name to retrieve.
 	 * @param string $wiki Wiki ID of the wiki in question.
-	 * @param array $params array of parameters.
-	 * @return Mixed the value of the setting requested.
+	 * @param array $params Array of parameters.
+	 * @return mixed The value of the setting requested.
 	 */
 	protected function getSetting( $settingName, $wiki, /*array*/ $params ) {
 		$retval = null;
@@ -260,9 +260,9 @@ class SiteConfiguration {
 	 * Type-safe string replace; won't do replacements on non-strings
 	 * private?
 	 *
-	 * @param $from
-	 * @param $to
-	 * @param $in
+	 * @param string $from
+	 * @param string $to
+	 * @param string|array $in
 	 * @return string
 	 */
 	function doReplace( $from, $to, $in ) {
@@ -284,7 +284,7 @@ class SiteConfiguration {
 	 * @param string $suffix The suffix of the wiki in question.
 	 * @param array $params List of parameters. $.'key' is replaced by $value in all returned data.
 	 * @param array $wikiTags The tags assigned to the wiki.
-	 * @return Array Array of settings requested.
+	 * @return array Array of settings requested.
 	 */
 	public function getAll( $wiki, $suffix = null, $params = array(), $wikiTags = array() ) {
 		$params = $this->mergeParams( $wiki, $suffix, $params, $wikiTags );
@@ -359,9 +359,9 @@ class SiteConfiguration {
 	}
 
 	/**
-	 * @param $setting string
-	 * @param $wiki string
-	 * @param $params array
+	 * @param string $setting
+	 * @param string $wiki
+	 * @param array $params
 	 */
 	public function extractGlobalSetting( $setting, $wiki, $params ) {
 		$value = $this->getSetting( $setting, $wiki, $params );
@@ -398,7 +398,7 @@ class SiteConfiguration {
 	 * See the documentation of self::$siteParamsCallback for more in-depth
 	 * documentation about this function
 	 *
-	 * @param $wiki String
+	 * @param string $wiki
 	 * @return array
 	 */
 	protected function getWikiParams( $wiki ) {
@@ -436,7 +436,7 @@ class SiteConfiguration {
 	 * @param string $wiki Wiki ID of the wiki in question.
 	 * @param string $suffix The suffix of the wiki in question.
 	 * @param array $params List of parameters. $.'key' is replaced by $value in
-	 *                all returned data.
+	 *   all returned data.
 	 * @param array $wikiTags The tags assigned to the wiki.
 	 * @return array
 	 */
@@ -464,7 +464,7 @@ class SiteConfiguration {
 
 	/**
 	 * Work out the site and language name from a database name
-	 * @param $db
+	 * @param string $db
 	 *
 	 * @return array
 	 */
@@ -499,7 +499,7 @@ class SiteConfiguration {
 	 *
 	 * @param string $wiki
 	 * @param array|string $settings A setting name or array of setting names
-	 * @return Array|mixed Array if $settings is an array, otherwise the value
+	 * @return array|mixed Array if $settings is an array, otherwise the value
 	 * @throws MWException
 	 * @since 1.21
 	 */
@@ -555,7 +555,7 @@ class SiteConfiguration {
 
 	/**
 	 * Returns true if the given vhost is handled locally.
-	 * @param $vhost String
+	 * @param string $vhost
 	 * @return bool
 	 */
 	public function isLocalVHost( $vhost ) {
@@ -568,7 +568,7 @@ class SiteConfiguration {
 	 * PHP's array_merge_recursive() merges ANY duplicate values into arrays,
 	 * which is not fun
 	 *
-	 * @param $array1 array
+	 * @param array $array1
 	 *
 	 * @return array
 	 */
diff --git a/includes/SiteStats.php b/includes/SiteStats.php
index 7169b2e2a9..4685c3ed6b 100644
--- a/includes/SiteStats.php
+++ b/includes/SiteStats.php
@@ -34,7 +34,7 @@ class SiteStats {
 	}
 
 	/**
-	 * @param $recache bool
+	 * @param bool $recache
 	 */
 	static function load( $recache = false ) {
 		if ( self::$loaded && !$recache ) {
@@ -55,7 +55,7 @@ class SiteStats {
 	}
 
 	/**
-	 * @return Bool|ResultWrapper
+	 * @return bool|ResultWrapper
 	 */
 	static function loadAndLazyInit() {
 		wfDebug( __METHOD__ . ": reading site_stats from slave\n" );
@@ -86,8 +86,8 @@ class SiteStats {
 	}
 
 	/**
-	 * @param $db DatabaseBase
-	 * @return Bool|ResultWrapper
+	 * @param DatabaseBase $db
+	 * @return bool|ResultWrapper
 	 */
 	static function doLoad( $db ) {
 		return $db->selectRow( 'site_stats', array(
@@ -161,7 +161,7 @@ class SiteStats {
 	/**
 	 * Find the number of users in a given user group.
 	 * @param string $group name of group
-	 * @return Integer
+	 * @return int
 	 */
 	static function numberingroup( $group ) {
 		if ( !isset( self::$groupMemberCounts[$group] ) ) {
@@ -199,7 +199,7 @@ class SiteStats {
 	}
 
 	/**
-	 * @param $ns int
+	 * @param int $ns
 	 *
 	 * @return int
 	 */
@@ -223,7 +223,7 @@ class SiteStats {
 	 *
 	 * Checks only fields which are filled by SiteStatsInit::refresh.
 	 *
-	 * @param $row
+	 * @param bool|object $row
 	 *
 	 * @return bool
 	 */
@@ -264,7 +264,7 @@ class SiteStatsInit {
 
 	/**
 	 * Constructor
-	 * @param $database Boolean or DatabaseBase:
+	 * @param bool|DatabaseBase $database
 	 * - Boolean: whether to use the master DB
 	 * - DatabaseBase: database connection to use
 	 */
@@ -278,7 +278,7 @@ class SiteStatsInit {
 
 	/**
 	 * Count the total number of edits
-	 * @return Integer
+	 * @return int
 	 */
 	public function edits() {
 		$this->mEdits = $this->db->selectField( 'revision', 'COUNT(*)', '', __METHOD__ );
@@ -288,7 +288,7 @@ class SiteStatsInit {
 
 	/**
 	 * Count pages in article space(s)
-	 * @return Integer
+	 * @return int
 	 */
 	public function articles() {
 		global $wgArticleCountMethod;
@@ -318,7 +318,7 @@ class SiteStatsInit {
 
 	/**
 	 * Count total pages
-	 * @return Integer
+	 * @return int
 	 */
 	public function pages() {
 		$this->mPages = $this->db->selectField( 'page', 'COUNT(*)', '', __METHOD__ );
@@ -327,7 +327,7 @@ class SiteStatsInit {
 
 	/**
 	 * Count total users
-	 * @return Integer
+	 * @return int
 	 */
 	public function users() {
 		$this->mUsers = $this->db->selectField( 'user', 'COUNT(*)', '', __METHOD__ );
@@ -336,7 +336,7 @@ class SiteStatsInit {
 
 	/**
 	 * Count views
-	 * @return Integer
+	 * @return int
 	 */
 	public function views() {
 		$this->mViews = $this->db->selectField( 'page', 'SUM(page_counter)', '', __METHOD__ );
@@ -345,7 +345,7 @@ class SiteStatsInit {
 
 	/**
 	 * Count total files
-	 * @return Integer
+	 * @return int
 	 */
 	public function files() {
 		$this->mFiles = $this->db->selectField( 'image', 'COUNT(*)', '', __METHOD__ );
@@ -356,7 +356,7 @@ class SiteStatsInit {
 	 * Do all updates and commit them. More or less a replacement
 	 * for the original initStats, but without output.
 	 *
-	 * @param $database DatabaseBase|bool
+	 * @param DatabaseBase|bool $database
 	 * - Boolean: whether to use the master DB
 	 * - DatabaseBase: database connection to use
 	 * @param array $options of options, may contain the following values
diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index f359a1cc09..b186447a78 100644
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -101,7 +101,7 @@ class SkinTemplate extends Skin {
 	/**
 	 * Add specific styles for this skin
 	 *
-	 * @param $out OutputPage
+	 * @param OutputPage $out
 	 */
 	function setupSkinUserCss( OutputPage $out ) {
 		$out->addModuleStyles( array(
@@ -116,9 +116,9 @@ class SkinTemplate extends Skin {
 	 * and eventually it spits out some HTML. Should have interface
 	 * roughly equivalent to PHPTAL 0.7.
 	 *
-	 * @param $classname String
-	 * @param string $repository subdirectory where we keep template files
-	 * @param $cache_dir string
+	 * @param string $classname
+	 * @param string $repository Subdirectory where we keep template files
+	 * @param string $cache_dir
 	 * @return QuickTemplate
 	 * @private
 	 */
@@ -239,7 +239,7 @@ class SkinTemplate extends Skin {
 	/**
 	 * initialize various variables and generate the template
 	 *
-	 * @param $out OutputPage
+	 * @param OutputPage $out
 	 */
 	function outputPage( OutputPage $out = null ) {
 		wfProfileIn( __METHOD__ );
@@ -277,7 +277,7 @@ class SkinTemplate extends Skin {
 	 * initialize various variables and generate the template
 	 *
 	 * @since 1.23
-	 * @return QuickTemplate the template to be executed by outputPage
+	 * @return QuickTemplate The template to be executed by outputPage
 	 */
 	protected function prepareQuickTemplate() {
 		global $wgContLang, $wgScript, $wgStylePath,
@@ -606,7 +606,7 @@ class SkinTemplate extends Skin {
 	 * an error object of the appropriate type.
 	 * For the base class, assume strings all around.
 	 *
-	 * @param $str Mixed
+	 * @param string $str
 	 * @private
 	 */
 	function printOrError( $str ) {
@@ -774,11 +774,11 @@ class SkinTemplate extends Skin {
 	/**
 	 * Builds an array with tab definition
 	 *
-	 * @param Title $title page where the tab links to
-	 * @param string|array $message message key or an array of message keys (will fall back)
-	 * @param boolean $selected display the tab as selected
-	 * @param string $query query string attached to tab URL
-	 * @param boolean $checkEdit check if $title exists and mark with .new if one doesn't
+	 * @param Title $title page Where the tab links to
+	 * @param string|array $message Message key or an array of message keys (will fall back)
+	 * @param bool $selected Display the tab as selected
+	 * @param string $query Query string attached to tab URL
+	 * @param bool $checkEdit Check if $title exists and mark with .new if one doesn't
 	 *
 	 * @return array
 	 */
@@ -1380,8 +1380,8 @@ abstract class QuickTemplate {
 
 	/**
 	 * Sets the value $value to $name
-	 * @param $name
-	 * @param $value
+	 * @param string $name
+	 * @param mixed $value
 	 */
 	public function set( $name, $value ) {
 		$this->data[$name] = $value;
@@ -1403,15 +1403,15 @@ abstract class QuickTemplate {
 	}
 
 	/**
-	 * @param $name
-	 * @param $value
+	 * @param string $name
+	 * @param mixed $value
 	 */
 	public function setRef( $name, &$value ) {
 		$this->data[$name] =& $value;
 	}
 
 	/**
-	 * @param $t
+	 * @param MediaWiki_I18N $t
 	 */
 	public function setTranslator( &$t ) {
 		$this->translator = &$t;
@@ -1425,6 +1425,8 @@ abstract class QuickTemplate {
 
 	/**
 	 * @private
+	 * @param string $str
+	 * @return string
 	 */
 	function text( $str ) {
 		echo htmlspecialchars( $this->data[$str] );
@@ -1432,6 +1434,8 @@ abstract class QuickTemplate {
 
 	/**
 	 * @private
+	 * @param string $str
+	 * @return string
 	 */
 	function html( $str ) {
 		echo $this->data[$str];
@@ -1439,6 +1443,8 @@ abstract class QuickTemplate {
 
 	/**
 	 * @private
+	 * @param string $str
+	 * @return string
 	 */
 	function msg( $str ) {
 		echo htmlspecialchars( $this->translator->translate( $str ) );
@@ -1446,6 +1452,8 @@ abstract class QuickTemplate {
 
 	/**
 	 * @private
+	 * @param string $str
+	 * @return string
 	 */
 	function msgHtml( $str ) {
 		echo $this->translator->translate( $str );
@@ -1454,6 +1462,8 @@ abstract class QuickTemplate {
 	/**
 	 * An ugly, ugly hack.
 	 * @private
+	 * @param string $str
+	 * @return string
 	 */
 	function msgWiki( $str ) {
 		global $wgOut;
@@ -1464,6 +1474,7 @@ abstract class QuickTemplate {
 
 	/**
 	 * @private
+	 * @param string $str
 	 * @return bool
 	 */
 	function haveData( $str ) {
@@ -1473,6 +1484,7 @@ abstract class QuickTemplate {
 	/**
 	 * @private
 	 *
+	 * @param string $str
 	 * @return bool
 	 */
 	function haveMsg( $str ) {
@@ -1483,7 +1495,7 @@ abstract class QuickTemplate {
 	/**
 	 * Get the Skin object related to this object
 	 *
-	 * @return Skin object
+	 * @return Skin
 	 */
 	public function getSkin() {
 		return $this->data['skin'];
@@ -1493,7 +1505,7 @@ abstract class QuickTemplate {
 	 * Fetch the output of a QuickTemplate and return it
 	 *
 	 * @since 1.23
-	 * @return String
+	 * @return string
 	 */
 	public function getHTML() {
 		ob_start();
@@ -1514,7 +1526,7 @@ abstract class BaseTemplate extends QuickTemplate {
 	/**
 	 * Get a Message object with its context set
 	 *
-	 * @param string $name message name
+	 * @param string $name Message name
 	 * @return Message
 	 */
 	public function getMsg( $name ) {
@@ -1877,12 +1889,12 @@ abstract class BaseTemplate extends QuickTemplate {
 	/**
 	 * Generates a list item for a navigation, portlet, portal, sidebar... list
 	 *
-	 * @param $key string, usually a key from the list you are generating this link from.
-	 * @param $item array, of list item data containing some of a specific set of keys.
+	 * @param string $key Usually a key from the list you are generating this link from.
+	 * @param array $item Array of list item data containing some of a specific set of keys.
 	 * The "id", "class" and "itemtitle" keys will be used as attributes for the list item,
 	 * if "active" contains a value of true a "active" class will also be appended to class.
 	 *
-	 * @param $options array
+	 * @param array $options
 	 *
 	 * If you want something other than a "<li>" you can pass a tag name such as
 	 * "tag" => "span" in the $options array to change the tag used.
@@ -2042,7 +2054,7 @@ abstract class BaseTemplate extends QuickTemplate {
 	 * in the list of footer icons. This is mostly useful for skins which only
 	 * display the text from footericons instead of the images and don't want a
 	 * duplicate copyright statement because footerlinks already rendered one.
-	 * @return
+	 * @return string
 	 */
 	function getFooterIcons( $option = null ) {
 		// Generate additional footer icons
diff --git a/includes/Status.php b/includes/Status.php
index 3573f4ab42..0244c8ae02 100644
--- a/includes/Status.php
+++ b/includes/Status.php
@@ -78,7 +78,7 @@ class Status {
 	/**
 	 * Factory function for good results
 	 *
-	 * @param $value Mixed
+	 * @param mixed $value
 	 * @return Status
 	 */
 	static function newGood( $value = null ) {
@@ -102,7 +102,7 @@ class Status {
 	 * Returns whether the operation completed and didn't have any error or
 	 * warnings
 	 *
-	 * @return Boolean
+	 * @return bool
 	 */
 	public function isGood() {
 		return $this->ok && !$this->errors;
@@ -111,7 +111,7 @@ class Status {
 	/**
 	 * Returns whether the operation completed
 	 *
-	 * @return Boolean
+	 * @return bool
 	 */
 	public function isOK() {
 		return $this->ok;
@@ -120,7 +120,7 @@ class Status {
 	/**
 	 * Add a new warning
 	 *
-	 * @param string|Message $message message name or object
+	 * @param string|Message $message Message name or object
 	 */
 	public function warning( $message /*, parameters... */ ) {
 		$params = array_slice( func_get_args(), 1 );
@@ -134,7 +134,7 @@ class Status {
 	 * Add an error, do not set fatal flag
 	 * This can be used for non-fatal errors
 	 *
-	 * @param string|Message $message message name or object
+	 * @param string|Message $message Message name or object
 	 */
 	public function error( $message /*, parameters... */ ) {
 		$params = array_slice( func_get_args(), 1 );
@@ -148,7 +148,7 @@ class Status {
 	 * Add an error and set OK to false, indicating that the operation
 	 * as a whole was fatal
 	 *
-	 * @param string|Message $message message name or object
+	 * @param string|Message $message Message name or object
 	 */
 	public function fatal( $message /*, parameters... */ ) {
 		$params = array_slice( func_get_args(), 1 );
@@ -167,7 +167,7 @@ class Status {
 	}
 
 	/**
-	 * @param $params array
+	 * @param array $params
 	 * @return array
 	 */
 	protected function cleanParams( $params ) {
@@ -184,10 +184,10 @@ class Status {
 	/**
 	 * Get the error list as a wikitext formatted list
 	 *
-	 * @param string $shortContext a short enclosing context message name, to
+	 * @param string $shortContext A short enclosing context message name, to
 	 *        be used when there is a single error
-	 * @param string $longContext a long enclosing context message name, for a list
-	 * @return String
+	 * @param string $longContext A long enclosing context message name, for a list
+	 * @return string
 	 */
 	public function getWikiText( $shortContext = false, $longContext = false ) {
 		if ( count( $this->errors ) == 0 ) {
@@ -275,12 +275,12 @@ class Status {
 
 	/**
 	 * Return the message for a single error.
-	 * @param $error Mixed With an array & two values keyed by
+	 * @param mixed $error With an array & two values keyed by
 	 * 'message' and 'params', use those keys-value pairs.
 	 * Otherwise, if its an array, just use the first value as the
 	 * message and the remaining items as the params.
 	 *
-	 * @return String
+	 * @return string
 	 */
 	protected function getErrorMessage( $error ) {
 		if ( is_array( $error ) ) {
@@ -303,10 +303,10 @@ class Status {
 	/**
 	 * Get the error message as HTML. This is done by parsing the wikitext error
 	 * message.
-	 * @param string $shortContext a short enclosing context message name, to
+	 * @param string $shortContext A short enclosing context message name, to
 	 *        be used when there is a single error
-	 * @param string $longContext a long enclosing context message name, for a list
-	 * @return String
+	 * @param string $longContext A long enclosing context message name, for a list
+	 * @return string
 	 */
 	public function getHTML( $shortContext = false, $longContext = false ) {
 		$text = $this->getWikiText( $shortContext, $longContext );
@@ -316,8 +316,8 @@ class Status {
 
 	/**
 	 * Return an array with the wikitext for each item in the array.
-	 * @param $errors Array
-	 * @return Array
+	 * @param array $errors
+	 * @return array
 	 */
 	protected function getErrorMessageArray( $errors ) {
 		return array_map( array( $this, 'getErrorMessage' ), $errors );
@@ -361,8 +361,8 @@ class Status {
 
 	/**
 	 * Returns a list of status messages of the given type
-	 * @param $type String
-	 * @return Array
+	 * @param string $type
+	 * @return array
 	 */
 	protected function getStatusArray( $type ) {
 		$result = array();
@@ -388,9 +388,9 @@ class Status {
 	 * Returns a list of status messages of the given type, with message and
 	 * params left untouched, like a sane version of getStatusArray
 	 *
-	 * @param $type String
+	 * @param string $type
 	 *
-	 * @return Array
+	 * @return array
 	 */
 	public function getErrorsByType( $type ) {
 		$result = array();
@@ -408,8 +408,8 @@ class Status {
 	 * Note, due to the lack of tools for comparing Message objects, this
 	 * function will not work when using a Message object as a parameter.
 	 *
-	 * @param string $msg message name
-	 * @return Boolean
+	 * @param string $msg Message name
+	 * @return bool
 	 */
 	public function hasMessage( $msg ) {
 		foreach ( $this->errors as $error ) {
diff --git a/includes/UserMailer.php b/includes/UserMailer.php
index de4457d958..41c68c0c12 100644
--- a/includes/UserMailer.php
+++ b/includes/UserMailer.php
@@ -31,9 +31,9 @@
  */
 class MailAddress {
 	/**
-	 * @param string|User $address string with an email address, or a User object
-	 * @param string $name human-readable name if a string address is given
-	 * @param string $realName human-readable real name if a string address is given
+	 * @param string|User $address String with an email address, or a User object
+	 * @param string $name Human-readable name if a string address is given
+	 * @param string $realName Human-readable real name if a string address is given
 	 */
 	function __construct( $address, $name = null, $realName = null ) {
 		if ( is_object( $address ) && $address instanceof User ) {
@@ -86,10 +86,10 @@ class UserMailer {
 	/**
 	 * Send mail using a PEAR mailer
 	 *
-	 * @param $mailer
-	 * @param $dest
-	 * @param $headers
-	 * @param $body
+	 * @param UserMailer $mailer
+	 * @param string $dest
+	 * @param string $headers
+	 * @param string $body
 	 *
 	 * @return Status
 	 */
@@ -115,7 +115,7 @@ class UserMailer {
 	 * Note RFC2822 says newlines must be CRLF (\r\n)
 	 * but php mail naively "corrects" it and requires \n for the "correction" to work
 	 *
-	 * @return String
+	 * @return string
 	 */
 	static function arrayToHeaderString( $headers, $endl = "\n" ) {
 		$strings = array();
@@ -130,7 +130,7 @@ class UserMailer {
 	/**
 	 * Create a value suitable for the MessageId Header
 	 *
-	 * @return String
+	 * @return string
 	 */
 	static function makeMsgId() {
 		global $wgSMTP, $wgServer;
@@ -151,14 +151,14 @@ class UserMailer {
 	 * array of parameters. It requires PEAR:Mail to do that.
 	 * Otherwise it just uses the standard PHP 'mail' function.
 	 *
-	 * @param $to MailAddress: recipient's email (or an array of them)
-	 * @param $from MailAddress: sender's email
-	 * @param string $subject email's subject.
-	 * @param string $body email's text or Array of two strings to be the text and html bodies
-	 * @param $replyto MailAddress: optional reply-to email (default: null).
-	 * @param string $contentType optional custom Content-Type (default: text/plain; charset=UTF-8)
+	 * @param MailAddress $to Recipient's email (or an array of them)
+	 * @param MailAddress $from Sender's email
+	 * @param string $subject Email's subject.
+	 * @param string $body Email's text or Array of two strings to be the text and html bodies
+	 * @param MailAddress $replyto Optional reply-to email (default: null).
+	 * @param string $contentType Optional custom Content-Type (default: text/plain; charset=UTF-8)
 	 * @throws MWException
-	 * @return Status object
+	 * @return Status
 	 */
 	public static function send( $to, $from, $subject, $body, $replyto = null, $contentType = 'text/plain; charset=UTF-8' ) {
 		global $wgSMTP, $wgEnotifMaxRecips, $wgAdditionalMailParams, $wgAllowHTMLEmail;
@@ -387,8 +387,8 @@ class UserMailer {
 	/**
 	 * Set the mail error message in self::$mErrorString
 	 *
-	 * @param $code Integer: error number
-	 * @param string $string error message
+	 * @param int $code Error number
+	 * @param string $string Error message
 	 */
 	static function errorHandler( $code, $string ) {
 		self::$mErrorString = preg_replace( '/^mail\(\)(\s*\[.*?\])?: /', '', $string );
@@ -405,7 +405,7 @@ class UserMailer {
 
 	/**
 	 * Converts a string into a valid RFC 822 "phrase", such as is used for the sender name
-	 * @param $phrase string
+	 * @param string $phrase
 	 * @return string
 	 */
 	public static function rfc822Phrase( $phrase ) {
@@ -493,13 +493,13 @@ class EmailNotification {
 	 *
 	 * May be deferred via the job queue.
 	 *
-	 * @param $editor User object
-	 * @param $title Title object
-	 * @param $timestamp
-	 * @param $summary
-	 * @param $minorEdit
-	 * @param $oldid (default: false)
-	 * @param $pageStatus (default: 'changed')
+	 * @param User $editor
+	 * @param Title $title
+	 * @param string $timestamp
+	 * @param string $summary
+	 * @param bool $minorEdit
+	 * @param bool $oldid (default: false)
+	 * @param string $pageStatus (default: 'changed')
 	 */
 	public function notifyOnPageChange( $editor, $title, $timestamp, $summary, $minorEdit, $oldid = false, $pageStatus = 'changed' ) {
 		global $wgEnotifUseJobQ, $wgEnotifWatchlist, $wgShowUpdatedMarker, $wgEnotifMinorEdits,
@@ -588,13 +588,13 @@ class EmailNotification {
 	 * Send emails corresponding to the user $editor editing the page $title.
 	 * Also updates wl_notificationtimestamp.
 	 *
-	 * @param $editor User object
-	 * @param $title Title object
+	 * @param User $editor
+	 * @param Title $title
 	 * @param string $timestamp Edit timestamp
 	 * @param string $summary Edit summary
-	 * @param $minorEdit bool
+	 * @param bool $minorEdit
 	 * @param int $oldid Revision ID
-	 * @param array $watchers of user IDs
+	 * @param array $watchers Array of user IDs
 	 * @param string $pageStatus
 	 * @throws MWException
 	 */
@@ -671,9 +671,9 @@ class EmailNotification {
 	}
 
 	/**
-	 * @param $editor User
-	 * @param $title Title bool
-	 * @param $minorEdit
+	 * @param User $editor
+	 * @param Title $title
+	 * @param bool $minorEdit
 	 * @return bool
 	 */
 	private function canSendUserTalkEmail( $editor, $title, $minorEdit ) {
@@ -818,7 +818,7 @@ class EmailNotification {
 	 * depending on settings.
 	 *
 	 * Call sendMails() to send any mails that were queued.
-	 * @param $user User
+	 * @param User $user
 	 */
 	function compose( $user ) {
 		global $wgEnotifImpersonal;
@@ -849,8 +849,8 @@ class EmailNotification {
 	 * timestamp in proper timezone, etc) and sends it out.
 	 * Returns true if the mail was sent successfully.
 	 *
-	 * @param $watchingUser User object
-	 * @return Boolean
+	 * @param User $watchingUser
+	 * @return bool
 	 * @private
 	 */
 	function sendPersonalised( $watchingUser ) {
@@ -878,7 +878,7 @@ class EmailNotification {
 	/**
 	 * Same as sendPersonalised but does impersonal mail suitable for bulk
 	 * mailing.  Takes an array of MailAddress objects.
-	 * @param $addresses array
+	 * @param array $addresses
 	 * @return Status|null
 	 */
 	function sendImpersonal( $addresses ) {
diff --git a/includes/UserRightsProxy.php b/includes/UserRightsProxy.php
index a8a22be733..e3655ceddb 100644
--- a/includes/UserRightsProxy.php
+++ b/includes/UserRightsProxy.php
@@ -31,10 +31,10 @@ class UserRightsProxy {
 	 *
 	 * @see newFromId()
 	 * @see newFromName()
-	 * @param $db DatabaseBase: db connection
-	 * @param string $database database name
-	 * @param string $name user name
-	 * @param $id Integer: user ID
+	 * @param DatabaseBase $db Db connection
+	 * @param string $database Database name
+	 * @param string $name User name
+	 * @param int $id User ID
 	 */
 	private function __construct( $db, $database, $name, $id ) {
 		$this->db = $db;
@@ -47,7 +47,7 @@ class UserRightsProxy {
 	/**
 	 * Accessor for $this->database
 	 *
-	 * @return String: database name
+	 * @return string Database name
 	 */
 	public function getDBName() {
 		return $this->database;
@@ -56,8 +56,8 @@ class UserRightsProxy {
 	/**
 	 * Confirm the selected database name is a valid local interwiki database name.
 	 *
-	 * @param string $database database name
-	 * @return Boolean
+	 * @param string $database Database name
+	 * @return bool
 	 */
 	public static function validDatabase( $database ) {
 		global $wgLocalDatabases;
@@ -67,10 +67,10 @@ class UserRightsProxy {
 	/**
 	 * Same as User::whoIs()
 	 *
-	 * @param string $database database name
-	 * @param $id Integer: user ID
-	 * @param $ignoreInvalidDB Boolean: if true, don't check if $database is in $wgLocalDatabases
-	 * @return String: user name or false if the user doesn't exist
+	 * @param string $database Database name
+	 * @param int $id User ID
+	 * @param bool $ignoreInvalidDB If true, don't check if $database is in $wgLocalDatabases
+	 * @return string User name or false if the user doesn't exist
 	 */
 	public static function whoIs( $database, $id, $ignoreInvalidDB = false ) {
 		$user = self::newFromId( $database, $id, $ignoreInvalidDB );
@@ -84,10 +84,10 @@ class UserRightsProxy {
 	/**
 	 * Factory function; get a remote user entry by ID number.
 	 *
-	 * @param string $database database name
-	 * @param $id Integer: user ID
-	 * @param $ignoreInvalidDB Boolean: if true, don't check if $database is in $wgLocalDatabases
-	 * @return UserRightsProxy or null if doesn't exist
+	 * @param string $database Database name
+	 * @param int $id User ID
+	 * @param bool $ignoreInvalidDB If true, don't check if $database is in $wgLocalDatabases
+	 * @return UserRightsProxy|null If doesn't exist
 	 */
 	public static function newFromId( $database, $id, $ignoreInvalidDB = false ) {
 		return self::newFromLookup( $database, 'user_id', intval( $id ), $ignoreInvalidDB );
@@ -96,20 +96,20 @@ class UserRightsProxy {
 	/**
 	 * Factory function; get a remote user entry by name.
 	 *
-	 * @param string $database database name
-	 * @param string $name user name
-	 * @param $ignoreInvalidDB Boolean: if true, don't check if $database is in $wgLocalDatabases
-	 * @return UserRightsProxy or null if doesn't exist
+	 * @param string $database Database name
+	 * @param string $name User name
+	 * @param bool $ignoreInvalidDB If true, don't check if $database is in $wgLocalDatabases
+	 * @return UserRightsProxy|null If doesn't exist
 	 */
 	public static function newFromName( $database, $name, $ignoreInvalidDB = false ) {
 		return self::newFromLookup( $database, 'user_name', $name, $ignoreInvalidDB );
 	}
 
 	/**
-	 * @param $database
-	 * @param $field
-	 * @param $value
-	 * @param $ignoreInvalidDB bool
+	 * @param string $database
+	 * @param string $field
+	 * @param string $value
+	 * @param bool $ignoreInvalidDB
 	 * @return null|UserRightsProxy
 	 */
 	private static function newFromLookup( $database, $field, $value, $ignoreInvalidDB = false ) {
@@ -132,9 +132,9 @@ class UserRightsProxy {
 	 * Open a database connection to work on for the requested user.
 	 * This may be a new connection to another database for remote users.
 	 *
-	 * @param $database String
-	 * @param $ignoreInvalidDB Boolean: if true, don't check if $database is in $wgLocalDatabases
-	 * @return DatabaseBase or null if invalid selection
+	 * @param string $database
+	 * @param bool $ignoreInvalidDB If true, don't check if $database is in $wgLocalDatabases
+	 * @return DatabaseBase|null If invalid selection
 	 */
 	public static function getDB( $database, $ignoreInvalidDB = false ) {
 		global $wgDBname;
@@ -166,7 +166,7 @@ class UserRightsProxy {
 	/**
 	 * Same as User::getName()
 	 *
-	 * @return String
+	 * @return string
 	 */
 	public function getName() {
 		return $this->name . '@' . $this->database;
@@ -175,7 +175,7 @@ class UserRightsProxy {
 	/**
 	 * Same as User::getUserPage()
 	 *
-	 * @return Title object
+	 * @return Title
 	 */
 	public function getUserPage() {
 		return Title::makeTitle( NS_USER, $this->getName() );
@@ -199,6 +199,7 @@ class UserRightsProxy {
 
 	/**
 	 * Replaces User::addUserGroup()
+	 * @param string $group
 	 */
 	function addGroup( $group ) {
 		$this->db->insert( 'user_groups',
@@ -212,6 +213,7 @@ class UserRightsProxy {
 
 	/**
 	 * Replaces User::removeUserGroup()
+	 * @param string $group
 	 */
 	function removeGroup( $group ) {
 		$this->db->delete( 'user_groups',
@@ -224,6 +226,8 @@ class UserRightsProxy {
 
 	/**
 	 * Replaces User::setOption()
+	 * @param string $option
+	 * @param mixed $value
 	 */
 	public function setOption( $option, $value ) {
 		$this->newOptions[$option] = $value;
diff --git a/includes/WikiMap.php b/includes/WikiMap.php
index 473975389b..34cd48dacf 100644
--- a/includes/WikiMap.php
+++ b/includes/WikiMap.php
@@ -28,8 +28,8 @@ class WikiMap {
 	/**
 	 * Get a WikiReference object for $wikiID
 	 *
-	 * @param string $wikiID wiki'd id (generally database name)
-	 * @return WikiReference object or null if the wiki was not found
+	 * @param string $wikiID Wiki'd id (generally database name)
+	 * @return WikiReference|null WikiReference object or null if the wiki was not found
 	 */
 	public static function getWiki( $wikiID ) {
 		global $wgConf;
@@ -58,7 +58,7 @@ class WikiMap {
 	 * Convenience to get the wiki's display name
 	 *
 	 * @todo We can give more info than just the wiki id!
-	 * @param string $wikiID wiki'd id (generally database name)
+	 * @param string $wikiID Wiki'd id (generally database name)
 	 * @return string|int Wiki's name or $wiki_id if the wiki was not found
 	 */
 	public static function getWikiName( $wikiID ) {
@@ -73,10 +73,10 @@ class WikiMap {
 	/**
 	 * Convenience to get a link to a user page on a foreign wiki
 	 *
-	 * @param string $wikiID wiki'd id (generally database name)
-	 * @param string $user user name (must be normalised before calling this function!)
-	 * @param string $text link's text; optional, default to "User:$user"
-	 * @return String: HTML link or false if the wiki was not found
+	 * @param string $wikiID Wiki'd id (generally database name)
+	 * @param string $user User name (must be normalised before calling this function!)
+	 * @param string $text Link's text; optional, default to "User:$user"
+	 * @return string HTML link or false if the wiki was not found
 	 */
 	public static function foreignUserLink( $wikiID, $user, $text = null ) {
 		return self::makeForeignLink( $wikiID, "User:$user", $text );
@@ -85,10 +85,10 @@ class WikiMap {
 	/**
 	 * Convenience to get a link to a page on a foreign wiki
 	 *
-	 * @param string $wikiID wiki'd id (generally database name)
-	 * @param string $page page name (must be normalised before calling this function!)
-	 * @param string $text link's text; optional, default to $page
-	 * @return String: HTML link or false if the wiki was not found
+	 * @param string $wikiID Wiki'd id (generally database name)
+	 * @param string $page Page name (must be normalised before calling this function!)
+	 * @param string $text Link's text; optional, default to $page
+	 * @return string HTML link or false if the wiki was not found
 	 */
 	public static function makeForeignLink( $wikiID, $page, $text = null ) {
 		if ( !$text ) {
@@ -106,9 +106,9 @@ class WikiMap {
 	/**
 	 * Convenience to get a url to a page on a foreign wiki
 	 *
-	 * @param string $wikiID wiki'd id (generally database name)
-	 * @param string $page page name (must be normalised before calling this function!)
-	 * @return String: URL or false if the wiki was not found
+	 * @param string $wikiID Wiki'd id (generally database name)
+	 * @param string $page Page name (must be normalised before calling this function!)
+	 * @return string|bool URL or false if the wiki was not found
 	 */
 	public static function getForeignURL( $wikiID, $page ) {
 		$wiki = WikiMap::getWiki( $wikiID );
@@ -132,11 +132,11 @@ class WikiReference {
 	private $mPath;   ///< path, '/wiki/$1'
 
 	/**
-	 * @param $major string
-	 * @param $minor string
-	 * @param $canonicalServer string
-	 * @param $path string
-	 * @param $server null|string
+	 * @param string $major
+	 * @param string $minor
+	 * @param string $canonicalServer
+	 * @param string $path
+	 * @param null|string $server
 	 */
 	public function __construct( $major, $minor, $canonicalServer, $path, $server = null ) {
 		$this->mMajor = $major;
@@ -164,7 +164,7 @@ class WikiReference {
 	 * Get the the URL in a way to de displayed to the user
 	 * More or less Wikimedia specific
 	 *
-	 * @return String
+	 * @return string
 	 */
 	public function getDisplayName() {
 		$url = $this->getUrl( '' );
@@ -181,8 +181,8 @@ class WikiReference {
 	 * Helper function for getUrl()
 	 *
 	 * @todo FIXME: This may be generalized...
-	 * @param string $page page name (must be normalised before calling this function!)
-	 * @return String: Url fragment
+	 * @param string $page Page name (must be normalised before calling this function!)
+	 * @return string Url fragment
 	 */
 	private function getLocalUrl( $page ) {
 		return str_replace( '$1', wfUrlEncode( str_replace( ' ', '_', $page ) ), $this->mPath );
@@ -191,8 +191,8 @@ class WikiReference {
 	/**
 	 * Get a canonical (i.e. based on $wgCanonicalServer) URL to a page on this foreign wiki
 	 *
-	 * @param string $page page name (must be normalised before calling this function!)
-	 * @return String: Url
+	 * @param string $page Page name (must be normalised before calling this function!)
+	 * @return string Url
 	 */
 	public function getCanonicalUrl( $page ) {
 		return $this->mCanonicalServer . $this->getLocalUrl( $page );
@@ -208,8 +208,8 @@ class WikiReference {
 
 	/**
 	 * Alias for getCanonicalUrl(), for backwards compatibility.
-	 * @param $page string
-	 * @return String
+	 * @param string $page
+	 * @return string
 	 */
 	public function getUrl( $page ) {
 		return $this->getCanonicalUrl( $page );
@@ -219,8 +219,8 @@ class WikiReference {
 	 * Get a URL based on $wgServer, like Title::getFullURL() would produce
 	 * when called locally on the wiki.
 	 *
-	 * @param string $page page name (must be normalized before calling this function!)
-	 * @return String: URL
+	 * @param string $page Page name (must be normalized before calling this function!)
+	 * @return string URL
 	 */
 	public function getFullUrl( $page ) {
 		return $this->mServer .
diff --git a/includes/profiler/Profiler.php b/includes/profiler/Profiler.php
index 8c819ff567..1581879324 100644
--- a/includes/profiler/Profiler.php
+++ b/includes/profiler/Profiler.php
@@ -354,9 +354,9 @@ abstract class Profiler {
 class TransactionProfiler {
 	/** @var float seconds */
 	protected $mDBLockThreshold = 5.0;
-	/** @var Array DB/server name => (active trx count,timestamp) */
+	/** @var array DB/server name => (active trx count,timestamp) */
 	protected $mDBTrxHoldingLocks = array();
-	/** @var Array DB/server name => list of (function name, elapsed time) */
+	/** @var array DB/server name => list of (function name, elapsed time) */
 	protected $mDBTrxMethodTimes = array();
 
 	/**
diff --git a/includes/profiler/ProfilerStandard.php b/includes/profiler/ProfilerStandard.php
index dc1114c5b2..5de9982d3f 100644
--- a/includes/profiler/ProfilerStandard.php
+++ b/includes/profiler/ProfilerStandard.php
@@ -59,7 +59,7 @@ class ProfilerStandard extends Profiler {
 	/**
 	 * Return whether this a stub profiler
 	 *
-	 * @return Boolean
+	 * @return bool
 	 */
 	public function isStub() {
 		return false;
@@ -69,7 +69,7 @@ class ProfilerStandard extends Profiler {
 	 * Return whether this profiler stores data
 	 *
 	 * @see Profiler::logData()
-	 * @return Boolean
+	 * @return bool
 	 */
 	public function isPersistent() {
 		return false;
@@ -81,7 +81,7 @@ class ProfilerStandard extends Profiler {
 	 * Only doing collation saves memory overhead but limits the use of certain
 	 * features like that of graph generation for the debug toolbar.
 	 *
-	 * @return boolean
+	 * @return bool
 	 */
 	protected function collateOnly() {
 		return false;
@@ -144,8 +144,8 @@ class ProfilerStandard extends Profiler {
 	 * @param string $name
 	 * @param float $elapsedCpu
 	 * @param float $elapsedReal
-	 * @param integer $memChange
-	 * @param integer $subcalls
+	 * @param int $memChange
+	 * @param int $subcalls
 	 * @param array|null $period Map of ('start','end','memory','subcalls')
 	 */
 	protected function updateEntry(
@@ -176,7 +176,7 @@ class ProfilerStandard extends Profiler {
 	/**
 	 * Called by wfProfieIn()
 	 *
-	 * @param $functionname String
+	 * @param string $functionname
 	 */
 	public function profileIn( $functionname ) {
 		global $wgDebugFunctionEntry;
@@ -198,7 +198,7 @@ class ProfilerStandard extends Profiler {
 	/**
 	 * Called by wfProfieOut()
 	 *
-	 * @param $functionname String
+	 * @param string $functionname
 	 */
 	public function profileOut( $functionname ) {
 		global $wgDebugFunctionEntry;
@@ -268,7 +268,7 @@ class ProfilerStandard extends Profiler {
 	/**
 	 * Returns a profiling output to be stored in debug file
 	 *
-	 * @return String
+	 * @return string
 	 */
 	public function getOutput() {
 		global $wgDebugFunctionEntry, $wgProfileCallTree;
@@ -528,9 +528,9 @@ class ProfilerStandard extends Profiler {
 	 * Counts the number of profiled function calls sitting under
 	 * the given point in the call graph. Not the most efficient algo.
 	 *
-	 * @param $stack Array:
-	 * @param $start Integer:
-	 * @return Integer
+	 * @param array $stack
+	 * @param int $start
+	 * @return int
 	 */
 	protected function calltreeCount( $stack, $start ) {
 		$level = $stack[$start][1];
-- 
2.20.1