Support extra named params in backtraces

Author: nikic

Zend/tests/named_params/backtrace.phpt

@@ -0,0 +1,69 @@
+--TEST--
+Extra named params in backtraces
+--FILE--
+<?php
+
+function test($a, ...$rest) {
+    var_dump(debug_backtrace());
+    debug_print_backtrace();
+    throw new Exception("Test");
+}
+
+try {
+    test(1, 2, x: 3, y: 4);
+} catch (Exception $e) {
+    var_dump($e->getTrace());
+    echo $e, "\n";
+}
+
+?>
+--EXPECTF--
+array(1) {
+  [0]=>
+  array(4) {
+    ["file"]=>
+    string(%d) "%s"
+    ["line"]=>
+    int(10)
+    ["function"]=>
+    string(4) "test"
+    ["args"]=>
+    array(4) {
+      [0]=>
+      int(1)
+      [1]=>
+      int(2)
+      ["x"]=>
+      int(3)
+      ["y"]=>
+      int(4)
+    }
+  }
+}
+#0  test(1, 2, x: 3, y: 4) called at [%s:10]
+array(1) {
+  [0]=>
+  array(4) {
+    ["file"]=>
+    string(%d) "%s"
+    ["line"]=>
+    int(10)
+    ["function"]=>
+    string(4) "test"
+    ["args"]=>
+    array(4) {
+      [0]=>
+      int(1)
+      [1]=>
+      int(2)
+      ["x"]=>
+      int(3)
+      ["y"]=>
+      int(4)
+    }
+  }
+}
+Exception: Test in %s:%d
+Stack trace:
+#0 %s(%d): test(1, 2, x: 3, y: 4)
+#1 {main}

Zend/zend_builtin_functions.c

@@ -1640,18 +1640,34 @@ static void debug_backtrace_get_args(zend_execute_data *call, zval *arg_array) /
 	} else {
 		ZVAL_EMPTY_ARRAY(arg_array);
 	}
+
+	if (ZEND_CALL_INFO(call) & ZEND_CALL_HAS_EXTRA_NAMED_PARAMS) {
+		zend_string *name;
+		zval *arg;
+		SEPARATE_ARRAY(arg_array);
+		ZEND_HASH_FOREACH_STR_KEY_VAL(call->extra_named_params, name, arg) {
+			ZVAL_DEREF(arg);
+			Z_TRY_ADDREF_P(arg);
+			zend_hash_add_new(Z_ARRVAL_P(arg_array), name, arg);
+		} ZEND_HASH_FOREACH_END();
+	}
 }
 /* }}} */
 
 void debug_print_backtrace_args(zval *arg_array) /* {{{ */
 {
+	zend_string *name;
 	zval *tmp;
 	int i = 0;
 
-	ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(arg_array), tmp) {
+	ZEND_HASH_FOREACH_STR_KEY_VAL(Z_ARRVAL_P(arg_array), name, tmp) {
 		if (i++) {
 			ZEND_PUTS(", ");
 		}
+		if (name) {
+			ZEND_PUTS(ZSTR_VAL(name));
+			ZEND_PUTS(": ");
+		}
 		zend_print_flat_zval_r(tmp);
 	} ZEND_HASH_FOREACH_END();
 }

Zend/zend_exceptions.c

@@ -566,9 +566,14 @@ static void _build_trace_string(smart_str *str, HashTable *ht, uint32_t num) /*
 	if (tmp) {
 		if (Z_TYPE_P(tmp) == IS_ARRAY) {
 			size_t last_len = ZSTR_LEN(str->s);
+			zend_string *name;
 			zval *arg;
 
-			ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(tmp), arg) {
+			ZEND_HASH_FOREACH_STR_KEY_VAL(Z_ARRVAL_P(tmp), name, arg) {
+				if (name) {
+					smart_str_append(str, name);
+					smart_str_appends(str, ": ");
+				}
 				_build_trace_args(arg, str);
 			} ZEND_HASH_FOREACH_END();