From 55ecf3e215a25e581380b00f86af21eb26fd49f1 Mon Sep 17 00:00:00 2001
From: Fomafix <fomafix@googlemail.com>
Date: Tue, 27 Jun 2017 16:25:01 +0200
Subject: [PATCH] Add new static function LanguageCode::replaceDeprecatedCodes

Refactor the deprecatedLanguageCodeMapping to a private variable.

Change-Id: I5f8e601e53de183e6268c9ef601eef8390b725cd
---
 languages/LanguageCode.php                   | 53 +++++++++++++++-----
 tests/phpunit/languages/LanguageCodeTest.php |  6 +++
 2 files changed, 47 insertions(+), 12 deletions(-)

diff --git a/languages/LanguageCode.php b/languages/LanguageCode.php
index 7c9da77ba6..3fa3dc16e5 100644
--- a/languages/LanguageCode.php
+++ b/languages/LanguageCode.php
@@ -27,6 +27,27 @@
  * @ingroup Language
  */
 class LanguageCode {
+	/**
+	 * Mapping of deprecated language codes that were used in previous
+	 * versions of MediaWiki to up-to-date, current language codes.
+	 *
+	 * @var array Mapping from language code to language code
+	 *
+	 * @since 1.30
+	 */
+	private static $deprecatedLanguageCodeMapping = [
+		// Note that als is actually a valid ISO 639 code (Tosk Albanian), but it
+		// was previously used in MediaWiki for Alsatian, which comes under gsw
+		'als' => 'gsw',
+		'bat-smg' => 'sgs',
+		'be-x-old' => 'be-tarask',
+		'fiu-vro' => 'vro',
+		'roa-rup' => 'rup',
+		'zh-classical' => 'lzh',
+		'zh-min-nan' => 'nan',
+		'zh-yue' => 'yue',
+	];
+
 	/**
 	 * Returns a mapping of deprecated language codes that were used in previous
 	 * versions of MediaWiki to up-to-date, current language codes.
@@ -36,19 +57,27 @@ class LanguageCode {
 	 * MediaWiki's localisation system.
 	 *
 	 * @return string[]
+	 *
+	 * @since 1.29
 	 */
 	public static function getDeprecatedCodeMapping() {
-		return [
-			// Note that als is actually a valid ISO 639 code (Tosk Albanian), but it
-			// was previously used in MediaWiki for Alsatian, which comes under gsw
-			'als' => 'gsw',
-			'bat-smg' => 'sgs',
-			'be-x-old' => 'be-tarask',
-			'fiu-vro' => 'vro',
-			'roa-rup' => 'rup',
-			'zh-classical' => 'lzh',
-			'zh-min-nan' => 'nan',
-			'zh-yue' => 'yue',
-		];
+		return self::$deprecatedLanguageCodeMapping;
+	}
+
+	/**
+	 * Replace deprecated language codes that were used in previous
+	 * versions of MediaWiki to up-to-date, current language codes.
+	 * Other values will returned unchanged.
+	 *
+	 * @param string $code Old language code
+	 * @return string New language code
+	 *
+	 * @since 1.30
+	 */
+	public static function replaceDeprecatedCodes( $code ) {
+		if ( isset( self::$deprecatedLanguageCodeMapping[$code] ) ) {
+			return self::$deprecatedLanguageCodeMapping[$code];
+		}
+		return $code;
 	}
 }
diff --git a/tests/phpunit/languages/LanguageCodeTest.php b/tests/phpunit/languages/LanguageCodeTest.php
index b33360cfe9..7689ef1dda 100644
--- a/tests/phpunit/languages/LanguageCodeTest.php
+++ b/tests/phpunit/languages/LanguageCodeTest.php
@@ -37,4 +37,10 @@ class LanguageCodeTest extends PHPUnit_Framework_TestCase {
 		$this->assertArrayNotHasKey( 'simple', $map );
 	}
 
+	public function testReplaceDeprecatedCodes() {
+		$this->assertEquals( 'gsw', LanguageCode::replaceDeprecatedCodes( 'als' ) );
+		$this->assertEquals( 'gsw', LanguageCode::replaceDeprecatedCodes( 'gsw' ) );
+		$this->assertEquals( null, LanguageCode::replaceDeprecatedCodes( null ) );
+	}
+
 }
-- 
2.20.1