static E_STRICT warnings

diff --git a/includes/LoadBalancer.php b/includes/LoadBalancer.php
index f985a7b..3141691 100644 (file)
--- a/includes/LoadBalancer.php
+++ b/includes/LoadBalancer.php
@@ -50,7 +50,7 @@ class LoadBalancer {
                $this->mAllowLag = false;
        }
 
-       function newFromParams( $servers, $failFunction = false, $waitTimeout = 10 )
+       static function newFromParams( $servers, $failFunction = false, $waitTimeout = 10 )
        {
                $lb = new LoadBalancer;
                $lb->initialise( $servers, $failFunction, $waitTimeout );

diff --git a/includes/Parser.php b/includes/Parser.php
index 31976ba..cfe6f1c 100644 (file)
--- a/includes/Parser.php
+++ b/includes/Parser.php
@@ -4556,7 +4556,7 @@ class ParserOptions
         * Get parser options
         * @static
         */
-       function newFromUser( &$user ) {
+       static function newFromUser( &$user ) {
                return new ParserOptions( $user );
        }
 

diff --git a/includes/Sanitizer.php b/includes/Sanitizer.php
index 234531e..7caefc6 100644 (file)
--- a/includes/Sanitizer.php
+++ b/includes/Sanitizer.php
@@ -920,8 +920,9 @@ class Sanitizer {
         * @param string $text
         * @return string
         * @public
+        * @static
         */
-       function decodeCharReferences( $text ) {
+       public static function decodeCharReferences( $text ) {
                return preg_replace_callback(
                        MW_CHAR_REFS_REGEX,
                        array( 'Sanitizer', 'decodeCharReferencesCallback' ),
@@ -932,7 +933,7 @@ class Sanitizer {
         * @param string $matches
         * @return string
         */
-       function decodeCharReferencesCallback( $matches ) {
+       static function decodeCharReferencesCallback( $matches ) {
                if( $matches[1] != '' ) {
                        return Sanitizer::decodeEntity( $matches[1] );
                } elseif( $matches[2] != '' ) {

diff --git a/includes/Title.php b/includes/Title.php
index bc8f69a..1a9df34 100644 (file)
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -108,7 +108,7 @@ class Title {
         * @static
         * @access public
         */
-       function newFromText( $text, $defaultNamespace = NS_MAIN ) {
+       public static function newFromText( $text, $defaultNamespace = NS_MAIN ) {
                $fname = 'Title::newFromText';
 
                if( is_object( $text ) ) {
@@ -233,7 +233,7 @@ class Title {
         * @static
         * @access public
         */
-       function &makeTitle( $ns, $title ) {
+       public static function &makeTitle( $ns, $title ) {
                $t =& new Title();
                $t->mInterwiki = '';
                $t->mFragment = '';