Tests: Make phpunit providers "public static".

[lhc/web/wiklou.git] / tests / phpunit / includes / cache / MessageCacheTest.php

diff --git a/tests/phpunit/includes/cache/MessageCacheTest.php b/tests/phpunit/includes/cache/MessageCacheTest.php
index 89021dd..eda06d4 100644 (file)
--- a/tests/phpunit/includes/cache/MessageCacheTest.php
+++ b/tests/phpunit/includes/cache/MessageCacheTest.php
@@ -12,6 +12,12 @@ class MessageCacheTest extends MediaWikiLangTestCase {
        }
 
        function addDBData() {
+               // be sure english messages under $key, not $key/en
+               $this->setMwGlobals( array(
+                       'wgLanguageCode' => 'en',
+                       'wgContLang' => Language::factory( 'en' ),
+               ) );
+
                // Set up messages and fallbacks ab -> ru -> en
                $this->makePage( 'FallbackLanguageTest-Full', 'ab' );
                $this->makePage( 'FallbackLanguageTest-Full', 'ru' );
@@ -57,7 +63,7 @@ class MessageCacheTest extends MediaWikiLangTestCase {
                $this->assertEquals( $expectedContent, $result, "Message fallback failed." );
        }
 
-       function provideMessagesForFallback() {
+       public static function provideMessagesForFallback() {
                return array(
                        array( 'FallbackLanguageTest-Full', 'ab', 'ab' ),
                        array( 'FallbackLanguageTest-Partial', 'ab', 'ru' ),
@@ -77,7 +83,7 @@ class MessageCacheTest extends MediaWikiLangTestCase {
                $this->assertEquals( $expectedContent, $result, "Full key message fallback failed." );
        }
 
-       function provideMessagesForFullKeys() {
+       public static function provideMessagesForFullKeys() {
                return array(
                        array( 'MessageCacheTest-FullKeyTest/ru', 'ru', 'ru' ),
                        array( 'MessageCacheTest-FullKeyTest/ru', 'ab', 'ru' ),