X-Git-Url: https://git.cyclocoop.org/%242?a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2Fapi%2FApiQuerySiteinfoTest.php;h=55f4a330ce87c3c67f826fa9366d76e3d4a579ea;hb=6497541c9c089966ce7d3b0e0abd6b68192d30d8;hp=9587a763f118c95a483af699039ede1c20aa20fc;hpb=8318677eee09085060a9bcbab7cb8db80fd6ac3b;p=lhc%2Fweb%2Fwiklou.git

diff --git a/tests/phpunit/includes/api/ApiQuerySiteinfoTest.php b/tests/phpunit/includes/api/ApiQuerySiteinfoTest.php
index 9587a763f1..55f4a330ce 100644
--- a/tests/phpunit/includes/api/ApiQuerySiteinfoTest.php
+++ b/tests/phpunit/includes/api/ApiQuerySiteinfoTest.php
@@ -40,36 +40,34 @@ class ApiQuerySiteinfoTest extends ApiTestCase {
 	}
 
 	public function testLinkPrefixCharset() {
-		global $wgContLang;
-
-		$this->setContentLang( 'ar' );
-		$this->assertTrue( $wgContLang->linkPrefixExtension(), 'Sanity check' );
+		$contLang = Language::factory( 'ar' );
+		$this->setContentLang( $contLang );
+		$this->assertTrue( $contLang->linkPrefixExtension(), 'Sanity check' );
 
 		$data = $this->doQuery();
 
-		$this->assertSame( $wgContLang->linkPrefixCharset(), $data['linkprefixcharset'] );
+		$this->assertSame( $contLang->linkPrefixCharset(), $data['linkprefixcharset'] );
 	}
 
 	public function testVariants() {
-		global $wgContLang;
-
-		$this->setContentLang( 'zh' );
-		$this->assertTrue( $wgContLang->hasVariants(), 'Sanity check' );
+		$contLang = Language::factory( 'zh' );
+		$this->setContentLang( $contLang );
+		$this->assertTrue( $contLang->hasVariants(), 'Sanity check' );
 
 		$data = $this->doQuery();
 
 		$expected = array_map(
-			function ( $code ) use ( $wgContLang ) {
-				return [ 'code' => $code, 'name' => $wgContLang->getVariantname( $code ) ];
+			function ( $code ) use ( $contLang ) {
+				return [ 'code' => $code, 'name' => $contLang->getVariantname( $code ) ];
 			},
-			$wgContLang->getVariants()
+			$contLang->getVariants()
 		);
 
 		$this->assertSame( $expected, $data['variants'] );
 	}
 
 	public function testReadOnly() {
-		$svc = \MediaWiki\MediaWikiServices::getInstance()->getReadOnlyMode();
+		$svc = MediaWikiServices::getInstance()->getReadOnlyMode();
 		$svc->setReason( 'Need more donations' );
 		try {
 			$data = $this->doQuery();
@@ -82,18 +80,21 @@ class ApiQuerySiteinfoTest extends ApiTestCase {
 	}
 
 	public function testNamespaces() {
-		global $wgContLang;
-
 		$this->setMwGlobals( 'wgExtraNamespaces', [ '138' => 'Testing' ] );
 
-		$this->assertSame( array_keys( $wgContLang->getFormattedNamespaces() ),
-			array_keys( $this->doQuery( 'namespaces' ) ) );
+		$this->assertSame(
+			array_keys( MediaWikiServices::getInstance()->getContentLanguage()->getFormattedNamespaces() ),
+			array_keys( $this->doQuery( 'namespaces' ) )
+		);
 	}
 
 	public function testNamespaceAliases() {
-		global $wgNamespaceAliases, $wgContLang;
+		global $wgNamespaceAliases;
 
-		$expected = array_merge( $wgNamespaceAliases, $wgContLang->getNamespaceAliases() );
+		$expected = array_merge(
+			$wgNamespaceAliases,
+			MediaWikiServices::getInstance()->getContentLanguage()->getNamespaceAliases()
+		);
 		$expected = array_map(
 			function ( $key, $val ) {
 				return [ 'id' => $val, 'alias' => strtr( $key, '_', ' ' ) ];
@@ -116,10 +117,8 @@ class ApiQuerySiteinfoTest extends ApiTestCase {
 	}
 
 	public function testMagicWords() {
-		global $wgContLang;
-
 		$this->assertCount(
-			count( $wgContLang->getMagicWords() ),
+			count( MediaWikiServices::getInstance()->getContentLanguage()->getMagicWords() ),
 			$this->doQuery( 'magicwords' )
 		);
 	}
@@ -489,6 +488,7 @@ class ApiQuerySiteinfoTest extends ApiTestCase {
 			function ( $code, $name ) {
 				return [
 					'code' => $code,
+					'bcp47' => LanguageCode::bcp47( $code ),
 					'name' => $name
 				];
 			},
@@ -590,7 +590,10 @@ class ApiQuerySiteinfoTest extends ApiTestCase {
 	}
 
 	public function testVariables() {
-		$this->assertSame( MagicWord::getVariableIDs(), $this->doQuery( 'variables' ) );
+		$this->assertSame(
+			MediaWikiServices::getInstance()->getMagicWordFactory()->getVariableIDs(),
+			$this->doQuery( 'variables' )
+		);
 	}
 
 	public function testProtocols() {