Normalize file layout

Aka move all code into includes/.

Change-Id: I21f7b80bb6df04abbed6bfccb94f92100dc8f071

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": {

includes/AbuseFilter.hooks.php

@@ -589,7 +589,7 @@ class AbuseFilterHooks {
 	 * @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' ) {