commit ad61e33e229ec9e2e812108bb211409a4b9b50e0
author Olly Betts <olly@survex.com> Thu Apr 22 07:56:25 2021 +1200
committer Olly Betts <olly@survex.com> Thu Apr 22 07:56:25 2021 +1200
tree b295f781eef13349c83e03ee45ee3da6e9743a3e
parent 50b13275dc8df83de4558387005fd026ac4eaa49

Wrap pointer to member as object not resource

Lib/php/php.swg

diff --git a/Lib/php/php.swg b/Lib/php/php.swg
index 4cef902..db47f49 100644
--- a/Lib/php/php.swg
+++ b/Lib/php/php.swg
@@ -386,16 +386,16 @@
   SWIG_SetPointerZval($input, (void *)&$1, $1_descriptor, $owner);
 %}
 
-%typemap(out, fragment="swig_php_init_member_ptr") SWIGTYPE (CLASS::*)
+%typemap(out) SWIGTYPE (CLASS::*)
 {
   void * p = emalloc(sizeof($1));
   memcpy(p, &$1, sizeof($1));
-  RETVAL_RES(zend_register_resource(p, swig_member_ptr));
+  SWIG_SetPointerZval($result, (void *)p, $&1_descriptor, 1);
 }
 
-%typemap(in, fragment="swig_php_init_member_ptr") SWIGTYPE (CLASS::*)
+%typemap(in) SWIGTYPE (CLASS::*)
 {
-  void * p = (void*)zend_fetch_resource_ex(&$input, SWIG_MEMBER_PTR, swig_member_ptr);
+  void * p = SWIG_Z_FETCH_OBJ_P(&$input)->ptr;
   memcpy(&$1, p, sizeof($1));
 }
 

Lib/php/phpinit.swg

diff --git a/Lib/php/phpinit.swg b/Lib/php/phpinit.swg
index b4d25d2..9e3dc75 100644
--- a/Lib/php/phpinit.swg
+++ b/Lib/php/phpinit.swg
@@ -9,18 +9,3 @@
 SWIG_php_minit {
   SWIG_InitializeModule((void*)&module_number);
 %}
-
-%fragment("swig_php_init_member_ptr2", "header") %{
-#define SWIG_MEMBER_PTR "CLASS::*"
-
-static void swig_member_ptr_dtor(zend_resource *res) {
-  efree(res->ptr);
-}
-
-static int swig_member_ptr = 0;
-%}
-
-%fragment("swig_php_init_member_ptr", "init", fragment="swig_php_init_member_ptr2") %{
-  // FIXME: Make this a class instead
-  swig_member_ptr = zend_register_list_destructors_ex(swig_member_ptr_dtor, NULL, SWIG_MEMBER_PTR, module_number);
-%}