jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/393367 )
Change subject: Cleanup: Move files under /includes
......................................................................
Cleanup: Move files under /includes
Add an /includes directory and move php classes there. Also rename the
hooks class to a proper filename (matching the class name).
Also uncomment the wfWarn within the deprecated entry point
ThrottleOverride.php, thus raising a warning when the deprecated entry
point is used.
Change-Id: I6a2ea370fc7550f2c7e9b2d1eee30c63b8cb6a27
---
M ThrottleOverride.php
M extension.json
R includes/SpecialOverrideThrottle.php
R includes/SpecialThrottleOverrideList.php
R includes/ThrottleOverrideHooks.php
R includes/ThrottleOverrideLogFormatter.php
R includes/ThrottleOverridePager.php
R includes/ThrottleOverridePurgeJob.php
R includes/ThrottleOverrideUtils.php
9 files changed, 12 insertions(+), 12 deletions(-)
Approvals:
Aaron Schulz: Looks good to me, approved
jenkins-bot: Verified
diff --git a/ThrottleOverride.php b/ThrottleOverride.php
index 0c1ec2a..c8fbc22 100644
--- a/ThrottleOverride.php
+++ b/ThrottleOverride.php
@@ -4,11 +4,11 @@
// Keep i18n globals so mergeMessageFileList.php doesn't break
$wgMessagesDirs['OverrideThrottle'] = __DIR__ . '/i18n';
$wgExtensionMessagesFiles['OverrideThrottleAlias'] = __DIR__ .
'/ThrottleOverride.i18n.alias.php';
- /*wfWarn(
+ wfWarn(
'Deprecated PHP entry point used for ThrottleOverride
extension. ' .
'Please use wfLoadExtension instead, ' .
'see https://www.mediawiki.org/wiki/Extension_registration for
more details.'
- );*/
+ );
return;
} else {
die( 'This version of the ThrottleOverride extension requires MediaWiki
1.28+' );
diff --git a/extension.json b/extension.json
index 70edb02..f2a9059 100644
--- a/extension.json
+++ b/extension.json
@@ -44,13 +44,13 @@
"OverrideThrottleAlias": "ThrottleOverride.i18n.alias.php"
},
"AutoloadClasses": {
- "ThrottleOverrideHooks": "ThrottleOverride.hooks.php",
- "SpecialOverrideThrottle": "SpecialOverrideThrottle.php",
- "SpecialThrottleOverrideList":
"SpecialThrottleOverrideList.php",
- "ThrottleOverridePager": "ThrottleOverridePager.php",
- "ThrottleOverridePurgeJob": "ThrottleOverridePurgeJob.php",
- "ThrottleOverrideLogFormatter":
"ThrottleOverrideLogFormatter.php",
- "ThrottleOverrideUtils": "ThrottleOverrideUtils.php"
+ "SpecialOverrideThrottle":
"includes/SpecialOverrideThrottle.php",
+ "SpecialThrottleOverrideList":
"includes/SpecialThrottleOverrideList.php",
+ "ThrottleOverrideHooks": "includes/ThrottleOverrideHooks.php",
+ "ThrottleOverrideLogFormatter":
"includes/ThrottleOverrideLogFormatter.php",
+ "ThrottleOverridePager": "includes/ThrottleOverridePager.php",
+ "ThrottleOverridePurgeJob":
"includes/ThrottleOverridePurgeJob.php",
+ "ThrottleOverrideUtils": "includes/ThrottleOverrideUtils.php"
},
"config": {
"ThrottleOverrideCentralWiki": {
diff --git a/SpecialOverrideThrottle.php b/includes/SpecialOverrideThrottle.php
similarity index 100%
rename from SpecialOverrideThrottle.php
rename to includes/SpecialOverrideThrottle.php
diff --git a/SpecialThrottleOverrideList.php
b/includes/SpecialThrottleOverrideList.php
similarity index 100%
rename from SpecialThrottleOverrideList.php
rename to includes/SpecialThrottleOverrideList.php
diff --git a/ThrottleOverride.hooks.php b/includes/ThrottleOverrideHooks.php
similarity index 96%
rename from ThrottleOverride.hooks.php
rename to includes/ThrottleOverrideHooks.php
index de9656d..25f67f2 100644
--- a/ThrottleOverride.hooks.php
+++ b/includes/ThrottleOverrideHooks.php
@@ -128,17 +128,17 @@
public static function onLoadExtensionSchemaUpdates( DatabaseUpdater
$updater ) {
$updater->addExtensionTable(
'throttle_override',
- __DIR__ . '/patches/table.sql'
+ __DIR__ . '/../patches/table.sql'
);
$updater->addExtensionIndex(
'throttle_override',
'thr_expiry',
- __DIR__ . '/patches/expiry_index.sql'
+ __DIR__ . '/../patches/expiry_index.sql'
);
$updater->addExtensionField(
'throttle_override',
'thr_target',
- __DIR__ . '/patches/patch-thr_target.sql'
+ __DIR__ . '/../patches/patch-thr_target.sql'
);
return true;
diff --git a/ThrottleOverrideLogFormatter.php
b/includes/ThrottleOverrideLogFormatter.php
similarity index 100%
rename from ThrottleOverrideLogFormatter.php
rename to includes/ThrottleOverrideLogFormatter.php
diff --git a/ThrottleOverridePager.php b/includes/ThrottleOverridePager.php
similarity index 100%
rename from ThrottleOverridePager.php
rename to includes/ThrottleOverridePager.php
diff --git a/ThrottleOverridePurgeJob.php
b/includes/ThrottleOverridePurgeJob.php
similarity index 100%
rename from ThrottleOverridePurgeJob.php
rename to includes/ThrottleOverridePurgeJob.php
diff --git a/ThrottleOverrideUtils.php b/includes/ThrottleOverrideUtils.php
similarity index 100%
rename from ThrottleOverrideUtils.php
rename to includes/ThrottleOverrideUtils.php
--
To view, visit https://gerrit.wikimedia.org/r/393367
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6a2ea370fc7550f2c7e9b2d1eee30c63b8cb6a27
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/ThrottleOverride
Gerrit-Branch: master
Gerrit-Owner: EddieGP <[email protected]>
Gerrit-Reviewer: Aaron Schulz <[email protected]>
Gerrit-Reviewer: BryanDavis <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
