Jeroen De Dauw has uploaded a new change for review.
https://gerrit.wikimedia.org/r/175760
Change subject: Rename class from LanguageLinkBadgeDisplay to
SiteLinkBadgeDisplay
......................................................................
Rename class from LanguageLinkBadgeDisplay to SiteLinkBadgeDisplay
Not 100% sure this was wrong, please verify
Change-Id: I7b46000b3d1ef5b95e2c63caeb0e0efdb3cec326
---
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/hooks/ParserAfterParserHookHandlerTest.php
M client/tests/phpunit/includes/hooks/SidebarHookHandlersTest.php
R client/tests/phpunit/includes/hooks/SiteLinkBadgeDisplayTest.php
8 files changed, 21 insertions(+), 21 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/60/175760/1
diff --git a/client/includes/LangLinkHandler.php
b/client/includes/LangLinkHandler.php
index 0cb47ab..773f17f 100644
--- a/client/includes/LangLinkHandler.php
+++ b/client/includes/LangLinkHandler.php
@@ -6,7 +6,7 @@
use Site;
use SiteList;
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\Item;
@@ -34,7 +34,7 @@
private $otherProjectsSidebarGeneratorFactory;
/**
- * @var LanguageLinkBadgeDisplay
+ * @var SiteLinkBadgeDisplay
*/
private $badgeDisplay;
@@ -75,7 +75,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
@@ -85,7 +85,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 5c1cbcf..1dd04e8 100644
--- a/client/includes/WikibaseClient.php
+++ b/client/includes/WikibaseClient.php
@@ -17,7 +17,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;
@@ -539,14 +539,14 @@
}
/**
- * @return LanguageLinkBadgeDisplay
+ * @return SiteLinkBadgeDisplay
*/
public function getLanguageLinkBadgeDisplay() {
global $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 a703555..852cf47 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;
@@ -61,7 +61,7 @@
$entityLookup = $wikibaseClient->getStore()->getEntityLookup();
$badgeClassNames = $settings->getSetting( 'badgeClassNames' );
- $badgeDisplay = new LanguageLinkBadgeDisplay(
+ $badgeDisplay = new SiteLinkBadgeDisplay(
$entityLookup,
is_array( $badgeClassNames ) ? $badgeClassNames :
array(),
$wgLang
@@ -120,7 +120,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* < benestar.wikime...@gmail.com >
* @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 e98fb3e..48198be 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;
@@ -127,7 +127,7 @@
}
/**
- * @return LanguageLinkBadgeDisplay
+ * @return SiteLinkBadgeDisplay
*/
private function getLanguageLinkBadgeDisplay() {
$badgeDisplay = $this->getMockBuilder(
'Wikibase\Client\Hooks\LanguageLinkBadgeDisplay' )
diff --git
a/client/tests/phpunit/includes/hooks/ParserAfterParserHookHandlerTest.php
b/client/tests/phpunit/includes/hooks/ParserAfterParserHookHandlerTest.php
index 8ba63b9..7ba0fda 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' )
diff --git a/client/tests/phpunit/includes/hooks/SidebarHookHandlersTest.php
b/client/tests/phpunit/includes/hooks/SidebarHookHandlersTest.php
index 19a00b9..76874b5 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\Usage\EntityUsage;
@@ -204,7 +204,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 94%
rename from client/tests/phpunit/includes/hooks/LanguageLinkBadgeDisplayTest.php
rename to client/tests/phpunit/includes/hooks/SiteLinkBadgeDisplayTest.php
index e328348..8c6244a 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* < benestar.wikime...@gmail.com >
*/
-class LanguageLinkBadgeDisplayTest extends \MediaWikiTestCase {
+class SiteLinkBadgeDisplayTest extends \MediaWikiTestCase {
private function getItems() {
$items = array();
@@ -70,7 +70,7 @@
$badgeClassNames = array( 'Q4' => 'foo', 'Q3' => 'bar' );
- return new LanguageLinkBadgeDisplay(
+ return new SiteLinkBadgeDisplay(
$mockRepo,
$badgeClassNames,
Language::factory( 'de' )
--
To view, visit https://gerrit.wikimedia.org/r/175760
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7b46000b3d1ef5b95e2c63caeb0e0efdb3cec326
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw <jeroended...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
