diff options
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/mysqli/mysqli.c | 6 | ||||
| -rw-r--r-- | ext/snmp/snmp.c | 4 | ||||
| -rw-r--r-- | ext/spl/spl_array.c | 10 | ||||
| -rw-r--r-- | ext/standard/array.c | 4 |
4 files changed, 12 insertions, 12 deletions
diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c index 6cc724f42e..4a32fb41ba 100644 --- a/ext/mysqli/mysqli.c +++ b/ext/mysqli/mysqli.c @@ -382,10 +382,10 @@ static int mysqli_object_has_property(zval *object, zval *member, int has_set_ex if ((p = zend_hash_find_ptr(obj->prop_handler, Z_STR_P(member))) != NULL) { switch (has_set_exists) { - case 2: + case ZEND_PROPERTY_EXISTS: ret = 1; break; - case 1: { + case ZEND_PROPERTY_HAS: { zval rv; zval *value = mysqli_read_property(object, member, BP_VAR_IS, cache_slot, &rv); if (value != &EG(uninitialized_zval)) { @@ -394,7 +394,7 @@ static int mysqli_object_has_property(zval *object, zval *member, int has_set_ex } break; } - case 0:{ + case ZEND_PROPERTY_ISSET: { zval rv; zval *value = mysqli_read_property(object, member, BP_VAR_IS, cache_slot, &rv); if (value != &EG(uninitialized_zval)) { diff --git a/ext/snmp/snmp.c b/ext/snmp/snmp.c index 42cc69c685..6f61eb2e28 100644 --- a/ext/snmp/snmp.c +++ b/ext/snmp/snmp.c @@ -1994,10 +1994,10 @@ static int php_snmp_has_property(zval *object, zval *member, int has_set_exists, if ((hnd = zend_hash_find_ptr(&php_snmp_properties, Z_STR_P(member))) != NULL) { switch (has_set_exists) { - case 2: + case ZEND_PROPERTY_EXISTS: ret = 1; break; - case 0: { + case ZEND_PROPERTY_ISSET: { zval *value = php_snmp_read_property(object, member, BP_VAR_IS, cache_slot, &rv); if (value != &EG(uninitialized_zval)) { ret = Z_TYPE_P(value) != IS_NULL? 1 : 0; diff --git a/ext/spl/spl_array.c b/ext/spl/spl_array.c index 59ae0b8c89..3039f10d7b 100644 --- a/ext/spl/spl_array.c +++ b/ext/spl/spl_array.c @@ -872,7 +872,7 @@ static zval *spl_array_read_property(zval *object, zval *member, int type, void spl_array_object *intern = Z_SPLARRAY_P(object); if ((intern->ar_flags & SPL_ARRAY_ARRAY_AS_PROPS) != 0 - && !zend_std_has_property(object, member, 2, NULL)) { + && !zend_std_has_property(object, member, ZEND_PROPERTY_EXISTS, NULL)) { return spl_array_read_dimension(object, member, type, rv); } 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 spl_array_object *intern = Z_SPLARRAY_P(object); if ((intern->ar_flags & SPL_ARRAY_ARRAY_AS_PROPS) != 0 - && !zend_std_has_property(object, member, 2, NULL)) { + && !zend_std_has_property(object, member, ZEND_PROPERTY_EXISTS, NULL)) { spl_array_write_dimension(object, member, value); return; } @@ -895,7 +895,7 @@ static zval *spl_array_get_property_ptr_ptr(zval *object, zval *member, int type spl_array_object *intern = Z_SPLARRAY_P(object); if ((intern->ar_flags & SPL_ARRAY_ARRAY_AS_PROPS) != 0 - && !zend_std_has_property(object, member, 2, NULL)) { + && !zend_std_has_property(object, member, ZEND_PROPERTY_EXISTS, NULL)) { /* If object has offsetGet() overridden, then fallback to read_property, * which will call offsetGet(). */ if (intern->fptr_offset_get) { @@ -911,7 +911,7 @@ static int spl_array_has_property(zval *object, zval *member, int has_set_exists spl_array_object *intern = Z_SPLARRAY_P(object); if ((intern->ar_flags & SPL_ARRAY_ARRAY_AS_PROPS) != 0 - && !zend_std_has_property(object, member, 2, NULL)) { + && !zend_std_has_property(object, member, ZEND_PROPERTY_EXISTS, NULL)) { return spl_array_has_dimension(object, member, has_set_exists); } 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 spl_array_object *intern = Z_SPLARRAY_P(object); if ((intern->ar_flags & SPL_ARRAY_ARRAY_AS_PROPS) != 0 - && !zend_std_has_property(object, member, 2, NULL)) { + && !zend_std_has_property(object, member, ZEND_PROPERTY_EXISTS, NULL)) { spl_array_unset_dimension(object, member); return; } diff --git a/ext/standard/array.c b/ext/standard/array.c index 28fbb5188d..c073d7d5ac 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -4110,8 +4110,8 @@ static inline zval *array_column_fetch_prop(zval *data, zval *name, zval *rv) /* /* The has_property check is first performed in "exists" mode (which returns true for * properties that are null but exist) and then in "has" mode to handle objects that * implement __isset (which is not called in "exists" mode). */ - if (Z_OBJ_HANDLER_P(data, has_property)(data, name, 2, NULL) - || Z_OBJ_HANDLER_P(data, has_property)(data, name, 0, NULL)) { + if (Z_OBJ_HANDLER_P(data, has_property)(data, name, ZEND_PROPERTY_EXISTS, NULL) + || Z_OBJ_HANDLER_P(data, has_property)(data, name, ZEND_PROPERTY_ISSET, NULL)) { prop = Z_OBJ_HANDLER_P(data, read_property)(data, name, BP_VAR_R, NULL, rv); if (prop) { ZVAL_DEREF(prop); |