Make #[\Deprecated]’s code E_USER_DEPRECATED

Author: TimWolla

Zend/tests/attributes/deprecated/004.phpt

@@ -14,12 +14,9 @@ function test() {
 try {
     test();
 } catch (ErrorException $e) {
-    echo $e;
+    echo "Caught: ", $e->getMessage(), PHP_EOL;
 }
 
 ?>
---EXPECTF--
-ErrorException: Function test() is deprecated, convert to exception in %s:%d
-Stack trace:
-#0 %s(%d): {closure:%s:%d}(8192, 'Function test()...', '%s', 12)
-#1 {main}%A
+--EXPECT--
+Caught: Function test() is deprecated, convert to exception

Zend/tests/attributes/deprecated/006.phpt

@@ -0,0 +1,20 @@
+--TEST--
+#[\Deprecated]: Code is E_USER_DEPRECATED.
+--FILE--
+<?php
+
+set_error_handler(function (int $errno, string $errstr, ?string $errfile = null, ?int $errline = null) {
+    var_dump($errno, E_USER_DEPRECATED, $errno === E_USER_DEPRECATED);
+});
+
+#[\Deprecated]
+function test() {
+}
+
+test();
+
+?>
+--EXPECT--
+int(16384)
+int(16384)
+bool(true)

Zend/zend_execute.c

@@ -1740,15 +1740,17 @@ 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 (message_suffix != NULL) {
 		if (fbc->common.scope) {
-			zend_error(E_DEPRECATED, "Method %s::%s() is deprecated, %s",
+			zend_error(code, "Method %s::%s() is deprecated, %s",
 				ZSTR_VAL(fbc->common.scope->name),
 				ZSTR_VAL(fbc->common.function_name),
 				ZSTR_VAL(message_suffix)
 			);
 		} else {
-			zend_error(E_DEPRECATED, "Function %s() is deprecated, %s",
+			zend_error(code, "Function %s() is deprecated, %s",
 				ZSTR_VAL(fbc->common.function_name),
 				ZSTR_VAL(message_suffix)
 			);
@@ -1757,12 +1759,12 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_deprecated_function(const zend_functi
 		zend_string_release(message_suffix);
 	} else {
 		if (fbc->common.scope) {
-			zend_error(E_DEPRECATED, "Method %s::%s() is deprecated",
+			zend_error(code, "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_error(code, "Function %s() is deprecated", ZSTR_VAL(fbc->common.function_name));
 		}
 	}
 }