Remove Language::factory and getParentLanguage use

Change-Id: I11f8801ef47ec1a1f63d840116e69667e6f3ae3c

1 files changed, 20 insertions, 21 deletions

diff --git a/tests/phpunit/includes/MessageTest.php b/tests/phpunit/includes/MessageTest.php
index e86547bbc214..03b8d70fe4b0 100644
--- a/tests/phpunit/includes/MessageTest.php
+++ b/tests/phpunit/includes/MessageTest.php
@@ -1,5 +1,6 @@
 <?php
 
+use MediaWiki\MediaWikiServices;
 use Wikimedia\TestingAccessWrapper;
 
 /**
@@ -40,8 +41,8 @@ class MessageTest extends MediaWikiLangTestCase {
 	}
 
 	public static function provideConstructor() {
-		$langDe = Language::factory( 'de' );
-		$langEn = Language::factory( 'en' );
+		$langDe = MediaWikiServices::getInstance()->getLanguageFactory()->getLanguage( 'de' );
+		$langEn = MediaWikiServices::getInstance()->getLanguageFactory()->getLanguage( 'en' );
 
 		return [
 			[ $langDe, 'foo', [], $langDe ],
@@ -140,7 +141,8 @@ class MessageTest extends MediaWikiLangTestCase {
 	 * @dataProvider provideConstructorLanguage
 	 */
 	public function testConstructorLanguage( $key, $params, $languageCode ) {
-		$language = Language::factory( $languageCode );
+		$language = MediaWikiServices::getInstance()->getLanguageFactory()
+			->getLanguage( $languageCode );
 		$message = new Message( $key, $params, $language );
 
 		$this->assertEquals( $language, $message->getLanguage() );
@@ -359,10 +361,10 @@ class MessageTest extends MediaWikiLangTestCase {
 
 		// NOTE: make sure internal caching of the message text is reset appropriately
 		$msg = wfMessage( 'mainpage' );
-		$this->assertSame( 'Main Page', $msg->inLanguage( Language::factory( 'en' ) )->text() );
+		$this->assertSame( 'Main Page', $msg->inLanguage( 'en' )->text() );
 		$this->assertSame(
 			'Заглавная страница',
-			$msg->inLanguage( Language::factory( 'ru' ) )->text()
+			$msg->inLanguage( 'ru' )->text()
 		);
 	}
 
@@ -439,7 +441,7 @@ class MessageTest extends MediaWikiLangTestCase {
 	 * @covers Message::numParams
 	 */
 	public function testNumParams() {
-		$lang = Language::factory( 'en' );
+		$lang = MediaWikiServices::getInstance()->getLanguageFactory()->getLanguage( 'en' );
 		$msg = new RawMessage( '$1' );
 
 		$this->assertSame(
@@ -454,7 +456,7 @@ class MessageTest extends MediaWikiLangTestCase {
 	 * @covers Message::durationParams
 	 */
 	public function testDurationParams() {
-		$lang = Language::factory( 'en' );
+		$lang = MediaWikiServices::getInstance()->getLanguageFactory()->getLanguage( 'en' );
 		$msg = new RawMessage( '$1' );
 
 		$this->assertSame(
@@ -470,7 +472,7 @@ class MessageTest extends MediaWikiLangTestCase {
 	 * @covers Message::expiryParams
 	 */
 	public function testExpiryParams() {
-		$lang = Language::factory( 'en' );
+		$lang = MediaWikiServices::getInstance()->getLanguageFactory()->getLanguage( 'en' );
 		$msg = new RawMessage( '$1' );
 
 		$this->assertSame(
@@ -485,7 +487,7 @@ class MessageTest extends MediaWikiLangTestCase {
 	 * @covers Message::timeperiodParams
 	 */
 	public function testTimeperiodParams() {
-		$lang = Language::factory( 'en' );
+		$lang = MediaWikiServices::getInstance()->getLanguageFactory()->getLanguage( 'en' );
 		$msg = new RawMessage( '$1' );
 
 		$this->assertSame(
@@ -500,7 +502,7 @@ class MessageTest extends MediaWikiLangTestCase {
 	 * @covers Message::sizeParams
 	 */
 	public function testSizeParams() {
-		$lang = Language::factory( 'en' );
+		$lang = MediaWikiServices::getInstance()->getLanguageFactory()->getLanguage( 'en' );
 		$msg = new RawMessage( '$1' );
 
 		$this->assertSame(
@@ -515,7 +517,7 @@ class MessageTest extends MediaWikiLangTestCase {
 	 * @covers Message::bitrateParams
 	 */
 	public function testBitrateParams() {
-		$lang = Language::factory( 'en' );
+		$lang = MediaWikiServices::getInstance()->getLanguageFactory()->getLanguage( 'en' );
 		$msg = new RawMessage( '$1' );
 
 		$this->assertSame(
@@ -565,8 +567,6 @@ class MessageTest extends MediaWikiLangTestCase {
 	 * @dataProvider providePlaintextParams
 	 */
 	public function testPlaintextParams( $expect, $format ) {
-		$lang = Language::factory( 'en' );
-
 		$msg = new RawMessage( '$1 $2' );
 		$params = [
 			'one $2',
@@ -574,13 +574,13 @@ class MessageTest extends MediaWikiLangTestCase {
 		];
 		$this->assertSame(
 			$expect,
-			$msg->inLanguage( $lang )->plaintextParams( $params )->$format(),
+			$msg->inLanguage( 'en' )->plaintextParams( $params )->$format(),
 			"Fail formatting for $format"
 		);
 	}
 
 	public static function provideListParam() {
-		$lang = Language::factory( 'de' );
+		$lang = MediaWikiServices::getInstance()->getLanguageFactory()->getLanguage( 'de' );
 		$msg1 = new Message( 'mainpage', [], $lang );
 		$msg2 = new RawMessage( "''link''", [], $lang );
 
@@ -671,13 +671,11 @@ class MessageTest extends MediaWikiLangTestCase {
 	 * @dataProvider provideListParam
 	 */
 	public function testListParam( $list, $type, $format, $expect ) {
-		$lang = Language::factory( 'en' );
-
 		$msg = new RawMessage( '$1' );
 		$msg->params( [ Message::listParam( $list, $type ) ] );
 		$this->assertEquals(
 			$expect,
-			$msg->inLanguage( $lang )->$format()
+			$msg->inLanguage( 'en' )->$format()
 		);
 	}
 
@@ -692,9 +690,10 @@ class MessageTest extends MediaWikiLangTestCase {
 
 		$msg = new Message( 'returnto', [
 			new Message( 'apihelp-link', [
-				'foo', new Message( 'mainpage', [], Language::factory( 'en' ) )
-			], Language::factory( 'de' ) )
-		], Language::factory( 'es' ) );
+				'foo', new Message( 'mainpage', [],
+					MediaWikiServices::getInstance()->getLanguageFactory()->getLanguage( 'en' ) )
+			], MediaWikiServices::getInstance()->getLanguageFactory()->getLanguage( 'de' ) )
+		], MediaWikiServices::getInstance()->getLanguageFactory()->getLanguage( 'es' ) );
 
 		$this->assertEquals(
 			'Volver a [[Special:ApiHelp/foo|Página principal]].',