Process #[Deprecated] reason message.

Author: beberlei

Zend/tests/attributes/deprecated_001.phpt

@@ -18,8 +18,8 @@ test();
 test2();
 call_user_func("test");
 --EXPECTF--
-Deprecated: Function test is deprecated in %s
+Deprecated: Function test() is deprecated in %s
 
-Deprecated: Function test2 is deprecated use test() instead in %s
+Deprecated: Function test2() is deprecated, use test() instead in %s
 
-Deprecated: Function test is deprecated in %s
+Deprecated: Function test() is deprecated in %s

Zend/zend_execute.c

@@ -42,6 +42,7 @@
 #include "zend_smart_str.h"
 #include "zend_observer.h"
 #include "zend_system_id.h"
+#include "zend_attributes.h"
 
 /* Virtual current working directory support */
 #include "zend_virtual_cwd.h"
@@ -1489,13 +1490,43 @@ static zend_never_inline ZEND_COLD void ZEND_FASTCALL zend_wrong_property_read(z
 
 ZEND_API 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",
-			ZSTR_VAL(fbc->common.scope->name),
-			ZSTR_VAL(fbc->common.function_name)
-		);
+	zend_attribute *deprecated;
+	zend_string *reason = NULL;
+
+	if (fbc->common.attributes != NULL) {
+		deprecated = zend_get_attribute_str(fbc->common.attributes, "deprecated", sizeof("deprecated")-1);
+
+		if (deprecated->argc >= 1) {
+			zval message;
+
+			if (FAILURE != zend_get_attribute_value(&message, deprecated, 0, fbc->common.scope)) {
+				reason = Z_STR(message);
+			}
+		}
+	}
+
+	if (reason != NULL) {
+		if (fbc->common.scope) {
+			zend_error(E_DEPRECATED, "Method %s::%s() is deprecated, %s",
+				ZSTR_VAL(fbc->common.scope->name),
+				ZSTR_VAL(fbc->common.function_name),
+				ZSTR_VAL(reason)
+			);
+		} else {
+			zend_error(E_DEPRECATED, "Function %s() is deprecated, %s",
+				ZSTR_VAL(fbc->common.function_name),
+				ZSTR_VAL(reason)
+			);
+		}
 	} else {
-		zend_error(E_DEPRECATED, "Function %s() is deprecated", ZSTR_VAL(fbc->common.function_name));
+		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));
+		}
 	}
 }