Remove @static from all over the place. That's what the static keyword is for, this being PHP5 and all

22 files changed, 1 insertions, 43 deletions

diff --git a/includes/ChangesList.php b/includes/ChangesList.php
index 8732e6f636aa..59bb7b2cdb1e 100644
--- a/includes/ChangesList.php
+++ b/includes/ChangesList.php
@@ -17,7 +17,6 @@ class RCCacheEntry extends RecentChange {
 	var $userlink, $timestamp, $watched;
 
 	/**
-	 * @static
 	 * @param $rc RecentChange
 	 * @return RCCacheEntry
 	 */
diff --git a/includes/Collation.php b/includes/Collation.php
index 1277c508b0b9..4cd921d95c3c 100644
--- a/includes/Collation.php
+++ b/includes/Collation.php
@@ -4,7 +4,6 @@ abstract class Collation {
 	static $instance;
 
 	/**
-	 * @static
 	 * @return Collation
 	 */
 	static function singleton() {
@@ -16,7 +15,6 @@ abstract class Collation {
 	}
 
 	/**
-	 * @static
 	 * @throws MWException
 	 * @param $collationName string
 	 * @return Collation
diff --git a/includes/Linker.php b/includes/Linker.php
index 4f2b833caee2..7c9031ac4110 100644
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -1208,7 +1208,6 @@ class Linker {
 	}
 
 	/**
-	 * @static
 	 * @param $contextTitle Title
 	 * @param  $target
 	 * @param  $text
diff --git a/includes/MagicWord.php b/includes/MagicWord.php
index f77d5f9ef654..d30f7cce5410 100644
--- a/includes/MagicWord.php
+++ b/includes/MagicWord.php
@@ -190,7 +190,6 @@ class MagicWord {
 
 	/**
 	 * Factory: creates an object representing an ID
-	 * @static
 	 * @return MagicWord
 	 */
 	static function &get( $id ) {
@@ -481,6 +480,7 @@ class MagicWord {
 	 * thereby gaining some efficiency. The result is placed in the out variable
 	 * $result. The return value is true if something was replaced.
 	 * @static
+	 * @todo Should this be static? It doesn't seem to be used at all
 	 **/
 	function replaceMultiple( $magicarr, $subject, &$result ){
 		$search = array();
diff --git a/includes/RecentChange.php b/includes/RecentChange.php
index 11b65b79fe18..ca3d20824a33 100644
--- a/includes/RecentChange.php
+++ b/includes/RecentChange.php
@@ -340,7 +340,6 @@ class RecentChange {
 	/**
 	 * Makes an entry in the database corresponding to an edit
 	 *
-	 * @static
 	 * @param $timestamp
 	 * @param $title Title
 	 * @param $minor
@@ -407,7 +406,6 @@ class RecentChange {
 	 * Note: the title object must be loaded with the new id using resetArticleID()
 	 * @todo Document parameters and return
 	 *
-	 * @static
 	 * @param $timestamp
 	 * @param $title Title
 	 * @param $minor
@@ -469,7 +467,6 @@ class RecentChange {
 	# Makes an entry in the database corresponding to a rename
 
 	/**
-	 * @static
 	 * @param $timestamp
 	 * @param $oldTitle Title
 	 * @param $newTitle Title
@@ -547,7 +544,6 @@ class RecentChange {
 	}
 
 	/**
-	 * @static
 	 * @param $timestamp
 	 * @param $title Title
 	 * @param $user User
diff --git a/includes/api/ApiDelete.php b/includes/api/ApiDelete.php
index 0eba21956ca3..c5cf855b2c48 100644
--- a/includes/api/ApiDelete.php
+++ b/includes/api/ApiDelete.php
@@ -155,7 +155,6 @@ class ApiDelete extends ApiBase {
 	}
 
 	/**
-	 * @static
 	 * @param $token
 	 * @param $title Title
 	 * @param $oldimage
diff --git a/includes/api/ApiMain.php b/includes/api/ApiMain.php
index 60820a782906..f6b98cde80df 100644
--- a/includes/api/ApiMain.php
+++ b/includes/api/ApiMain.php
@@ -880,7 +880,6 @@ class ApiMain extends ApiBase {
 	}
 
 	/**
-	 * @static
 	 * @param  $module ApiBase
 	 * @param  $paramName String What type of request is this? e.g. action, query, list, prop, meta, format
 	 * @return string
diff --git a/includes/api/ApiQueryImageInfo.php b/includes/api/ApiQueryImageInfo.php
index 002820dc35b9..2ccee27252cc 100644
--- a/includes/api/ApiQueryImageInfo.php
+++ b/includes/api/ApiQueryImageInfo.php
@@ -486,7 +486,6 @@ class ApiQueryImageInfo extends ApiQueryBase {
 	 *
 	 * @param array $filter List of properties to filter out
 	 *
-	 * @static
 	 * @return Array
 	 */
 	public static function getPropertyNames( $filter = array() ) {
@@ -496,7 +495,6 @@ class ApiQueryImageInfo extends ApiQueryBase {
 	/**
 	 * Returns array key value pairs of properties and their descriptions
 	 *
-	 * @static
 	 * @return array
 	 */
 	private static function getProperties() {
@@ -524,7 +522,6 @@ class ApiQueryImageInfo extends ApiQueryBase {
 	 * 
 	 * @param array $filter List of properties to filter out
 	 *
-	 * @static
 	 * @return array
 	 */
 	public static function getPropertyDescriptions( $filter = array() ) {
diff --git a/includes/api/ApiQueryLogEvents.php b/includes/api/ApiQueryLogEvents.php
index 0863b76f7ecb..2e51c3f65e06 100644
--- a/includes/api/ApiQueryLogEvents.php
+++ b/includes/api/ApiQueryLogEvents.php
@@ -197,7 +197,6 @@ class ApiQueryLogEvents extends ApiQueryBase {
 	}
 
 	/**
-	 * @static
 	 * @param $result ApiResult
 	 * @param $vals
 	 * @param $params
diff --git a/includes/api/ApiQueryRecentChanges.php b/includes/api/ApiQueryRecentChanges.php
index 324b12f7c10f..67c50f1ef780 100644
--- a/includes/api/ApiQueryRecentChanges.php
+++ b/includes/api/ApiQueryRecentChanges.php
@@ -73,7 +73,6 @@ class ApiQueryRecentChanges extends ApiQueryGeneratorBase {
 	}
 
 	/**
-	 * @static
 	 * @param  $pageid
 	 * @param  $title
 	 * @param $rc RecentChange
diff --git a/includes/api/ApiQueryRevisions.php b/includes/api/ApiQueryRevisions.php
index c17ea06d7516..ef1b1e0974cf 100644
--- a/includes/api/ApiQueryRevisions.php
+++ b/includes/api/ApiQueryRevisions.php
@@ -74,7 +74,6 @@ class ApiQueryRevisions extends ApiQueryBase {
 	}
 
 	/**
-	 * @static
 	 * @param $pageid
 	 * @param $title Title
 	 * @param $rev Revision
diff --git a/includes/api/ApiQueryUsers.php b/includes/api/ApiQueryUsers.php
index ff4d90783a32..6e8ddf4ec863 100644
--- a/includes/api/ApiQueryUsers.php
+++ b/includes/api/ApiQueryUsers.php
@@ -67,7 +67,6 @@ class ApiQueryUsers extends ApiQueryBase {
 	}
 
 	 /**
-	  * @static
 	  * @param $user User
 	  * @return String
 	  */
diff --git a/includes/db/DatabasePostgres.php b/includes/db/DatabasePostgres.php
index a14bcc095c36..521e8c00a8ca 100644
--- a/includes/db/DatabasePostgres.php
+++ b/includes/db/DatabasePostgres.php
@@ -10,7 +10,6 @@ class PostgresField implements Field {
 	private $name, $tablename, $type, $nullable, $max_length, $deferred, $deferrable, $conname;
 
 	/**
-	 * @static
 	 * @param $db DatabaseBase
 	 * @param  $table
 	 * @param  $field
diff --git a/includes/filerepo/ForeignAPIFile.php b/includes/filerepo/ForeignAPIFile.php
index a56131a62674..69223e199734 100644
--- a/includes/filerepo/ForeignAPIFile.php
+++ b/includes/filerepo/ForeignAPIFile.php
@@ -29,7 +29,6 @@ class ForeignAPIFile extends File {
 	}
 
 	/**
-	 * @static
 	 * @param  $title Title
 	 * @param  $repo ForeignApiRepo
 	 * @return ForeignAPIFile|null
diff --git a/includes/filerepo/LocalRepo.php b/includes/filerepo/LocalRepo.php
index 662dfd9ffb70..26651e6aba5a 100644
--- a/includes/filerepo/LocalRepo.php
+++ b/includes/filerepo/LocalRepo.php
@@ -86,7 +86,6 @@ class LocalRepo extends FSRepo {
 	/**
 	 * Gets the SHA1 hash from a storage key
 	 *
-	 * @static
 	 * @param string $key
 	 * @return string
 	 */
diff --git a/includes/filerepo/OldLocalFile.php b/includes/filerepo/OldLocalFile.php
index 7e733cc69093..544d3de3b916 100644
--- a/includes/filerepo/OldLocalFile.php
+++ b/includes/filerepo/OldLocalFile.php
@@ -36,7 +36,6 @@ class OldLocalFile extends LocalFile {
 	}
 
 	/**
-	 * @static
 	 * @param  $sha1
 	 * @param $repo LocalRepo
 	 * @param bool $timestamp
diff --git a/includes/installer/DatabaseUpdater.php b/includes/installer/DatabaseUpdater.php
index cd94206bede9..c0cfcc2dcf7f 100644
--- a/includes/installer/DatabaseUpdater.php
+++ b/includes/installer/DatabaseUpdater.php
@@ -88,7 +88,6 @@ abstract class DatabaseUpdater {
 	}
 
 	/**
-	 * @static
 	 * @throws MWException
 	 * @param DatabaseBase $db
 	 * @param bool $shared
diff --git a/includes/parser/CoreLinkFunctions.php b/includes/parser/CoreLinkFunctions.php
index 48936146c599..8de13278c2d6 100644
--- a/includes/parser/CoreLinkFunctions.php
+++ b/includes/parser/CoreLinkFunctions.php
@@ -11,7 +11,6 @@
  */
 class CoreLinkFunctions {
 	/**
-	 * @static
 	 * @param $parser Parser_LinkHooks
 	 * @return bool
 	 */
@@ -21,7 +20,6 @@ class CoreLinkFunctions {
 	}
 
 	/**
-	 * @static
 	 * @param $parser Parser
 	 * @param $holders LinkHolderArray
 	 * @param $markers LinkMarkerReplacer
@@ -45,7 +43,6 @@ class CoreLinkFunctions {
 	}
 
 	/**
-	 * @static
 	 * @param  $parser Parser
 	 * @param  $holders LinkHolderArray
 	 * @param  $markers LinkMarkerReplacer
diff --git a/includes/parser/CoreParserFunctions.php b/includes/parser/CoreParserFunctions.php
index 466c48772159..ab970e403d72 100644
--- a/includes/parser/CoreParserFunctions.php
+++ b/includes/parser/CoreParserFunctions.php
@@ -11,7 +11,6 @@
  */
 class CoreParserFunctions {
 	/**
-	 * @static
 	 * @param $parser Parser
 	 * @return void
 	 */
@@ -89,7 +88,6 @@ class CoreParserFunctions {
 	}
 
 	/**
-	 * @static
 	 * @param $parser Parser
 	 * @param string $part1
 	 * @return array
@@ -106,7 +104,6 @@ class CoreParserFunctions {
 	}
 
 	/**
-	 * @static
 	 * @param $parser Parser
 	 * @param  $date
 	 * @param null $defaultPref
@@ -190,7 +187,6 @@ class CoreParserFunctions {
 	}
 
 	/**
-	 * @static
 	 * @param $parser Parser
 	 * @param string $s
 	 * @return
@@ -205,7 +201,6 @@ class CoreParserFunctions {
 	}
 
 	/**
-	 * @static
 	 * @param $parser Parser
 	 * @param string $s
 	 * @return
@@ -249,7 +244,6 @@ class CoreParserFunctions {
 	}
 
 	/**
-	 * @static
 	 * @param $parser Parser
 	 * @param string $num
 	 * @param null $raw
@@ -264,7 +258,6 @@ class CoreParserFunctions {
 	}
 
 	/**
-	 * @static
 	 * @param $parser Parser
 	 * @param string $case
 	 * @param string $word
@@ -275,7 +268,6 @@ class CoreParserFunctions {
 	}
 
 	/**
-	 * @static
 	 * @param $parser Parser
 	 * @param $user User
 	 * @return
@@ -306,7 +298,6 @@ class CoreParserFunctions {
 	}
 
 	/**
-	 * @static
 	 * @param $parser Parser
 	 * @param string $text
 	 * @return
@@ -643,7 +634,6 @@ class CoreParserFunctions {
 	}
 
 	/**
-	 * @static
 	 * @param $parser Parser
 	 * @param  $text
 	 * @return string
@@ -663,7 +653,6 @@ class CoreParserFunctions {
 	}
 
 	/**
-	 * @static
 	 * @param $parser Parser
 	 * @param  $text
 	 * @return string
diff --git a/includes/parser/CoreTagHooks.php b/includes/parser/CoreTagHooks.php
index 1d5208dc20a0..1eb24f4bcab3 100644
--- a/includes/parser/CoreTagHooks.php
+++ b/includes/parser/CoreTagHooks.php
@@ -11,7 +11,6 @@
  */
 class CoreTagHooks {
 	/**
-	 * @static
 	 * @param $parser Parser
 	 * @return void
 	 */
@@ -50,7 +49,6 @@ class CoreTagHooks {
 	}
 
 	/**
-	 * @static
 	 * @param  $content
 	 * @param  $attributes
 	 * @param $parser Parser
diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index c3f6a39bbe49..8bcb4167cd12 100644
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -495,8 +495,6 @@ class Parser {
 
 	/**
 	 * Get a random string
-	 *
-	 * @static
 	 */
 	static public function getRandomString() {
 		return dechex( mt_rand( 0, 0x7fffffff ) ) . dechex( mt_rand( 0, 0x7fffffff ) );
diff --git a/includes/revisiondelete/RevisionDeleter.php b/includes/revisiondelete/RevisionDeleter.php
index 2450bb8f368b..623c08feed75 100644
--- a/includes/revisiondelete/RevisionDeleter.php
+++ b/includes/revisiondelete/RevisionDeleter.php
@@ -131,7 +131,6 @@ class RevisionDeleter {
 	 * If it doesn't, returns the corresponding ar_timestamp field
 	 * so that this key can be used instead.
 	 *
-	 * @static
 	 * @param $title Title
 	 * @param  $revid
 	 * @return bool|mixed
@@ -156,7 +155,6 @@ class RevisionDeleter {
 	/**
 	 * Creates utility links for log entries.
 	 *
-	 * @static
 	 * @param $title Title
 	 * @param $paramArray Array
 	 * @param $skin Skin