Merged pull request #568

xdebug · Apr 3, 2020 · a7ef6bc · a7ef6bc
2 parents 3baf17a + 3ee9ebb
commit a7ef6bc
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 16 deletions.
diff --git a/tests/base/bug00265-php74.phpt b/tests/base/bug00265-php74.phpt
@@ -27,7 +27,7 @@ var_dump(error_get_last());
 gabba();
 ?>
 --EXPECTF--
-%s: Undefined variable: b in %sbug00265-php74.php on line 6
+%s: Undefined variable%sb in %sbug00265-php74.php on line 6
 
 Call Stack:
 %w%f %w%d   1. {main}() %sbug00265-php74.php:0
@@ -36,14 +36,14 @@ array(4) {
   ["type"]=>
   int(%d)
   ["message"]=>
-  string(21) "Undefined variable: b"
+  string(21) "Undefined variable%sb"
   ["file"]=>
   string(%d) "%sbug00265-php74.php"
   ["line"]=>
   int(6)
 }
 
-%s: Undefined variable: b in %sbug00265-php74.php on line 8
+%s: Undefined variable%sb in %sbug00265-php74.php on line 8
 
 Call Stack:
 %w%f %w%d   1. {main}() %sbug00265-php74.php:0

diff --git a/tests/base/bug01323-001.phpt b/tests/base/bug01323-001.phpt
@@ -26,47 +26,47 @@ foreach ( $formats as $format )
 --EXPECTF--
 <br />
 <font size='1'><table class='xdebug-error xe-%s' dir='ltr' border='1' cellspacing='0' cellpadding='1'>
-<tr><th align='left' bgcolor='#f57900' colspan="5"><span style='background-color: #cc0000; color: #fce94f; font-size: x-large;'>( ! )</span> %s: Undefined variable: i in %sbug01323-001.php on line <i>15</i></th></tr>
+<tr><th align='left' bgcolor='#f57900' colspan="5"><span style='background-color: #cc0000; color: #fce94f; font-size: x-large;'>( ! )</span> %s: Undefined variable%si in %sbug01323-001.php on line <i>15</i></th></tr>
 <tr><th align='left' bgcolor='#e9b96e' colspan='5'>Call Stack</th></tr>
 <tr><th align='center' bgcolor='#eeeeec'>#</th><th align='left' bgcolor='#eeeeec'>Time</th><th align='left' bgcolor='#eeeeec'>Memory</th><th align='left' bgcolor='#eeeeec'>Function</th><th align='left' bgcolor='#eeeeec'>Location</th></tr>
 <tr><td bgcolor='#eeeeec' align='center'>1</td><td bgcolor='#eeeeec' align='center'>%f</td><td bgcolor='#eeeeec' align='right'>%d</td><td bgcolor='#eeeeec'>{main}(  )</td><td title='%sbug01323-001.php' bgcolor='#eeeeec'>...%ebug01323-001.php<b>:</b>0</td></tr>
 </table></font>
 
 <br />
 <font size='1'><table class='xdebug-error xe-%s' dir='ltr' border='1' cellspacing='0' cellpadding='1'>
-<tr><th align='left' bgcolor='#f57900' colspan="5"><span style='background-color: #cc0000; color: #fce94f; font-size: x-large;'>( ! )</span> %s: Undefined variable: i in %sbug01323-001.php on line <i>15</i></th></tr>
+<tr><th align='left' bgcolor='#f57900' colspan="5"><span style='background-color: #cc0000; color: #fce94f; font-size: x-large;'>( ! )</span> %s: Undefined variable%si in %sbug01323-001.php on line <i>15</i></th></tr>
 <tr><th align='left' bgcolor='#e9b96e' colspan='5'>Call Stack</th></tr>
 <tr><th align='center' bgcolor='#eeeeec'>#</th><th align='left' bgcolor='#eeeeec'>Time</th><th align='left' bgcolor='#eeeeec'>Memory</th><th align='left' bgcolor='#eeeeec'>Function</th><th align='left' bgcolor='#eeeeec'>Location</th></tr>
 <tr><td bgcolor='#eeeeec' align='center'>1</td><td bgcolor='#eeeeec' align='center'>%f</td><td bgcolor='#eeeeec' align='right'>%d</td><td bgcolor='#eeeeec'>{main}(  )</td><td title='%sbug01323-001.php' bgcolor='#eeeeec'>bug01323-001.php<b>:</b>0</td></tr>
 </table></font>
 
 <br />
 <font size='1'><table class='xdebug-error xe-%s' dir='ltr' border='1' cellspacing='0' cellpadding='1'>
-<tr><th align='left' bgcolor='#f57900' colspan="5"><span style='background-color: #cc0000; color: #fce94f; font-size: x-large;'>( ! )</span> %s: Undefined variable: i in %sbug01323-001.php on line <i>15</i></th></tr>
+<tr><th align='left' bgcolor='#f57900' colspan="5"><span style='background-color: #cc0000; color: #fce94f; font-size: x-large;'>( ! )</span> %s: Undefined variable%si in %sbug01323-001.php on line <i>15</i></th></tr>
 <tr><th align='left' bgcolor='#e9b96e' colspan='5'>Call Stack</th></tr>
 <tr><th align='center' bgcolor='#eeeeec'>#</th><th align='left' bgcolor='#eeeeec'>Time</th><th align='left' bgcolor='#eeeeec'>Memory</th><th align='left' bgcolor='#eeeeec'>Function</th><th align='left' bgcolor='#eeeeec'>Location</th></tr>
 <tr><td bgcolor='#eeeeec' align='center'>1</td><td bgcolor='#eeeeec' align='center'>%f</td><td bgcolor='#eeeeec' align='right'>%d</td><td bgcolor='#eeeeec'>{main}(  )</td><td title='%sbug01323-001.php' bgcolor='#eeeeec'>base%ebug01323-001.php<b>:</b>0</td></tr>
 </table></font>
 
 <br />
 <font size='1'><table class='xdebug-error xe-%s' dir='ltr' border='1' cellspacing='0' cellpadding='1'>
-<tr><th align='left' bgcolor='#f57900' colspan="5"><span style='background-color: #cc0000; color: #fce94f; font-size: x-large;'>( ! )</span> %s: Undefined variable: i in %sbug01323-001.php on line <i>15</i></th></tr>
+<tr><th align='left' bgcolor='#f57900' colspan="5"><span style='background-color: #cc0000; color: #fce94f; font-size: x-large;'>( ! )</span> %s: Undefined variable%si in %sbug01323-001.php on line <i>15</i></th></tr>
 <tr><th align='left' bgcolor='#e9b96e' colspan='5'>Call Stack</th></tr>
 <tr><th align='center' bgcolor='#eeeeec'>#</th><th align='left' bgcolor='#eeeeec'>Time</th><th align='left' bgcolor='#eeeeec'>Memory</th><th align='left' bgcolor='#eeeeec'>Function</th><th align='left' bgcolor='#eeeeec'>Location</th></tr>
 <tr><td bgcolor='#eeeeec' align='center'>1</td><td bgcolor='#eeeeec' align='center'>%f</td><td bgcolor='#eeeeec' align='right'>%d</td><td bgcolor='#eeeeec'>{main}(  )</td><td title='%sbug01323-001.php' bgcolor='#eeeeec'>tests%ebase%ebug01323-001.php<b>:</b>0</td></tr>
 </table></font>
 
 <br />
 <font size='1'><table class='xdebug-error xe-%s' dir='ltr' border='1' cellspacing='0' cellpadding='1'>
-<tr><th align='left' bgcolor='#f57900' colspan="5"><span style='background-color: #cc0000; color: #fce94f; font-size: x-large;'>( ! )</span> %s: Undefined variable: i in %sbug01323-001.php on line <i>15</i></th></tr>
+<tr><th align='left' bgcolor='#f57900' colspan="5"><span style='background-color: #cc0000; color: #fce94f; font-size: x-large;'>( ! )</span> %s: Undefined variable%si in %sbug01323-001.php on line <i>15</i></th></tr>
 <tr><th align='left' bgcolor='#e9b96e' colspan='5'>Call Stack</th></tr>
 <tr><th align='center' bgcolor='#eeeeec'>#</th><th align='left' bgcolor='#eeeeec'>Time</th><th align='left' bgcolor='#eeeeec'>Memory</th><th align='left' bgcolor='#eeeeec'>Function</th><th align='left' bgcolor='#eeeeec'>Location</th></tr>
 <tr><td bgcolor='#eeeeec' align='center'>1</td><td bgcolor='#eeeeec' align='center'>%f</td><td bgcolor='#eeeeec' align='right'>%d</td><td bgcolor='#eeeeec'>{main}(  )</td><td title='%sbug01323-001.php' bgcolor='#eeeeec'>%r(\/|\w:)%r%s%etests%ebase%ebug01323-001.php<b>:</b>0</td></tr>
 </table></font>
 
 <br />
 <font size='1'><table class='xdebug-error xe-%s' dir='ltr' border='1' cellspacing='0' cellpadding='1'>
-<tr><th align='left' bgcolor='#f57900' colspan="5"><span style='background-color: #cc0000; color: #fce94f; font-size: x-large;'>( ! )</span> %s: Undefined variable: i in %sbug01323-001.php on line <i>15</i></th></tr>
+<tr><th align='left' bgcolor='#f57900' colspan="5"><span style='background-color: #cc0000; color: #fce94f; font-size: x-large;'>( ! )</span> %s: Undefined variable%si in %sbug01323-001.php on line <i>15</i></th></tr>
 <tr><th align='left' bgcolor='#e9b96e' colspan='5'>Call Stack</th></tr>
 <tr><th align='center' bgcolor='#eeeeec'>#</th><th align='left' bgcolor='#eeeeec'>Time</th><th align='left' bgcolor='#eeeeec'>Memory</th><th align='left' bgcolor='#eeeeec'>Function</th><th align='left' bgcolor='#eeeeec'>Location</th></tr>
 <tr><td bgcolor='#eeeeec' align='center'>1</td><td bgcolor='#eeeeec' align='center'>%f</td><td bgcolor='#eeeeec' align='right'>%d</td><td bgcolor='#eeeeec'>{main}(  )</td><td title='%sbug01323-001.php' bgcolor='#eeeeec'>...%ebug01323-001.php<b>:</b>0</td></tr>

diff --git a/tests/debugger/bug00990-001.phpt b/tests/debugger/bug00990-001.phpt
@@ -40,7 +40,7 @@ dbgpRunFile( $filename, $commands );
 
 -> step_into -i 4
 <?xml version="1.0" encoding="iso-8859-1"?>
-<notify xmlns="urn:debugger_protocol_v1" xmlns:xdebug="https://xdebug.org/dbgp/xdebug" name="error"><xdebug:message filename="file://bug00990-001.inc" lineno="3" type="%s"><![CDATA[Undefined variable: bar]]></xdebug:message></notify>
+<notify xmlns="urn:debugger_protocol_v1" xmlns:xdebug="https://xdebug.org/dbgp/xdebug" name="error"><xdebug:message filename="file://bug00990-001.inc" lineno="3" type="%s"><![CDATA[Undefined variable%sbar]]></xdebug:message></notify>
 
 <?xml version="1.0" encoding="iso-8859-1"?>
 <response xmlns="urn:debugger_protocol_v1" xmlns:xdebug="https://xdebug.org/dbgp/xdebug" command="step_into" transaction_id="4" status="break" reason="ok"><xdebug:message filename="file://bug00990-001.inc" lineno="4"></xdebug:message></response>

diff --git a/tests/debugger/bug01083.phpt b/tests/debugger/bug01083.phpt
@@ -20,7 +20,7 @@ $commands = array(
 
 dbgpRunFile( $filename, $commands );
 ?>
---EXPECT--
+--EXPECTF--
 <?xml version="1.0" encoding="iso-8859-1"?>
 <init xmlns="urn:debugger_protocol_v1" xmlns:xdebug="https://xdebug.org/dbgp/xdebug" fileuri="file://bug01083.inc" language="PHP" xdebug:language_version="" protocol_version="1.0" appid="" idekey=""><engine version=""><![CDATA[Xdebug]]></engine><author><![CDATA[Derick Rethans]]></author><url><![CDATA[https://xdebug.org]]></url><copyright><![CDATA[Copyright (c) 2002-2099 by Derick Rethans]]></copyright></init>
 
@@ -30,7 +30,7 @@ dbgpRunFile( $filename, $commands );
 
 -> run -i 2
 <?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="2" status="break" reason="ok"><xdebug:message filename="file://bug01083.inc" lineno="5" exception="Exception"><![CDATA[Undefined variable: undefined]]></xdebug:message></response>
+<response xmlns="urn:debugger_protocol_v1" xmlns:xdebug="https://xdebug.org/dbgp/xdebug" command="run" transaction_id="2" status="break" reason="ok"><xdebug:message filename="file://bug01083.inc" lineno="5" exception="Exception"><![CDATA[Undefined variable%sundefined]]></xdebug:message></response>
 
 -> context_get -i 3 -d 1 -c 0
 <?xml version="1.0" encoding="iso-8859-1"?>

diff --git a/tests/tracing/assignment-trace-002-php73-opcache.phpt b/tests/tracing/assignment-trace-002-php73-opcache.phpt
@@ -46,7 +46,7 @@ echo file_get_contents($tf);
 unlink($tf);
 ?>
 --EXPECTF--
-%s: Undefined variable: b in %sassignment-trace-002-php73-opcache.php on line 8
+%s: Undefined variable%sb in %sassignment-trace-002-php73-opcache.php on line 8
 
 Call Stack:
 %w%f %w%d   1. {main}() %sassignment-trace-002-php73-opcache.php:0

diff --git a/tests/tracing/assignment-trace-002.phpt b/tests/tracing/assignment-trace-002.phpt
@@ -48,7 +48,7 @@ echo file_get_contents($tf);
 unlink($tf);
 ?>
 --EXPECTF--
-%s: Undefined variable: b in %sassignment-trace-002.php on line 8
+%s: Undefined variable%sb in %sassignment-trace-002.php on line 8
 
 Call Stack:
 %w%f %w%d   1. {main}() %sassignment-trace-002.php:0

diff --git a/tests/tracing/assignment-trace-003.phpt b/tests/tracing/assignment-trace-003.phpt
@@ -26,7 +26,7 @@ echo file_get_contents($tf);
 unlink($tf);
 ?>
 --EXPECTF--
-%s: Undefined variable: b in %sassignment-trace-003.php on line 5
+%s: Undefined variable%sb in %sassignment-trace-003.php on line 5
 
 Call Stack:
 %w%f %w%d   1. {main}() %sassignment-trace-003.php:0

diff --git a/tests/tracing/assignment-trace-004.phpt b/tests/tracing/assignment-trace-004.phpt
@@ -26,7 +26,7 @@ echo file_get_contents($tf);
 unlink($tf);
 ?>
 --EXPECTF--
-%s: Undefined variable: b in %sassignment-trace-004.php on line 5
+%s: Undefined variable%sb in %sassignment-trace-004.php on line 5
 
 Call Stack:
 %w%f %w%d   1. {main}() %sassignment-trace-004.php:0