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

diff --git a/includes/ChangesList.php b/includes/ChangesList.php
index 8732e6f..59bb7b2 100644 (file)
--- 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 1277c50..4cd921d 100644 (file)
--- 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 4f2b833..7c9031a 100644 (file)
--- 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 f77d5f9..d30f7cc 100644 (file)
--- 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 11b65b7..ca3d208 100644 (file)
--- 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 0eba219..c5cf855 100644 (file)
--- 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 60820a7..f6b98cd 100644 (file)
--- 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 002820d..2ccee27 100644 (file)
--- 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 0863b76..2e51c3f 100644 (file)
--- 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 324b12f..67c50f1 100644 (file)
--- 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 c17ea06..ef1b1e0 100644 (file)
--- 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 ff4d907..6e8ddf4 100644 (file)
--- 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 a14bcc0..521e8c0 100644 (file)
--- 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 a56131a..69223e1 100644 (file)
--- 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 662dfd9..26651e6 100644 (file)
--- 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 7e733cc..544d3de 100644 (file)
--- 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 cd94206..c0cfcc2 100644 (file)
--- 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 4893614..8de1327 100644 (file)
--- 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 466c487..ab970e4 100644 (file)
--- 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 1d5208d..1eb24f4 100644 (file)
--- 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 c3f6a39..8bcb416 100644 (file)
--- 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 2450bb8..623c08f 100644 (file)
--- 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