Merge "Move classes into includes/"

.minus-x.json

@@ -1,5 +1,5 @@
 {
 	"ignore": [
-		"./engines/LuaStandalone/binaries/lua5_1_5_mac_lion_fat_generic/lua"
+		"./includes/engines/LuaStandalone/binaries/lua5_1_5_mac_lion_fat_generic/lua"
 	]
 }

extension.json

@@ -32,39 +32,39 @@
 		"ScribuntoNamespaces": "Scribunto.namespaces.php"
 	},
 	"AutoloadClasses": {
-		"ScribuntoEngineBase": "common/Base.php",
-		"ScribuntoModuleBase": "common/Base.php",
-		"ScribuntoHooks": "common/Hooks.php",
-		"ScribuntoException": "common/Common.php",
-		"Scribunto": "common/Common.php",
-		"ApiScribuntoConsole": "common/ApiScribuntoConsole.php",
-		"ScribuntoContentHandler": "common/ScribuntoContentHandler.php",
-		"ScribuntoContent": "common/ScribuntoContent.php",
-		"Scribunto_LuaError": "engines/LuaCommon/LuaCommon.php",
-		"Scribunto_LuaInterpreterNotFoundError": "engines/LuaCommon/LuaInterpreter.php",
-		"Scribunto_LuaInterpreterBadVersionError": "engines/LuaCommon/LuaInterpreter.php",
-		"Scribunto_LuaSandboxInterpreter": "engines/LuaSandbox/Engine.php",
-		"Scribunto_LuaSandboxCallback": "engines/LuaSandbox/Engine.php",
-		"Scribunto_LuaStandaloneInterpreterFunction": "engines/LuaStandalone/LuaStandaloneEngine.php",
+		"ScribuntoEngineBase": "includes/common/Base.php",
+		"ScribuntoModuleBase": "includes/common/Base.php",
+		"ScribuntoHooks": "includes/common/Hooks.php",
+		"ScribuntoException": "includes/common/Common.php",
+		"Scribunto": "includes/common/Common.php",
+		"ApiScribuntoConsole": "includes/common/ApiScribuntoConsole.php",
+		"ScribuntoContentHandler": "includes/common/ScribuntoContentHandler.php",
+		"ScribuntoContent": "includes/common/ScribuntoContent.php",
+		"Scribunto_LuaError": "includes/engines/LuaCommon/LuaCommon.php",
+		"Scribunto_LuaInterpreterNotFoundError": "includes/engines/LuaCommon/LuaInterpreter.php",
+		"Scribunto_LuaInterpreterBadVersionError": "includes/engines/LuaCommon/LuaInterpreter.php",
+		"Scribunto_LuaSandboxInterpreter": "includes/engines/LuaSandbox/Engine.php",
+		"Scribunto_LuaSandboxCallback": "includes/engines/LuaSandbox/Engine.php",
+		"Scribunto_LuaStandaloneInterpreterFunction": "includes/engines/LuaStandalone/LuaStandaloneEngine.php",
 		"Scribunto_LuaEngineTestSkip": "tests/phpunit/engines/LuaCommon/LuaEngineTestBase.php",
-		"Scribunto_LuaEngine": "engines/LuaCommon/LuaCommon.php",
-		"Scribunto_LuaModule": "engines/LuaCommon/LuaCommon.php",
-		"Scribunto_LuaInterpreter": "engines/LuaCommon/LuaInterpreter.php",
-		"Scribunto_LuaSandboxEngine": "engines/LuaSandbox/Engine.php",
-		"Scribunto_LuaStandaloneEngine": "engines/LuaStandalone/LuaStandaloneEngine.php",
-		"Scribunto_LuaStandaloneInterpreter": "engines/LuaStandalone/LuaStandaloneEngine.php",
-		"Scribunto_LuaLibraryBase": "engines/LuaCommon/LibraryBase.php",
+		"Scribunto_LuaEngine": "includes/engines/LuaCommon/LuaCommon.php",
+		"Scribunto_LuaModule": "includes/engines/LuaCommon/LuaCommon.php",
+		"Scribunto_LuaInterpreter": "includes/engines/LuaCommon/LuaInterpreter.php",
+		"Scribunto_LuaSandboxEngine": "includes/engines/LuaSandbox/Engine.php",
+		"Scribunto_LuaStandaloneEngine": "includes/engines/LuaStandalone/LuaStandaloneEngine.php",
+		"Scribunto_LuaStandaloneInterpreter": "includes/engines/LuaStandalone/LuaStandaloneEngine.php",
+		"Scribunto_LuaLibraryBase": "includes/engines/LuaCommon/LibraryBase.php",
 		"Scribunto_LuaEngineTestBase": "tests/phpunit/engines/LuaCommon/LuaEngineTestBase.php",
 		"Scribunto_LuaDataProvider": "tests/phpunit/engines/LuaCommon/LuaDataProvider.php",
-		"Scribunto_LuaSiteLibrary": "engines/LuaCommon/SiteLibrary.php",
-		"Scribunto_LuaUriLibrary": "engines/LuaCommon/UriLibrary.php",
-		"Scribunto_LuaUstringLibrary": "engines/LuaCommon/UstringLibrary.php",
-		"Scribunto_LuaLanguageLibrary": "engines/LuaCommon/LanguageLibrary.php",
-		"Scribunto_LuaMessageLibrary": "engines/LuaCommon/MessageLibrary.php",
-		"Scribunto_LuaTitleLibrary": "engines/LuaCommon/TitleLibrary.php",
-		"Scribunto_LuaTextLibrary": "engines/LuaCommon/TextLibrary.php",
-		"Scribunto_LuaHtmlLibrary": "engines/LuaCommon/HtmlLibrary.php",
-		"Scribunto_LuaHashLibrary": "engines/LuaCommon/HashLibrary.php"
+		"Scribunto_LuaSiteLibrary": "includes/engines/LuaCommon/SiteLibrary.php",
+		"Scribunto_LuaUriLibrary": "includes/engines/LuaCommon/UriLibrary.php",
+		"Scribunto_LuaUstringLibrary": "includes/engines/LuaCommon/UstringLibrary.php",
+		"Scribunto_LuaLanguageLibrary": "includes/engines/LuaCommon/LanguageLibrary.php",
+		"Scribunto_LuaMessageLibrary": "includes/engines/LuaCommon/MessageLibrary.php",
+		"Scribunto_LuaTitleLibrary": "includes/engines/LuaCommon/TitleLibrary.php",
+		"Scribunto_LuaTextLibrary": "includes/engines/LuaCommon/TextLibrary.php",
+		"Scribunto_LuaHtmlLibrary": "includes/engines/LuaCommon/HtmlLibrary.php",
+		"Scribunto_LuaHashLibrary": "includes/engines/LuaCommon/HashLibrary.php"
 	},
 	"ResourceModules": {
 		"ext.scribunto.errors": {

includes/engines/LuaCommon/lualib/ustring/make-normalization-table.php

@@ -13,10 +13,10 @@ if ( count( $argv ) > 1 ) {
 	}
 } else {
 	foreach ( [
-		__DIR__ . '/../../../../../core/vendor/wikimedia/utfnormal/src/UtfNormalData.inc',
-		__DIR__ . '/../../../../../vendor/wikimedia/utfnormal/src/UtfNormalData.inc',
-		__DIR__ . '/../../../../../core/includes/libs/normal/UtfNormalData.inc',
-		__DIR__ . '/../../../../../includes/libs/normal/UtfNormalData.inc',
+		__DIR__ . '/../../../../../../core/vendor/wikimedia/utfnormal/src/UtfNormalData.inc',
+		__DIR__ . '/../../../../../../vendor/wikimedia/utfnormal/src/UtfNormalData.inc',
+		__DIR__ . '/../../../../../../core/includes/libs/normal/UtfNormalData.inc',
+		__DIR__ . '/../../../../../../includes/libs/normal/UtfNormalData.inc',
 	] as $tryfile ) {
 		$tryfile = realpath( $tryfile );
 		if ( file_exists( $tryfile ) ) {
@@ -38,10 +38,10 @@ if ( count( $argv ) > 2 ) {
 } else {
 	foreach ( [
 		dirname( $datafile ) . '/UtfNormalDataK.inc',
-		__DIR__ . '/../../../../../core/vendor/wikimedia/utfnormal/src/UtfNormalData.inc',
-		__DIR__ . '/../../../../../vendor/wikimedia/utfnormal/src/UtfNormalData.inc',
-		__DIR__ . '/../../../../../core/includes/libs/normal/UtfNormalData.inc',
-		__DIR__ . '/../../../../../includes/libs/normal/UtfNormalData.inc',
+		__DIR__ . '/../../../../../../core/vendor/wikimedia/utfnormal/src/UtfNormalData.inc',
+		__DIR__ . '/../../../../../../vendor/wikimedia/utfnormal/src/UtfNormalData.inc',
+		__DIR__ . '/../../../../../../core/includes/libs/normal/UtfNormalData.inc',
+		__DIR__ . '/../../../../../../includes/libs/normal/UtfNormalData.inc',
 	] as $tryfile ) {
 		$tryfile = realpath( $tryfile );
 		if ( file_exists( $tryfile ) ) {