Skip to content

Commit

Permalink
Revert "Call cast_object handler from get_properties_for"
Browse files Browse the repository at this point in the history
This reverts commit 4182813.
  • Loading branch information
iluuu1994 committed Aug 7, 2023
1 parent 7397607 commit efc73f2
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 17 deletions.
2 changes: 0 additions & 2 deletions UPGRADING.INTERNALS
Expand Up @@ -70,8 +70,6 @@ PHP 8.3 INTERNALS UPGRADE NOTES
* _php_stream_dirent now has an extra d_type field that is used to store the
directory entry type. This can be used to avoid additional stat calls for
types when the type is already known.
* zend_std_get_properties_for now calls the cast_object handler when casting
objects to arrays.

========================
2. Build system changes
Expand Down
10 changes: 0 additions & 10 deletions Zend/zend_object_handlers.c
Expand Up @@ -1975,16 +1975,6 @@ ZEND_API HashTable *zend_std_get_properties_for(zend_object *obj, zend_prop_purp
}
ZEND_FALLTHROUGH;
case ZEND_PROP_PURPOSE_ARRAY_CAST:
if (obj->handlers->cast_object != std_object_handlers.cast_object) {
zval result;
if (obj->handlers->cast_object(obj, &result, IS_ARRAY) == SUCCESS) {
return Z_ARRVAL(result);
}
if (EG(exception)) {
return NULL;
}
}
ZEND_FALLTHROUGH;
case ZEND_PROP_PURPOSE_SERIALIZE:
case ZEND_PROP_PURPOSE_VAR_EXPORT:
case ZEND_PROP_PURPOSE_JSON:
Expand Down
4 changes: 0 additions & 4 deletions ext/com_dotnet/com_handlers.c
Expand Up @@ -431,10 +431,6 @@ static int com_objects_compare(zval *object1, zval *object2)

static zend_result com_object_cast(zend_object *readobj, zval *writeobj, int type)
{
if (type == IS_ARRAY) {
return FAILURE;
}

php_com_dotnet_object *obj;
VARIANT v;
VARTYPE vt = VT_EMPTY;
Expand Down
1 change: 0 additions & 1 deletion ext/simplexml/simplexml.c
Expand Up @@ -1819,7 +1819,6 @@ static zend_result cast_object(zval *object, int type, char *contents)
convert_scalar_to_number(object);
break;
default:
zval_ptr_dtor_nogc(object);
return FAILURE;
}
return SUCCESS;
Expand Down

0 comments on commit efc73f2

Please sign in to comment.