Reverting. Let's not introduce major BC breakage like this without a

good reason.

1 files changed, 1 insertions, 3 deletions

diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c
index fc7770191d..8f2b1e9502 100644
--- a/Zend/zend_object_handlers.c
+++ b/Zend/zend_object_handlers.c
@@ -819,9 +819,7 @@ static int zend_std_has_property(zval *object, zval *member, int check_empty TSR
 		if (check_empty) {
 			result = zend_is_true(*value);
 		} else {
-			/* We do not need to check for NULL here because this is not called for isset/isempty.
-			 * And indeed even a NULL value means the property is defined. */
-			result = 1;
+			result = (Z_TYPE_PP(value) != IS_NULL);
 		}
 	} else {
 		result = 0;