From adff1261e4fd3baf6e819e342f08fbe5c84c8d4d Mon Sep 17 00:00:00 2001
From: Derick Rethans <github@derickrethans.nl>
Date: Mon, 11 Dec 2023 14:56:50 +0000
Subject: [PATCH] Fixed test robustness

---
 tests/debugger/bug01388-08.phpt  | 4 ++--
 tests/debugger/bug02006-001.phpt | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/debugger/bug01388-08.phpt b/tests/debugger/bug01388-08.phpt
index e37fa6369..df1fec064 100644
--- a/tests/debugger/bug01388-08.phpt
+++ b/tests/debugger/bug01388-08.phpt
@@ -50,10 +50,10 @@ dbgpRunFile( $filename, $commands );
 
 -> run -i 6
 <?xml version="1.0" encoding="iso-8859-1"?>
-<notify xmlns="urn:debugger_protocol_v1" xmlns:xdebug="https://xdebug.org/dbgp/xdebug" name="breakpoint_resolved"><breakpoint type="line" resolved="resolved" filename="file://bug01388-08b.inc" lineno="2" state="enabled" hit_count="0" hit_value="0" id="{{PID}}0001"></breakpoint></notify>
+<notify xmlns="urn:debugger_protocol_v1" xmlns:xdebug="https://xdebug.org/dbgp/xdebug" name="breakpoint_resolved"><breakpoint type="line" resolved="resolved" filename="file://bug01388-08b.inc" lineno="%r(2|9)%r" state="enabled" hit_count="0" hit_value="0" id="{{PID}}000%r(1|2)%r"></breakpoint></notify>
 
 <?xml version="1.0" encoding="iso-8859-1"?>
-<notify xmlns="urn:debugger_protocol_v1" xmlns:xdebug="https://xdebug.org/dbgp/xdebug" name="breakpoint_resolved"><breakpoint type="line" resolved="resolved" filename="file://bug01388-08b.inc" lineno="9" state="enabled" hit_count="0" hit_value="0" id="{{PID}}0002"></breakpoint></notify>
+<notify xmlns="urn:debugger_protocol_v1" xmlns:xdebug="https://xdebug.org/dbgp/xdebug" name="breakpoint_resolved"><breakpoint type="line" resolved="resolved" filename="file://bug01388-08b.inc" lineno="%r(2|9)%r" state="enabled" hit_count="0" hit_value="0" id="{{PID}}000%r(1|2)%r"></breakpoint></notify>
 
 <?xml version="1.0" encoding="iso-8859-1"?>
 <response xmlns="urn:debugger_protocol_v1" xmlns:xdebug="https://xdebug.org/dbgp/xdebug" command="run" transaction_id="6" status="break" reason="ok"><xdebug:message filename="file://bug01388-08b.inc" lineno="2"></xdebug:message></response>
diff --git a/tests/debugger/bug02006-001.phpt b/tests/debugger/bug02006-001.phpt
index 908480701..b52218bff 100644
--- a/tests/debugger/bug02006-001.phpt
+++ b/tests/debugger/bug02006-001.phpt
@@ -35,7 +35,7 @@ dbgpRunFile( $filename, $commands );
 
 -> breakpoint_list -i 3
 <?xml version="1.0" encoding="iso-8859-1"?>
-<response xmlns="urn:debugger_protocol_v1" xmlns:xdebug="https://xdebug.org/dbgp/xdebug" command="breakpoint_list" transaction_id="3"><breakpoint type="call" function="a" state="enabled" hit_count="0" hit_value="0" id="{{PID}}0001"></breakpoint><breakpoint type="call" function="b" state="enabled" hit_count="0" hit_value="0" id="{{PID}}0002"></breakpoint></response>
+<response xmlns="urn:debugger_protocol_v1" xmlns:xdebug="https://xdebug.org/dbgp/xdebug" command="breakpoint_list" transaction_id="3"><breakpoint type="call" function="%r(a|b)%r" state="enabled" hit_count="0" hit_value="0" id="{{PID}}000%r(1|2)%r"></breakpoint><breakpoint type="call" function="%r(a|b)%r" state="enabled" hit_count="0" hit_value="0" id="{{PID}}000%r(1|2)%r"></breakpoint></response>
 
 -> breakpoint_remove -i 4 -d %d0001
 <?xml version="1.0" encoding="iso-8859-1"?>