[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Move static hook handler to the class
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/381294 )
Change subject: Move static hook handler to the class
..
Move static hook handler to the class
It's better to have related code together.
Change-Id: I9712ce13bb3ee2806c622a80e71d494d41166cd1
---
M client/WikibaseClient.hooks.php
M client/WikibaseClient.php
M client/includes/Hooks/InfoActionHookHandler.php
3 files changed, 40 insertions(+), 42 deletions(-)
Approvals:
jenkins-bot: Verified
Thiemo Mättig (WMDE): Looks good to me, approved
diff --git a/client/WikibaseClient.hooks.php b/client/WikibaseClient.hooks.php
index 4853c6d..584b0b6 100644
--- a/client/WikibaseClient.hooks.php
+++ b/client/WikibaseClient.hooks.php
@@ -6,7 +6,6 @@
use BaseTemplate;
use EchoEvent;
use EditPage;
-use IContextSource;
use OutputPage;
use Parser;
use Skin;
@@ -21,14 +20,12 @@
use Wikibase\Client\Hooks\DeletePageNoticeCreator;
use Wikibase\Client\Hooks\EchoNotificationsHandlers;
use Wikibase\Client\Hooks\EditActionHookHandler;
-use Wikibase\Client\Hooks\InfoActionHookHandler;
+use Wikibase\Client\Specials\SpecialEntityUsage;
use Wikibase\Client\Specials\SpecialPagesWithBadges;
use Wikibase\Client\Specials\SpecialUnconnectedPages;
-use Wikibase\Client\Specials\SpecialEntityUsage;
use Wikibase\Client\WikibaseClient;
use Wikibase\DataModel\Entity\EntityId;
use Wikibase\Lib\AutoCommentFormatter;
-use Wikibase\Lib\Store\LanguageFallbackLabelDescriptionLookupFactory;
/**
* File defining the hook handlers for the Wikibase Client extension.
@@ -280,42 +277,6 @@
*/
public static function onParserFirstCallInit( Parser &$parser ) {
WikibaseClient::getDefaultInstance()->getParserFunctionRegistrant()->register(
$parser );
-
- return true;
- }
-
- /**
-* Adds the Entity ID of the corresponding Wikidata item in action=info
-*
-* @param IContextSource $context
-* @param array $pageInfo
-*
-* @return bool
-*/
- public static function onInfoAction( IContextSource $context, array
&$pageInfo ) {
- $wikibaseClient = WikibaseClient::getDefaultInstance();
- $settings = $wikibaseClient->getSettings();
-
- $namespaceChecker = $wikibaseClient->getNamespaceChecker();
- $usageLookup = $wikibaseClient->getStore()->getUsageLookup();
- $labelDescriptionLookupFactory = new
LanguageFallbackLabelDescriptionLookupFactory(
- $wikibaseClient->getLanguageFallbackChainFactory(),
- $wikibaseClient->getTermLookup(),
- $wikibaseClient->getTermBuffer()
- );
- $idParser = $wikibaseClient->getEntityIdParser();
-
- $infoActionHookHandler = new InfoActionHookHandler(
- $namespaceChecker,
- $wikibaseClient->newRepoLinker(),
- $wikibaseClient->getStore()->getSiteLinkLookup(),
- $settings->getSetting( 'siteGlobalID' ),
- $usageLookup,
- $labelDescriptionLookupFactory,
- $idParser
- );
-
- $pageInfo = $infoActionHookHandler->handle( $context, $pageInfo
);
return true;
}
diff --git a/client/WikibaseClient.php b/client/WikibaseClient.php
index f71a631..baf0bec 100644
--- a/client/WikibaseClient.php
+++ b/client/WikibaseClient.php
@@ -139,7 +139,7 @@
$wgHooks['BeforePageDisplay'][] =
'\Wikibase\ClientHooks::onBeforePageDisplay';
$wgHooks['BeforePageDisplay'][] =
'\Wikibase\ClientHooks::onBeforePageDisplayAddJsConfig';
$wgHooks['ScribuntoExternalLibraries'][] =
'\Wikibase\ClientHooks::onScribuntoExternalLibraries';
- $wgHooks['InfoAction'][] = '\Wikibase\ClientHooks::onInfoAction';
+ $wgHooks['InfoAction'][] =
'\Wikibase\Client\Hooks\InfoActionHookHandler::onInfoAction';
$wgHooks['EditPage::showStandardInputs:options'][] =
'\Wikibase\ClientHooks::onEditAction';
$wgHooks['BaseTemplateAfterPortlet'][] =
'\Wikibase\ClientHooks::onBaseTemplateAfterPortlet';
$wgHooks['GetBetaFeaturePreferences'][] =
'\Wikibase\ClientHooks::onGetBetaFeaturePreferences';
diff --git a/client/includes/Hooks/InfoActionHookHandler.php
b/client/includes/Hooks/InfoActionHookHandler.php
index a87e6d5..2478b89 100644
--- a/client/includes/Hooks/InfoActionHookHandler.php
+++ b/client/includes/Hooks/InfoActionHookHandler.php
@@ -9,9 +9,10 @@
use Wikibase\Client\Usage\UsageLookup;
use Wikibase\DataModel\Entity\EntityIdParser;
use Wikibase\DataModel\Entity\ItemId;
-use Wikibase\Lib\Store\SiteLinkLookup;
use Wikibase\Lib\Store\LanguageFallbackLabelDescriptionLookupFactory;
+use Wikibase\Lib\Store\SiteLinkLookup;
use
[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Move static hook handler to the class
Matěj Suchánek has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/381294 )
Change subject: Move static hook handler to the class
..
Move static hook handler to the class
It's better to have related code together.
Change-Id: I9712ce13bb3ee2806c622a80e71d494d41166cd1
---
M client/WikibaseClient.hooks.php
M client/WikibaseClient.php
M client/includes/Hooks/InfoActionHookHandler.php
3 files changed, 40 insertions(+), 42 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/94/381294/1
diff --git a/client/WikibaseClient.hooks.php b/client/WikibaseClient.hooks.php
index 4853c6d..584b0b6 100644
--- a/client/WikibaseClient.hooks.php
+++ b/client/WikibaseClient.hooks.php
@@ -6,7 +6,6 @@
use BaseTemplate;
use EchoEvent;
use EditPage;
-use IContextSource;
use OutputPage;
use Parser;
use Skin;
@@ -21,14 +20,12 @@
use Wikibase\Client\Hooks\DeletePageNoticeCreator;
use Wikibase\Client\Hooks\EchoNotificationsHandlers;
use Wikibase\Client\Hooks\EditActionHookHandler;
-use Wikibase\Client\Hooks\InfoActionHookHandler;
+use Wikibase\Client\Specials\SpecialEntityUsage;
use Wikibase\Client\Specials\SpecialPagesWithBadges;
use Wikibase\Client\Specials\SpecialUnconnectedPages;
-use Wikibase\Client\Specials\SpecialEntityUsage;
use Wikibase\Client\WikibaseClient;
use Wikibase\DataModel\Entity\EntityId;
use Wikibase\Lib\AutoCommentFormatter;
-use Wikibase\Lib\Store\LanguageFallbackLabelDescriptionLookupFactory;
/**
* File defining the hook handlers for the Wikibase Client extension.
@@ -280,42 +277,6 @@
*/
public static function onParserFirstCallInit( Parser &$parser ) {
WikibaseClient::getDefaultInstance()->getParserFunctionRegistrant()->register(
$parser );
-
- return true;
- }
-
- /**
-* Adds the Entity ID of the corresponding Wikidata item in action=info
-*
-* @param IContextSource $context
-* @param array $pageInfo
-*
-* @return bool
-*/
- public static function onInfoAction( IContextSource $context, array
&$pageInfo ) {
- $wikibaseClient = WikibaseClient::getDefaultInstance();
- $settings = $wikibaseClient->getSettings();
-
- $namespaceChecker = $wikibaseClient->getNamespaceChecker();
- $usageLookup = $wikibaseClient->getStore()->getUsageLookup();
- $labelDescriptionLookupFactory = new
LanguageFallbackLabelDescriptionLookupFactory(
- $wikibaseClient->getLanguageFallbackChainFactory(),
- $wikibaseClient->getTermLookup(),
- $wikibaseClient->getTermBuffer()
- );
- $idParser = $wikibaseClient->getEntityIdParser();
-
- $infoActionHookHandler = new InfoActionHookHandler(
- $namespaceChecker,
- $wikibaseClient->newRepoLinker(),
- $wikibaseClient->getStore()->getSiteLinkLookup(),
- $settings->getSetting( 'siteGlobalID' ),
- $usageLookup,
- $labelDescriptionLookupFactory,
- $idParser
- );
-
- $pageInfo = $infoActionHookHandler->handle( $context, $pageInfo
);
return true;
}
diff --git a/client/WikibaseClient.php b/client/WikibaseClient.php
index f71a631..baf0bec 100644
--- a/client/WikibaseClient.php
+++ b/client/WikibaseClient.php
@@ -139,7 +139,7 @@
$wgHooks['BeforePageDisplay'][] =
'\Wikibase\ClientHooks::onBeforePageDisplay';
$wgHooks['BeforePageDisplay'][] =
'\Wikibase\ClientHooks::onBeforePageDisplayAddJsConfig';
$wgHooks['ScribuntoExternalLibraries'][] =
'\Wikibase\ClientHooks::onScribuntoExternalLibraries';
- $wgHooks['InfoAction'][] = '\Wikibase\ClientHooks::onInfoAction';
+ $wgHooks['InfoAction'][] =
'\Wikibase\Client\Hooks\InfoActionHookHandler::onInfoAction';
$wgHooks['EditPage::showStandardInputs:options'][] =
'\Wikibase\ClientHooks::onEditAction';
$wgHooks['BaseTemplateAfterPortlet'][] =
'\Wikibase\ClientHooks::onBaseTemplateAfterPortlet';
$wgHooks['GetBetaFeaturePreferences'][] =
'\Wikibase\ClientHooks::onGetBetaFeaturePreferences';
diff --git a/client/includes/Hooks/InfoActionHookHandler.php
b/client/includes/Hooks/InfoActionHookHandler.php
index a87e6d5..2478b89 100644
--- a/client/includes/Hooks/InfoActionHookHandler.php
+++ b/client/includes/Hooks/InfoActionHookHandler.php
@@ -9,9 +9,10 @@
use Wikibase\Client\Usage\UsageLookup;
use Wikibase\DataModel\Entity\EntityIdParser;
use Wikibase\DataModel\Entity\ItemId;
-use Wikibase\Lib\Store\SiteLinkLookup;
use Wikibase\Lib\Store\LanguageFallbackLabelDescriptionLookupFactory;
+use Wikibase\Lib\Store\SiteLinkLookup;
use
