PHP 8.6: zval_dtor() has been deprecated in favour of zval_ptr_dtor_nogc()

derickr · derickr · commit c0f21bb4ee54 · 2025-12-10T16:25:01.000Z
diff --git a/src/base/base.c b/src/base/base.c
@@ -192,7 +192,7 @@ int xdebug_include_or_eval_handler(XDEBUG_OPCODE_HANDLER_ARGS)
 	XG_BASE(last_eval_statement) = zend_string_init(Z_STRVAL_P(inc_filename), Z_STRLEN_P(inc_filename), 0);
 
 	if (inc_filename == &tmp_inc_filename) {
-		zval_dtor(&tmp_inc_filename);
+		zval_ptr_dtor_nogc(&tmp_inc_filename);
 	}
 
 	return xdebug_call_original_opcode_handler_if_set(opline->opcode, XDEBUG_OPCODE_HANDLER_ARGS_PASSTHRU);
diff --git a/src/debugger/debugger.c b/src/debugger/debugger.c
@@ -467,7 +467,7 @@ void xdebug_debugger_statement_call(zend_string *filename, int lineno)
 					res = xdebug_do_eval(extra_brk_info->condition, &retval, NULL);
 					if (res) {
 						break_ok = Z_TYPE(retval) == IS_TRUE;
-						zval_dtor(&retval);
+						zval_ptr_dtor_nogc(&retval);
 					}
 				}
 				if (break_ok && xdebug_handle_hit_value(extra_brk_info)) {
diff --git a/src/debugger/handler_dbgp.c b/src/debugger/handler_dbgp.c
@@ -1937,7 +1937,7 @@ DBGP_FUNC(property_set)
 		/* don't send an error, send success = zero */
 		xdebug_xml_add_attribute(*retval, "success", "0");
 	} else {
-		zval_dtor(&ret_zval);
+		zval_ptr_dtor_nogc(&ret_zval);
 		xdebug_xml_add_attribute(*retval, "success", "1");
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,7 @@ int xdebug_include_or_eval_handler(XDEBUG_OPCODE_HANDLER_ARGS)`
`192`	`192`	`XG_BASE(last_eval_statement) = zend_string_init(Z_STRVAL_P(inc_filename), Z_STRLEN_P(inc_filename), 0);`
`193`	`193`
`194`	`194`	`if (inc_filename == &tmp_inc_filename) {`
`195`		`- zval_dtor(&tmp_inc_filename);`
	`195`	`+ zval_ptr_dtor_nogc(&tmp_inc_filename);`
`196`	`196`	`}`
`197`	`197`
`198`	`198`	`return xdebug_call_original_opcode_handler_if_set(opline->opcode, XDEBUG_OPCODE_HANDLER_ARGS_PASSTHRU);`
Original file line number	Diff line number	Diff line change
`@@ -467,7 +467,7 @@ void xdebug_debugger_statement_call(zend_string *filename, int lineno)`
`467`	`467`	`res = xdebug_do_eval(extra_brk_info->condition, &retval, NULL);`
`468`	`468`	`if (res) {`
`469`	`469`	`break_ok = Z_TYPE(retval) == IS_TRUE;`
`470`		`- zval_dtor(&retval);`
	`470`	`+ zval_ptr_dtor_nogc(&retval);`
`471`	`471`	`}`
`472`	`472`	`}`
`473`	`473`	`if (break_ok && xdebug_handle_hit_value(extra_brk_info)) {`
Original file line number	Diff line number	Diff line change
`@@ -1937,7 +1937,7 @@ DBGP_FUNC(property_set)`
`1937`	`1937`	`/* don't send an error, send success = zero */`
`1938`	`1938`	`xdebug_xml_add_attribute(*retval, "success", "0");`
`1939`	`1939`	`} else {`
`1940`		`- zval_dtor(&ret_zval);`
	`1940`	`+ zval_ptr_dtor_nogc(&ret_zval);`
`1941`	`1941`	`xdebug_xml_add_attribute(*retval, "success", "1");`
`1942`	`1942`	`}`
`1943`	`1943`	`}`