MaxSem has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/370598 )
Change subject: Normalize file layout
......................................................................
Normalize file layout
Aka move all code into includes/.
Change-Id: I21f7b80bb6df04abbed6bfccb94f92100dc8f071
---
M extension.json
R includes/AbuseFilter.hooks.php
R includes/Views/AbuseFilterView.php
R includes/Views/AbuseFilterViewDiff.php
R includes/Views/AbuseFilterViewEdit.php
R includes/Views/AbuseFilterViewExamine.php
R includes/Views/AbuseFilterViewHistory.php
R includes/Views/AbuseFilterViewImport.php
R includes/Views/AbuseFilterViewList.php
R includes/Views/AbuseFilterViewRevert.php
R includes/Views/AbuseFilterViewTestBatch.php
R includes/Views/AbuseFilterViewTools.php
R includes/api/ApiAbuseFilterCheckMatch.php
R includes/api/ApiAbuseFilterCheckSyntax.php
R includes/api/ApiAbuseFilterEvalExpression.php
R includes/api/ApiAbuseFilterUnblockAutopromote.php
R includes/api/ApiQueryAbuseFilters.php
R includes/api/ApiQueryAbuseLog.php
R includes/special/SpecialAbuseFilter.php
R includes/special/SpecialAbuseLog.php
20 files changed, 27 insertions(+), 27 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AbuseFilter
refs/changes/98/370598/1
diff --git a/extension.json b/extension.json
index 75838ef..9cd5ab9 100644
--- a/extension.json
+++ b/extension.json
@@ -74,28 +74,28 @@
"AbuseFilterCachingParser" :
"includes/parser/AbuseFilterCachingParser.php",
"AbuseFilterParser": "includes/parser/AbuseFilterParser.php",
"AbuseFilterTokenizer":
"includes/parser/AbuseFilterTokenizer.php",
- "AbuseFilterHooks": "AbuseFilter.hooks.php",
+ "AbuseFilterHooks": "includes/AbuseFilter.hooks.php",
"AbuseFilterPreAuthenticationProvider":
"includes/AbuseFilterPreAuthenticationProvider.php",
- "SpecialAbuseLog": "special/SpecialAbuseLog.php",
- "AbuseLogPager": "special/SpecialAbuseLog.php",
- "SpecialAbuseFilter": "special/SpecialAbuseFilter.php",
+ "SpecialAbuseLog": "includes/special/SpecialAbuseLog.php",
+ "AbuseLogPager": "includes/special/SpecialAbuseLog.php",
+ "SpecialAbuseFilter": "includes/special/SpecialAbuseFilter.php",
"AbuseLogHitFormatter": "includes/AbuseLogHitFormatter.php",
- "AbuseFilterViewList": "Views/AbuseFilterViewList.php",
- "AbuseFilterPager": "Views/AbuseFilterViewList.php",
- "GlobalAbuseFilterPager": "Views/AbuseFilterViewList.php",
- "AbuseFilterView": "Views/AbuseFilterView.php",
- "AbuseFilterViewEdit": "Views/AbuseFilterViewEdit.php",
- "AbuseFilterViewTools": "Views/AbuseFilterViewTools.php",
- "AbuseFilterViewHistory": "Views/AbuseFilterViewHistory.php",
- "AbuseFilterHistoryPager": "Views/AbuseFilterViewHistory.php",
- "AbuseFilterViewRevert": "Views/AbuseFilterViewRevert.php",
- "AbuseFilterViewTestBatch":
"Views/AbuseFilterViewTestBatch.php",
- "AbuseFilterViewExamine": "Views/AbuseFilterViewExamine.php",
- "AbuseFilterExaminePager": "Views/AbuseFilterViewExamine.php",
- "AbuseFilterChangesList": "Views/AbuseFilterView.php",
- "AbuseFilterViewDiff": "Views/AbuseFilterViewDiff.php",
- "TableDiffFormatterFullContext":
"Views/AbuseFilterViewDiff.php",
- "AbuseFilterViewImport": "Views/AbuseFilterViewImport.php",
+ "AbuseFilterViewList": "includes/Views/AbuseFilterViewList.php",
+ "AbuseFilterPager": "includes/Views/AbuseFilterViewList.php",
+ "GlobalAbuseFilterPager":
"includes/Views/AbuseFilterViewList.php",
+ "AbuseFilterView": "includes/Views/AbuseFilterView.php",
+ "AbuseFilterViewEdit": "includes/Views/AbuseFilterViewEdit.php",
+ "AbuseFilterViewTools":
"includes/Views/AbuseFilterViewTools.php",
+ "AbuseFilterViewHistory":
"includes/Views/AbuseFilterViewHistory.php",
+ "AbuseFilterHistoryPager":
"includes/Views/AbuseFilterViewHistory.php",
+ "AbuseFilterViewRevert":
"includes/Views/AbuseFilterViewRevert.php",
+ "AbuseFilterViewTestBatch":
"includes/Views/AbuseFilterViewTestBatch.php",
+ "AbuseFilterViewExamine":
"includes/Views/AbuseFilterViewExamine.php",
+ "AbuseFilterExaminePager":
"includes/Views/AbuseFilterViewExamine.php",
+ "AbuseFilterChangesList": "includes/Views/AbuseFilterView.php",
+ "AbuseFilterViewDiff": "includes/Views/AbuseFilterViewDiff.php",
+ "TableDiffFormatterFullContext":
"includes/Views/AbuseFilterViewDiff.php",
+ "AbuseFilterViewImport":
"includes/Views/AbuseFilterViewImport.php",
"AbuseFilterVariableHolder":
"includes/AbuseFilterVariableHolder.php",
"AFComputedVariable": "includes/AFComputedVariable.php",
"AFPData": "includes/parser/AFPData.php",
@@ -105,12 +105,12 @@
"AFPTreeNode": "includes/parser/AFPTreeNode.php",
"AFPTreeParser": "includes/parser/AFPTreeParser.php",
"AFPUserVisibleException":
"includes/parser/AFPUserVisibleException.php",
- "ApiQueryAbuseLog": "api/ApiQueryAbuseLog.php",
- "ApiQueryAbuseFilters": "api/ApiQueryAbuseFilters.php",
- "ApiAbuseFilterCheckSyntax":
"api/ApiAbuseFilterCheckSyntax.php",
- "ApiAbuseFilterEvalExpression":
"api/ApiAbuseFilterEvalExpression.php",
- "ApiAbuseFilterUnblockAutopromote":
"api/ApiAbuseFilterUnblockAutopromote.php",
- "ApiAbuseFilterCheckMatch": "api/ApiAbuseFilterCheckMatch.php"
+ "ApiQueryAbuseLog": "includes/api/ApiQueryAbuseLog.php",
+ "ApiQueryAbuseFilters": "includes/api/ApiQueryAbuseFilters.php",
+ "ApiAbuseFilterCheckSyntax":
"includes/api/ApiAbuseFilterCheckSyntax.php",
+ "ApiAbuseFilterEvalExpression":
"includes/api/ApiAbuseFilterEvalExpression.php",
+ "ApiAbuseFilterUnblockAutopromote":
"includes/api/ApiAbuseFilterUnblockAutopromote.php",
+ "ApiAbuseFilterCheckMatch":
"includes/api/ApiAbuseFilterCheckMatch.php"
},
"ResourceModules": {
"ext.abuseFilter": {
diff --git a/AbuseFilter.hooks.php b/includes/AbuseFilter.hooks.php
similarity index 99%
rename from AbuseFilter.hooks.php
rename to includes/AbuseFilter.hooks.php
index 55be162..3fd8c46 100644
--- a/AbuseFilter.hooks.php
+++ b/includes/AbuseFilter.hooks.php
@@ -589,7 +589,7 @@
* @return bool
*/
public static function onLoadExtensionSchemaUpdates( $updater = null ) {
- $dir = __DIR__;
+ $dir = dirname( __DIR__ );
if ( $updater->getDB()->getType() == 'mysql' ||
$updater->getDB()->getType() == 'sqlite' ) {
if ( $updater->getDB()->getType() == 'mysql' ) {
diff --git a/Views/AbuseFilterView.php b/includes/Views/AbuseFilterView.php
similarity index 100%
rename from Views/AbuseFilterView.php
rename to includes/Views/AbuseFilterView.php
diff --git a/Views/AbuseFilterViewDiff.php
b/includes/Views/AbuseFilterViewDiff.php
similarity index 100%
rename from Views/AbuseFilterViewDiff.php
rename to includes/Views/AbuseFilterViewDiff.php
diff --git a/Views/AbuseFilterViewEdit.php
b/includes/Views/AbuseFilterViewEdit.php
similarity index 100%
rename from Views/AbuseFilterViewEdit.php
rename to includes/Views/AbuseFilterViewEdit.php
diff --git a/Views/AbuseFilterViewExamine.php
b/includes/Views/AbuseFilterViewExamine.php
similarity index 100%
rename from Views/AbuseFilterViewExamine.php
rename to includes/Views/AbuseFilterViewExamine.php
diff --git a/Views/AbuseFilterViewHistory.php
b/includes/Views/AbuseFilterViewHistory.php
similarity index 100%
rename from Views/AbuseFilterViewHistory.php
rename to includes/Views/AbuseFilterViewHistory.php
diff --git a/Views/AbuseFilterViewImport.php
b/includes/Views/AbuseFilterViewImport.php
similarity index 100%
rename from Views/AbuseFilterViewImport.php
rename to includes/Views/AbuseFilterViewImport.php
diff --git a/Views/AbuseFilterViewList.php
b/includes/Views/AbuseFilterViewList.php
similarity index 100%
rename from Views/AbuseFilterViewList.php
rename to includes/Views/AbuseFilterViewList.php
diff --git a/Views/AbuseFilterViewRevert.php
b/includes/Views/AbuseFilterViewRevert.php
similarity index 100%
rename from Views/AbuseFilterViewRevert.php
rename to includes/Views/AbuseFilterViewRevert.php
diff --git a/Views/AbuseFilterViewTestBatch.php
b/includes/Views/AbuseFilterViewTestBatch.php
similarity index 100%
rename from Views/AbuseFilterViewTestBatch.php
rename to includes/Views/AbuseFilterViewTestBatch.php
diff --git a/Views/AbuseFilterViewTools.php
b/includes/Views/AbuseFilterViewTools.php
similarity index 100%
rename from Views/AbuseFilterViewTools.php
rename to includes/Views/AbuseFilterViewTools.php
diff --git a/api/ApiAbuseFilterCheckMatch.php
b/includes/api/ApiAbuseFilterCheckMatch.php
similarity index 100%
rename from api/ApiAbuseFilterCheckMatch.php
rename to includes/api/ApiAbuseFilterCheckMatch.php
diff --git a/api/ApiAbuseFilterCheckSyntax.php
b/includes/api/ApiAbuseFilterCheckSyntax.php
similarity index 100%
rename from api/ApiAbuseFilterCheckSyntax.php
rename to includes/api/ApiAbuseFilterCheckSyntax.php
diff --git a/api/ApiAbuseFilterEvalExpression.php
b/includes/api/ApiAbuseFilterEvalExpression.php
similarity index 100%
rename from api/ApiAbuseFilterEvalExpression.php
rename to includes/api/ApiAbuseFilterEvalExpression.php
diff --git a/api/ApiAbuseFilterUnblockAutopromote.php
b/includes/api/ApiAbuseFilterUnblockAutopromote.php
similarity index 100%
rename from api/ApiAbuseFilterUnblockAutopromote.php
rename to includes/api/ApiAbuseFilterUnblockAutopromote.php
diff --git a/api/ApiQueryAbuseFilters.php
b/includes/api/ApiQueryAbuseFilters.php
similarity index 100%
rename from api/ApiQueryAbuseFilters.php
rename to includes/api/ApiQueryAbuseFilters.php
diff --git a/api/ApiQueryAbuseLog.php b/includes/api/ApiQueryAbuseLog.php
similarity index 100%
rename from api/ApiQueryAbuseLog.php
rename to includes/api/ApiQueryAbuseLog.php
diff --git a/special/SpecialAbuseFilter.php
b/includes/special/SpecialAbuseFilter.php
similarity index 100%
rename from special/SpecialAbuseFilter.php
rename to includes/special/SpecialAbuseFilter.php
diff --git a/special/SpecialAbuseLog.php b/includes/special/SpecialAbuseLog.php
similarity index 100%
rename from special/SpecialAbuseLog.php
rename to includes/special/SpecialAbuseLog.php
--
To view, visit https://gerrit.wikimedia.org/r/370598
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I21f7b80bb6df04abbed6bfccb94f92100dc8f071
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: master
Gerrit-Owner: MaxSem <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
