Go back to unique attribute names

Author: beberlei

Zend/tests/attributes_003.phpt

@@ -5,10 +5,7 @@ Resolve attribute names
 function dump_attributes($attributes) {
     $arr = [];
     foreach ($attributes as $attribute) {
-        if (!isset($arr[$attribute->getName()])) {
-            $arr[$attribute->getName()] = [];
-        }
-        $arr[$attribute->getName()][] = $attribute->getArguments();
+        $arr[$attribute->getName()] = $attribute->getArguments();
     }
     var_dump($arr);
 }
@@ -35,11 +32,8 @@ array(1) {
   array(1) {
     [0]=>
     array(1) {
-      [0]=>
-      array(1) {
-        ["foo"]=>
-        string(3) "bar"
-      }
+      ["foo"]=>
+      string(3) "bar"
     }
   }
 }

Zend/zend_ast.c

@@ -2137,10 +2137,9 @@ ZEND_API void zend_ast_convert_to_object(zval *p, zend_ast *ast, zend_class_entr
 	}
 }
 
-ZEND_API zval *zend_ast_convert_attributes(HashTable *attributes, zend_class_entry *ce)
+zval *zend_ast_convert_attributes(HashTable *attributes, zend_class_entry *ce)
 {
 	zval *val, tmp;
-	HashTable *ht, *ht2;
 	zval *res = emalloc(sizeof(zval));
 
 	array_init(res);
@@ -2185,16 +2184,10 @@ void zend_ast_add_attribute(zend_ast *name, zend_ast *value) /* {{{ */
 		if (value->kind == ZEND_AST_ZVAL) {
 			zval *zv = zend_ast_get_zval(value);
 
-			if (Z_TYPE_P(zv) == IS_ARRAY) {
-				ZVAL_COPY_VALUE(val, zv);
-			} else {
-				array_init(val);
-				zend_hash_next_index_insert_new(Z_ARRVAL_P(val), zv);
-			}
+			ZVAL_COPY_VALUE(val, zv);
 		} else {
 			zend_const_expr_to_zval(&tmp, value);
-			array_init(val);
-			zend_hash_next_index_insert_new(Z_ARRVAL_P(val), &tmp);
+			ZVAL_COPY_VALUE(val, &tmp);
 		}
 	} else {
 		array_init(val);

Zend/zend_ast.h

@@ -356,5 +356,5 @@ static zend_always_inline zend_ast *zend_ast_list_rtrim(zend_ast *ast) {
 
 void zend_ast_add_attribute(zend_ast *name, zend_ast *value);
 zend_ast *zend_ast_add_attribute_value(zend_ast *list_ast, zend_ast *val_ast);
-ZEND_API zval *zend_ast_convert_attributes(HashTable *attributes, zend_class_entry *ce);
+zval *zend_ast_convert_attributes(HashTable *attributes, zend_class_entry *ce);
 #endif

Zend/zend_language_parser.y

@@ -234,7 +234,7 @@ static YYSIZE_T zend_yytnamerr(char*, const char*);
 %type <ast> group_use_declaration inline_use_declarations inline_use_declaration
 %type <ast> mixed_group_use_declaration use_declaration unprefixed_use_declaration
 %type <ast> unprefixed_use_declarations const_decl inner_statement
-%type <ast> attribute_values expr optional_expr while_statement for_statement foreach_variable
+%type <ast> attribute_arguments expr optional_expr while_statement for_statement foreach_variable
 %type <ast> foreach_statement declare_statement finally_statement unset_variable variable
 %type <ast> extends_from parameter optional_type_without_static argument global_var
 %type <ast> static_var class_statement annotated_class_statement trait_adaptation trait_precedence trait_alias
@@ -314,14 +314,14 @@ name:
 	|	T_NS_SEPARATOR namespace_name				{ $$ = $2; $$->attr = ZEND_NAME_FQ; }
 ;
 
-attribute_values:
+attribute_arguments:
 		expr						{ $$ = $1; }
-	|	attribute_values ',' expr	{ $$ = zend_ast_add_attribute_value($1, $3); }
+	|	attribute_arguments ',' expr	{ $$ = zend_ast_add_attribute_value($1, $3); }
 ;
 
 attribute_decl:
 		class_name_reference												{ zend_ast_add_attribute($1, NULL); }
-	|	class_name_reference '(' attribute_values ')'						{ zend_ast_add_attribute($1, $3); }
+	|	class_name_reference '(' attribute_arguments ')'						{ zend_ast_add_attribute($1, $3); }
 ;
 
 attribute:

ext/reflection/php_reflection.c

@@ -1057,24 +1057,19 @@ static void reflection_attribute_factory(zval *object, zend_string *name, zval *
 /* }}} */
 
 
-static zval* convert_attributes(zval *ret, HashTable *attributes, zend_class_entry *ce)
+static void convert_attributes(zval *ret, HashTable *attributes, zend_class_entry *ce)
 {
 	zend_string *attribute_name;
-	zval *attrs, *attr, *object;
+	zval *attr, *object;
 	zval *converted_attributes;
 
 	array_init(ret);
 
-	ZEND_HASH_FOREACH_STR_KEY_VAL(attributes, attribute_name, attrs) {
+	ZEND_HASH_FOREACH_STR_KEY_VAL(attributes, attribute_name, attr) {
 		if (attribute_name) {
-
-			ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(attrs), attr) {
-				converted_attributes = zend_ast_convert_attributes(Z_ARRVAL_P(attr), ce);
-
-				reflection_attribute_factory(object, attribute_name, converted_attributes);
-
-				zend_hash_next_index_insert(Z_ARRVAL_P(ret), object);
-			} ZEND_HASH_FOREACH_END();
+			converted_attributes = zend_ast_convert_attributes(Z_ARRVAL_P(attr), ce);
+			reflection_attribute_factory(object, attribute_name, converted_attributes);
+			zend_hash_next_index_insert(Z_ARRVAL_P(ret), object);
 		}
 	} ZEND_HASH_FOREACH_END();
 }