Merge branch 'xdebug_3_4'

Author: derickr

src/develop/stack.c

@@ -760,16 +760,14 @@ void xdebug_append_printable_stack(xdebug_str *str, int html)
 				xdebug_str_add_literal(str, "...");
 			}
 
-			if (fse->var[j].name) {
-				if (html) {
-					xdebug_str_add_literal(str, "<span>$");
-					xdebug_str_add_zstr(str, fse->var[j].name);
-					xdebug_str_add_literal(str, " = </span>");
-				} else {
-					xdebug_str_add_literal(str, "$");
-					xdebug_str_add_zstr(str, fse->var[j].name);
-					xdebug_str_add_literal(str, " = ");
-				}
+			if (fse->user_defined == XDEBUG_BUILT_IN && (fse->op_array->fn_flags & ZEND_ACC_USER_ARG_INFO) && fse->op_array->arg_info[j].name) {
+				xdebug_str_add_const(str, html ? "<span>$" : "$");
+				xdebug_str_add_zstr(str, fse->op_array->arg_info[j].name);
+				xdebug_str_add_const(str, html ? " = </span>" : " = ");
+			} else if (fse->var[j].name) {
+				xdebug_str_add_const(str, html ? "<span>$" : "$");
+				xdebug_str_add_zstr(str, fse->var[j].name);
+				xdebug_str_add_const(str, html ? " = </span>" : " = ");
 			}
 
 			if (!variadic_opened && fse->var[j].is_variadic && Z_ISUNDEF(fse->var[j].data)) {

tests/develop/bug02354.phpt

@@ -0,0 +1,34 @@
+--TEST--
+Test for bug #2354: The __invoke frame in call stacks don't have the argument name in the trace (< PHP 8.2)
+--SKIPIF--
+<?php
+require __DIR__ . '/../utils.inc';
+check_reqs('PHP < 8.1');
+?>
+--INI--
+xdebug.mode=develop
+--FILE--
+<?php
+class RedisProxy {
+	function __construct(public Closure $c)
+	{
+	}
+
+	function __call($method, $args)
+	{
+		$this->c->__invoke($args);
+	}
+}
+
+$c = function(array $args)
+{
+	throw new Exception();
+};
+
+$rp = new RedisProxy($c);
+$rp->isConnected();
+?>
+--EXPECTF--
+%A
+%w%f %w%d   %d. Closure->__invoke($args = []) %sbug02354.php:9
+%A