- Synch zend_call_function() with VM function call helper

This commit is contained in:
Marcus Boerger 2006-02-20 20:03:36 +00:00
parent 3b3e006e33
commit a27e272670

View file

@ -861,11 +861,16 @@ int zend_call_function(zend_fcall_info *fci, zend_fcall_info_cache *fci_cache TS
fci->object_pp = fci_cache->object_pp; fci->object_pp = fci_cache->object_pp;
} }
if (EX(function_state).function->common.fn_flags & ZEND_ACC_DEPRECATED) { if (EX(function_state).function->common.fn_flags & (ZEND_ACC_ABSTRACT|ZEND_ACC_DEPRECATED)) {
zend_error(E_NOTICE, "Function %s%s%s() is deprecated", if (EX(function_state).function->common.fn_flags & ZEND_ACC_ABSTRACT) {
EX(function_state).function->common.scope ? EX(function_state).function->common.scope->name : "", zend_error_noreturn(E_ERROR, "Cannot call abstract method %v::%v()", EX(function_state).function->common.scope->name, EX(function_state).function->common.function_name);
EX(function_state).function->common.scope ? "::" : "", }
EX(function_state).function->common.function_name); if (EX(function_state).function->common.fn_flags & ZEND_ACC_DEPRECATED) {
zend_error(E_NOTICE, "Function %s%s%s() is deprecated",
EX(function_state).function->common.scope ? EX(function_state).function->common.scope->name : "",
EX(function_state).function->common.scope ? "::" : "",
EX(function_state).function->common.function_name);
}
} }
for (i=0; i<fci->param_count; i++) { for (i=0; i<fci->param_count; i++) {