Merge "Remove WikibaseRepo.LanguageNameLookup service"

wikimedia · Sep 20, 2023 · b53a8f9 · b53a8f9
2 parents 185e205 + 5dd38ee
commit b53a8f9
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 56 deletions.
diff --git a/repo/WikibaseRepo.ServiceWiring.php b/repo/WikibaseRepo.ServiceWiring.php
@@ -83,7 +83,6 @@
 use Wikibase\Lib\Formatters\WikibaseSnakFormatterBuilders;
 use Wikibase\Lib\Formatters\WikibaseValueFormatterBuilders;
 use Wikibase\Lib\LanguageFallbackChainFactory;
-use Wikibase\Lib\LanguageNameLookup;
 use Wikibase\Lib\LanguageNameLookupFactory;
 use Wikibase\Lib\MediaWikiMessageInLanguageProvider;
 use Wikibase\Lib\MessageInLanguageProvider;
@@ -1389,12 +1388,6 @@ function ( EntityNamespaceLookup $nsLookup, DatabaseEntitySource $source ): Enti
 		);
 	},
 
-	'WikibaseRepo.LanguageNameLookup' => function ( MediaWikiServices $services ): LanguageNameLookup {
-		$userLanguage = WikibaseRepo::getUserLanguage( $services );
-		return WikibaseRepo::getLanguageNameLookupFactory( $services )
-			->getForLanguage( $userLanguage );
-	},
-
 	'WikibaseRepo.LanguageNameLookupFactory' => function ( MediaWikiServices $services ): LanguageNameLookupFactory {
 		return new LanguageNameLookupFactory( $services->getLanguageNameUtils() );
 	},

diff --git a/repo/includes/WikibaseRepo.php b/repo/includes/WikibaseRepo.php
@@ -47,7 +47,6 @@
 use Wikibase\Lib\Formatters\WikibaseSnakFormatterBuilders;
 use Wikibase\Lib\Formatters\WikibaseValueFormatterBuilders;
 use Wikibase\Lib\LanguageFallbackChainFactory;
-use Wikibase\Lib\LanguageNameLookup;
 use Wikibase\Lib\LanguageNameLookupFactory;
 use Wikibase\Lib\MessageInLanguageProvider;
 use Wikibase\Lib\Modules\PropertyValueExpertsModule;
@@ -174,14 +173,6 @@ public static function getLanguageDirectionalityLookup( ContainerInterface $serv
 			->get( 'WikibaseRepo.LanguageDirectionalityLookup' );
 	}
 
-	/**
-	 * @deprecated use {@link LanguageNameLookupFactory} or {@link LanguageNameUtils} instead
-	 */
-	public static function getLanguageNameLookup( ContainerInterface $services = null ): LanguageNameLookup {
-		return ( $services ?: MediaWikiServices::getInstance() )
-			->get( 'WikibaseRepo.LanguageNameLookup' );
-	}
-
 	public static function getLanguageNameLookupFactory( ContainerInterface $services = null ): LanguageNameLookupFactory {
 		return ( $services ?: MediaWikiServices::getInstance() )
 			->get( 'WikibaseRepo.LanguageNameLookupFactory' );

diff --git a/repo/tests/phpunit/unit/ServiceWiring/LanguageNameLookupTest.php b/repo/tests/phpunit/unit/ServiceWiring/LanguageNameLookupTest.php