Jeroen De Dauw has uploaded a new change for review.
https://gerrit.wikimedia.org/r/182987
Change subject: Rename class from LanguageLinkBadgeDisplay to
SiteLinkBadgeDisplay.
......................................................................
Rename class from LanguageLinkBadgeDisplay to SiteLinkBadgeDisplay.
Change-Id: I9749dcf455a243d5764e7d78b09077e7e147815b
---
M client/includes/LangLinkHandler.php
M client/includes/WikibaseClient.php
M client/includes/hooks/SidebarHookHandlers.php
R client/includes/hooks/SiteLinkBadgeDisplay.php
M client/tests/phpunit/includes/LangLinkHandlerTest.php
M client/tests/phpunit/includes/WikibaseClientTest.php
M client/tests/phpunit/includes/hooks/ParserAfterParserHookHandlerTest.php
M client/tests/phpunit/includes/hooks/SidebarHookHandlersTest.php
R client/tests/phpunit/includes/hooks/SiteLinkBadgeDisplayTest.php
9 files changed, 33 insertions(+), 33 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/87/182987/1
diff --git a/client/includes/LangLinkHandler.php
b/client/includes/LangLinkHandler.php
index eb2af02..9c181f4 100644
--- a/client/includes/LangLinkHandler.php
+++ b/client/includes/LangLinkHandler.php
@@ -6,7 +6,7 @@
use Site;
use SiteStore;
use Title;
-use Wikibase\Client\Hooks\LanguageLinkBadgeDisplay;
+use Wikibase\Client\Hooks\SiteLinkBadgeDisplay;
use Wikibase\Client\Hooks\OtherProjectsSidebarGeneratorFactory;
use Wikibase\Client\Usage\ParserOutputUsageAccumulator;
use Wikibase\DataModel\Entity\ItemId;
@@ -33,7 +33,7 @@
private $otherProjectsSidebarGeneratorFactory;
/**
- * @var LanguageLinkBadgeDisplay
+ * @var SiteLinkBadgeDisplay
*/
private $badgeDisplay;
@@ -74,7 +74,7 @@
/**
* @param OtherProjectsSidebarGeneratorFactory
$otherProjectsSidebarGeneratorFactory
- * @param LanguageLinkBadgeDisplay $badgeDisplay
+ * @param SiteLinkBadgeDisplay $badgeDisplay
* @param string $siteId The global site ID for the local wiki
* @param NamespaceChecker $namespaceChecker determines which
namespaces wikibase is enabled on
* @param SiteLinkLookup $siteLinkLookup A site link lookup service
@@ -84,7 +84,7 @@
*/
public function __construct(
OtherProjectsSidebarGeneratorFactory
$otherProjectsSidebarGeneratorFactory,
- LanguageLinkBadgeDisplay $badgeDisplay,
+ SiteLinkBadgeDisplay $badgeDisplay,
$siteId,
NamespaceChecker $namespaceChecker,
SiteLinkLookup $siteLinkLookup,
diff --git a/client/includes/WikibaseClient.php
b/client/includes/WikibaseClient.php
index 4c8ce45..fabe047 100644
--- a/client/includes/WikibaseClient.php
+++ b/client/includes/WikibaseClient.php
@@ -18,7 +18,7 @@
use Wikibase\Client\Changes\ChangeHandler;
use Wikibase\Client\Changes\ChangeRunCoalescer;
use Wikibase\Client\Changes\WikiPageUpdater;
-use Wikibase\Client\Hooks\LanguageLinkBadgeDisplay;
+use Wikibase\Client\Hooks\SiteLinkBadgeDisplay;
use Wikibase\Client\Hooks\OtherProjectsSidebarGeneratorFactory;
use Wikibase\Client\Hooks\ParserFunctionRegistrant;
use Wikibase\Client\Store\TitleFactory;
@@ -535,7 +535,7 @@
if ( $this->langLinkHandler === null ) {
$this->langLinkHandler = new LangLinkHandler(
$this->getOtherProjectsSidebarGeneratorFactory(),
- $this->getLanguageLinkBadgeDisplay(),
+ $this->getSiteLinkBadgeDisplay(),
$this->settings->getSetting( 'siteGlobalID' ),
$this->getNamespaceChecker(),
$this->getStore()->getSiteLinkLookup(),
@@ -549,15 +549,15 @@
}
/**
- * @return LanguageLinkBadgeDisplay
+ * @return SiteLinkBadgeDisplay
*/
- public function getLanguageLinkBadgeDisplay() {
+ public function getSiteLinkBadgeDisplay() {
global $wgLang;
StubObject::unstub( $wgLang );
$badgeClassNames = $this->settings->getSetting(
'badgeClassNames' );
- return new LanguageLinkBadgeDisplay(
+ return new SiteLinkBadgeDisplay(
$this->getEntityLookup(),
is_array( $badgeClassNames ) ? $badgeClassNames :
array(),
$wgLang
diff --git a/client/includes/hooks/SidebarHookHandlers.php
b/client/includes/hooks/SidebarHookHandlers.php
index e2f625a..8c355b2 100644
--- a/client/includes/hooks/SidebarHookHandlers.php
+++ b/client/includes/hooks/SidebarHookHandlers.php
@@ -35,7 +35,7 @@
private $namespaceChecker;
/**
- * @var LanguageLinkBadgeDisplay
+ * @var SiteLinkBadgeDisplay
*/
private $badgeDisplay;
@@ -77,7 +77,7 @@
$entityLookup = $wikibaseClient->getStore()->getEntityLookup();
$badgeClassNames = $settings->getSetting( 'badgeClassNames' );
- $badgeDisplay = new LanguageLinkBadgeDisplay(
+ $badgeDisplay = new SiteLinkBadgeDisplay(
$entityLookup,
is_array( $badgeClassNames ) ? $badgeClassNames :
array(),
$wgLang
@@ -136,7 +136,7 @@
public function __construct(
NamespaceChecker $namespaceChecker,
- LanguageLinkBadgeDisplay $badgeDisplay,
+ SiteLinkBadgeDisplay $badgeDisplay,
OtherProjectsSidebarGeneratorFactory
$otherProjectsSidebarGeneratorFactory,
$otherProjectsLinksBeta,
$otherProjectsLinksDefault
diff --git a/client/includes/hooks/LanguageLinkBadgeDisplay.php
b/client/includes/hooks/SiteLinkBadgeDisplay.php
similarity index 99%
rename from client/includes/hooks/LanguageLinkBadgeDisplay.php
rename to client/includes/hooks/SiteLinkBadgeDisplay.php
index e0a666f..95b9888 100644
--- a/client/includes/hooks/LanguageLinkBadgeDisplay.php
+++ b/client/includes/hooks/SiteLinkBadgeDisplay.php
@@ -21,7 +21,7 @@
* @author Bene* < [email protected] >
* @author Daniel Kinzler
*/
-class LanguageLinkBadgeDisplay {
+class SiteLinkBadgeDisplay {
/**
* @var EntityLookup
diff --git a/client/tests/phpunit/includes/LangLinkHandlerTest.php
b/client/tests/phpunit/includes/LangLinkHandlerTest.php
index 7805756..eb5a9c2 100644
--- a/client/tests/phpunit/includes/LangLinkHandlerTest.php
+++ b/client/tests/phpunit/includes/LangLinkHandlerTest.php
@@ -5,7 +5,7 @@
use MediaWikiSite;
use ParserOutput;
use Title;
-use Wikibase\Client\Hooks\LanguageLinkBadgeDisplay;
+use Wikibase\Client\Hooks\SiteLinkBadgeDisplay;
use Wikibase\Client\Hooks\OtherProjectsSidebarGenerator;
use Wikibase\Client\Usage\EntityUsage;
use Wikibase\Client\Usage\ParserOutputUsageAccumulator;
@@ -83,7 +83,7 @@
return new LangLinkHandler(
$this->getOtherProjectsSidebarGeneratorFactory(
$otherProjects ),
- $this->getLanguageLinkBadgeDisplay(),
+ $this->getSiteLinkBadgeDisplay(),
'srwiki',
new NamespaceChecker( array( NS_TALK ), array() ),
$this->mockRepo,
@@ -127,10 +127,10 @@
}
/**
- * @return LanguageLinkBadgeDisplay
+ * @return SiteLinkBadgeDisplay
*/
- private function getLanguageLinkBadgeDisplay() {
- $badgeDisplay = $this->getMockBuilder(
'Wikibase\Client\Hooks\LanguageLinkBadgeDisplay' )
+ private function getSiteLinkBadgeDisplay() {
+ $badgeDisplay = $this->getMockBuilder(
'Wikibase\Client\Hooks\SiteLinkBadgeDisplay' )
->disableOriginalConstructor()
->getMock();
diff --git a/client/tests/phpunit/includes/WikibaseClientTest.php
b/client/tests/phpunit/includes/WikibaseClientTest.php
index e992372..d8b45e9 100644
--- a/client/tests/phpunit/includes/WikibaseClientTest.php
+++ b/client/tests/phpunit/includes/WikibaseClientTest.php
@@ -151,9 +151,9 @@
$this->assertInstanceOf(
'Wikibase\Lib\OutputFormatValueFormatterFactory', $returnValue );
}
- public function testGetLanguageLinkBadgeDisplay() {
- $returnValue =
$this->getWikibaseClient()->getLanguageLinkBadgeDisplay();
- $this->assertInstanceOf(
'Wikibase\Client\Hooks\LanguageLinkBadgeDisplay', $returnValue );
+ public function testGetSiteLinkBadgeDisplay() {
+ $returnValue =
$this->getWikibaseClient()->getSiteLinkBadgeDisplay();
+ $this->assertInstanceOf(
'Wikibase\Client\Hooks\SiteLinkBadgeDisplay', $returnValue );
}
public function testGetOtherProjectsSidebarGeneratorFactoryReturnType()
{
diff --git
a/client/tests/phpunit/includes/hooks/ParserAfterParserHookHandlerTest.php
b/client/tests/phpunit/includes/hooks/ParserAfterParserHookHandlerTest.php
index 5e0ba9f..145b077 100644
--- a/client/tests/phpunit/includes/hooks/ParserAfterParserHookHandlerTest.php
+++ b/client/tests/phpunit/includes/hooks/ParserAfterParserHookHandlerTest.php
@@ -11,7 +11,7 @@
use SiteStore;
use StripState;
use Title;
-use Wikibase\Client\Hooks\LanguageLinkBadgeDisplay;
+use Wikibase\Client\Hooks\SiteLinkBadgeDisplay;
use Wikibase\Client\Hooks\OtherProjectsSidebarGeneratorFactory;
use Wikibase\Client\Hooks\ParserAfterParseHookHandler;
use Wikibase\Client\Usage\EntityUsage;
@@ -165,7 +165,7 @@
$mockRepo = $this->getMockRepo( $links );
$mockRepo->putEntity( $this->getBadgeItem() );
- $badgeDisplay = new LanguageLinkBadgeDisplay(
+ $badgeDisplay = new SiteLinkBadgeDisplay(
$mockRepo,
array( 'Q17' => 'featured' ),
Language::factory( 'en' )
@@ -329,7 +329,7 @@
$actualBadges = $parserOutput->getExtensionData(
'wikibase_badges' );
- // $actualBadges contains info arrays, these are checked by
LanguageLinkBadgeDisplayTest and LangLinkHandlerTest
+ // $actualBadges contains info arrays, these are checked by
SiteLinkBadgeDisplayTest and LangLinkHandlerTest
$this->assertSame( $expectedBadges, $actualBadges );
}
diff --git a/client/tests/phpunit/includes/hooks/SidebarHookHandlersTest.php
b/client/tests/phpunit/includes/hooks/SidebarHookHandlersTest.php
index a4320e6..0fca24c 100644
--- a/client/tests/phpunit/includes/hooks/SidebarHookHandlersTest.php
+++ b/client/tests/phpunit/includes/hooks/SidebarHookHandlersTest.php
@@ -13,7 +13,7 @@
use SiteStore;
use Skin;
use Title;
-use Wikibase\Client\Hooks\LanguageLinkBadgeDisplay;
+use Wikibase\Client\Hooks\SiteLinkBadgeDisplay;
use Wikibase\Client\Hooks\OtherProjectsSidebarGeneratorFactory;
use Wikibase\Client\Hooks\SidebarHookHandlers;
use Wikibase\Client\WikibaseClient;
@@ -203,7 +203,7 @@
$mockRepo = $this->getMockRepository( $siteLinksPerItem );
$mockRepo->putEntity( $this->getBadgeItem() );
- $badgeDisplay = new LanguageLinkBadgeDisplay(
+ $badgeDisplay = new SiteLinkBadgeDisplay(
$mockRepo,
array( 'Q17' => 'featured' ),
$en
diff --git
a/client/tests/phpunit/includes/hooks/LanguageLinkBadgeDisplayTest.php
b/client/tests/phpunit/includes/hooks/SiteLinkBadgeDisplayTest.php
similarity index 89%
rename from client/tests/phpunit/includes/hooks/LanguageLinkBadgeDisplayTest.php
rename to client/tests/phpunit/includes/hooks/SiteLinkBadgeDisplayTest.php
index 75b8650..e07df78 100644
--- a/client/tests/phpunit/includes/hooks/LanguageLinkBadgeDisplayTest.php
+++ b/client/tests/phpunit/includes/hooks/SiteLinkBadgeDisplayTest.php
@@ -8,14 +8,14 @@
use ParserOutput;
use RequestContext;
use Title;
-use Wikibase\Client\Hooks\LanguageLinkBadgeDisplay;
+use Wikibase\Client\Hooks\SiteLinkBadgeDisplay;
use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\SiteLink;
use Wikibase\Test\MockRepository;
/**
- * @covers Wikibase\Client\Hooks\LanguageLinkBadgeDisplay
+ * @covers Wikibase\Client\Hooks\SiteLinkBadgeDisplay
*
* @since 0.5
*
@@ -26,7 +26,7 @@
* @licence GNU GPL v2+
* @author Bene* < [email protected] >
*/
-class LanguageLinkBadgeDisplayTest extends \MediaWikiTestCase {
+class SiteLinkBadgeDisplayTest extends \MediaWikiTestCase {
private function getItems() {
$items = array();
@@ -61,7 +61,7 @@
return $items;
}
- private function getLanguageLinkBadgeDisplay() {
+ private function getSiteLinkBadgeDisplay() {
$mockRepo = new MockRepository();
foreach ( $this->getItems() as $item ) {
@@ -70,7 +70,7 @@
$badgeClassNames = array( 'Q4' => 'foo', 'Q3' => 'bar' );
- return new LanguageLinkBadgeDisplay(
+ return new SiteLinkBadgeDisplay(
$mockRepo,
$badgeClassNames,
Language::factory( 'de' )
@@ -81,7 +81,7 @@
* @dataProvider attachBadgesToOutputProvider
*/
public function testAttachBadgesToOutput( $expected, $languageLinks ) {
- $languageLinkBadgeDisplay =
$this->getLanguageLinkBadgeDisplay();
+ $languageLinkBadgeDisplay = $this->getSiteLinkBadgeDisplay();
$parserOutput = new ParserOutput();
$languageLinkBadgeDisplay->attachBadgesToOutput(
$languageLinks, $parserOutput );
@@ -142,7 +142,7 @@
$output = new OutputPage( $context );
$output->setProperty( 'wikibase_badges', $badges );
- $languageLinkBadgeDisplay =
$this->getLanguageLinkBadgeDisplay();
+ $languageLinkBadgeDisplay = $this->getSiteLinkBadgeDisplay();
$languageLinkBadgeDisplay->applyBadges( $link,
$languageLinkTitle, $output );
$this->assertEquals( $expected, $link );
--
To view, visit https://gerrit.wikimedia.org/r/182987
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9749dcf455a243d5764e7d78b09077e7e147815b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
