We should output & instead of & in an HTML context

xdebug · Sep 27, 2015 · 86346cb · 86346cb
1 parent b87a5bd
commit 86346cb
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/tests/xdebug_var_dump.phpt b/tests/xdebug_var_dump.phpt
@@ -38,7 +38,7 @@ xdebug.file_link_format=
   <i>private</i> 'timestamp' <font color='#888a85'>=&gt;</font> <small>int</small> <font color='#4e9a06'>1092515106</font>
   <i>private</i> 'user_defined' <font color='#888a85'>=&gt;</font> <small>boolean</small> <font color='#75507b'>true</font>
   <i>private</i> 'self' <font color='#888a85'>=&gt;</font> 
-    <i>&</i><b>object</b>(<i>TimeStuff</i>)[<i>1</i>]
+    <i>&amp;</i><b>object</b>(<i>TimeStuff</i>)[<i>1</i>]
   <i>protected</i> 'tm' <font color='#888a85'>=&gt;</font> 
     <b>array</b> <i>(size=11)</i>
       'seconds' <font color='#888a85'>=&gt;</font> <small>int</small> <font color='#4e9a06'>6</font>

diff --git a/tests/xdebug_var_dump_file.phpt b/tests/xdebug_var_dump_file.phpt
@@ -39,7 +39,7 @@ xdebug.file_link_format=
   <i>private</i> 'timestamp' <font color='#888a85'>=&gt;</font> <small>int</small> <font color='#4e9a06'>1092515106</font>
   <i>private</i> 'user_defined' <font color='#888a85'>=&gt;</font> <small>boolean</small> <font color='#75507b'>true</font>
   <i>private</i> 'self' <font color='#888a85'>=&gt;</font> 
-    <i>&</i><b>object</b>(<i>TimeStuff</i>)[<i>1</i>]
+    <i>&amp;</i><b>object</b>(<i>TimeStuff</i>)[<i>1</i>]
   <i>protected</i> 'tm' <font color='#888a85'>=&gt;</font> 
     <b>array</b> <i>(size=11)</i>
       'seconds' <font color='#888a85'>=&gt;</font> <small>int</small> <font color='#4e9a06'>6</font>

diff --git a/tests/xdebug_var_dump_file_link.phpt b/tests/xdebug_var_dump_file_link.phpt
@@ -39,7 +39,7 @@ xdebug.file_link_format=xdebug://%f@%l
   <i>private</i> 'timestamp' <font color='#888a85'>=&gt;</font> <small>int</small> <font color='#4e9a06'>1092515106</font>
   <i>private</i> 'user_defined' <font color='#888a85'>=&gt;</font> <small>boolean</small> <font color='#75507b'>true</font>
   <i>private</i> 'self' <font color='#888a85'>=&gt;</font> 
-    <i>&</i><b>object</b>(<i>TimeStuff</i>)[<i>1</i>]
+    <i>&amp;</i><b>object</b>(<i>TimeStuff</i>)[<i>1</i>]
   <i>protected</i> 'tm' <font color='#888a85'>=&gt;</font> 
     <b>array</b> <i>(size=11)</i>
       'seconds' <font color='#888a85'>=&gt;</font> <small>int</small> <font color='#4e9a06'>6</font>

diff --git a/xdebug_var.c b/xdebug_var.c
@@ -2372,7 +2372,7 @@ void xdebug_var_export_fancy(zval **struc, xdebug_str *str, int level, int debug
 					xdebug_str_add(str, xdebug_sprintf("%*s...\n", (level * 4) - 2, ""), 1);
 				}
 			} else {
-				xdebug_str_addl(str, "<i>&</i><b>array</b>\n", 21, 0);
+				xdebug_str_addl(str, "<i>&amp;</i><b>array</b>\n", 21, 0);
 			}
 			break;
 
@@ -2402,7 +2402,7 @@ void xdebug_var_export_fancy(zval **struc, xdebug_str *str, int level, int debug
 					xdebug_str_add(str, xdebug_sprintf("%*s...\n", (level * 4) - 2, ""), 1);
 				}
 			} else {
-				xdebug_str_add(str, xdebug_sprintf("<i>&</i><b>object</b>(<i>%s</i>)", STR_NAME_VAL(Z_OBJCE_P(*struc)->name)), 1);
+				xdebug_str_add(str, xdebug_sprintf("<i>&amp;</i><b>object</b>(<i>%s</i>)", STR_NAME_VAL(Z_OBJCE_P(*struc)->name)), 1);
 				xdebug_str_add(str, xdebug_sprintf("[<i>%d</i>]\n", Z_OBJ_HANDLE_P(*struc)), 1);
 			}
 			if (is_temp) {