diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2017-12-13 21:25:21 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2017-12-13 21:25:21 +0100 |
| commit | 652d30acdcaa8f6779edc39c648dc89cb1827fd7 (patch) | |
| tree | 55e4ef451bb4f6484c8ec3358cc66cc9e4e879d6 /Zend/zend_API.c | |
| parent | 4cbc1f7e0d06d360a5317108f06657dcab349cf3 (diff) | |
| parent | 580bae4a2c5997fbc0c7ef87304e8814c5576aeb (diff) | |
| download | php-git-652d30acdcaa8f6779edc39c648dc89cb1827fd7.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
Diffstat (limited to 'Zend/zend_API.c')
| -rw-r--r-- | Zend/zend_API.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_API.c b/Zend/zend_API.c index 6ec350ebf2..516753fdf7 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -2414,7 +2414,7 @@ ZEND_API int zend_register_functions(zend_class_entry *scope, const zend_functio } if (clone) { if (clone->common.fn_flags & ZEND_ACC_STATIC) { - zend_error(error_type, "Constructor %s::%s() cannot be static", ZSTR_VAL(scope->name), ZSTR_VAL(clone->common.function_name)); + zend_error(error_type, "%s::%s() cannot be static", ZSTR_VAL(scope->name), ZSTR_VAL(clone->common.function_name)); } clone->common.fn_flags &= ~ZEND_ACC_ALLOW_STATIC; } @@ -2474,7 +2474,7 @@ ZEND_API int zend_register_functions(zend_class_entry *scope, const zend_functio zend_error_noreturn(E_CORE_ERROR, "Destructor %s::%s() cannot declare a return type", ZSTR_VAL(scope->name), ZSTR_VAL(dtor->common.function_name)); } - if (clone && clone->common.fn_flags & ZEND_ACC_HAS_RETURN_TYPE && dtor->common.fn_flags & ZEND_ACC_DTOR) { + if (clone && (clone->common.fn_flags & ZEND_ACC_HAS_RETURN_TYPE)) { zend_error_noreturn(E_CORE_ERROR, "%s::%s() cannot declare a return type", ZSTR_VAL(scope->name), ZSTR_VAL(clone->common.function_name)); } efree((char*)lc_class_name); |