jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/372152 )
Change subject: BSFoundation: Changed the 'Hook' namespace to its singular
'Hook'
......................................................................
BSFoundation: Changed the 'Hook' namespace to its singular 'Hook'
Change-Id: I1ef3349841c8e4be3794dfb751d4600477f4c146
---
M extension.json
R src/Hook/BeforePageDisplay.php
R src/Hook/Hook.php
R src/Hook/LinkEnd.php
R src/Hook/LinkEnd/AddDataTitle.php
R src/Hook/LinkEnd/AddDataUserName.php
R src/Hook/LoadExtensionSchemaUpdates.php
R src/Hook/MakeGlobalVariablesScript.php
R src/Hook/PageContentSaveComplete.php
R src/Hook/ParserFirstCallInit.php
R src/Hook/SkinTemplateNavigation.php
R src/Hook/SoftwareInfo.php
R src/Hook/SoftwareInfo/AddBlueSpice.php
R src/Hook/UserCan.php
R src/Hook/UserGetRights.php
R tests/phpunit/Hook/LinkEnd/AddDataTitleTest.php
R tests/phpunit/Hook/LinkEnd/AddDataUserNameTest.php
R tests/phpunit/Hook/SoftwareInfo/AddBlueSpiceTest.php
18 files changed, 30 insertions(+), 30 deletions(-)
Approvals:
Robert Vogel: Looks good to me, approved
jenkins-bot: Verified
diff --git a/extension.json b/extension.json
index 6b6a86c..e6ff4f1 100644
--- a/extension.json
+++ b/extension.json
@@ -399,8 +399,8 @@
"SoftwareInfo":
"BlueSpice\\Hooks\\SoftwareInfo\\AddBlueSpice::callback",
"BeforePageDisplay": "BsCoreHooks::onBeforePageDisplay",
"LinkEnd": [
- "BlueSpice\\Hooks\\LinkEnd\\AddDataTitle::callback",
- "BlueSpice\\Hooks\\LinkEnd\\AddDataUserName::callback"
+ "BlueSpice\\Hook\\LinkEnd\\AddDataTitle::callback",
+ "BlueSpice\\Hook\\LinkEnd\\AddDataUserName::callback"
],
"LinkerMakeMediaLinkFile":
"BsCoreHooks::onLinkerMakeMediaLinkFile",
"ThumbnailBeforeProduceHTML":
"BsCoreHooks::onThumbnailBeforeProduceHTML",
diff --git a/src/Hooks/BeforePageDisplay.php b/src/Hook/BeforePageDisplay.php
similarity index 96%
rename from src/Hooks/BeforePageDisplay.php
rename to src/Hook/BeforePageDisplay.php
index 22d9a1d..ec2c657 100644
--- a/src/Hooks/BeforePageDisplay.php
+++ b/src/Hook/BeforePageDisplay.php
@@ -1,6 +1,6 @@
<?php
-namespace BlueSpice\Hooks;
+namespace BlueSpice\Hook;
abstract class BeforePageDisplay extends Hook {
diff --git a/src/Hooks/Hook.php b/src/Hook/Hook.php
similarity index 97%
rename from src/Hooks/Hook.php
rename to src/Hook/Hook.php
index 78dc028..9ee8e18 100644
--- a/src/Hooks/Hook.php
+++ b/src/Hook/Hook.php
@@ -1,5 +1,5 @@
<?php
-namespace BlueSpice\Hooks;
+namespace BlueSpice\Hook;
abstract class Hook {
diff --git a/src/Hooks/LinkEnd.php b/src/Hook/LinkEnd.php
similarity index 98%
rename from src/Hooks/LinkEnd.php
rename to src/Hook/LinkEnd.php
index 87f4c6d..ba141e6 100644
--- a/src/Hooks/LinkEnd.php
+++ b/src/Hook/LinkEnd.php
@@ -1,6 +1,6 @@
<?php
-namespace BlueSpice\Hooks;
+namespace BlueSpice\Hook;
abstract class LinkEnd extends Hook {
diff --git a/src/Hooks/LinkEnd/AddDataTitle.php
b/src/Hook/LinkEnd/AddDataTitle.php
similarity index 75%
rename from src/Hooks/LinkEnd/AddDataTitle.php
rename to src/Hook/LinkEnd/AddDataTitle.php
index 9294a33..d8cb23f 100644
--- a/src/Hooks/LinkEnd/AddDataTitle.php
+++ b/src/Hook/LinkEnd/AddDataTitle.php
@@ -1,8 +1,8 @@
<?php
-namespace BlueSpice\Hooks\LinkEnd;
+namespace BlueSpice\Hook\LinkEnd;
-class AddDataTitle extends \BlueSpice\Hooks\LinkEnd {
+class AddDataTitle extends \BlueSpice\Hook\LinkEnd {
protected function doProcess() {
//We add the original title to a link. This may be the same
content as
//"title" attribute, but it doesn't have to. I.e. in red links
diff --git a/src/Hooks/LinkEnd/AddDataUserName.php
b/src/Hook/LinkEnd/AddDataUserName.php
similarity index 85%
rename from src/Hooks/LinkEnd/AddDataUserName.php
rename to src/Hook/LinkEnd/AddDataUserName.php
index 703c1c2..f8a0546 100644
--- a/src/Hooks/LinkEnd/AddDataUserName.php
+++ b/src/Hook/LinkEnd/AddDataUserName.php
@@ -1,8 +1,8 @@
<?php
-namespace BlueSpice\Hooks\LinkEnd;
+namespace BlueSpice\Hook\LinkEnd;
-class AddDataUserName extends \BlueSpice\Hooks\LinkEnd {
+class AddDataUserName extends \BlueSpice\Hook\LinkEnd {
protected function doProcess() {
if( $this->target->getNamespace() !== NS_USER ||
$this->target->isSubpage() ) {
return true;
diff --git a/src/Hooks/LoadExtensionSchemaUpdates.php
b/src/Hook/LoadExtensionSchemaUpdates.php
similarity index 95%
rename from src/Hooks/LoadExtensionSchemaUpdates.php
rename to src/Hook/LoadExtensionSchemaUpdates.php
index 57009f6..f52e95a 100644
--- a/src/Hooks/LoadExtensionSchemaUpdates.php
+++ b/src/Hook/LoadExtensionSchemaUpdates.php
@@ -1,6 +1,6 @@
<?php
-namespace BlueSpice\Hooks;
+namespace BlueSpice\Hook;
abstract class LoadExtensionSchemaUpdates extends Hook {
diff --git a/src/Hooks/MakeGlobalVariablesScript.php
b/src/Hook/MakeGlobalVariablesScript.php
similarity index 95%
rename from src/Hooks/MakeGlobalVariablesScript.php
rename to src/Hook/MakeGlobalVariablesScript.php
index 908551e..c406f9a 100644
--- a/src/Hooks/MakeGlobalVariablesScript.php
+++ b/src/Hook/MakeGlobalVariablesScript.php
@@ -1,6 +1,6 @@
<?php
-namespace BlueSpice\Hooks;
+namespace BlueSpice\Hook;
abstract class MakeGlobalVariablesScript extends Hook {
diff --git a/src/Hooks/PageContentSaveComplete.php
b/src/Hook/PageContentSaveComplete.php
similarity index 98%
rename from src/Hooks/PageContentSaveComplete.php
rename to src/Hook/PageContentSaveComplete.php
index e6aa230..fcdecb2 100644
--- a/src/Hooks/PageContentSaveComplete.php
+++ b/src/Hook/PageContentSaveComplete.php
@@ -1,6 +1,6 @@
<?php
-namespace BlueSpice\Hooks;
+namespace BlueSpice\Hook;
abstract class PageContentSaveComplete extends Hook {
diff --git a/src/Hooks/ParserFirstCallInit.php
b/src/Hook/ParserFirstCallInit.php
similarity index 95%
rename from src/Hooks/ParserFirstCallInit.php
rename to src/Hook/ParserFirstCallInit.php
index 5c7ebd7..4913f8d 100644
--- a/src/Hooks/ParserFirstCallInit.php
+++ b/src/Hook/ParserFirstCallInit.php
@@ -1,6 +1,6 @@
<?php
-namespace BlueSpice\Hooks;
+namespace BlueSpice\Hook;
abstract class ParserFirstCallInit extends Hook {
diff --git a/src/Hooks/SkinTemplateNavigation.php
b/src/Hook/SkinTemplateNavigation.php
similarity index 96%
rename from src/Hooks/SkinTemplateNavigation.php
rename to src/Hook/SkinTemplateNavigation.php
index c1395a9..e3379c7 100644
--- a/src/Hooks/SkinTemplateNavigation.php
+++ b/src/Hook/SkinTemplateNavigation.php
@@ -1,6 +1,6 @@
<?php
-namespace BlueSpice\Hooks;
+namespace BlueSpice\Hook;
abstract class SkinTemplateNavigation extends Hook {
diff --git a/src/Hooks/SoftwareInfo.php b/src/Hook/SoftwareInfo.php
similarity index 95%
rename from src/Hooks/SoftwareInfo.php
rename to src/Hook/SoftwareInfo.php
index 5339e40..d28c797 100644
--- a/src/Hooks/SoftwareInfo.php
+++ b/src/Hook/SoftwareInfo.php
@@ -1,6 +1,6 @@
<?php
-namespace BlueSpice\Hooks;
+namespace BlueSpice\Hook;
abstract class SoftwareInfo extends Hook {
diff --git a/src/Hooks/SoftwareInfo/AddBlueSpice.php
b/src/Hook/SoftwareInfo/AddBlueSpice.php
similarity index 77%
rename from src/Hooks/SoftwareInfo/AddBlueSpice.php
rename to src/Hook/SoftwareInfo/AddBlueSpice.php
index de9208d..38d7542 100644
--- a/src/Hooks/SoftwareInfo/AddBlueSpice.php
+++ b/src/Hook/SoftwareInfo/AddBlueSpice.php
@@ -1,8 +1,8 @@
<?php
-namespace BlueSpice\Hooks\SoftwareInfo;
+namespace BlueSpice\Hook\SoftwareInfo;
-class AddBlueSpice extends \BlueSpice\Hooks\SoftwareInfo {
+class AddBlueSpice extends \BlueSpice\Hook\SoftwareInfo {
protected static $configName = 'bsg';
diff --git a/src/Hooks/UserCan.php b/src/Hook/UserCan.php
similarity index 96%
rename from src/Hooks/UserCan.php
rename to src/Hook/UserCan.php
index 14b1d53..f5a9662 100644
--- a/src/Hooks/UserCan.php
+++ b/src/Hook/UserCan.php
@@ -1,6 +1,6 @@
<?php
-namespace BlueSpice\Hooks;
+namespace BlueSpice\Hook;
abstract class UserCan extends Hook {
diff --git a/src/Hooks/UserGetRights.php b/src/Hook/UserGetRights.php
similarity index 96%
rename from src/Hooks/UserGetRights.php
rename to src/Hook/UserGetRights.php
index b7e22e1..0f10d0e 100644
--- a/src/Hooks/UserGetRights.php
+++ b/src/Hook/UserGetRights.php
@@ -1,6 +1,6 @@
<?php
-namespace BlueSpice\Hooks;
+namespace BlueSpice\Hook;
abstract class UserGetRights extends Hook {
diff --git a/tests/phpunit/Hooks/LinkEnd/AddDataTitleTest.php
b/tests/phpunit/Hook/LinkEnd/AddDataTitleTest.php
similarity index 89%
rename from tests/phpunit/Hooks/LinkEnd/AddDataTitleTest.php
rename to tests/phpunit/Hook/LinkEnd/AddDataTitleTest.php
index db13497..32facc5 100644
--- a/tests/phpunit/Hooks/LinkEnd/AddDataTitleTest.php
+++ b/tests/phpunit/Hook/LinkEnd/AddDataTitleTest.php
@@ -22,8 +22,8 @@
$ret = '';
$this->assertInstanceOf(
- '\BlueSpice\Hooks\LinkEnd\AddDataTitle',
- new \BlueSpice\Hooks\LinkEnd\AddDataTitle(
+ '\BlueSpice\Hook\LinkEnd\AddDataTitle',
+ new \BlueSpice\Hook\LinkEnd\AddDataTitle(
$context,
$config,
$dummy,
@@ -53,7 +53,7 @@
$attribs = [];
$ret = '';
- $instance = new \BlueSpice\Hooks\LinkEnd\AddDataTitle(
+ $instance = new \BlueSpice\Hook\LinkEnd\AddDataTitle(
$context,
$config,
$dummy,
diff --git a/tests/phpunit/Hooks/LinkEnd/AddDataUserNameTest.php
b/tests/phpunit/Hook/LinkEnd/AddDataUserNameTest.php
similarity index 91%
rename from tests/phpunit/Hooks/LinkEnd/AddDataUserNameTest.php
rename to tests/phpunit/Hook/LinkEnd/AddDataUserNameTest.php
index 6d04197..b2751a4 100644
--- a/tests/phpunit/Hooks/LinkEnd/AddDataUserNameTest.php
+++ b/tests/phpunit/Hook/LinkEnd/AddDataUserNameTest.php
@@ -23,8 +23,8 @@
$ret = '';
$this->assertInstanceOf(
- '\BlueSpice\Hooks\LinkEnd\AddDataUserName',
- new \BlueSpice\Hooks\LinkEnd\AddDataUserName(
+ '\BlueSpice\Hook\LinkEnd\AddDataUserName',
+ new \BlueSpice\Hook\LinkEnd\AddDataUserName(
$context,
$config,
$dummy,
@@ -58,7 +58,7 @@
$attribs = [];
$ret = '';
- $instance = new \BlueSpice\Hooks\LinkEnd\AddDataUserName(
+ $instance = new \BlueSpice\Hook\LinkEnd\AddDataUserName(
$context,
$config,
$dummy,
@@ -96,7 +96,7 @@
$attribs = [];
$ret = '';
- $instance = new \BlueSpice\Hooks\LinkEnd\AddDataUserName(
+ $instance = new \BlueSpice\Hook\LinkEnd\AddDataUserName(
$context,
$config,
$dummy,
@@ -129,7 +129,7 @@
$attribs = [];
$ret = '';
- $instance = new \BlueSpice\Hooks\LinkEnd\AddDataUserName(
+ $instance = new \BlueSpice\Hook\LinkEnd\AddDataUserName(
$context,
$config,
$dummy,
diff --git a/tests/phpunit/Hooks/SoftwareInfo/AddBlueSpiceTest.php
b/tests/phpunit/Hook/SoftwareInfo/AddBlueSpiceTest.php
similarity index 84%
rename from tests/phpunit/Hooks/SoftwareInfo/AddBlueSpiceTest.php
rename to tests/phpunit/Hook/SoftwareInfo/AddBlueSpiceTest.php
index 4b02a90..6a6ec9a 100644
--- a/tests/phpunit/Hooks/SoftwareInfo/AddBlueSpiceTest.php
+++ b/tests/phpunit/Hook/SoftwareInfo/AddBlueSpiceTest.php
@@ -18,8 +18,8 @@
$this->assertInstanceOf(
- '\BlueSpice\Hooks\SoftwareInfo\AddBlueSpice',
- new \BlueSpice\Hooks\SoftwareInfo\AddBlueSpice(
+ '\BlueSpice\Hook\SoftwareInfo\AddBlueSpice',
+ new \BlueSpice\Hook\SoftwareInfo\AddBlueSpice(
$context,
$config,
$software
@@ -42,7 +42,7 @@
$software = [];
- $instance = new \BlueSpice\Hooks\SoftwareInfo\AddBlueSpice(
+ $instance = new \BlueSpice\Hook\SoftwareInfo\AddBlueSpice(
$context,
$config,
$software
--
To view, visit https://gerrit.wikimedia.org/r/372152
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1ef3349841c8e4be3794dfb751d4600477f4c146
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Pwirth <[email protected]>
Gerrit-Reviewer: Ljonka <[email protected]>
Gerrit-Reviewer: Mglaser <[email protected]>
Gerrit-Reviewer: Robert Vogel <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
