diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2017-12-13 21:25:38 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2017-12-13 21:25:38 +0100 |
| commit | 76a001e32a409db0554bc664c658678f75f54495 (patch) | |
| tree | 0789159161e56897515c6e72896912a0c7a2d9ee | |
| parent | 76e4c8ba73c558fa1222a0733baaac975ad920ac (diff) | |
| parent | 652d30acdcaa8f6779edc39c648dc89cb1827fd7 (diff) | |
| download | php-git-76a001e32a409db0554bc664c658678f75f54495.tar.gz | |
Merge branch 'PHP-7.2'
| -rw-r--r-- | Zend/zend_API.c | 4 | ||||
| -rw-r--r-- | Zend/zend_closures.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Zend/zend_API.c b/Zend/zend_API.c index 8a99fd2151..357368f88d 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -2345,7 +2345,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; } @@ -2405,7 +2405,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); diff --git a/Zend/zend_closures.c b/Zend/zend_closures.c index 5aee27b02f..63cb4192bc 100644 --- a/Zend/zend_closures.c +++ b/Zend/zend_closures.c @@ -242,7 +242,7 @@ static ZEND_NAMED_FUNCTION(zend_closure_call_magic) /* {{{ */ { zval params[2]; memset(&fci, 0, sizeof(zend_fcall_info)); - memset(&fci, 0, sizeof(zend_fcall_info_cache)); + memset(&fcc, 0, sizeof(zend_fcall_info_cache)); fci.size = sizeof(zend_fcall_info); fci.retval = return_value; |