Fixed property attributes. Added attribute placement a test case.

Author: kooldev

Zend/zend_ast.c

@@ -2142,7 +2142,7 @@ zend_ast * ZEND_FASTCALL zend_ast_with_attributes(zend_ast *ast, zend_ast *attr)
 		ast->lineno = ast->child[0]->lineno;
 		break;
 	default:
-		zend_ast_destroy(attr);
+		zend_error_noreturn(E_COMPILE_ERROR, "Invalid use of attributes");
 	}
 
 	return ast;

Zend/zend_ast.h

@@ -149,13 +149,13 @@ enum _zend_ast_kind {
 
 	ZEND_AST_TRY,
 	ZEND_AST_CATCH,
+	ZEND_AST_PROP_GROUP,
 	ZEND_AST_PROP_ELEM,
 	ZEND_AST_CONST_ELEM,
 
 	/* 4 child nodes */
 	ZEND_AST_FOR = 4 << ZEND_AST_NUM_CHILDREN_SHIFT,
 	ZEND_AST_FOREACH,
-	ZEND_AST_PROP_GROUP,
 	ZEND_AST_PARAM,
 };
 

Zend/zend_compile.c

@@ -6526,7 +6526,7 @@ void zend_compile_prop_group(zend_ast *list) /* {{{ */
 	zend_ast *type_ast = list->child[0];
 	zend_ast *prop_ast = list->child[1];
 
-	attributes = list->child[3] ? zend_compile_attributes(list->child[3]) : NULL;
+	attributes = list->child[2] ? zend_compile_attributes(list->child[2]) : NULL;
 
 	zend_compile_prop_decl(prop_ast, type_ast, list->attr, attributes);
 

Zend/zend_language_parser.y

@@ -782,7 +782,7 @@ class_statement_list:
 
 annotated_class_statement:
 		variable_modifiers optional_type_without_static property_list ';'
-			{ $$ = zend_ast_create(ZEND_AST_PROP_GROUP, $2, $3, NULL, NULL);
+			{ $$ = zend_ast_create(ZEND_AST_PROP_GROUP, $2, $3, NULL);
 			  $$->attr = $1; }
 	|	method_modifiers T_CONST class_const_list ';'
 			{ $$ = $3; $$->attr = $1; }

ext/reflection/tests/attributes/placement.phpt

@@ -0,0 +1,112 @@
+--TEST--
+Attributes can be placed on all supported elements.
+--FILE--
+<?php
+
+<<A1(1)>>
+class Foo
+{
+    <<A1(2)>>
+    public const FOO = 'foo', BAR = 'bar';
+    
+    <<A1(3)>>
+    public $x, $y;
+    
+    <<A1(4)>>
+    public function foo(<<A1(5)>> $a, <<A1(6)>> $b) { }
+}
+
+$object = new <<A1(7)>> class () { };
+
+<<A1(8)>>
+function f1() { }
+
+$f2 = <<A1(9)>> function () { };
+
+$f3 = <<A1(10)>> fn () => 1;
+
+$ref = new \ReflectionClass(Foo::class);
+
+$sources = [
+    $ref,
+    $ref->getReflectionConstant('FOO'),
+    $ref->getReflectionConstant('BAR'),
+    $ref->getProperty('x'),
+    $ref->getProperty('y'),
+    $ref->getMethod('foo'),
+    $ref->getMethod('foo')->getParameters()[0],
+    $ref->getMethod('foo')->getParameters()[1],
+    new \ReflectionObject($object),
+    new \ReflectionFunction('f1'),
+    new \ReflectionFunction($f2),
+    new \ReflectionFunction($f3)
+];
+
+foreach ($sources as $r) {
+    foreach ($r->getAttributes() as $attr) {
+        var_dump($attr->getName(), $attr->getArguments());
+    }
+}
+
+?>
+--EXPECT--
+string(2) "A1"
+array(1) {
+  [0]=>
+  int(1)
+}
+string(2) "A1"
+array(1) {
+  [0]=>
+  int(2)
+}
+string(2) "A1"
+array(1) {
+  [0]=>
+  int(2)
+}
+string(2) "A1"
+array(1) {
+  [0]=>
+  int(3)
+}
+string(2) "A1"
+array(1) {
+  [0]=>
+  int(3)
+}
+string(2) "A1"
+array(1) {
+  [0]=>
+  int(4)
+}
+string(2) "A1"
+array(1) {
+  [0]=>
+  int(5)
+}
+string(2) "A1"
+array(1) {
+  [0]=>
+  int(6)
+}
+string(2) "A1"
+array(1) {
+  [0]=>
+  int(7)
+}
+string(2) "A1"
+array(1) {
+  [0]=>
+  int(8)
+}
+string(2) "A1"
+array(1) {
+  [0]=>
+  int(9)
+}
+string(2) "A1"
+array(1) {
+  [0]=>
+  int(10)
+}