Revert to use <span> again

kamil-tekiela · kamil-tekiela · commit 950b89326995 · 2023-08-11T23:30:22.000+01:00
diff --git a/Zend/tests/bug35655.phpt b/Zend/tests/bug35655.phpt
@@ -19,10 +19,10 @@ EOT
 highlight_string($code);
 ?>
 --EXPECT--
-<pre style="color: #000000">
-<code style="color: #0000BB">&lt;?php
-  $x </code><code style="color: #007700">= &lt;&lt;&lt;EOT
-</code><code style="color: #DD0000">some string    
-</code><code style="color: #007700">EOT
-  </code><code style="color: #0000BB">$y </code><code style="color: #007700">= </code><code style="color: #0000BB">2</code><code style="color: #007700">;
-</code><code style="color: #0000BB">?&gt;</code></pre>
+<pre><code style="color: #000000">
+<span style="color: #0000BB">&lt;?php
+  $x </span><span style="color: #007700">= &lt;&lt;&lt;EOT
+</span><span style="color: #DD0000">some string    
+</span><span style="color: #007700">EOT
+  </span><span style="color: #0000BB">$y </span><span style="color: #007700">= </span><span style="color: #0000BB">2</span><span style="color: #007700">;
+</span><span style="color: #0000BB">?&gt;</span></code></pre>
diff --git a/Zend/tests/bug42767.phpt b/Zend/tests/bug42767.phpt
@@ -11,4 +11,4 @@ highlight.html    = #000000
 highlight_string('<?php /*some comment..');
 ?>
 --EXPECT--
-<pre style="color: #000000"><code style="color: #0000BB">&lt;?php </code><code style="color: #FF8000">/*some comment..</code></pre>
+<pre><code style="color: #000000"><span style="color: #0000BB">&lt;?php </span><span style="color: #FF8000">/*some comment..</span></code></pre>
diff --git a/Zend/tests/bug71086.phpt b/Zend/tests/bug71086.phpt
@@ -8,5 +8,5 @@ var_dump($highlightedString);
 
 ?>
 --EXPECT--
-string(126) "<pre style="color: #000000"><code style="color: #0000BB">&lt;?php 
- 09 09 09</code><code style="color: #007700">;</code></pre>"
+string(139) "<pre><code style="color: #000000"><span style="color: #0000BB">&lt;?php 
+ 09 09 09</span><span style="color: #007700">;</span></code></pre>"
diff --git a/Zend/tests/nowdoc_013.phpt b/Zend/tests/nowdoc_013.phpt
@@ -20,9 +20,9 @@ EOF;
 highlight_string($code);
 ?>
 --EXPECT--
-<pre style="color: #000000"><code style="color: #0000BB">&lt;?php
-  $x </code><code style="color: #007700">= &lt;&lt;&lt;'EOT'
-</code><code style="color: #DD0000">some string    
-</code><code style="color: #007700">EOT
-  </code><code style="color: #0000BB">$y </code><code style="color: #007700">= </code><code style="color: #0000BB">2</code><code style="color: #007700">;
-</code><code style="color: #0000BB">?&gt;</code></pre>
+<pre><code style="color: #000000"><span style="color: #0000BB">&lt;?php
+  $x </span><span style="color: #007700">= &lt;&lt;&lt;'EOT'
+</span><span style="color: #DD0000">some string    
+</span><span style="color: #007700">EOT
+  </span><span style="color: #0000BB">$y </span><span style="color: #007700">= </span><span style="color: #0000BB">2</span><span style="color: #007700">;
+</span><span style="color: #0000BB">?&gt;</span></code></pre>
diff --git a/Zend/tests/nowdoc_014.phpt b/Zend/tests/nowdoc_014.phpt
@@ -18,8 +18,8 @@ EOF;
 highlight_string($code);
 ?>
 --EXPECT--
-<pre style="color: #000000"><code style="color: #0000BB">&lt;?php
-  $x </code><code style="color: #007700">= &lt;&lt;&lt;'EOT'
+<pre><code style="color: #000000"><span style="color: #0000BB">&lt;?php
+  $x </span><span style="color: #007700">= &lt;&lt;&lt;'EOT'
 EOT
-  </code><code style="color: #0000BB">$y </code><code style="color: #007700">= </code><code style="color: #0000BB">2</code><code style="color: #007700">;
-</code><code style="color: #0000BB">?&gt;</code></pre>
+  </span><span style="color: #0000BB">$y </span><span style="color: #007700">= </span><span style="color: #0000BB">2</span><span style="color: #007700">;
+</span><span style="color: #0000BB">?&gt;</span></code></pre>
diff --git a/Zend/zend_highlight.c b/Zend/zend_highlight.c
@@ -82,7 +82,7 @@ ZEND_API void zend_highlight(zend_syntax_highlighter_ini *syntax_highlighter_ini
 	char *last_color = syntax_highlighter_ini->highlight_html;
 	char *next_color;
 
-	zend_printf("<pre style=\"color: %s\">", last_color);
+	zend_printf("<pre><code style=\"color: %s\">", last_color);
 	/* highlight stuff coming back from zendlex() */
 	while ((token_type=lex_scan(&token, NULL))) {
 		switch (token_type) {
@@ -127,11 +127,11 @@ ZEND_API void zend_highlight(zend_syntax_highlighter_ini *syntax_highlighter_ini
 
 		if (last_color != next_color) {
 			if (last_color != syntax_highlighter_ini->highlight_html) {
-				zend_printf("</code>");
+				zend_printf("</span>");
 			}
 			last_color = next_color;
 			if (last_color != syntax_highlighter_ini->highlight_html) {
-				zend_printf("<code style=\"color: %s\">", last_color);
+				zend_printf("<span style=\"color: %s\">", last_color);
 			}
 		}
 
@@ -155,9 +155,9 @@ ZEND_API void zend_highlight(zend_syntax_highlighter_ini *syntax_highlighter_ini
 	}
 
 	if (last_color != syntax_highlighter_ini->highlight_html) {
-		zend_printf("</code>");
+		zend_printf("</span>");
 	}
-	zend_printf("</pre>");
+	zend_printf("</code></pre>");
 
 	/* Discard parse errors thrown during tokenization */
 	zend_clear_exception();
diff --git a/ext/phar/tests/cache_list/frontcontroller15.phpt b/ext/phar/tests/cache_list/frontcontroller15.phpt
@@ -14,4 +14,4 @@ files/frontcontroller8.phar
 --EXPECTHEADERS--
 Content-type: text/html; charset=UTF-8
 --EXPECT--
-<pre style="color: #000000"><code style="color: #0000BB">&lt;?php </code><code style="color: #007700">function </code><code style="color: #0000BB">hio</code><code style="color: #007700">(){}</code></pre>
+<pre><code style="color: #000000"><span style="color: #0000BB">&lt;?php </span><span style="color: #007700">function </span><span style="color: #0000BB">hio</span><span style="color: #007700">(){}</span></code></pre>
diff --git a/ext/phar/tests/cache_list/frontcontroller3.phpt b/ext/phar/tests/cache_list/frontcontroller3.phpt
@@ -14,4 +14,4 @@ files/frontcontroller.phar
 --EXPECTHEADERS--
 Content-type: text/html; charset=UTF-8
 --EXPECT--
-<pre style="color: #000000"><code style="color: #0000BB">&lt;?php </code><code style="color: #007700">function </code><code style="color: #0000BB">hio</code><code style="color: #007700">(){}</code></pre>
+<pre><code style="color: #000000"><span style="color: #0000BB">&lt;?php </span><span style="color: #007700">function </span><span style="color: #0000BB">hio</span><span style="color: #007700">(){}</span></code></pre>
diff --git a/ext/phar/tests/cache_list/frontcontroller9.phpt b/ext/phar/tests/cache_list/frontcontroller9.phpt
@@ -14,4 +14,4 @@ files/frontcontroller3.phar
 --EXPECTHEADERS--
 Content-type: text/html; charset=UTF-8
 --EXPECT--
-<pre style="color: #000000"><code style="color: #0000BB">&lt;?php </code><code style="color: #007700">function </code><code style="color: #0000BB">hio</code><code style="color: #007700">(){}</code></pre>
+<pre><code style="color: #000000"><span style="color: #0000BB">&lt;?php </span><span style="color: #007700">function </span><span style="color: #0000BB">hio</span><span style="color: #007700">(){}</span></code></pre>
diff --git a/ext/phar/tests/frontcontroller15.phpt b/ext/phar/tests/frontcontroller15.phpt
@@ -13,4 +13,4 @@ files/frontcontroller8.phar
 --EXPECTHEADERS--
 Content-type: text/html; charset=UTF-8
 --EXPECT--
-<pre style="color: #000000"><code style="color: #0000BB">&lt;?php </code><code style="color: #007700">function </code><code style="color: #0000BB">hio</code><code style="color: #007700">(){}</code></pre>
+<pre><code style="color: #000000"><span style="color: #0000BB">&lt;?php </span><span style="color: #007700">function </span><span style="color: #0000BB">hio</span><span style="color: #007700">(){}</span></code></pre>
diff --git a/ext/phar/tests/frontcontroller3.phpt b/ext/phar/tests/frontcontroller3.phpt
@@ -13,4 +13,4 @@ files/frontcontroller.phar
 --EXPECTHEADERS--
 Content-type: text/html; charset=UTF-8
 --EXPECT--
-<pre style="color: #000000"><code style="color: #0000BB">&lt;?php </code><code style="color: #007700">function </code><code style="color: #0000BB">hio</code><code style="color: #007700">(){}</code></pre>
+<pre><code style="color: #000000"><span style="color: #0000BB">&lt;?php </span><span style="color: #007700">function </span><span style="color: #0000BB">hio</span><span style="color: #007700">(){}</span></code></pre>
diff --git a/ext/phar/tests/frontcontroller9.phpt b/ext/phar/tests/frontcontroller9.phpt
@@ -13,4 +13,4 @@ files/frontcontroller3.phar
 --EXPECTHEADERS--
 Content-type: text/html; charset=UTF-8
 --EXPECT--
-<pre style="color: #000000"><code style="color: #0000BB">&lt;?php </code><code style="color: #007700">function </code><code style="color: #0000BB">hio</code><code style="color: #007700">(){}</code></pre>
+<pre><code style="color: #000000"><span style="color: #0000BB">&lt;?php </span><span style="color: #007700">function </span><span style="color: #0000BB">hio</span><span style="color: #007700">(){}</span></code></pre>
diff --git a/ext/phar/tests/tar/frontcontroller15.phar.phpt b/ext/phar/tests/tar/frontcontroller15.phar.phpt
@@ -13,4 +13,4 @@ files/frontcontroller8.phar.tar
 --EXPECTHEADERS--
 Content-type: text/html; charset=UTF-8
 --EXPECT--
-<pre style="color: #000000"><code style="color: #0000BB">&lt;?php </code><code style="color: #007700">function </code><code style="color: #0000BB">hio</code><code style="color: #007700">(){}</code></pre>
+<pre><code style="color: #000000"><span style="color: #0000BB">&lt;?php </span><span style="color: #007700">function </span><span style="color: #0000BB">hio</span><span style="color: #007700">(){}</span></code></pre>
diff --git a/ext/phar/tests/tar/frontcontroller3.phar.phpt b/ext/phar/tests/tar/frontcontroller3.phar.phpt
@@ -13,4 +13,4 @@ files/frontcontroller.phar.tar
 --EXPECTHEADERS--
 Content-type: text/html; charset=UTF-8
 --EXPECT--
-<pre style="color: #000000"><code style="color: #0000BB">&lt;?php </code><code style="color: #007700">function </code><code style="color: #0000BB">hio</code><code style="color: #007700">(){}</code></pre>
+<pre><code style="color: #000000"><span style="color: #0000BB">&lt;?php </span><span style="color: #007700">function </span><span style="color: #0000BB">hio</span><span style="color: #007700">(){}</span></code></pre>
diff --git a/ext/phar/tests/tar/frontcontroller9.phar.phpt b/ext/phar/tests/tar/frontcontroller9.phar.phpt
@@ -13,4 +13,4 @@ files/frontcontroller3.phar.tar
 --EXPECTHEADERS--
 Content-type: text/html; charset=UTF-8
 --EXPECT--
-<pre style="color: #000000"><code style="color: #0000BB">&lt;?php </code><code style="color: #007700">function </code><code style="color: #0000BB">hio</code><code style="color: #007700">(){}</code></pre>
+<pre><code style="color: #000000"><span style="color: #0000BB">&lt;?php </span><span style="color: #007700">function </span><span style="color: #0000BB">hio</span><span style="color: #007700">(){}</span></code></pre>
diff --git a/ext/phar/tests/zip/frontcontroller15.phar.phpt b/ext/phar/tests/zip/frontcontroller15.phar.phpt
@@ -15,4 +15,4 @@ files/frontcontroller8.phar.zip
 --EXPECTHEADERS--
 Content-type: text/html; charset=UTF-8
 --EXPECT--
-<pre style="color: #000000"><code style="color: #0000BB">&lt;?php </code><code style="color: #007700">function </code><code style="color: #0000BB">hio</code><code style="color: #007700">(){}</code></pre>
+<pre><code style="color: #000000"><span style="color: #0000BB">&lt;?php </span><span style="color: #007700">function </span><span style="color: #0000BB">hio</span><span style="color: #007700">(){}</span></code></pre>
diff --git a/ext/phar/tests/zip/frontcontroller3.phar.phpt b/ext/phar/tests/zip/frontcontroller3.phar.phpt
@@ -15,4 +15,4 @@ files/frontcontroller.phar.zip
 --EXPECTHEADERS--
 Content-type: text/html; charset=UTF-8
 --EXPECT--
-<pre style="color: #000000"><code style="color: #0000BB">&lt;?php </code><code style="color: #007700">function </code><code style="color: #0000BB">hio</code><code style="color: #007700">(){}</code></pre>
+<pre><code style="color: #000000"><span style="color: #0000BB">&lt;?php </span><span style="color: #007700">function </span><span style="color: #0000BB">hio</span><span style="color: #007700">(){}</span></code></pre>
diff --git a/ext/phar/tests/zip/frontcontroller9.phar.phpt b/ext/phar/tests/zip/frontcontroller9.phar.phpt
@@ -13,4 +13,4 @@ files/frontcontroller3.phar.zip
 --EXPECTHEADERS--
 Content-type: text/html; charset=UTF-8
 --EXPECT--
-<pre style="color: #000000"><code style="color: #0000BB">&lt;?php </code><code style="color: #007700">function </code><code style="color: #0000BB">hio</code><code style="color: #007700">(){}</code></pre>
+<pre><code style="color: #000000"><span style="color: #0000BB">&lt;?php </span><span style="color: #007700">function </span><span style="color: #0000BB">hio</span><span style="color: #007700">(){}</span></code></pre>
diff --git a/ext/standard/tests/general_functions/highlight_heredoc.phpt b/ext/standard/tests/general_functions/highlight_heredoc.phpt
@@ -16,12 +16,12 @@ DDDD;
 highlight_string($str);
 ?>
 --EXPECT--
-<pre style="color: #000000">
+<pre><code style="color: #000000">
 $x=&lt;&lt;&lt;DD
 jhdsjkfhjdsh
 DD
 ."";
 $a=&lt;&lt;&lt;DDDD
 jhdsjkfhjdsh
 DDDD;
-</pre>
+</code></pre>
diff --git a/ext/standard/tests/strings/highlight_file.phpt b/ext/standard/tests/strings/highlight_file.phpt
@@ -42,14 +42,14 @@ Warning: highlight_file(%shighlight_file.dat): Failed to open stream: No such fi
 
 Warning: highlight_file(): Failed opening '%shighlight_file.dat' for highlighting in %s on line %d
 bool(false)
-<pre style="color: #000000"><code style="color: #0000BB">&lt;?php </code><code style="color: #007700">echo </code><code style="color: #DD0000">"test"</code><code style="color: #007700">; </code><code style="color: #0000BB">?&gt;</code></pre>bool(true)
-<pre style="color: #000000"><code style="color: #0000BB">&lt;?php </code><code style="color: #007700">echo </code><code style="color: #DD0000">"test ?&gt;</code></pre>bool(true)
-<pre style="color: #000000">
-<code style="color: #0000BB">&lt;?php
-</code><code style="color: #007700">class </code><code style="color: #0000BB">test </code><code style="color: #007700">{
-    public </code><code style="color: #0000BB">$var </code><code style="color: #007700">= </code><code style="color: #0000BB">1</code><code style="color: #007700">;
-    private function </code><code style="color: #0000BB">foo</code><code style="color: #007700">() { echo </code><code style="color: #DD0000">"foo"</code><code style="color: #007700">; }
-    public function </code><code style="color: #0000BB">bar</code><code style="color: #007700">() { </code><code style="color: #0000BB">var_dump</code><code style="color: #007700">(</code><code style="color: #0000BB">test</code><code style="color: #007700">::</code><code style="color: #0000BB">foo</code><code style="color: #007700">()); }
+<pre><code style="color: #000000"><span style="color: #0000BB">&lt;?php </span><span style="color: #007700">echo </span><span style="color: #DD0000">"test"</span><span style="color: #007700">; </span><span style="color: #0000BB">?&gt;</span></code></pre>bool(true)
+<pre><code style="color: #000000"><span style="color: #0000BB">&lt;?php </span><span style="color: #007700">echo </span><span style="color: #DD0000">"test ?&gt;</span></code></pre>bool(true)
+<pre><code style="color: #000000">
+<span style="color: #0000BB">&lt;?php
+</span><span style="color: #007700">class </span><span style="color: #0000BB">test </span><span style="color: #007700">{
+    public </span><span style="color: #0000BB">$var </span><span style="color: #007700">= </span><span style="color: #0000BB">1</span><span style="color: #007700">;
+    private function </span><span style="color: #0000BB">foo</span><span style="color: #007700">() { echo </span><span style="color: #DD0000">"foo"</span><span style="color: #007700">; }
+    public function </span><span style="color: #0000BB">bar</span><span style="color: #007700">() { </span><span style="color: #0000BB">var_dump</span><span style="color: #007700">(</span><span style="color: #0000BB">test</span><span style="color: #007700">::</span><span style="color: #0000BB">foo</span><span style="color: #007700">()); }
 }
-</code><code style="color: #0000BB">?&gt;</code></pre>bool(true)
+</span><span style="color: #0000BB">?&gt;</span></code></pre>bool(true)
 Done
diff --git a/ext/standard/tests/strings/show_source_basic.phpt b/ext/standard/tests/strings/show_source_basic.phpt
@@ -21,19 +21,19 @@ show_source(__FILE__);
 ?>
 --EXPECT--
 *** Test by calling method or function with its expected arguments ***
-<pre style="color: #000000"><code style="color: #0000BB">&lt;?php
-</code><code style="color: #007700">echo </code><code style="color: #DD0000">"*** Test by calling method or function with its expected arguments ***\n"</code><code style="color: #007700">;
-</code><code style="color: #0000BB">$foo </code><code style="color: #007700">= </code><code style="color: #DD0000">'bar'</code><code style="color: #007700">;
-</code><code style="color: #0000BB">$baz </code><code style="color: #007700">= </code><code style="color: #DD0000">"something "</code><code style="color: #007700">.</code><code style="color: #0000BB">$foo</code><code style="color: #007700">.</code><code style="color: #DD0000">"\n"</code><code style="color: #007700">;
+<pre><code style="color: #000000"><span style="color: #0000BB">&lt;?php
+</span><span style="color: #007700">echo </span><span style="color: #DD0000">"*** Test by calling method or function with its expected arguments ***\n"</span><span style="color: #007700">;
+</span><span style="color: #0000BB">$foo </span><span style="color: #007700">= </span><span style="color: #DD0000">'bar'</span><span style="color: #007700">;
+</span><span style="color: #0000BB">$baz </span><span style="color: #007700">= </span><span style="color: #DD0000">"something "</span><span style="color: #007700">.</span><span style="color: #0000BB">$foo</span><span style="color: #007700">.</span><span style="color: #DD0000">"\n"</span><span style="color: #007700">;
 
-if ( </code><code style="color: #0000BB">$foo </code><code style="color: #007700">== </code><code style="color: #DD0000">'bar' </code><code style="color: #007700">)
+if ( </span><span style="color: #0000BB">$foo </span><span style="color: #007700">== </span><span style="color: #DD0000">'bar' </span><span style="color: #007700">)
 {
-  </code><code style="color: #0000BB">$baz </code><code style="color: #007700">= </code><code style="color: #DD0000">'baz'</code><code style="color: #007700">;
+  </span><span style="color: #0000BB">$baz </span><span style="color: #007700">= </span><span style="color: #DD0000">'baz'</span><span style="color: #007700">;
 }
 
- </code><code style="color: #FF8000">/* some code here */
+ </span><span style="color: #FF8000">/* some code here */
 
-</code><code style="color: #0000BB">show_source</code><code style="color: #007700">(</code><code style="color: #0000BB">__FILE__</code><code style="color: #007700">);
+</span><span style="color: #0000BB">show_source</span><span style="color: #007700">(</span><span style="color: #0000BB">__FILE__</span><span style="color: #007700">);
 
-</code><code style="color: #0000BB">?&gt;
-</code></pre>
+</span><span style="color: #0000BB">?&gt;
+</span></code></pre>
diff --git a/ext/standard/tests/strings/show_source_variation1.phpt b/ext/standard/tests/strings/show_source_variation1.phpt
diff --git a/ext/standard/tests/strings/show_source_variation2.phpt b/ext/standard/tests/strings/show_source_variation2.phpt
diff --git a/sapi/cgi/tests/008.phpt b/sapi/cgi/tests/008.phpt
diff --git a/sapi/cli/tests/014.phpt b/sapi/cli/tests/014.phpt
diff --git a/tests/strings/004.phpt b/tests/strings/004.phpt
diff --git a/tests/strings/bug26703.phpt b/tests/strings/bug26703.phpt

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ ZEND_API void zend_highlight(zend_syntax_highlighter_ini *syntax_highlighter_ini`
`82`	`82`	`char *last_color = syntax_highlighter_ini->highlight_html;`
`83`	`83`	`char *next_color;`
`84`	`84`
`85`		`- zend_printf("<pre style=\"color: %s\">", last_color);`
	`85`	`+ zend_printf("<pre><code style=\"color: %s\">", last_color);`
`86`	`86`	`/* highlight stuff coming back from zendlex() */`
`87`	`87`	`while ((token_type=lex_scan(&token, NULL))) {`
`88`	`88`	`switch (token_type) {`
`@@ -127,11 +127,11 @@ ZEND_API void zend_highlight(zend_syntax_highlighter_ini *syntax_highlighter_ini`
`127`	`127`
`128`	`128`	`if (last_color != next_color) {`
`129`	`129`	`if (last_color != syntax_highlighter_ini->highlight_html) {`
`130`		`- zend_printf("</code>");`
	`130`	`+ zend_printf("</span>");`
`131`	`131`	`}`
`132`	`132`	`last_color = next_color;`
`133`	`133`	`if (last_color != syntax_highlighter_ini->highlight_html) {`
`134`		`- zend_printf("<code style=\"color: %s\">", last_color);`
	`134`	`+ zend_printf("<span style=\"color: %s\">", last_color);`
`135`	`135`	`}`
`136`	`136`	`}`
`137`	`137`
`@@ -155,9 +155,9 @@ ZEND_API void zend_highlight(zend_syntax_highlighter_ini *syntax_highlighter_ini`
`155`	`155`	`}`
`156`	`156`
`157`	`157`	`if (last_color != syntax_highlighter_ini->highlight_html) {`
`158`		`- zend_printf("</code>");`
	`158`	`+ zend_printf("</span>");`
`159`	`159`	`}`
`160`		`- zend_printf("</pre>");`
	`160`	`+ zend_printf("</code></pre>");`
`161`	`161`
`162`	`162`	`/* Discard parse errors thrown during tokenization */`
`163`	`163`	`zend_clear_exception();`