Merge "Remove LanguageWithConversion methods returning Language"

Author: jenkins-bot

extension-repo.json

@@ -500,6 +500,7 @@
 		"MyLanguageFallbackChain": {
 			"class": "Wikibase\\Repo\\Specials\\SpecialMyLanguageFallbackChain",
 			"services": [
+				"LanguageFactory",
 				"LanguageNameUtils",
 				"WikibaseRepo.LanguageFallbackChainFactory"
 			]

lib/includes/LanguageWithConversion.php

@@ -20,21 +20,11 @@ class LanguageWithConversion {
 	 */
 	private static $objectCache = [];
 
-	/**
-	 * @var Language|null
-	 */
-	private $language;
-
 	/**
 	 * @var string
 	 */
 	private $languageCode;
 
-	/**
-	 * @var Language|null
-	 */
-	private $sourceLanguage;
-
 	/**
 	 * @var string|null
 	 */
@@ -56,22 +46,16 @@ class LanguageWithConversion {
 	private $translatePool = [];
 
 	/**
-	 * @param null|Language $language
 	 * @param string $languageCode
-	 * @param null|Language $sourceLanguage
 	 * @param null|string $sourceLanguageCode
 	 * @param null|Language $parentLanguage
 	 */
 	private function __construct(
-		?Language $language,
 		$languageCode,
-		Language $sourceLanguage = null,
 		$sourceLanguageCode = null,
 		Language $parentLanguage = null
 	) {
-		$this->language = $language;
 		$this->languageCode = $languageCode;
-		$this->sourceLanguage = $sourceLanguage;
 		$this->sourceLanguageCode = $sourceLanguageCode;
 		$this->parentLanguage = $parentLanguage;
 	}
@@ -113,14 +97,12 @@ public static function validateLanguageCode( $code ) {
 	public static function factory( $language, $sourceLanguage = null ) {
 		if ( is_string( $language ) ) {
 			$languageCode = self::validateLanguageCode( $language );
-			$language = null;
 		} else {
 			$languageCode = $language->getCode();
 		}
 
 		if ( is_string( $sourceLanguage ) ) {
 			$sourceLanguageCode = self::validateLanguageCode( $sourceLanguage );
-			$sourceLanguage = null;
 		} elseif ( $sourceLanguage === null ) {
 			$sourceLanguageCode = null;
 		} else {
@@ -136,10 +118,7 @@ public static function factory( $language, $sourceLanguage = null ) {
 			$services = MediaWikiServices::getInstance();
 			$langFactory = $services->getLanguageFactory();
 			$langConvFactory = $services->getLanguageConverterFactory();
-			if ( !$language ) {
-				$language = $langFactory->getLanguage( $languageCode );
-			}
-			$parentLanguage = $langFactory->getParentLanguage( $language->getCode() );
+			$parentLanguage = $langFactory->getParentLanguage( $languageCode );
 
 			if ( !$parentLanguage ) {
 				throw new MWException( __METHOD__ . ': $language does not support conversion' );
@@ -152,7 +131,7 @@ public static function factory( $language, $sourceLanguage = null ) {
 			$parentLanguage = null;
 		}
 
-		$object = new self( $language, $languageCode, $sourceLanguage, $sourceLanguageCode, $parentLanguage );
+		$object = new self( $languageCode, $sourceLanguageCode, $parentLanguage );
 		self::$objectCache[$languageCode][$sourceLanguageKey] = $object;
 		return $object;
 	}
@@ -166,19 +145,6 @@ public function getLanguageCode() {
 		return $this->languageCode;
 	}
 
-	/**
-	 * Get the language this object wraps.
-	 *
-	 * @return Language
-	 */
-	public function getLanguage() {
-		if ( !$this->language ) {
-			$this->language = MediaWikiServices::getInstance()->getLanguageFactory()->getLanguage( $this->languageCode );
-		}
-
-		return $this->language;
-	}
-
 	/**
 	 * Get the code of the source language defined.
 	 *
@@ -188,19 +154,6 @@ public function getSourceLanguageCode() {
 		return $this->sourceLanguageCode;
 	}
 
-	/**
-	 * Get the source language defined.
-	 *
-	 * @return Language
-	 */
-	public function getSourceLanguage() {
-		if ( $this->sourceLanguageCode !== null && !$this->sourceLanguage ) {
-			$this->sourceLanguage = MediaWikiServices::getInstance()->getLanguageFactory()->getLanguage( $this->sourceLanguageCode );
-		}
-
-		return $this->sourceLanguage;
-	}
-
 	/**
 	 * Get the code of the language where data should be fetched.
 	 *

lib/tests/phpunit/Formatters/OutputFormatValueFormatterFactoryTest.php

@@ -124,7 +124,7 @@ public function testApplyLanguageDefaults( FormatterOptions $options, $expectedL
 			/** @var TermLanguageFallbackChain $languageFallback */
 			$languageFallback = $options->getOption( FormatterLabelDescriptionLookupFactory::OPT_LANGUAGE_FALLBACK_CHAIN );
 			$languages = $languageFallback->getFallbackChain();
-			$lang = $languages[0]->getLanguage()->getCode();
+			$lang = $languages[0]->getLanguageCode();
 
 			$this->assertEquals( $expectedFallback, $lang, 'OPT_LANGUAGE_FALLBACK_CHAIN' );
 		}

lib/tests/phpunit/LanguageFallbackChainFactoryTest.php

@@ -58,11 +58,11 @@ private function assertChainEquals( array $expectedItems, array $chain ) {
 		$this->assertSame( count( $expectedItems ), count( $chain ) );
 		foreach ( $expectedItems as $i => $expected ) {
 			if ( is_array( $expected ) ) {
-				$this->assertSame( $expected[0], $chain[$i]->getLanguage()->getCode() );
-				$this->assertSame( $expected[1], $chain[$i]->getSourceLanguage()->getCode() );
+				$this->assertSame( $expected[0], $chain[$i]->getLanguageCode() );
+				$this->assertSame( $expected[1], $chain[$i]->getSourceLanguageCode() );
 			} else {
-				$this->assertSame( $expected, $chain[$i]->getLanguage()->getCode() );
-				$this->assertNull( $chain[$i]->getSourceLanguage() );
+				$this->assertSame( $expected, $chain[$i]->getLanguageCode() );
+				$this->assertNull( $chain[$i]->getSourceLanguageCode() );
 			}
 		}
 	}

lib/tests/phpunit/LanguageWithConversionTest.php

@@ -28,13 +28,10 @@ private function assertLanguageWithConversion(
 		$expectedSourceLangCode,
 		$expectedFetchLangCode
 	) {
-		$this->assertEquals( $expectedLangCode, $obj->getLanguage()->getCode() );
 		$this->assertEquals( $expectedLangCode, $obj->getLanguageCode() );
 		if ( $expectedSourceLangCode === null ) {
-			$this->assertNull( $obj->getSourceLanguage() );
 			$this->assertNull( $obj->getSourceLanguageCode() );
 		} else {
-			$this->assertEquals( $expectedSourceLangCode, $obj->getSourceLanguage()->getCode() );
 			$this->assertEquals( $expectedSourceLangCode, $obj->getSourceLanguageCode() );
 		}
 		$this->assertEquals( $expectedFetchLangCode, $obj->getFetchLanguageCode() );

repo/includes/Specials/SpecialMyLanguageFallbackChain.php

@@ -7,6 +7,7 @@
 use ExtensionRegistry;
 use Html;
 use IContextSource;
+use MediaWiki\Languages\LanguageFactory;
 use MediaWiki\Languages\LanguageNameUtils;
 use SpecialPage;
 use Wikibase\Lib\LanguageFallbackChainFactory;
@@ -25,6 +26,11 @@ class SpecialMyLanguageFallbackChain extends SpecialPage {
 	 */
 	private $chain;
 
+	/**
+	 * @var LanguageFactory
+	 */
+	private $languageFactory;
+
 	/**
 	 * @var LanguageNameUtils
 	 */
@@ -36,11 +42,13 @@ class SpecialMyLanguageFallbackChain extends SpecialPage {
 	private $languageFallbackChainFactory;
 
 	public function __construct(
+		LanguageFactory $languageFactory,
 		LanguageNameUtils $languageNameUtils,
 		LanguageFallbackChainFactory $languageFallbackChainFactory
 	) {
 		parent::__construct( 'MyLanguageFallbackChain' );
 
+		$this->languageFactory = $languageFactory;
 		$this->languageNameUtils = $languageNameUtils;
 		$this->languageFallbackChainFactory = $languageFallbackChainFactory;
 	}
@@ -96,13 +104,15 @@ public function execute( $subPage ): void {
 		$this->getOutput()->addHTML( Html::openElement( 'ul' ) );
 
 		foreach ( $this->getLanguageFallbackChain()->getFallbackChain() as $lang ) {
-			$language = $lang->getLanguage();
-			$sourceLanguage = $lang->getSourceLanguage();
-			$languageName = $this->languageNameUtils->getLanguageName( $language->getCode(), $inLanguage );
+			$languageCode = $lang->getLanguageCode();
+			$sourceLanguageCode = $lang->getSourceLanguageCode();
+			$language = $this->languageFactory->getLanguage( $languageCode );
+			$languageName = $this->languageNameUtils->getLanguageName( $languageCode, $inLanguage );
 
-			if ( $sourceLanguage ) {
+			if ( $sourceLanguageCode ) {
+				$sourceLanguage = $this->languageFactory->getLanguage( $sourceLanguageCode );
 				$sourceLanguageName = $this->languageNameUtils
-					->getLanguageName( $sourceLanguage->getCode(), $inLanguage );
+					->getLanguageName( $sourceLanguageCode, $inLanguage );
 				$msgHtml = $this->msg(
 					'wikibase-mylanguagefallbackchain-converted-item',
 					$language->getHtmlCode(),

repo/tests/phpunit/includes/Specials/SpecialMyLanguageFallbackChainTest.php

@@ -22,9 +22,11 @@
 class SpecialMyLanguageFallbackChainTest extends SpecialPageTestBase {
 
 	protected function newSpecialPage(): SpecialMyLanguageFallbackChain {
+		$services = $this->getServiceContainer();
 		return new SpecialMyLanguageFallbackChain(
-			$this->getServiceContainer()->getLanguageNameUtils(),
-			WikibaseRepo::getLanguageFallbackChainFactory()
+			$services->getLanguageFactory(),
+			$services->getLanguageNameUtils(),
+			WikibaseRepo::getLanguageFallbackChainFactory( $services )
 		);
 	}