jenkins-bot has submitted this change and it was merged.
Change subject: Move Repo Hooks classes to Hooks folder/namespace
..
Move Repo Hooks classes to Hooks folder/namespace
The folder in Wikibase Client was called "hooks" (lowercase plural),
the folder in Wikibase Repo was called "Hook" (uppercase singular).
The two patches If466217 and If9295f0 make these two equal.
A lot more folders/namespaces need to be cleaned up the same way
but I want to do this in patches that are as small as possible.
Change-Id: If9295f0996ac2aa791de4169b97d76e2d5e0923a
---
M repo/Wikibase.hooks.php
M repo/Wikibase.php
R repo/includes/Hooks/LabelPrefetchHookHandlers.php
R repo/includes/Hooks/LinkBeginHookHandler.php
R repo/includes/Hooks/OutputPageJsConfigHookHandler.php
R repo/tests/phpunit/includes/Hooks/LabelPrefetchHookHandlersTest.php
R repo/tests/phpunit/includes/Hooks/LinkBeginHookHandlerTest.php
R repo/tests/phpunit/includes/Hooks/OutputPageJsConfigHookHandlerTest.php
8 files changed, 33 insertions(+), 22 deletions(-)
Approvals:
JanZerebecki: Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/Wikibase.hooks.php b/repo/Wikibase.hooks.php
index 3c3bb5c..440427e 100644
--- a/repo/Wikibase.hooks.php
+++ b/repo/Wikibase.hooks.php
@@ -28,8 +28,8 @@
use User;
use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\Entity\EntityIdParsingException;
-use Wikibase\Hook\OutputPageJsConfigHookHandler;
use Wikibase\Repo\Content\EntityHandler;
+use Wikibase\Repo\Hooks\OutputPageJsConfigHookHandler;
use Wikibase\Repo\View\EntityViewPlaceholderExpander;
use Wikibase\Repo\View\TextInjector;
use Wikibase\Repo\WikibaseRepo;
diff --git a/repo/Wikibase.php b/repo/Wikibase.php
index f9c7cbe..ba61cd9 100644
--- a/repo/Wikibase.php
+++ b/repo/Wikibase.php
@@ -176,8 +176,8 @@
$wgHooks['ArticleDeleteComplete'][] =
'Wikibase\RepoHooks::onArticleDeleteComplete';
$wgHooks['ArticleUndelete'][]
= 'Wikibase\RepoHooks::onArticleUndelete';
$wgHooks['GetPreferences'][]
= 'Wikibase\RepoHooks::onGetPreferences';
- $wgHooks['LinkBegin'][]
= 'Wikibase\Repo\Hook\LinkBeginHookHandler::onLinkBegin';
- $wgHooks['ChangesListInitRows'][]
= 'Wikibase\Repo\Hook\LabelPrefetchHookHandlers::onChangesListInitRows';
+ $wgHooks['LinkBegin'][]
= 'Wikibase\Repo\Hooks\LinkBeginHookHandler::onLinkBegin';
+ $wgHooks['ChangesListInitRows'][]
= 'Wikibase\Repo\Hooks\LabelPrefetchHookHandlers::onChangesListInitRows';
$wgHooks['OutputPageBodyAttributes'][] =
'Wikibase\RepoHooks::onOutputPageBodyAttributes';
//FIXME: handle other types of entities with autocomments too!
$wgHooks['FormatAutocomments'][]
= array( 'Wikibase\RepoHooks::onFormat', array( CONTENT_MODEL_WIKIBASE_ITEM,
"wikibase-item" ) );
diff --git a/repo/includes/Hook/LabelPrefetchHookHandlers.php
b/repo/includes/Hooks/LabelPrefetchHookHandlers.php
similarity index 93%
rename from repo/includes/Hook/LabelPrefetchHookHandlers.php
rename to repo/includes/Hooks/LabelPrefetchHookHandlers.php
index d43e4fd..154d255 100644
--- a/repo/includes/Hook/LabelPrefetchHookHandlers.php
+++ b/repo/includes/Hooks/LabelPrefetchHookHandlers.php
@@ -1,6 +1,6 @@
doChangesListInitRows( $list, $rows );
}
+ /**
+* @param TermBuffer $buffer
+* @param EntityIdLookup $idLookup
+* @param TitleFactory $titleFactory
+* @param string[] $termTypes
+* @param string[] $languageCodes
+*/
public function __construct(
TermBuffer $buffer,
EntityIdLookup $idLookup,
@@ -108,7 +115,6 @@
array $termTypes,
array $languageCodes
) {
-
$this->buffer = $buffer;
$this->idLookup = $idLookup;
$this->titleFactory = $titleFactory;
@@ -148,4 +154,5 @@
return $titles;
}
+
}
diff --git a/repo/includes/Hook/LinkBeginHookHandler.php
b/repo/includes/Hooks/LinkBeginHookHandler.php
similarity index 99%
rename from repo/includes/Hook/LinkBeginHookHandler.php
rename to repo/includes/Hooks/LinkBeginHookHandler.php
index 92eaa02..532602c 100644
--- a/repo/includes/Hook/LinkBeginHookHandler.php
+++ b/repo/includes/Hooks/LinkBeginHookHandler.php
@@ -1,6 +1,6 @@
getMock( 'Wikibase\Store\TermBuffer' );
$termBuffer->expects( $this->atLeastOnce() )
->method( 'prefetchTerms' )
@@ -81,11 +82,9 @@
$termTypes,
$languageCodes
