archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

- Make ReflectionObject::hasProperty() recognize dynamically added props

Browse source
This commit is contained in:
Marcus Boerger 2005-05-12 21:25:42 +00:00
parent a5c37f37b6
commit c1e480d46e
2 changed files with 22 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Zend/zend_reflection_api.c
View file

@ -2656,6 +2656,7 @@ ZEND_METHOD(reflection_class, hasProperty)
zend_class_entry *ce;
char *name;
int name_len;
zval *property;
METHOD_NOTSTATIC;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &name, &name_len) == FAILURE) {
@ -2666,6 +2667,16 @@ ZEND_METHOD(reflection_class, hasProperty)
if (zend_hash_exists(&ce->properties_info, name, name_len + 1)) {
RETURN_TRUE;
} else {
if (intern->obj && Z_OBJ_HANDLER_P(intern->obj, has_property))
{
MAKE_STD_ZVAL(property);
ZVAL_STRINGL(property, name, name_len, 1);
if (Z_OBJ_HANDLER_P(intern->obj, has_property)(intern->obj, property, 2 TSRMLS_CC)) {
zval_ptr_dtor(&property);
RETURN_TRUE;
}
zval_ptr_dtor(&property);
}
RETURN_FALSE;
}
}

11
ext/reflection/php_reflection.c
View file

@ -2656,6 +2656,7 @@ ZEND_METHOD(reflection_class, hasProperty)
zend_class_entry *ce;
char *name;
int name_len;
zval *property;
METHOD_NOTSTATIC;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &name, &name_len) == FAILURE) {
@ -2666,6 +2667,16 @@ ZEND_METHOD(reflection_class, hasProperty)
if (zend_hash_exists(&ce->properties_info, name, name_len + 1)) {
RETURN_TRUE;
} else {
if (intern->obj && Z_OBJ_HANDLER_P(intern->obj, has_property))
{
MAKE_STD_ZVAL(property);
ZVAL_STRINGL(property, name, name_len, 1);
if (Z_OBJ_HANDLER_P(intern->obj, has_property)(intern->obj, property, 2 TSRMLS_CC)) {
zval_ptr_dtor(&property);
RETURN_TRUE;
}
zval_ptr_dtor(&property);
}
RETURN_FALSE;
}
}