change order of checking to avoid edgecases with the $egVariablesAreV…

…olatile setting in Extension:Variables add .gitignore file moved some files around for cleanup purposes renamed some files and moved to AutoloadNamespaces instead of AutoloadClasses
Liquipedia · Sep 3, 2019 · db91525 · db91525
1 parent dc92920
commit db91525
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+/nbproject/
diff --git a/extension.json b/extension.json
@@ -1,6 +1,6 @@
 {
 	"name": "VariablesLua",
-	"version": "1.4.0",
+	"version": "1.4.1",
 	"author": [
 		"[https://fo-nttax.de Alex Winkler]"
 	],
@@ -20,9 +20,8 @@
 			"i18n"
 		]
 	},
-	"AutoloadClasses": {
-		"Liquipedia\\VariablesLua\\Hooks": "VariablesLuaHooks.php",
-		"Liquipedia\\VariablesLua\\Scribunto_LuaVariablesLuaLibrary": "Scribunto_LuaVariablesLuaLibrary.php"
+	"AutoloadNamespaces": {
+		"Liquipedia\\VariablesLua\\": "src/"
 	},
 	"Hooks": {
 		"ScribuntoExternalLibraries": [

diff --git a/mw.ext.VariablesLua.lua → lua/mw.ext.VariablesLua.lua b/mw.ext.VariablesLua.lua → lua/mw.ext.VariablesLua.lua
diff --git a/VariablesLuaHooks.php → src/Hooks.php b/VariablesLuaHooks.php → src/Hooks.php
diff --git a/Scribunto_LuaVariablesLuaLibrary.php → src/Scribunto_LuaVariablesLuaLibrary.php b/Scribunto_LuaVariablesLuaLibrary.php → src/Scribunto_LuaVariablesLuaLibrary.php
@@ -15,7 +15,7 @@ public function register() {
 			'varexists' => [ $this, 'fn_varexists' ],
 		];
 		return $this->getEngine()->registerInterface(
-				__DIR__ . '/mw.ext.VariablesLua.lua', $lib, []
+				__DIR__ . '/../lua/mw.ext.VariablesLua.lua', $lib, []
 		);
 	}
 
@@ -46,10 +46,10 @@ public function fn_vardefineecho() {
 	public function fn_varexists() {
 		$params = func_get_args();
 		$parser = $this->getParser();
-		if ( method_exists( 'ExtVariables', 'pf_varexists' ) ) {
-			return [ ExtVariables::pf_varexists( $parser, ...$params ) ];
-		} else {
+		if ( method_exists( 'ExtVariables', 'pfObj_varexists' ) ) {
 			return [ ExtVariables::pfObj_varexists( $parser, $parser->getPreprocessor()->newFrame(), $params ) ];
+		} else {
+			return [ ExtVariables::pf_varexists( $parser, ...$params ) ];
 		}
 	}