diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-09-23 16:53:54 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-09-23 16:53:54 +0200 |
| commit | 6276dd826b30c91bb95fc59846794617f9b4dd64 (patch) | |
| tree | 95640cd7b7dfb1d9c6be5b1e3d56d19e53ce55c6 /Zend/zend_API.c | |
| parent | 3a104c3c3736cc7b9fc0190477b0d631032b3d80 (diff) | |
| download | php-git-6276dd826b30c91bb95fc59846794617f9b4dd64.tar.gz | |
Use ZEND_TYPE_IS_SET() when checking for property types
Instead of a simple if or 0 comparison. This would no longer work
if zend_type is a struct.
Diffstat (limited to 'Zend/zend_API.c')
| -rw-r--r-- | Zend/zend_API.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Zend/zend_API.c b/Zend/zend_API.c index ad61ad6624..472d886467 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -1073,7 +1073,7 @@ ZEND_API int zend_update_class_constants(zend_class_entry *class_type) /* {{{ */ val = (zval*)((char*)class_type->default_properties_table + prop_info->offset - OBJ_PROP_TO_OFFSET(0)); } if (Z_TYPE_P(val) == IS_CONSTANT_AST) { - if (prop_info->type) { + if (ZEND_TYPE_IS_SET(prop_info->type)) { zval tmp; ZVAL_COPY(&tmp, val); @@ -1149,7 +1149,7 @@ ZEND_API void object_properties_init_ex(zend_object *object, HashTable *properti (property_info->flags & ZEND_ACC_STATIC) == 0) { zval *slot = OBJ_PROP(object, property_info->offset); - if (UNEXPECTED(property_info->type)) { + if (UNEXPECTED(ZEND_TYPE_IS_SET(property_info->type))) { zval tmp; ZVAL_COPY_VALUE(&tmp, prop); @@ -3725,7 +3725,7 @@ ZEND_API int zend_try_assign_typed_ref_zval_ex(zend_reference *ref, zval *zv, ze ZEND_API int zend_declare_property_ex(zend_class_entry *ce, zend_string *name, zval *property, int access_type, zend_string *doc_comment) /* {{{ */ { - return zend_declare_typed_property(ce, name, property, access_type, doc_comment, 0); + return zend_declare_typed_property(ce, name, property, access_type, doc_comment, ZEND_TYPE_ENCODE_NONE()); } /* }}} */ @@ -4024,7 +4024,7 @@ ZEND_API int zend_update_static_property_ex(zend_class_entry *scope, zend_string ZEND_ASSERT(!Z_ISREF_P(value)); Z_TRY_ADDREF_P(value); - if (prop_info->type) { + if (ZEND_TYPE_IS_SET(prop_info->type)) { ZVAL_COPY_VALUE(&tmp, value); if (!zend_verify_property_type(prop_info, &tmp, /* strict */ 0)) { Z_TRY_DELREF_P(value); |