Improve type validation for the Deprecated attribute

Author: TimWolla

Zend/tests/attributes/deprecated/003.phpt

@@ -1,12 +1,14 @@
 --TEST--
-#[\Deprecated]: Type validation of $message parameter.
+#[\Deprecated]: Type validation of $message parameter with int.
 --FILE--
 <?php
 
 #[\Deprecated(1234)]
 function test() {
 }
 
+test();
+
 ?>
 --EXPECTF--
-Fatal error: Deprecated::__construct: Argument #1 ($message) must be of type string, int given in %s
+Deprecated: Function test() is deprecated, 1234 in %s on line %d

Zend/tests/attributes/deprecated/009.phpt

@@ -0,0 +1,17 @@
+--TEST--
+#[\Deprecated]: Type validation of $message parameter with native enum case.
+--FILE--
+<?php
+
+#[\Deprecated(\Random\IntervalBoundary::ClosedOpen)]
+function test() {
+}
+test();
+
+?>
+--EXPECTF--
+Fatal error: Uncaught TypeError: Deprecated::__construct(): Argument #1 ($message) must be of type ?string, Random\IntervalBoundary given in %s:%d
+Stack trace:
+#0 %s(%d): Deprecated->__construct(Object(Random\IntervalBoundary))
+#1 {main}
+  thrown in %s on line %d

Zend/tests/attributes/deprecated/010.phpt

@@ -0,0 +1,17 @@
+--TEST--
+#[\Deprecated]: Type validation of $message parameter with array.
+--FILE--
+<?php
+
+#[\Deprecated([])]
+function test() {
+}
+test();
+
+?>
+--EXPECTF--
+Fatal error: Uncaught TypeError: Deprecated::__construct(): Argument #1 ($message) must be of type ?string, array given in %s:%d
+Stack trace:
+#0 %s(%d): Deprecated->__construct(Array)
+#1 {main}
+  thrown in %s on line %d

Zend/tests/attributes/deprecated/011.phpt

@@ -0,0 +1,19 @@
+--TEST--
+#[\Deprecated]: Type validation of $message parameter with int and strict types.
+--FILE--
+<?php
+declare(strict_types = 1);
+
+#[\Deprecated(1234)]
+function test() {
+}
+
+test();
+
+?>
+--EXPECTF--
+Fatal error: Uncaught TypeError: Deprecated::__construct(): Argument #1 ($message) must be of type ?string, int given in %s:%d
+Stack trace:
+#0 %s(%d): Deprecated->__construct(1234)
+#1 {main}
+  thrown in %s on line %d

Zend/zend_attributes.c

@@ -83,28 +83,6 @@ static void validate_allow_dynamic_properties(
 
 void validate_deprecated_attribute(zend_attribute *attr, uint32_t target, zend_class_entry *scope)
 {
-	// TODO: More proper signature validation: Too many args, incorrect arg names.
-	if (attr->argc == 1) {
-		zval message;
-
-		/* As this is run in the middle of compilation, fetch the attribute value without
-		* specifying a scope. The class is not fully linked yet, and we may seen an
-		* inconsistent state. */
-		if (FAILURE == zend_get_attribute_value(&message, attr, 0, NULL)) {
-			return;
-		}
-
-		if (Z_TYPE(message) != IS_STRING) {
-			zval_ptr_dtor(&message);
-
-			zend_error_noreturn(E_COMPILE_ERROR,
-				"Deprecated::__construct: Argument #1 ($message) must be of type string, %s given",
-				zend_zval_type_name(&message)
-			);
-		}
-
-		zval_ptr_dtor(&message);
-	}
 }
 
 ZEND_METHOD(Attribute, __construct)

Zend/zend_execute.c

@@ -1734,7 +1734,27 @@ 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)) {
-				message_suffix = Z_STR(message);
+				zval obj;
+
+				object_init_ex(&obj, zend_ce_deprecated);
+				zend_call_method_with_1_params(Z_OBJ_P(&obj), zend_ce_deprecated, &zend_ce_deprecated->constructor, "__construct", NULL, &message);
+				zval_ptr_dtor(&message);
+
+				if (EG(exception)) {
+					zval_ptr_dtor(&obj);
+					return;
+				}
+
+				zval *z;
+
+				if ((z = zend_read_property_ex(zend_ce_deprecated, Z_OBJ_P(&obj), ZSTR_KNOWN(ZEND_STR_MESSAGE), false, NULL)) == NULL) {
+					zval_ptr_dtor(&obj);
+					return;
+				}
+
+				zval_ptr_dtor(&obj);
+
+				message_suffix = Z_STR_P(z);
 			}
 		}
 	}