@@ -759,7 +759,7 @@ static void php_phongo_handle_field_path_entry_for_compound_type(php_phongo_bson
759
759
break ;
760
760
case PHONGO_TYPEMAP_CLASS :
761
761
element -> type = entry -> node .type ;
762
- element -> class = entry -> node .class ;
762
+ element -> ce = entry -> node .ce ;
763
763
break ;
764
764
default :
765
765
/* Do nothing - pacify compiler */
@@ -900,7 +900,7 @@ static bool php_phongo_bson_visit_document(const bson_iter_t* iter ARG_UNUSED, c
900
900
901
901
case PHONGO_TYPEMAP_CLASS : {
902
902
zval obj ;
903
- zend_class_entry * obj_ce = state .odm ? state .odm : state .map .document .class ;
903
+ zend_class_entry * obj_ce = state .odm ? state .odm : state .map .document .ce ;
904
904
905
905
if (!php_phongo_bson_init_document_object (& state .zchild , obj_ce , & obj )) {
906
906
/* Exception already thrown. Clean up and return
@@ -975,7 +975,7 @@ static bool php_phongo_bson_visit_array(const bson_iter_t* iter ARG_UNUSED, cons
975
975
case PHONGO_TYPEMAP_CLASS : {
976
976
zval obj ;
977
977
978
- object_init_ex (& obj , state .map .array .class );
978
+ object_init_ex (& obj , state .map .array .ce );
979
979
zend_call_method_with_1_params (PHONGO_COMPAT_OBJ_P (& obj ), NULL , NULL , BSON_UNSERIALIZE_FUNC_NAME , NULL , & state .zchild );
980
980
zval_ptr_dtor (& state .zchild );
981
981
ZVAL_COPY_VALUE (& state .zchild , & obj );
@@ -1124,7 +1124,7 @@ bool php_phongo_bson_to_zval_ex(const bson_t* b, php_phongo_bson_state* state)
1124
1124
1125
1125
case PHONGO_TYPEMAP_CLASS : {
1126
1126
zval obj ;
1127
- zend_class_entry * obj_ce = state -> odm ? state -> odm : state -> map .root .class ;
1127
+ zend_class_entry * obj_ce = state -> odm ? state -> odm : state -> map .root .ce ;
1128
1128
1129
1129
#if PHP_VERSION_ID >= 80100
1130
1130
/* Enums require special handling for instantiation */
@@ -1267,12 +1267,12 @@ static bool php_phongo_bson_state_parse_type(zval* options, const char* name, ph
1267
1267
1268
1268
if (!strcasecmp (classname , "array" )) {
1269
1269
element -> type = PHONGO_TYPEMAP_NATIVE_ARRAY ;
1270
- element -> class = NULL ;
1270
+ element -> ce = NULL ;
1271
1271
} else if (!strcasecmp (classname , "stdclass" ) || !strcasecmp (classname , "object" )) {
1272
1272
element -> type = PHONGO_TYPEMAP_NATIVE_OBJECT ;
1273
- element -> class = NULL ;
1273
+ element -> ce = NULL ;
1274
1274
} else {
1275
- if ((element -> class = php_phongo_bson_state_fetch_class (classname , classname_len , php_phongo_unserializable_ce ))) {
1275
+ if ((element -> ce = php_phongo_bson_state_fetch_class (classname , classname_len , php_phongo_unserializable_ce ))) {
1276
1276
element -> type = PHONGO_TYPEMAP_CLASS ;
1277
1277
} else {
1278
1278
retval = false;
@@ -1290,7 +1290,7 @@ static bool php_phongo_bson_state_parse_type(zval* options, const char* name, ph
1290
1290
static void field_path_map_element_set_info (php_phongo_field_path_map_element * element , php_phongo_bson_typemap_element * typemap_element )
1291
1291
{
1292
1292
element -> node .type = typemap_element -> type ;
1293
- element -> node .class = typemap_element -> class ;
1293
+ element -> node .ce = typemap_element -> ce ;
1294
1294
}
1295
1295
1296
1296
static void map_add_field_path_element (php_phongo_bson_typemap * map , php_phongo_field_path_map_element * element )
0 commit comments