From 183bb97f740c45a1a5319578128fa3aa23decdd7 Mon Sep 17 00:00:00 2001
From: Fomafix <fomafix@googlemail.com>
Date: Wed, 27 Oct 2021 20:03:44 +0000
Subject: [PATCH] ApiULSLocalization: Inject LanguageNameUtils

Replace deprecated Language::isValidCode by
LanguageNameUtils::isValidCode.

Change-Id: I2adef21fb37e78c163674008a4f9b1e5a74aa6a1
---
 extension.json                      |  7 ++++++-
 includes/api/ApiULSLocalization.php | 20 +++++++++++++++++++-
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/extension.json b/extension.json
index ecb5a817..751d31e9 100644
--- a/extension.json
+++ b/extension.json
@@ -32,7 +32,12 @@
 	},
 	"APIModules": {
 		"languagesearch": "ApiLanguageSearch",
-		"ulslocalization": "ApiULSLocalization",
+		"ulslocalization": {
+			"class": "ApiULSLocalization",
+			"services": [
+				"LanguageNameUtils"
+			]
+		},
 		"ulssetlang": {
 			"class": "ApiULSSetLanguage",
 			"services": [
diff --git a/includes/api/ApiULSLocalization.php b/includes/api/ApiULSLocalization.php
index 6d856a30..005c66d2 100644
--- a/includes/api/ApiULSLocalization.php
+++ b/includes/api/ApiULSLocalization.php
@@ -18,10 +18,28 @@
  * @license MIT
  */
 
+use MediaWiki\Languages\LanguageNameUtils;
+
 /**
  * @ingroup API
  */
 class ApiULSLocalization extends ApiBase {
+	/** @var LanguageNameUtils */
+	private $languageNameUtils;
+
+	/**
+	 * @param ApiMain $main
+	 * @param string $action
+	 * @param LanguageNameUtils $languageNameUtils
+	 */
+	public function __construct(
+		ApiMain $main,
+		$action,
+		LanguageNameUtils $languageNameUtils
+	) {
+		parent::__construct( $main, $action );
+		$this->languageNameUtils = $languageNameUtils;
+	}
 
 	public function execute() {
 		$this->getMain()->setCacheMode( 'public' );
@@ -29,7 +47,7 @@ class ApiULSLocalization extends ApiBase {
 
 		$params = $this->extractRequestParams();
 		$language = $params['language'];
-		if ( !Language::isValidCode( $language ) ) {
+		if ( !$this->languageNameUtils->isValidCode( $language ) ) {
 			$this->dieWithError( [ 'apierror-invalidlang', 'language' ], 'invalidlanguage' );
 		}
 		$contents = ULSJsonMessageLoader::getMessages( $language );