Skip to content

Commit 1638a6e

Browse files
laruencelaruence
committed
Give a meaningful name
1 parent 4aada39 commit 1638a6e

File tree

7 files changed

+24
-19
lines changed

7 files changed

+24
-19
lines changed

‎Zend/zend_closures.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@ static zval *zend_closure_get_property_ptr_ptr(zval *object, zval *member, int t
412412

413413
static int zend_closure_has_property(zval *object, zval *member, int has_set_exists, void **cache_slot) /* {{{ */
414414
{
415-
if (has_set_exists != 2) {
415+
if (has_set_exists != ZEND_PROPERTY_EXISTS) {
416416
ZEND_CLOSURE_PROPERTY_ERROR();
417417
}
418418
return 0;

‎Zend/zend_object_handlers.c

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1657,16 +1657,17 @@ ZEND_API int zend_std_has_property(zval *object, zval *member, int has_set_exist
16571657
}
16581658
found:
16591659
switch (has_set_exists) {
1660-
case 0:
1660+
case ZEND_PROPERTY_ISSET:
16611661
ZVAL_DEREF(value);
16621662
result = (Z_TYPE_P(value) != IS_NULL);
16631663
break;
1664+
case ZEND_PROPERTY_EXISTS:
1665+
result = 1;
1666+
break;
1667+
case ZEND_PROPERTY_HAS:
16641668
default:
16651669
result = zend_is_true(value);
16661670
break;
1667-
case 2:
1668-
result = 1;
1669-
break;
16701671
}
16711672
goto exit;
16721673
}
@@ -1677,7 +1678,7 @@ ZEND_API int zend_std_has_property(zval *object, zval *member, int has_set_exist
16771678
}
16781679

16791680
result = 0;
1680-
if ((has_set_exists != 2) && zobj->ce->__isset) {
1681+
if ((has_set_exists != ZEND_PROPERTY_EXISTS) && zobj->ce->__isset) {
16811682
uint32_t *guard = zend_get_property_guard(zobj, Z_STR_P(member));
16821683

16831684
if (!((*guard) & IN_ISSET)) {
@@ -1694,7 +1695,7 @@ ZEND_API int zend_std_has_property(zval *object, zval *member, int has_set_exist
16941695
if (Z_TYPE(rv) != IS_UNDEF) {
16951696
result = zend_is_true(&rv);
16961697
zval_ptr_dtor(&rv);
1697-
if (has_set_exists && result) {
1698+
if (has_set_exists == ZEND_PROPERTY_HAS && result) {
16981699
if (EXPECTED(!EG(exception)) && zobj->ce->__get && !((*guard) & IN_GET)) {
16991700
(*guard) |= IN_GET;
17001701
zend_std_call_getter(zobj, member, &rv);

‎Zend/zend_object_handlers.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,10 @@ extern const ZEND_API zend_object_handlers std_object_handlers;
173173
#define zend_get_function_root_class(fbc) \
174174
((fbc)->common.prototype ? (fbc)->common.prototype->common.scope : (fbc)->common.scope)
175175

176+
#define ZEND_PROPERTY_ISSET 0x0 /* Property is exists and not NULL */
177+
#define ZEND_PROPERTY_HAS 0x1 /* Property is exists and is TRUE */
178+
#define ZEND_PROPERTY_EXISTS 0x2 /* Property is exists */
179+
176180
ZEND_API zend_function *zend_std_get_static_method(zend_class_entry *ce, zend_string *function_name_strval, const zval *key);
177181
ZEND_API zval *zend_std_get_static_property(zend_class_entry *ce, zend_string *property_name, zend_bool silent);
178182
ZEND_API ZEND_COLD zend_bool zend_std_unset_static_property(zend_class_entry *ce, zend_string *property_name);

‎ext/mysqli/mysqli.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -382,10 +382,10 @@ static int mysqli_object_has_property(zval *object, zval *member, int has_set_ex
382382

383383
if ((p = zend_hash_find_ptr(obj->prop_handler, Z_STR_P(member))) != NULL) {
384384
switch (has_set_exists) {
385-
case 2:
385+
case ZEND_PROPERTY_EXISTS:
386386
ret = 1;
387387
break;
388-
case 1: {
388+
case ZEND_PROPERTY_HAS: {
389389
zval rv;
390390
zval *value = mysqli_read_property(object, member, BP_VAR_IS, cache_slot, &rv);
391391
if (value != &EG(uninitialized_zval)) {
@@ -394,7 +394,7 @@ static int mysqli_object_has_property(zval *object, zval *member, int has_set_ex
394394
}
395395
break;
396396
}
397-
case 0:{
397+
case ZEND_PROPERTY_ISSET: {
398398
zval rv;
399399
zval *value = mysqli_read_property(object, member, BP_VAR_IS, cache_slot, &rv);
400400
if (value != &EG(uninitialized_zval)) {

‎ext/snmp/snmp.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1994,10 +1994,10 @@ static int php_snmp_has_property(zval *object, zval *member, int has_set_exists,
19941994

19951995
if ((hnd = zend_hash_find_ptr(&php_snmp_properties, Z_STR_P(member))) != NULL) {
19961996
switch (has_set_exists) {
1997-
case 2:
1997+
case ZEND_PROPERTY_EXISTS:
19981998
ret = 1;
19991999
break;
2000-
case 0: {
2000+
case ZEND_PROPERTY_ISSET: {
20012001
zval *value = php_snmp_read_property(object, member, BP_VAR_IS, cache_slot, &rv);
20022002
if (value != &EG(uninitialized_zval)) {
20032003
ret = Z_TYPE_P(value) != IS_NULL? 1 : 0;

‎ext/spl/spl_array.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -872,7 +872,7 @@ static zval *spl_array_read_property(zval *object, zval *member, int type, void
872872
spl_array_object *intern = Z_SPLARRAY_P(object);
873873

874874
if ((intern->ar_flags & SPL_ARRAY_ARRAY_AS_PROPS) != 0
875-
&& !zend_std_has_property(object, member, 2, NULL)) {
875+
&& !zend_std_has_property(object, member, ZEND_PROPERTY_EXISTS, NULL)) {
876876
return spl_array_read_dimension(object, member, type, rv);
877877
}
878878
return zend_std_read_property(object, member, type, cache_slot, rv);
@@ -883,7 +883,7 @@ static void spl_array_write_property(zval *object, zval *member, zval *value, vo
883883
spl_array_object *intern = Z_SPLARRAY_P(object);
884884

885885
if ((intern->ar_flags & SPL_ARRAY_ARRAY_AS_PROPS) != 0
886-
&& !zend_std_has_property(object, member, 2, NULL)) {
886+
&& !zend_std_has_property(object, member, ZEND_PROPERTY_EXISTS, NULL)) {
887887
spl_array_write_dimension(object, member, value);
888888
return;
889889
}
@@ -895,7 +895,7 @@ static zval *spl_array_get_property_ptr_ptr(zval *object, zval *member, int type
895895
spl_array_object *intern = Z_SPLARRAY_P(object);
896896

897897
if ((intern->ar_flags & SPL_ARRAY_ARRAY_AS_PROPS) != 0
898-
&& !zend_std_has_property(object, member, 2, NULL)) {
898+
&& !zend_std_has_property(object, member, ZEND_PROPERTY_EXISTS, NULL)) {
899899
/* If object has offsetGet() overridden, then fallback to read_property,
900900
* which will call offsetGet(). */
901901
if (intern->fptr_offset_get) {
@@ -911,7 +911,7 @@ static int spl_array_has_property(zval *object, zval *member, int has_set_exists
911911
spl_array_object *intern = Z_SPLARRAY_P(object);
912912

913913
if ((intern->ar_flags & SPL_ARRAY_ARRAY_AS_PROPS) != 0
914-
&& !zend_std_has_property(object, member, 2, NULL)) {
914+
&& !zend_std_has_property(object, member, ZEND_PROPERTY_EXISTS, NULL)) {
915915
return spl_array_has_dimension(object, member, has_set_exists);
916916
}
917917
return zend_std_has_property(object, member, has_set_exists, cache_slot);
@@ -922,7 +922,7 @@ static void spl_array_unset_property(zval *object, zval *member, void **cache_sl
922922
spl_array_object *intern = Z_SPLARRAY_P(object);
923923

924924
if ((intern->ar_flags & SPL_ARRAY_ARRAY_AS_PROPS) != 0
925-
&& !zend_std_has_property(object, member, 2, NULL)) {
925+
&& !zend_std_has_property(object, member, ZEND_PROPERTY_EXISTS, NULL)) {
926926
spl_array_unset_dimension(object, member);
927927
return;
928928
}

‎ext/standard/array.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4110,8 +4110,8 @@ static inline zval *array_column_fetch_prop(zval *data, zval *name, zval *rv) /*
41104110
/* The has_property check is first performed in "exists" mode (which returns true for
41114111
* properties that are null but exist) and then in "has" mode to handle objects that
41124112
* implement __isset (which is not called in "exists" mode). */
4113-
if (Z_OBJ_HANDLER_P(data, has_property)(data, name, 2, NULL)
4114-
|| Z_OBJ_HANDLER_P(data, has_property)(data, name, 0, NULL)) {
4113+
if (Z_OBJ_HANDLER_P(data, has_property)(data, name, ZEND_PROPERTY_EXISTS, NULL)
4114+
|| Z_OBJ_HANDLER_P(data, has_property)(data, name, ZEND_PROPERTY_ISSET, NULL)) {
41154115
prop = Z_OBJ_HANDLER_P(data, read_property)(data, name, BP_VAR_R, NULL, rv);
41164116
if (prop) {
41174117
ZVAL_DEREF(prop);

0 commit comments

Comments
 (0)