From: Felipe Pena <felipe@php.net>
Date: Mon, 18 Aug 2008 17:40:14 +0000 (+0000)
Subject: - Fixed bug #45743 (property_exists fails to find static protected member in child... 
X-Git-Tag: BEFORE_HEAD_NS_CHANGE~657
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3efdd8b69bb8ce216e860a68ccd4f2480401b4fb;p=php

- Fixed bug #45743 (property_exists fails to find static protected member in child class)
In general, now property_exists() behave like method_exists() (ie. independs of context/visibibility)
---

diff --git a/Zend/tests/011.phpt b/Zend/tests/011.phpt
index dd4255f713..7bcab0798f 100644
--- a/Zend/tests/011.phpt
+++ b/Zend/tests/011.phpt
@@ -59,16 +59,16 @@ NULL
 Warning: property_exists() expects exactly 2 parameters, 1 given in %s on line %d
 NULL
 bool(true)
-bool(false)
-bool(false)
+bool(true)
+bool(true)
 bool(false)
 bool(false)
 bool(false)
 bool(false)
 bool(false)
 bool(true)
-bool(false)
-bool(false)
+bool(true)
+bool(true)
 bool(false)
 bool(false)
 
@@ -84,6 +84,6 @@ bool(true)
 bool(true)
 bool(true)
 bool(true)
-bool(false)
+bool(true)
 bool(true)
 Done
diff --git a/Zend/tests/bug42211.phpt b/Zend/tests/bug42211.phpt
index 80f6b8b004..c6ea10652a 100644
--- a/Zend/tests/bug42211.phpt
+++ b/Zend/tests/bug42211.phpt
@@ -22,8 +22,8 @@ $b = new B();
 $b->foo();
 --EXPECT--
 bool(true)
-bool(false)
-bool(false)
 bool(true)
 bool(true)
-bool(false)
+bool(true)
+bool(true)
+bool(true)
diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c
index bf1caf8a98..b2daf3c489 100644
--- a/Zend/zend_builtin_functions.c
+++ b/Zend/zend_builtin_functions.c
@@ -1214,8 +1214,8 @@ ZEND_FUNCTION(property_exists)
 	zend_uchar property_type;
 	zend_class_entry *ce, **pce;
 	zend_property_info *property_info;
-	zstr prop_name, class_name;
 	zval property_z;
+	ulong h;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zt", &object, &property, &property_len, &property_type) == FAILURE) {
 		return;
@@ -1225,53 +1225,34 @@ ZEND_FUNCTION(property_exists)
 		RETURN_FALSE;
 	}
 
-	ZVAL_ZSTRL(&property_z, property_type, property, property_len, 0);
-
-	switch(Z_TYPE_P(object)) {
-	case IS_STRING:
-	case IS_UNICODE:
-		if (!Z_UNILEN_P(object)) {
-			RETURN_FALSE;
-		}
-		if (zend_u_lookup_class(Z_TYPE_P(object), Z_UNIVAL_P(object), Z_UNILEN_P(object), &pce TSRMLS_CC) == SUCCESS) {
-			ce = *pce;
-		} else {
-			RETURN_FALSE;
-		}
-		if (!ce) {
-			RETURN_NULL();
-		}
-		if (!(property_info = zend_get_property_info(ce, &property_z, 1 TSRMLS_CC)) || property_info == &EG(std_property_info)) {
+	if (Z_TYPE_P(object) == IS_STRING || Z_TYPE_P(object) == IS_UNICODE) {
+		if (zend_u_lookup_class(Z_TYPE_P(object), Z_UNIVAL_P(object), Z_UNILEN_P(object), &pce TSRMLS_CC) == FAILURE) {
 			RETURN_FALSE;
 		}
-		if (property_info->flags & ZEND_ACC_PUBLIC) {
-			RETURN_TRUE;
-		}
-		zend_u_unmangle_property_name(property_type, property_info->name, property_info->name_length, &class_name, &prop_name);
-		if (class_name.s[0] ==  '*') {
-			if (instanceof_function(EG(scope), ce TSRMLS_CC) ||
-				(EG(This) && instanceof_function(Z_OBJCE_P(EG(This)), ce TSRMLS_CC))) {
-				RETURN_TRUE;
-			}
-			RETURN_FALSE;
-		}
-		if (zend_u_lookup_class(Z_TYPE_P(object), Z_UNIVAL_P(object), Z_UNILEN_P(object), &pce TSRMLS_CC) == SUCCESS) {
-			ce = *pce;
-		} else {
-			RETURN_FALSE; /* shouldn't happen */
-		}
-		RETURN_BOOL(EG(scope) == ce);
-
-	case IS_OBJECT:
-		if (Z_OBJ_HANDLER_P(object, has_property) && Z_OBJ_HANDLER_P(object, has_property)(object, &property_z, 2 TSRMLS_CC)) {
-			RETURN_TRUE;
-		}
-		RETURN_FALSE;
-
-	default:
+		ce = *pce;	
+	} else if (Z_TYPE_P(object) == IS_OBJECT) {
+		ce = Z_OBJCE_P(object);
+	} else {
 		zend_error(E_WARNING, "First parameter must either be an object or the name of an existing class");
 		RETURN_NULL();
 	}
+	
+	h = zend_u_get_hash_value(property_type, property, property_len+1);
+	if (zend_u_hash_quick_find(&ce->properties_info, property_type, property, property_len+1, h, (void **) &property_info) == SUCCESS) {
+		if (property_info->flags & ZEND_ACC_SHADOW) {
+			RETURN_FALSE;
+		}
+		RETURN_TRUE;
+	}
+	
+	ZVAL_ZSTRL(&property_z, property_type, property, property_len, 0);
+	
+	if (Z_TYPE_P(object) == IS_OBJECT &&
+		Z_OBJ_HANDLER_P(object, has_property) &&
+		Z_OBJ_HANDLER_P(object, has_property)(object, &property_z, 2 TSRMLS_CC)) {
+		RETURN_TRUE;
+	}
+	RETURN_FALSE;
 }
 /* }}} */