diff options
| -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 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); diff --git a/Zend/zend_closures.c b/Zend/zend_closures.c index 1a1eb7349d..fa4cdfd862 100644 --- a/Zend/zend_closures.c +++ b/Zend/zend_closures.c @@ -241,7 +241,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; |