fixup! Improve error message for deprecated methods

Author: kocsismate

Zend/zend_execute.c

@@ -1509,7 +1509,7 @@ static zend_never_inline ZEND_COLD void ZEND_FASTCALL zend_wrong_property_read(z
 	zend_tmp_string_release(tmp_property_name);
 }
 
-static zend_never_inline ZEND_COLD void ZEND_FASTCALL zend_deprecated_function(const zend_function *fbc)
+ZEND_API zend_never_inline ZEND_COLD void ZEND_FASTCALL zend_deprecated_function(const zend_function *fbc)
 {
 	if (fbc->common.scope) {
 		zend_error(E_DEPRECATED, "Method %s::%s() is deprecated",

Zend/zend_execute.h

@@ -44,6 +44,7 @@ ZEND_API zend_class_entry *zend_lookup_class(zend_string *name);
 ZEND_API zend_class_entry *zend_lookup_class_ex(zend_string *name, zend_string *lcname, uint32_t flags);
 ZEND_API zend_class_entry *zend_get_called_scope(zend_execute_data *ex);
 ZEND_API zend_object *zend_get_this_object(zend_execute_data *ex);
+extern ZEND_API zend_never_inline ZEND_COLD void ZEND_FASTCALL zend_deprecated_function(const zend_function *fbc);
 ZEND_API int zend_eval_string(const char *str, zval *retval_ptr, const char *string_name);
 ZEND_API int zend_eval_stringl(const char *str, size_t str_len, zval *retval_ptr, const char *string_name);
 ZEND_API int zend_eval_string_ex(const char *str, zval *retval_ptr, const char *string_name, int handle_exceptions);

Zend/zend_execute_API.c

@@ -722,14 +722,7 @@ int zend_call_function(zend_fcall_info *fci, zend_fcall_info_cache *fci_cache) /
 		func, fci->param_count, object_or_called_scope);
 
 	if (UNEXPECTED(func->common.fn_flags & ZEND_ACC_DEPRECATED)) {
-		if (func->common.scope) {
-			zend_error(E_DEPRECATED, "Method %s::%s() is deprecated",
-				ZSTR_VAL(func->common.scope->name),
-				ZSTR_VAL(func->common.function_name)
-			);
-		} else {
-			zend_error(E_DEPRECATED, "Function %s() is deprecated", ZSTR_VAL(func->common.function_name));
-		}
+		zend_deprecated_function(func);
 
 		if (UNEXPECTED(EG(exception))) {
 			zend_vm_stack_free_call_frame(call);

ext/opcache/jit/zend_jit_vm_helpers.c

@@ -157,14 +157,8 @@ void ZEND_FASTCALL zend_jit_deprecated_helper(OPLINE_D)
 {
 	zend_execute_data *call = (zend_execute_data *) opline;
 	zend_function *fbc = call->func;
-	if (fbc->common.scope) {
-		zend_error(E_DEPRECATED, "Method %s::%s() is deprecated",
-			ZSTR_VAL(fbc->common.scope->name),
-			ZSTR_VAL(fbc->common.function_name)
-		);
-	} else {
-		zend_error(E_DEPRECATED, "Function %s() is deprecated", ZSTR_VAL(fbc->common.function_name));
-	}
+
+	zend_deprecated_function(fbc);
 
 	if (EG(exception)) {
 #ifndef HAVE_GCC_GLOBAL_REGS