Thiemo Mättig (WMDE) has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/176661

Change subject: Move Repo Hooks classes to Hooks folder/namespace
......................................................................

Move Repo Hooks classes to Hooks folder/namespace

Change-Id: If9295f0996ac2aa791de4169b97d76e2d5e0923a
---
M repo/Wikibase.hooks.php
M repo/Wikibase.php
R repo/includes/Hooks/LinkBeginHookHandler.php
R repo/includes/Hooks/OutputPageJsConfigHookHandler.php
R repo/tests/phpunit/includes/Hooks/LinkBeginHookHandlerTest.php
R repo/tests/phpunit/includes/Hooks/OutputPageJsConfigHookHandlerTest.php
6 files changed, 11 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/61/176661/1

diff --git a/repo/Wikibase.hooks.php b/repo/Wikibase.hooks.php
index 33a63fe..d8f480c 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 a5fdfaf..b6e9bad 100644
--- a/repo/Wikibase.php
+++ b/repo/Wikibase.php
@@ -195,7 +195,7 @@
        $wgHooks['ArticleDeleteComplete'][]                             = 
'Wikibase\RepoHooks::onArticleDeleteComplete';
        $wgHooks['ArticleUndelete'][]                                           
= 'Wikibase\RepoHooks::onArticleUndelete';
        $wgHooks['GetPreferences'][]                                            
= 'Wikibase\RepoHooks::onGetPreferences';
-       $wgHooks['LinkBegin'][]                                                 
        = 'Wikibase\Repo\Hook\LinkBeginHookHandler::onLinkBegin';
+       $wgHooks['LinkBegin'][]                                                 
        = 'Wikibase\Repo\Hooks\LinkBeginHookHandler::onLinkBegin';
        $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/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 39160a5..0227115 100644
--- a/repo/includes/Hook/LinkBeginHookHandler.php
+++ b/repo/includes/Hooks/LinkBeginHookHandler.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Wikibase\Repo\Hook;
+namespace Wikibase\Repo\Hooks;
 
 use DummyLinker;
 use Html;
diff --git a/repo/includes/Hook/OutputPageJsConfigHookHandler.php 
b/repo/includes/Hooks/OutputPageJsConfigHookHandler.php
similarity index 97%
rename from repo/includes/Hook/OutputPageJsConfigHookHandler.php
rename to repo/includes/Hooks/OutputPageJsConfigHookHandler.php
index e242766..34a8f7b 100644
--- a/repo/includes/Hook/OutputPageJsConfigHookHandler.php
+++ b/repo/includes/Hooks/OutputPageJsConfigHookHandler.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Wikibase\Hook;
+namespace Wikibase\Repo\Hooks;
 
 use OutputPage;
 use Wikibase\OutputPageJsConfigBuilder;
diff --git a/repo/tests/phpunit/includes/Hook/LinkBeginHookHandlerTest.php 
b/repo/tests/phpunit/includes/Hooks/LinkBeginHookHandlerTest.php
similarity index 97%
rename from repo/tests/phpunit/includes/Hook/LinkBeginHookHandlerTest.php
rename to repo/tests/phpunit/includes/Hooks/LinkBeginHookHandlerTest.php
index 0d48d8b..ab84107 100644
--- a/repo/tests/phpunit/includes/Hook/LinkBeginHookHandlerTest.php
+++ b/repo/tests/phpunit/includes/Hooks/LinkBeginHookHandlerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Wikibase\Test;
+namespace Wikibase\Repo\Tests\Hooks;
 
 use Language;
 use RequestContext;
@@ -8,11 +8,11 @@
 use Wikibase\DataModel\Entity\Item;
 use Wikibase\DataModel\Entity\ItemId;
 use Wikibase\Lib\Store\EntityTitleLookup;
-use Wikibase\Repo\Hook\LinkBeginHookHandler;
+use Wikibase\Repo\Hooks\LinkBeginHookHandler;
 use Wikibase\Repo\WikibaseRepo;
 
 /**
- * @covers Wikibase\Repo\Hook\LinkBeginHookHandler
+ * @covers Wikibase\Repo\Hooks\LinkBeginHookHandler
  *
  * @since 0.5
  *
@@ -185,4 +185,5 @@
                );
 
        }
+
 }
diff --git 
a/repo/tests/phpunit/includes/Hook/OutputPageJsConfigHookHandlerTest.php 
b/repo/tests/phpunit/includes/Hooks/OutputPageJsConfigHookHandlerTest.php
similarity index 92%
rename from 
repo/tests/phpunit/includes/Hook/OutputPageJsConfigHookHandlerTest.php
rename to 
repo/tests/phpunit/includes/Hooks/OutputPageJsConfigHookHandlerTest.php
index dbec07c..4c15a0e 100644
--- a/repo/tests/phpunit/includes/Hook/OutputPageJsConfigHookHandlerTest.php
+++ b/repo/tests/phpunit/includes/Hooks/OutputPageJsConfigHookHandlerTest.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace Wikibase\Test;
+namespace Wikibase\Repo\Tests\Hooks;
 
 use RequestContext;
 use Title;
 use Wikibase\DataModel\Entity\EntityId;
 use Wikibase\DataModel\Entity\ItemId;
-use Wikibase\Hook\OutputPageJsConfigHookHandler;
+use Wikibase\Repo\Hooks\OutputPageJsConfigHookHandler;
 use Wikibase\Settings;
 
 /**
- * @covers Wikibase\Hook\OutputPageJsConfigHookHandler
+ * @covers Wikibase\Repo\Hooks\OutputPageJsConfigHookHandler
  *
  * @since 0.5
  *

-- 
To view, visit https://gerrit.wikimedia.org/r/176661
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If9295f0996ac2aa791de4169b97d76e2d5e0923a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) <thiemo.maet...@wikimedia.de>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to