diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2020-04-21 13:28:01 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2020-04-27 10:04:29 +0200 |
| commit | 6bc8f7e5a9949b2ba79376abd1ed13d0b4d0ae3c (patch) | |
| tree | 6ac969977e3b5b4f24ff7aaa936fb727a3851401 | |
| parent | a2ed731fa5b22e9551c54f9237b56dc71ba37c81 (diff) | |
| download | php-git-6bc8f7e5a9949b2ba79376abd1ed13d0b4d0ae3c.tar.gz | |
Fix #79065: DOM classes do not expose properties to Reflection
We add a `get_properties` handler which complements the already
existing `has_property` and `read_property`handlers.
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | ext/dom/php_dom.c | 23 | ||||
| -rw-r--r-- | ext/dom/tests/bug79065.phpt | 30 |
3 files changed, 55 insertions, 0 deletions
@@ -16,6 +16,8 @@ PHP NEWS - DOM: . Fixed bug #78221 (DOMNode::normalize() doesn't remove empty text nodes). (cmb) + . Fixed bug #79065 (DOM classes do not expose properties to Reflection). + (cmb) - EXIF: . Fixed bug #79336 (ext/exif/tests/bug79046.phpt fails on Big endian arch). diff --git a/ext/dom/php_dom.c b/ext/dom/php_dom.c index 6bc72e9f97..ad297ca778 100644 --- a/ext/dom/php_dom.c +++ b/ext/dom/php_dom.c @@ -410,6 +410,28 @@ static int dom_property_exists(zval *object, zval *member, int check_empty, void } /* }}} */ +/* {{{ dom_get_properties */ +static HashTable *dom_get_properties(zval *object) +{ + dom_object *obj = Z_DOMOBJ_P(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) /* {{{ */ { dom_object *obj = Z_DOMOBJ_P(object); @@ -602,6 +624,7 @@ PHP_MINIT_FUNCTION(dom) dom_object_handlers.get_property_ptr_ptr = dom_get_property_ptr_ptr; dom_object_handlers.clone_obj = dom_objects_store_clone_obj; dom_object_handlers.has_property = dom_property_exists; + dom_object_handlers.get_properties = dom_get_properties; dom_object_handlers.get_debug_info = dom_get_debug_info; memcpy(&dom_nnodemap_object_handlers, &dom_object_handlers, sizeof(zend_object_handlers)); diff --git a/ext/dom/tests/bug79065.phpt b/ext/dom/tests/bug79065.phpt new file mode 100644 index 0000000000..9f3f49b7c8 --- /dev/null +++ b/ext/dom/tests/bug79065.phpt @@ -0,0 +1,30 @@ +--TEST-- +Bug #79065 (DOM classes do not expose properties to Reflection) +--SKIPIF-- +<?php +if (!extension_loaded('dom')) die('skip dom extension not available'); +?> +--FILE-- +<?php +$dom = new DOMDocument; +$dom->loadHTML('<b>test</b>'); +var_dump(count(get_object_vars($dom))); + +$ro = new ReflectionObject($dom); +var_dump(count($ro->getProperties())); +var_dump($ro->hasProperty("textContent")); +$rp = $ro->getProperty("textContent"); +var_dump($rp); +var_dump($rp->getValue($dom)); +?> +--EXPECTF-- +int(35) +int(35) +bool(true) +object(ReflectionProperty)#%d (2) { + ["name"]=> + string(11) "textContent" + ["class"]=> + string(11) "DOMDocument" +} +string(4) "test" |