Add attribute arguments to output when passed.

Author: beberlei

ext/reflection/php_reflection.c

@@ -6403,6 +6403,8 @@ ZEND_METHOD(ReflectionAttribute, __toString)
 	reflection_object *intern;
 	attribute_reference *attr;
 	smart_str str = {0};
+	zval tmp;
+	int i;
 
 	if (zend_parse_parameters_none() == FAILURE) {
 		RETURN_THROWS();
@@ -6412,7 +6414,37 @@ ZEND_METHOD(ReflectionAttribute, __toString)
 
 	smart_str_append_printf(&str, "Attribute [ ");
 	smart_str_append_printf(&str, "%s", ZSTR_VAL(attr->data->name));
-	smart_str_append_printf(&str, " ]\n");
+	smart_str_append_printf(&str, " ]");
+
+	if (attr->data->argc > 0) {
+		smart_str_append_printf(&str, " {\n");
+		smart_str_append_printf(&str, "  - Arguments [%d] {\n", attr->data->argc);
+
+		for (i = 0; i < attr->data->argc; i++) {
+			if (FAILURE == zend_get_attribute_value(&tmp, attr->data, i, attr->scope)) {
+				RETURN_THROWS();
+			}
+
+			if (attr->data->args[i].name != NULL) {
+				smart_str_append_printf(&str, "    Argument #%d [ %s = ", i, ZSTR_VAL(attr->data->args[i].name));
+			} else {
+				smart_str_append_printf(&str, "    Argument #%d [ ", i);
+			}
+
+			if (format_default_value(&str, &tmp, NULL) == FAILURE) {
+				return;
+			}
+
+			smart_str_append_printf(&str, " ]\n");
+
+			zval_ptr_dtor(&tmp);
+		}
+		smart_str_append_printf(&str, "  }\n");
+
+		smart_str_append_printf(&str, "}\n");
+	} else {
+		smart_str_append_printf(&str, "\n");
+	}
 
 	RETURN_STR(smart_str_extract(&str));
 }

ext/reflection/tests/ReflectionAttribute_toString.phpt

@@ -3,10 +3,24 @@ ReflectionAttribute::__toString
 --FILE--
 <?php
 
-#[Foo]
+#[Foo, Bar(a: "foo", b: 1234), Baz("foo", 1234)]
 function foo() {}
 
 $refl = new ReflectionFunction('foo');
 echo $refl->getAttributes()[0];
+echo $refl->getAttributes()[1];
+echo $refl->getAttributes()[2];
 --EXPECTF--
 Attribute [ Foo ]
+Attribute [ Bar ] {
+  - Arguments [2] {
+    Argument #0 [ a = 'foo' ]
+    Argument #1 [ b = 1234 ]
+  }
+}
+Attribute [ Baz ] {
+  - Arguments [2] {
+    Argument #0 [ 'foo' ]
+    Argument #1 [ 1234 ]
+  }
+}