Skip to content

Commit 75470bc

Browse files
committed
Revert "Fix #79065: DOM classes do not expose properties to Reflection"
This reverts commit 6bc8f7e. This causes an assertion failure in PHPUnit.
1 parent 817e100 commit 75470bc

File tree

3 files changed

+0
-55
lines changed

3 files changed

+0
-55
lines changed

NEWS

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ PHP NEWS
1616
- DOM:
1717
. Fixed bug #78221 (DOMNode::normalize() doesn't remove empty text nodes).
1818
(cmb)
19-
. Fixed bug #79065 (DOM classes do not expose properties to Reflection).
20-
(cmb)
2119

2220
- EXIF:
2321
. Fixed bug #79336 (ext/exif/tests/bug79046.phpt fails on Big endian arch).

ext/dom/php_dom.c

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -410,28 +410,6 @@ static int dom_property_exists(zval *object, zval *member, int check_empty, void
410410
}
411411
/* }}} */
412412

413-
/* {{{ dom_get_properties */
414-
static HashTable *dom_get_properties(zval *object)
415-
{
416-
dom_object *obj = Z_DOMOBJ_P(object);
417-
HashTable *props = zend_std_get_properties(object);
418-
419-
if (obj->prop_handler != NULL) {
420-
zend_string *key;
421-
dom_prop_handler *hnd;
422-
423-
ZEND_HASH_FOREACH_STR_KEY_PTR(obj->prop_handler, key, hnd) {
424-
zval val;
425-
426-
if (hnd->read_func(obj, &val) == SUCCESS) {
427-
zend_hash_update(props, key, &val);
428-
}
429-
} ZEND_HASH_FOREACH_END();
430-
}
431-
return props;
432-
}
433-
/* }}} */
434-
435413
static HashTable* dom_get_debug_info_helper(zval *object, int *is_temp) /* {{{ */
436414
{
437415
dom_object *obj = Z_DOMOBJ_P(object);
@@ -624,7 +602,6 @@ PHP_MINIT_FUNCTION(dom)
624602
dom_object_handlers.get_property_ptr_ptr = dom_get_property_ptr_ptr;
625603
dom_object_handlers.clone_obj = dom_objects_store_clone_obj;
626604
dom_object_handlers.has_property = dom_property_exists;
627-
dom_object_handlers.get_properties = dom_get_properties;
628605
dom_object_handlers.get_debug_info = dom_get_debug_info;
629606

630607
memcpy(&dom_nnodemap_object_handlers, &dom_object_handlers, sizeof(zend_object_handlers));

ext/dom/tests/bug79065.phpt

Lines changed: 0 additions & 30 deletions
This file was deleted.

0 commit comments

Comments
 (0)