jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix compatibility with PHP8

Browse source
This commit is contained in:
Olly Betts 2021-03-28 19:46:51 +13:00
commit 4b055c343d
1 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Lib/php/phprun.swg
View file

@ -199,7 +199,11 @@ SWIG_ConvertResourcePtr(zval *z, swig_type_info *ty, int flags) {
if (!type_name) { if (!type_name) {
if (Z_TYPE_P(z) == IS_OBJECT) { if (Z_TYPE_P(z) == IS_OBJECT) {
#if PHP_MAJOR_VERSION < 8
HashTable * ht = Z_OBJ_HT_P(z)->get_properties(z); HashTable * ht = Z_OBJ_HT_P(z)->get_properties(z);
#else
HashTable * ht = Z_OBJ_HT_P(z)->get_properties(Z_OBJ_P(z));
#endif
zval * _cPtr = zend_hash_str_find(ht, "_cPtr", sizeof("_cPtr") - 1); zval * _cPtr = zend_hash_str_find(ht, "_cPtr", sizeof("_cPtr") - 1);
type_name=zend_rsrc_list_get_rsrc_type(Z_RES_P(_cPtr)); type_name=zend_rsrc_list_get_rsrc_type(Z_RES_P(_cPtr));
} }
@ -274,7 +278,11 @@ SWIG_generalize_object(zval *zval_obj, void *ptr, int userNewObj, swig_type_info
HashTable *ht = 0; HashTable *ht = 0;
SWIG_pack_zval(zval_obj, ptr, userNewObj); SWIG_pack_zval(zval_obj, ptr, userNewObj);
#if PHP_MAJOR_VERSION < 8
ht = Z_OBJ_HT_P(zval_obj)->get_properties(zval_obj); ht = Z_OBJ_HT_P(zval_obj)->get_properties(zval_obj);
#else
ht = Z_OBJ_HT_P(zval_obj)->get_properties(Z_OBJ_P(zval_obj));
#endif
if(ht) { if(ht) {
ZVAL_RES(&tempZval,zend_register_resource(ptr,*(int *)(type->clientdata))); ZVAL_RES(&tempZval,zend_register_resource(ptr,*(int *)(type->clientdata)));