From: Andi Gutmans Date: Mon, 1 Dec 2003 11:53:42 +0000 (+0000) Subject: - Nuke property_exists(). We need to fix isset() and this is already X-Git-Tag: php-5.0.0b3RC1~452 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=709060e161118e6fef9bb71f38431c16174e1485;p=php - Nuke property_exists(). We need to fix isset() and this is already - supported in reflection API. In any case, it's best not to add new - functions in the general namespace except for keeping engine consistency (which would have been true in this case) --- diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c index 228e9dfaea..37f7e1b5c7 100644 --- a/Zend/zend_builtin_functions.c +++ b/Zend/zend_builtin_functions.c @@ -42,7 +42,6 @@ static ZEND_FUNCTION(define); static ZEND_FUNCTION(defined); static ZEND_FUNCTION(get_class); static ZEND_FUNCTION(get_parent_class); -static ZEND_FUNCTION(property_exists); static ZEND_FUNCTION(method_exists); static ZEND_FUNCTION(class_exists); static ZEND_FUNCTION(function_exists); @@ -100,7 +99,6 @@ static zend_function_entry builtin_functions[] = { ZEND_FE(defined, NULL) ZEND_FE(get_class, NULL) ZEND_FE(get_parent_class, NULL) - ZEND_FE(property_exists, NULL) ZEND_FE(method_exists, NULL) ZEND_FE(class_exists, NULL) ZEND_FE(function_exists, NULL) @@ -756,28 +754,7 @@ ZEND_FUNCTION(get_class_methods) } } /* }}} */ - - -/* {{{ proto bool property_exists(object obj, string property_name) - Checks if the object has a property */ -ZEND_FUNCTION(property_exists) -{ - zval **object, **property; - - if (ZEND_NUM_ARGS()!=2 || zend_get_parameters_ex(2, &object, &property)==FAILURE) { - ZEND_WRONG_PARAM_COUNT(); - } - if ((*object)->type != IS_OBJECT) { - RETURN_FALSE; - } - - if (Z_OBJ_HANDLER_PP(object, has_property) && Z_OBJ_HANDLER_PP(object, has_property)(*object, *property, 1 TSRMLS_CC)) { - RETURN_TRUE; - } else { - RETURN_FALSE; - } -} -/* }}} */ +\ /* {{{ proto bool method_exists(object object, string method)