Handle attributes for promoted properties

nikic · nikic · commit a4a52edaad84 · 2020-06-05T12:12:51.000+02:00
diff --git a/Zend/tests/ctor_promotion_attributes.phpt b/Zend/tests/ctor_promotion_attributes.phpt
@@ -0,0 +1,22 @@
+--TEST--
+Attributes on promoted properties are assigned to both the property and parameter
+--FILE--
+<?php
+
+class Test {
+    public function __construct(
+        <<NonNegative>>
+        public int $num,
+    ) {}
+}
+
+$prop = new ReflectionProperty(Test::class, 'num');
+var_dump($prop->getAttributes()[0]->getName());
+
+$param = new ReflectionParameter([Test::class, '__construct'], 'num');
+var_dump($param->getAttributes()[0]->getName());
+
+?>
+--EXPECT--
+string(11) "NonNegative"
+string(11) "NonNegative"
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
@@ -5941,8 +5941,12 @@ void zend_compile_params(zend_ast *ast, zend_ast *return_type_ast, uint32_t fall
 
 			zend_string *doc_comment =
 				doc_comment_ast ? zend_string_copy(zend_ast_get_str(doc_comment_ast)) : NULL;
-			zend_declare_typed_property(
+			zend_property_info *prop = zend_declare_typed_property(
 				scope, name, &default_value, visibility, doc_comment, type);
+			if (attributes_ast) {
+				zend_compile_attributes(
+					&prop->attributes, attributes_ast, 0, ZEND_ATTRIBUTE_TARGET_PROPERTY);
+			}
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -5941,8 +5941,12 @@ void zend_compile_params(zend_ast ast, zend_ast return_type_ast, uint32_t fall`
`5941`	`5941`
`5942`	`5942`	`zend_string *doc_comment =`
`5943`	`5943`	`doc_comment_ast ? zend_string_copy(zend_ast_get_str(doc_comment_ast)) : NULL;`
`5944`		`- zend_declare_typed_property(`
	`5944`	`+ zend_property_info *prop = zend_declare_typed_property(`
`5945`	`5945`	`scope, name, &default_value, visibility, doc_comment, type);`
	`5946`	`+ if (attributes_ast) {`
	`5947`	`+ zend_compile_attributes(`
	`5948`	`+ &prop->attributes, attributes_ast, 0, ZEND_ATTRIBUTE_TARGET_PROPERTY);`
	`5949`	`+ }`
`5946`	`5950`	`}`
`5947`	`5951`	`}`
`5948`	`5952`