Skip to content

Commit e77345d

Browse files
committed
fixup! zend_objects: Add clone_obj_with object handler
1 parent ad0dafa commit e77345d

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Zend/zend_objects.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ ZEND_API zend_object* ZEND_FASTCALL zend_objects_new(zend_class_entry *ce)
213213
return object;
214214
}
215215

216-
ZEND_API void ZEND_FASTCALL zend_objects_clone_members_ex(zend_object *new_object, zend_object *old_object, zend_class_entry *scope, const HashTable *properties)
216+
ZEND_API void ZEND_FASTCALL zend_objects_clone_members_with(zend_object *new_object, zend_object *old_object, zend_class_entry *scope, const HashTable *properties)
217217
{
218218
bool might_update_properties = old_object->ce->clone != NULL || zend_hash_num_elements(properties) > 0;
219219

@@ -343,7 +343,7 @@ ZEND_API void ZEND_FASTCALL zend_objects_clone_members(zend_object *new_object,
343343
{
344344
ZEND_ASSERT(old_object->ce == new_object->ce);
345345

346-
zend_objects_clone_members_ex(new_object, old_object, old_object->ce, &zend_empty_array);
346+
zend_objects_clone_members_with(new_object, old_object, old_object->ce, &zend_empty_array);
347347
}
348348

349349
ZEND_API zend_object *zend_objects_clone_obj_with(zend_object *old_object, zend_class_entry *scope, const HashTable *properties)
@@ -382,7 +382,7 @@ ZEND_API zend_object *zend_objects_clone_obj_with(zend_object *old_object, zend_
382382
} while (p != end);
383383
}
384384

385-
zend_objects_clone_members_ex(new_object, old_object, scope, properties);
385+
zend_objects_clone_members_with(new_object, old_object, scope, properties);
386386

387387
return new_object;
388388
}

Zend/zend_objects.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ BEGIN_EXTERN_C()
2626
ZEND_API void ZEND_FASTCALL zend_object_std_init(zend_object *object, zend_class_entry *ce);
2727
ZEND_API zend_object* ZEND_FASTCALL zend_objects_new(zend_class_entry *ce);
2828
ZEND_API void ZEND_FASTCALL zend_objects_clone_members(zend_object *new_object, zend_object *old_object);
29-
ZEND_API void ZEND_FASTCALL zend_objects_clone_members_ex(zend_object *new_object, zend_object *old_object, zend_class_entry *scope, const HashTable *properties);
29+
ZEND_API void ZEND_FASTCALL zend_objects_clone_members_with(zend_object *new_object, zend_object *old_object, zend_class_entry *scope, const HashTable *properties);
3030

3131
ZEND_API void zend_object_std_dtor(zend_object *object);
3232
ZEND_API void zend_objects_destroy_object(zend_object *object);

0 commit comments

Comments
 (0)