]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorNikita Popov <nikita.ppv@gmail.com>
Tue, 28 Apr 2020 13:10:23 +0000 (15:10 +0200)
committerNikita Popov <nikita.ppv@gmail.com>
Tue, 28 Apr 2020 13:10:23 +0000 (15:10 +0200)
* PHP-7.4:
  Revert "Fix #79065: DOM classes do not expose properties to Reflection"

1  2 
ext/dom/php_dom.c

index 67961b303a936f687c0f4b91854c5eea94e31a0d,6bc72e9f9794032a20324ced797a4c189595d822..c7b2103a0f5cb098c0a9d914401c9e427d843e38
@@@ -385,31 -410,9 +385,9 @@@ static int dom_property_exists(zend_obj
  }
  /* }}} */
  
- /* {{{ dom_get_properties */
- static HashTable *dom_get_properties(zend_object *object)
- {
-       dom_object *obj = php_dom_obj_from_obj(object);
-       HashTable *props = zend_std_get_properties(object);
-       if (obj->prop_handler != NULL) {
-               zend_string *key;
-               dom_prop_handler *hnd;
-               ZEND_HASH_FOREACH_STR_KEY_PTR(obj->prop_handler, key, hnd) {
-                       zval val;
-                       if (hnd->read_func(obj, &val) == SUCCESS) {
-                               zend_hash_update(props, key, &val);
-                       }
-               } ZEND_HASH_FOREACH_END();
-       }
-       return props;
- }
- /* }}} */
 -static HashTable* dom_get_debug_info_helper(zval *object, int *is_temp) /* {{{ */
 +static HashTable* dom_get_debug_info_helper(zend_object *object, int *is_temp) /* {{{ */
  {
 -      dom_object                      *obj = Z_DOMOBJ_P(object);
 +      dom_object                      *obj = php_dom_obj_from_obj(object);
        HashTable                       *debug_info,
                                                *prop_handlers = obj->prop_handler,
                                                *std_props;