[php7] replace untyped code in php.Session

std/php7/Global.hx

@@ -1,6 +1,7 @@
 package php;
 
 import haxe.extern.*;
+import haxe.Constraints;
 
 /**
 	This class contains externs for native PHP functions defined in global namespace.
@@ -1090,4 +1091,70 @@ extern class Global {
 		@see http://php.net/manual/en/function.flush.php
 	**/
 	static function flush() : Void;
+
+	/**
+		@see http://php.net/manual/en/function.session-cache-limiter.php
+	**/
+	static function session_cache_limiter( ?cache_limiter:String ) : String;
+
+	/**
+		@see http://php.net/manual/en/function.session-cache-expire.php
+	**/
+	static function session_cache_expire( ?new_cache_expire:Int ) : Int;
+
+	/**
+		@see http://php.net/manual/en/function.session-name.php
+	**/
+	static function session_name( ?name:String ) : String;
+
+	/**
+		@see http://php.net/manual/en/function.session-start.php
+	**/
+	static function session_start( ?options:NativeArray ) : Bool;
+
+	/**
+		@see http://php.net/manual/en/function.session-unset.php
+	**/
+	static function session_unset() : Void;
+
+	/**
+		@see http://php.net/manual/en/function.session-write-close.php
+	**/
+	static function session_write_close() : Void;
+
+	/**
+		@see http://php.net/manual/en/function.session-id.php
+	**/
+	static function session_id( ?id:String ) : String;
+
+	/**
+		@see http://php.net/manual/en/function.session-save-path.php
+	**/
+	static function session_save_path( ?path:String ) : String;
+
+	/**
+		@see http://php.net/manual/en/function.session-module-name.php
+	**/
+	static function session_module_name( ?module:String ) : String;
+
+	/**
+		@see http://php.net/manual/en/function.session-regenerate-id.php
+	**/
+	static function session_regenerate_id( delete_old_session:Bool = false ) : Bool;
+
+	/**
+		@see http://php.net/manual/en/function.session-set-cookie-params.php
+	**/
+	static function session_set_cookie_params( lifetime:Int, ?path:String, ?domain:String, secure:Bool = false, httponly:Bool = false ) : Bool;
+
+	/**
+		@see http://php.net/manual/en/function.session-get-cookie-params.php
+	**/
+	static function session_get_cookie_params() : NativeAssocArray<Dynamic>;
+
+	/**
+		@see http://php.net/manual/en/function.session-set-save-handler.php
+	**/
+	@:overload(function( sessionhandler:SessionHandlerInterface, register_shutdown:Bool = true ) : Bool {})
+	static function session_set_save_handler( open:String->String->Bool, close:Void->Bool, read:String->String, write:String->String->Bool, destroy:String->Bool, gc:Int->Bool, ?create_sid:Void->String, ?validate_sid:Function, ?update_timestamp:Function ) : Bool;
 }

std/php7/Session.hx

@@ -21,13 +21,17 @@
  */
 package php;
 
+import php.Boot;
+import php.Global.*;
+import php.SuperGlobal.*;
+
 /**
 	Session consists of a way to preserve certain data across
 	subsequent accesses.
 */
 class Session {
 	public static function getCacheLimiter() {
-		switch(untyped __call__("session_cache_limiter")) {
+		switch(session_cache_limiter()) {
 			case "public":
 				return Public;
 			case "private":
@@ -44,119 +48,118 @@ class Session {
 		if(started) throw "You can't set the cache limiter while the session is already in use";
 		switch(l) {
 			case Public:
-				untyped __call__("session_cache_limiter", "public");
+				session_cache_limiter("public");
 			case Private:
-				untyped __call__("session_cache_limiter", "private");
+				session_cache_limiter("private");
 			case NoCache:
-				untyped __call__("session_cache_limiter", "nocache");
+				session_cache_limiter("nocache");
 			case PrivateNoExpire:
-				untyped __call__("session_cache_limiter", "private_no_expire");
+				session_cache_limiter("private_no_expire");
 		}
 	}
 
 	public static function getCacheExpire() : Int {
-		return untyped __call__("session_cache_expire");
+		return session_cache_expire();
 	}
 
 	public static function setCacheExpire(minutes : Int) {
 		if(started) throw "You can't set the cache expire time while the session is already in use";
-		untyped __call__("session_cache_expire", minutes);
+		session_cache_expire(minutes);
 	}
 
 	public static function setName(name : String) {
 		if(started) throw "You can't set the name while the session is already in use";
-		untyped __call__("session_name", name);
+		session_name(name);
 	}
 
 	public static function getName() : String {
-		return untyped __call__("session_name");
+		return session_name();
 	}
 
 	public static function getId() : String {
-		return untyped __call__("session_id");
+		return session_id();
 	}
 
 	public static function setId(id : String) {
 		if(started) throw "You can't set the session id while the session is already in use";
-		untyped __call__("session_id", id);
+		session_id(id);
 	}
 
 	public static function getSavePath() : String {
-		return untyped __call__("session_save_path");
+		return session_save_path();
 	}
 
 	public static function setSavePath(path : String) {
 		if(started) throw "You can't set the save path while the session is already in use";
-		untyped __call__("session_save_path", path);
+		session_save_path(path);
 	}
 
 	public static function getModule() : String {
-		return untyped __call__("session_module_name");
+		return session_module_name();
 	}
 
 	public static function setModule(module : String) {
 		if(started) throw "You can't set the module while the session is already in use";
-		untyped __call__("session_module_name", module);
+		session_module_name(module);
 	}
 
 	public static function regenerateId(?deleteold : Bool) : Bool {
-		return untyped __call__("session_regenerate_id", deleteold);
+		return session_regenerate_id(deleteold);
 	}
 
 	public static function get(name : String) : Dynamic {
 		start();
-		if(!untyped __call__('isset', __var__("_SESSION", name))) return null;
-		return untyped __var__("_SESSION", name);
+		if(!isset(_SESSION[name])) return null;
+		return _SESSION[name];
 	}
 
 	public static function set(name : String, value : Dynamic) {
 		start();
-		return untyped __set__("_SESSION", name, value);
+		return _SESSION[name] = value;
 	}
 
 	public static function setCookieParams(?lifetime : Int, ?path : String, ?domain : String, ?secure : Bool, ?httponly : Bool) {
 		if(started) throw "You can't set the cookie params while the session is already in use";
-		untyped __call__("session_set_cookie_params", lifetime, path, domain, secure, httponly);
+		session_set_cookie_params(lifetime, path, domain, secure, httponly);
 	}
 
 	public static function getCookieParams() : { lifetime : Int, path : String, domain : String, secure : Bool, httponly : Bool} {
-		return untyped __call__("_hx_anonymous", untyped __call__("session_get_cookie_params"));
+		return Boot.createAnon(session_get_cookie_params());
 	}
 
 	// TODO: completely untested
 	public static function setSaveHandler(open : String -> String -> Bool, close : Void -> Bool, read : String -> String, write : String -> String -> Bool, destroy, gc) : Bool {
-		return untyped __call__("session_set_save_handler", open, close, read, write, destroy, gc);
+		return session_set_save_handler(open, close, read, write, destroy, gc);
 	}
 
 	public static function exists(name : String) {
 		start();
-		return untyped __call__("array_key_exists", name, __var__("_SESSION"));
+		return array_key_exists(name, _SESSION);
 	}
 
 	public static function remove(name : String) {
 		start();
-		untyped __call__("unset", __var__("_SESSION", name));
+		unset(_SESSION[name]);
 	}
 
 	public static var started(default, null) : Bool;
 	public static function start() {
 		if(started) return;
 		started = true;
-		untyped __call__("session_start");
+		session_start();
 	}
 
 	public static function clear() {
-		untyped __call__("session_unset");
+		session_unset();
 	}
 
 	public static function close() {
-		untyped __call__("session_write_close");
+		session_write_close();
 		started = false; // TODO: not sure this useful; test if a closed session can be re-opened (I doubt)
 	}
 
-	static function __init__()
-	{
-		started = untyped __call__("isset", __var__("_SESSION"));
+	static function __init__() {
+		started = isset(_SESSION);
 	}
 }
 

std/php7/SessionHandlerInterface.hx

@@ -0,0 +1,14 @@
+package php;
+
+/**
+	@see http://php.net/manual/en/class.sessionhandlerinterface.php
+**/
+@:native('SessionHandlerInterface')
+extern interface SessionHandlerInterface {
+	function close() : Bool;
+	function destroy( session_id:String ) : Bool;
+	function gc( maxlifetime:Int ) : Bool;
+	function open( save_path:String, session_name:String ) : Bool;
+	function read( session_id:String ) : String;
+	function write( session_id:String, session_data:String ) : Bool;
+}