Aude has uploaded a new change for review.
https://gerrit.wikimedia.org/r/50950
Change subject: Remove static from LangLinkHandler methods
......................................................................
Remove static from LangLinkHandler methods
Change-Id: Ifcd7ec8d631f859251a9ca031845cfdea1ce7c78
---
M client/includes/LangLinkHandler.php
M client/includes/NoLangLinkHandler.php
M client/tests/phpunit/includes/LangLinkHandlerTest.php
3 files changed, 15 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/50/50950/1
diff --git a/client/includes/LangLinkHandler.php
b/client/includes/LangLinkHandler.php
index ed13489..b80715c 100644
--- a/client/includes/LangLinkHandler.php
+++ b/client/includes/LangLinkHandler.php
@@ -117,7 +117,7 @@
// use repoLinks in only the namespaces specified in settings
if ( in_array( $title->getNamespace(), $this->namespaces ) ) {
- $nel = self::getNoExternalLangLinks( $out );
+ $nel = $this->getNoExternalLangLinks( $out );
if( in_array( '*', $nel ) ) {
wfProfileOut( __METHOD__ );
@@ -151,7 +151,7 @@
public function suppressRepoLinks( ParserOutput $out, $repoLinks ) {
wfProfileIn( __METHOD__ );
- $nel = self::getNoExternalLangLinks( $out );
+ $nel = $this->getNoExternalLangLinks( $out );
foreach ( $nel as $code ) {
$site = $this->getSiteByNavigationId( $code );
@@ -179,7 +179,7 @@
* @return Array A list of language codes, identifying which repository
links to ignore.
* Empty if {{#noexternallanglinks}} was not used on the page.
*/
- public static function getNoExternalLangLinks( ParserOutput $out ) {
+ public function getNoExternalLangLinks( ParserOutput $out ) {
wfProfileIn( __METHOD__ );
$nel = $out->getProperty( 'noexternallanglinks' );
@@ -202,7 +202,7 @@
* @param \ParserOutput $out
* @param array $noexternallanglinks a list of languages to suppress
*/
- public static function setNoExternalLangLinks( ParserOutput $out, array
$noexternallanglinks ) {
+ public function setNoExternalLangLinks( ParserOutput $out, array
$noexternallanglinks ) {
wfProfileIn( __METHOD__ );
$out->setProperty( 'noexternallanglinks', serialize(
$noexternallanglinks ) );
wfProfileOut( __METHOD__ );
diff --git a/client/includes/NoLangLinkHandler.php
b/client/includes/NoLangLinkHandler.php
index c6006a4..ddf7c57 100644
--- a/client/includes/NoLangLinkHandler.php
+++ b/client/includes/NoLangLinkHandler.php
@@ -71,9 +71,16 @@
array_shift( $langs );
$out = $parser->getOutput();
- $nel = LangLinkHandler::getNoExternalLangLinks( $out );
+ $langLinkHandler = new LanguageLinkHandler(
+ Settings::get( 'siteGlobalID' ),
+ Settings::get( 'namespaces' ),
+ ClientStoreFactory::getStore()->newSiteLinkTable(),
+ \Sites::singleton() );
+ );
+
+ $nel = $langLinkHandler->getNoExternalLangLinks( $out );
$nel += $langs;
- LangLinkHandler::setNoExternalLangLinks( $out, $nel );
+ $langLinkHandler->setNoExternalLangLinks( $out, $nel );
return "";
}
diff --git a/client/tests/phpunit/includes/LangLinkHandlerTest.php
b/client/tests/phpunit/includes/LangLinkHandlerTest.php
index 6cd99c9..b5e51c3 100644
--- a/client/tests/phpunit/includes/LangLinkHandlerTest.php
+++ b/client/tests/phpunit/includes/LangLinkHandlerTest.php
@@ -141,8 +141,7 @@
protected function makeParserOutput( $langlinks, $noexternallanglinks =
array() ) {
$out = new \ParserOutput();
-
- LangLinkHandler::setNoExternalLangLinks( $out,
$noexternallanglinks );
+ $this->langLinkHandler->setNoExternalLangLinks( $out,
$noexternallanglinks );
foreach ( $langlinks as $lang => $link ) {
$out->addLanguageLink( "$lang:$link" );
@@ -156,8 +155,7 @@
*/
public function testGetNoExternalLangLinks( $noexternallanglinks ) {
$out = $this->makeParserOutput( array(), $noexternallanglinks );
-
- $nel = LangLinkHandler::getNoExternalLangLinks( $out );
+ $nel = $this->langLinkHandler->getNoExternalLangLinks( $out );
$this->assertEquals( $noexternallanglinks, $nel );
}
--
To view, visit https://gerrit.wikimedia.org/r/50950
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifcd7ec8d631f859251a9ca031845cfdea1ce7c78
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Aude <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
