Introduce Deprecated constructor and streamline naming.

Author: beberlei

Zend/tests/attributes/deprecated_002.phpt

@@ -0,0 +1,17 @@
+--TEST--
+#[Deprecated] attribute
+--FILE--
+<?php
+
+#[Deprecated("use test() instead")]
+function test() {
+}
+
+$reflection = new ReflectionFunction('test');
+var_dump($reflection->getAttributes()[0]->newInstance());
+
+--EXPECTF--
+object(Deprecated)#3 (1) {
+  ["message"]=>
+  string(18) "use test() instead"
+}

Zend/zend_attributes.c

@@ -90,6 +90,18 @@ ZEND_METHOD(Attribute, __construct)
 	ZVAL_LONG(OBJ_PROP_NUM(Z_OBJ_P(ZEND_THIS), 0), flags);
 }
 
+ZEND_METHOD(Deprecated, __construct)
+{
+	zend_string *message;
+
+	ZEND_PARSE_PARAMETERS_START(0, 1)
+		Z_PARAM_OPTIONAL
+		Z_PARAM_STR(message)
+	ZEND_PARSE_PARAMETERS_END();
+
+	ZVAL_STR(OBJ_PROP_NUM(Z_OBJ_P(ZEND_THIS), 0), message);
+}
+
 static zend_attribute *get_attribute(HashTable *attributes, zend_string *lcname, uint32_t offset)
 {
 	if (attributes) {
@@ -313,10 +325,15 @@ void zend_register_attribute_ce(void)
 	attr = zend_internal_attribute_register(zend_ce_attribute, ZEND_ATTRIBUTE_TARGET_CLASS);
 	attr->validator = validate_attribute;
 
-	INIT_CLASS_ENTRY(ce, "Deprecated", NULL);
+	INIT_CLASS_ENTRY(ce, "Deprecated", class_Deprecated_methods);
 	zend_ce_deprecated_attribute = zend_register_internal_class(&ce);
 	zend_ce_deprecated_attribute->ce_flags |= ZEND_ACC_FINAL;
 
+	ZVAL_UNDEF(&tmp);
+	str = zend_string_init(ZEND_STRL("message"), 1);
+	zend_declare_typed_property(zend_ce_deprecated_attribute, str, &tmp, ZEND_ACC_PUBLIC, NULL, (zend_type) ZEND_TYPE_INIT_CODE(IS_STRING, 0, 0));
+	zend_string_release(str);
+
 	attr = zend_internal_attribute_register(zend_ce_deprecated_attribute, ZEND_ATTRIBUTE_TARGET_FUNCTION | ZEND_ATTRIBUTE_TARGET_METHOD);
 	attr->validator = validate_deprecated_attribute;
 }

Zend/zend_attributes.stub.php

@@ -6,3 +6,8 @@ final class Attribute
 {
     public function __construct(int $flags = Attribute::TARGET_ALL) {}
 }
+
+final class Deprecated
+{
+    public function __construct(?string $message = null) {}
+}

Zend/zend_attributes_arginfo.h

@@ -1,15 +1,26 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 54eede8541597ec2ac5c04e31d14e2db7e8c5556 */
+ * Stub hash: 9cd28e1ad07c22dc16341b5ee781f0c29f689307 */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Attribute___construct, 0, 0, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "Attribute::TARGET_ALL")
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Deprecated___construct, 0, 0, 0)
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, message, IS_STRING, 1, "null")
+ZEND_END_ARG_INFO()
+
 
 ZEND_METHOD(Attribute, __construct);
+ZEND_METHOD(Deprecated, __construct);
 
 
 static const zend_function_entry class_Attribute_methods[] = {
 	ZEND_ME(Attribute, __construct, arginfo_class_Attribute___construct, ZEND_ACC_PUBLIC)
 	ZEND_FE_END
 };
+
+
+static const zend_function_entry class_Deprecated_methods[] = {
+	ZEND_ME(Deprecated, __construct, arginfo_class_Deprecated___construct, ZEND_ACC_PUBLIC)
+	ZEND_FE_END
+};

Zend/zend_execute.c

@@ -1491,7 +1491,7 @@ 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)
 {
 	zend_attribute *deprecated;
-	zend_string *reason = NULL;
+	zend_string *message_suffix = NULL;
 
 	if (fbc->common.attributes != NULL) {
 		deprecated = zend_get_attribute_str(fbc->common.attributes, "deprecated", sizeof("deprecated")-1);
@@ -1500,22 +1500,22 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_deprecated_function(const zend_functi
 			zval message;
 
 			if (FAILURE != zend_get_attribute_value(&message, deprecated, 0, fbc->common.scope)) {
-				reason = Z_STR(message);
+				message_suffix = Z_STR(message);
 			}
 		}
 	}
 
-	if (reason != NULL) {
+	if (message_suffix != 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)
+				ZSTR_VAL(message_suffix)
 			);
 		} else {
 			zend_error(E_DEPRECATED, "Function %s() is deprecated, %s",
 				ZSTR_VAL(fbc->common.function_name),
-				ZSTR_VAL(reason)
+				ZSTR_VAL(message_suffix)
 			);
 		}
 	} else {