Commit ee7d02d76dc for php.net
commit ee7d02d76dc8adfd5e2c32ecca0bdf0642860d25
Author: Gina Peter Banyard <girgias@php.net>
Date: Fri Nov 7 02:09:29 2025 +0000
zend_builtin_functions.c: use RET{URN|VAL}_BOOL() when possible
diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c
index 8487b803230..0a0f5036259 100644
--- a/Zend/zend_builtin_functions.c
+++ b/Zend/zend_builtin_functions.c
@@ -590,11 +590,7 @@ ZEND_FUNCTION(define)
/* non persistent */
ZEND_CONSTANT_SET_FLAGS(&c, 0, PHP_USER_CONSTANT);
c.name = zend_string_copy(name);
- if (zend_register_constant(&c) != NULL) {
- RETURN_TRUE;
- } else {
- RETURN_FALSE;
- }
+ RETURN_BOOL(zend_register_constant(&c) != NULL);
}
/* }}} */
@@ -608,11 +604,7 @@ ZEND_FUNCTION(defined)
Z_PARAM_STR(name)
ZEND_PARSE_PARAMETERS_END();
- if (zend_get_constant_ex(name, zend_get_executed_scope(), ZEND_FETCH_CLASS_SILENT)) {
- RETURN_TRUE;
- } else {
- RETURN_FALSE;
- }
+ RETURN_BOOL(zend_get_constant_ex(name, zend_get_executed_scope(), ZEND_FETCH_CLASS_SILENT));
}
/* }}} */
@@ -1043,11 +1035,10 @@ static void _property_exists(zval *return_value, const zval *object, zend_string
RETURN_TRUE;
}
- if (Z_TYPE_P(object) == IS_OBJECT &&
- Z_OBJ_HANDLER_P(object, has_property)(Z_OBJ_P(object), property, ZEND_PROPERTY_EXISTS, NULL)) {
- RETURN_TRUE;
- }
- RETURN_FALSE;
+ RETURN_BOOL(
+ Z_TYPE_P(object) == IS_OBJECT &&
+ Z_OBJ_HANDLER_P(object, has_property)(Z_OBJ_P(object), property, ZEND_PROPERTY_EXISTS, NULL)
+ );
}
/* {{{ Checks if the object or class has a property */
@@ -1107,11 +1098,7 @@ static zend_always_inline void _class_exists_impl(zval *return_value, zend_strin
ce = zend_lookup_class(name);
}
- if (ce) {
- RETURN_BOOL(((ce->ce_flags & flags) == flags) && !(ce->ce_flags & skip_flags));
- } else {
- RETURN_FALSE;
- }
+ RETURN_BOOL(ce && ((ce->ce_flags & flags) == flags) && !(ce->ce_flags & skip_flags));
}
/* {{{ */