Simplify implementation of zend_deprecated_function()

Author: TimWolla

Zend/zend_execute.c

@@ -1725,11 +1725,10 @@ ZEND_API ZEND_COLD void zend_wrong_string_offset_error(void)
 
 ZEND_API ZEND_COLD void ZEND_FASTCALL zend_deprecated_function(const zend_function *fbc)
 {
-	zend_attribute *deprecated;
 	zend_string *message_suffix = zend_empty_string;
 
 	if (fbc->common.attributes != NULL) {
-		deprecated = zend_get_attribute_str(fbc->common.attributes, "deprecated", sizeof("deprecated")-1);
+		zend_attribute *deprecated = zend_get_attribute_str(fbc->common.attributes, "deprecated", sizeof("deprecated")-1);
 
 		if (deprecated->argc >= 1) {
 			zval message;
@@ -1742,31 +1741,22 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_deprecated_function(const zend_functi
 
 	int code = fbc->type == ZEND_INTERNAL_FUNCTION ? E_DEPRECATED : E_USER_DEPRECATED;
 
-	if (ZSTR_LEN(message_suffix) > 0) {
-		if (fbc->common.scope) {
-			zend_error_unchecked(code, "Method %s::%s() is deprecated, %S",
-				ZSTR_VAL(fbc->common.scope->name),
-				ZSTR_VAL(fbc->common.function_name),
-				message_suffix
-			);
-		} else {
-			zend_error_unchecked(code, "Function %s() is deprecated, %S",
-				ZSTR_VAL(fbc->common.function_name),
-				message_suffix
-			);
-		}
-
-		zend_string_release(message_suffix);
+	if (fbc->common.scope) {
+		zend_error_unchecked(code, "Method %s::%s() is deprecated%s%S",
+			ZSTR_VAL(fbc->common.scope->name),
+			ZSTR_VAL(fbc->common.function_name),
+			ZSTR_LEN(message_suffix) > 0 ? ", " : "",
+			message_suffix
+		);
 	} else {
-		if (fbc->common.scope) {
-			zend_error(code, "Method %s::%s() is deprecated",
-				ZSTR_VAL(fbc->common.scope->name),
-				ZSTR_VAL(fbc->common.function_name)
-			);
-		} else {
-			zend_error(code, "Function %s() is deprecated", ZSTR_VAL(fbc->common.function_name));
-		}
+		zend_error_unchecked(code, "Function %s() is deprecated%s%S",
+			ZSTR_VAL(fbc->common.function_name),
+			ZSTR_LEN(message_suffix) > 0 ? ", " : "",
+			message_suffix
+		);
 	}
+
+	zend_string_release(message_suffix);
 }
 
 ZEND_API ZEND_COLD void ZEND_FASTCALL zend_false_to_array_deprecated(void)