Merge "Add getLanguage method to Message"

diff --git a/includes/Message.php b/includes/Message.php
index 9ffd9aa..d0ce482 100644 (file)
--- 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 914f235..44ca3d2 100644 (file)
--- 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