From 78937428b6bc5210335ebc8b730c18a81d8fc4b7 Mon Sep 17 00:00:00 2001 From: aude Date: Wed, 26 Mar 2014 18:59:30 +0100 Subject: [PATCH] Add getLanguage method to Message This allows to more easily test code where language is set, Message::inLanguage() is called, etc. Change-Id: If8f9697480f5d084f755990fdc0f2a1e18f056bc --- includes/Message.php | 11 +++++++++++ tests/phpunit/includes/MessageTest.php | 18 ++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/includes/Message.php b/includes/Message.php index 9ffd9aada6..d0ce4828b9 100644 --- a/includes/Message.php +++ b/includes/Message.php @@ -272,6 +272,17 @@ class Message { return $this->format; } + /** + * Returns the Language of the Message. + * + * @since 1.23 + * + * @return Language + */ + public function getLanguage() { + return $this->language; + } + /** * Factory function that is just wrapper for the real constructor. It is * intended to be used instead of the real constructor, because it allows diff --git a/tests/phpunit/includes/MessageTest.php b/tests/phpunit/includes/MessageTest.php index 914f2358e3..44ca3d22e7 100644 --- a/tests/phpunit/includes/MessageTest.php +++ b/tests/phpunit/includes/MessageTest.php @@ -59,6 +59,24 @@ class MessageTest extends MediaWikiLangTestCase { ); } + public function getLanguageProvider() { + return array( + array( 'foo', array( 'bar' ), 'en' ), + array( 'foo', array( 'bar' ), 'de' ) + ); + } + + /** + * @covers Message::getLanguage + * @dataProvider getLanguageProvider + */ + public function testGetLanguageCode( $key, $params, $languageCode ) { + $language = Language::factory( $languageCode ); + $message = new Message( $key, $params, $language ); + + $this->assertEquals( $language, $message->getLanguage() ); + } + /** * @covers Message::params * @dataProvider provideTestParams -- 2.20.1