From 8343be4f5c3301a1c82093cb15571462b9e71c49 Mon Sep 17 00:00:00 2001 From: Kamil Tekiela Date: Fri, 11 Aug 2023 20:39:24 +0100 Subject: [PATCH 1/2] Align highlight_string|file with HTML standard and modern browsers --- Zend/tests/bug35655.phpt | 11 ++++++---- Zend/tests/bug42767.phpt | 5 +---- Zend/tests/bug71086.phpt | 6 ++--- Zend/tests/nowdoc_013.phpt | 10 +++++---- Zend/tests/nowdoc_014.phpt | 9 ++++---- Zend/zend_highlight.c | 20 +++++------------ .../tests/cache_list/frontcontroller15.phpt | 5 +---- .../tests/cache_list/frontcontroller3.phpt | 5 +---- .../tests/cache_list/frontcontroller9.phpt | 5 +---- ext/phar/tests/frontcontroller15.phpt | 5 +---- ext/phar/tests/frontcontroller3.phpt | 5 +---- ext/phar/tests/frontcontroller9.phpt | 5 +---- .../tests/tar/frontcontroller15.phar.phpt | 5 +---- ext/phar/tests/tar/frontcontroller3.phar.phpt | 5 +---- ext/phar/tests/tar/frontcontroller9.phar.phpt | 5 +---- .../tests/zip/frontcontroller15.phar.phpt | 5 +---- ext/phar/tests/zip/frontcontroller3.phar.phpt | 5 +---- ext/phar/tests/zip/frontcontroller9.phar.phpt | 5 +---- .../general_functions/highlight_heredoc.phpt | 12 +++++++--- .../tests/strings/highlight_file.phpt | 22 +++++++++---------- .../tests/strings/show_source_basic.phpt | 20 +++++++++++++---- .../tests/strings/show_source_variation1.phpt | 20 +++++++++++++---- .../tests/strings/show_source_variation2.phpt | 20 +++++++++++++---- sapi/cgi/tests/008.phpt | 20 +++++++++++++---- sapi/cli/tests/014.phpt | 20 +++++++++++++---- tests/strings/004.phpt | 8 ++----- tests/strings/bug26703.phpt | 5 +---- 27 files changed, 141 insertions(+), 127 deletions(-) diff --git a/Zend/tests/bug35655.phpt b/Zend/tests/bug35655.phpt index 47e7a7bd7e2e..6dc67a504f67 100644 --- a/Zend/tests/bug35655.phpt +++ b/Zend/tests/bug35655.phpt @@ -19,7 +19,10 @@ EOT highlight_string($code); ?> --EXPECT-- - -
<?php
  $x = <<<EOT
some string    
EOT
  $y = 2;
?> - - +
+<?php
+  $x = <<<EOT
+some string    
+EOT
+  $y = 2;
+?>
diff --git a/Zend/tests/bug42767.phpt b/Zend/tests/bug42767.phpt index b57177e4b5e5..a1b18448dc4f 100644 --- a/Zend/tests/bug42767.phpt +++ b/Zend/tests/bug42767.phpt @@ -11,7 +11,4 @@ highlight.html = #000000 highlight_string(' --EXPECT-- - -<?php /*some comment.. - - +
<?php /*some comment..
diff --git a/Zend/tests/bug71086.phpt b/Zend/tests/bug71086.phpt index 3e64f9c13a51..f7861ba74128 100644 --- a/Zend/tests/bug71086.phpt +++ b/Zend/tests/bug71086.phpt @@ -8,7 +8,5 @@ var_dump($highlightedString); ?> --EXPECT-- -string(169) " -<?php 
 09 09 09; - -" +string(126) "
<?php 
+ 09 09 09;
" diff --git a/Zend/tests/nowdoc_013.phpt b/Zend/tests/nowdoc_013.phpt index 61543f74e3b1..04b1470f9535 100644 --- a/Zend/tests/nowdoc_013.phpt +++ b/Zend/tests/nowdoc_013.phpt @@ -20,7 +20,9 @@ EOF; highlight_string($code); ?> --EXPECT-- - -<?php
  $x = <<<'EOT'
some string    
EOT
  $y = 2;
?> - - +
<?php
+  $x = <<<'EOT'
+some string    
+EOT
+  $y = 2;
+?>
diff --git a/Zend/tests/nowdoc_014.phpt b/Zend/tests/nowdoc_014.phpt index 694490b17d58..55a575265ed4 100644 --- a/Zend/tests/nowdoc_014.phpt +++ b/Zend/tests/nowdoc_014.phpt @@ -18,7 +18,8 @@ EOF; highlight_string($code); ?> --EXPECT-- - -<?php
  $x = <<<'EOT'
EOT
  $y = 2;
?> - - +
<?php
+  $x = <<<'EOT'
+EOT
+  $y = 2;
+?>
diff --git a/Zend/zend_highlight.c b/Zend/zend_highlight.c index 501eed575713..b1bbfc4b50aa 100644 --- a/Zend/zend_highlight.c +++ b/Zend/zend_highlight.c @@ -28,9 +28,6 @@ ZEND_API void zend_html_putc(char c) { switch (c) { - case '\n': - ZEND_PUTS("
"); - break; case '<': ZEND_PUTS("<"); break; @@ -40,11 +37,8 @@ ZEND_API void zend_html_putc(char c) case '&': ZEND_PUTS("&"); break; - case ' ': - ZEND_PUTS(" "); - break; case '\t': - ZEND_PUTS("    "); + ZEND_PUTS(" "); break; default: ZEND_PUTC(c); @@ -88,8 +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(""); - zend_printf("\n", last_color); + zend_printf("
", last_color);
 	/* highlight stuff coming back from zendlex() */
 	while ((token_type=lex_scan(&token, NULL))) {
 		switch (token_type) {
@@ -134,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("");
+				zend_printf("");
 			}
 			last_color = next_color;
 			if (last_color != syntax_highlighter_ini->highlight_html) {
-				zend_printf("", last_color);
+				zend_printf("", last_color);
 			}
 		}
 
@@ -162,10 +155,9 @@ ZEND_API void zend_highlight(zend_syntax_highlighter_ini *syntax_highlighter_ini
 	}
 
 	if (last_color != syntax_highlighter_ini->highlight_html) {
-		zend_printf("\n");
+		zend_printf("");
 	}
-	zend_printf("\n");
-	zend_printf("");
+	zend_printf("
"); /* 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 index 1a9490be9c91..20eac4bf59c5 100644 --- a/ext/phar/tests/cache_list/frontcontroller15.phpt +++ b/ext/phar/tests/cache_list/frontcontroller15.phpt @@ -14,7 +14,4 @@ files/frontcontroller8.phar --EXPECTHEADERS-- Content-type: text/html; charset=UTF-8 --EXPECT-- - -<?php function hio(){} - - +
<?php function hio(){}
diff --git a/ext/phar/tests/cache_list/frontcontroller3.phpt b/ext/phar/tests/cache_list/frontcontroller3.phpt index 04dad8a7ca30..a5faee6afa53 100644 --- a/ext/phar/tests/cache_list/frontcontroller3.phpt +++ b/ext/phar/tests/cache_list/frontcontroller3.phpt @@ -14,7 +14,4 @@ files/frontcontroller.phar --EXPECTHEADERS-- Content-type: text/html; charset=UTF-8 --EXPECT-- - -<?php function hio(){} - - +
<?php function hio(){}
diff --git a/ext/phar/tests/cache_list/frontcontroller9.phpt b/ext/phar/tests/cache_list/frontcontroller9.phpt index ddc129912164..c526fda6ac7f 100644 --- a/ext/phar/tests/cache_list/frontcontroller9.phpt +++ b/ext/phar/tests/cache_list/frontcontroller9.phpt @@ -14,7 +14,4 @@ files/frontcontroller3.phar --EXPECTHEADERS-- Content-type: text/html; charset=UTF-8 --EXPECT-- - -<?php function hio(){} - - +
<?php function hio(){}
diff --git a/ext/phar/tests/frontcontroller15.phpt b/ext/phar/tests/frontcontroller15.phpt index 99d2476490b9..efe809e594ad 100644 --- a/ext/phar/tests/frontcontroller15.phpt +++ b/ext/phar/tests/frontcontroller15.phpt @@ -13,7 +13,4 @@ files/frontcontroller8.phar --EXPECTHEADERS-- Content-type: text/html; charset=UTF-8 --EXPECT-- - -<?php function hio(){} - - +
<?php function hio(){}
diff --git a/ext/phar/tests/frontcontroller3.phpt b/ext/phar/tests/frontcontroller3.phpt index 045aca26c1d0..bf217cfecdfa 100644 --- a/ext/phar/tests/frontcontroller3.phpt +++ b/ext/phar/tests/frontcontroller3.phpt @@ -13,7 +13,4 @@ files/frontcontroller.phar --EXPECTHEADERS-- Content-type: text/html; charset=UTF-8 --EXPECT-- - -<?php function hio(){} - - +
<?php function hio(){}
diff --git a/ext/phar/tests/frontcontroller9.phpt b/ext/phar/tests/frontcontroller9.phpt index 54b50b482122..f4d6f5a5997b 100644 --- a/ext/phar/tests/frontcontroller9.phpt +++ b/ext/phar/tests/frontcontroller9.phpt @@ -13,7 +13,4 @@ files/frontcontroller3.phar --EXPECTHEADERS-- Content-type: text/html; charset=UTF-8 --EXPECT-- - -<?php function hio(){} - - +
<?php function hio(){}
diff --git a/ext/phar/tests/tar/frontcontroller15.phar.phpt b/ext/phar/tests/tar/frontcontroller15.phar.phpt index 941baef6b7a9..6498c57eeadf 100644 --- a/ext/phar/tests/tar/frontcontroller15.phar.phpt +++ b/ext/phar/tests/tar/frontcontroller15.phar.phpt @@ -13,7 +13,4 @@ files/frontcontroller8.phar.tar --EXPECTHEADERS-- Content-type: text/html; charset=UTF-8 --EXPECT-- - -<?php function hio(){} - - +
<?php function hio(){}
diff --git a/ext/phar/tests/tar/frontcontroller3.phar.phpt b/ext/phar/tests/tar/frontcontroller3.phar.phpt index edbd20858ab2..ecbf5ad69ad4 100644 --- a/ext/phar/tests/tar/frontcontroller3.phar.phpt +++ b/ext/phar/tests/tar/frontcontroller3.phar.phpt @@ -13,7 +13,4 @@ files/frontcontroller.phar.tar --EXPECTHEADERS-- Content-type: text/html; charset=UTF-8 --EXPECT-- - -<?php function hio(){} - - +
<?php function hio(){}
diff --git a/ext/phar/tests/tar/frontcontroller9.phar.phpt b/ext/phar/tests/tar/frontcontroller9.phar.phpt index 2cbfdaa83224..63c177c8cb67 100644 --- a/ext/phar/tests/tar/frontcontroller9.phar.phpt +++ b/ext/phar/tests/tar/frontcontroller9.phar.phpt @@ -13,7 +13,4 @@ files/frontcontroller3.phar.tar --EXPECTHEADERS-- Content-type: text/html; charset=UTF-8 --EXPECT-- - -<?php function hio(){} - - +
<?php function hio(){}
diff --git a/ext/phar/tests/zip/frontcontroller15.phar.phpt b/ext/phar/tests/zip/frontcontroller15.phar.phpt index f10b91f68e15..1274622898a2 100644 --- a/ext/phar/tests/zip/frontcontroller15.phar.phpt +++ b/ext/phar/tests/zip/frontcontroller15.phar.phpt @@ -15,7 +15,4 @@ files/frontcontroller8.phar.zip --EXPECTHEADERS-- Content-type: text/html; charset=UTF-8 --EXPECT-- - -<?php function hio(){} - - +
<?php function hio(){}
diff --git a/ext/phar/tests/zip/frontcontroller3.phar.phpt b/ext/phar/tests/zip/frontcontroller3.phar.phpt index 9c4581c12435..f4513e08bf15 100644 --- a/ext/phar/tests/zip/frontcontroller3.phar.phpt +++ b/ext/phar/tests/zip/frontcontroller3.phar.phpt @@ -15,7 +15,4 @@ files/frontcontroller.phar.zip --EXPECTHEADERS-- Content-type: text/html; charset=UTF-8 --EXPECT-- - -<?php function hio(){} - - +
<?php function hio(){}
diff --git a/ext/phar/tests/zip/frontcontroller9.phar.phpt b/ext/phar/tests/zip/frontcontroller9.phar.phpt index 9f118e6c5b9b..4b5508e700f3 100644 --- a/ext/phar/tests/zip/frontcontroller9.phar.phpt +++ b/ext/phar/tests/zip/frontcontroller9.phar.phpt @@ -13,7 +13,4 @@ files/frontcontroller3.phar.zip --EXPECTHEADERS-- Content-type: text/html; charset=UTF-8 --EXPECT-- - -<?php function hio(){} - - +
<?php function hio(){}
diff --git a/ext/standard/tests/general_functions/highlight_heredoc.phpt b/ext/standard/tests/general_functions/highlight_heredoc.phpt index ee4e2e8281b0..54025adf1109 100644 --- a/ext/standard/tests/general_functions/highlight_heredoc.phpt +++ b/ext/standard/tests/general_functions/highlight_heredoc.phpt @@ -16,6 +16,12 @@ DDDD; highlight_string($str); ?> --EXPECT-- - -
$x=<<<DD
jhdsjkfhjdsh
DD
."";
$a=<<<DDDD
jhdsjkfhjdsh
DDDD;
 - +
+$x=<<<DD
+jhdsjkfhjdsh
+DD
+."";
+$a=<<<DDDD
+jhdsjkfhjdsh
+DDDD;
+
diff --git a/ext/standard/tests/strings/highlight_file.phpt b/ext/standard/tests/strings/highlight_file.phpt index 28bde64a1823..9b940e5057a1 100644 --- a/ext/standard/tests/strings/highlight_file.phpt +++ b/ext/standard/tests/strings/highlight_file.phpt @@ -42,16 +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) - -<?php echo "test"; ?> - -bool(true) - -<?php echo "test ?> - -bool(true) - -
<?php
class test {
    public $var = 1;
    private function foo() { echo "foo"; }
    public function bar() { var_dump(test::foo()); }
}
?> - -bool(true) +
<?php echo "test"; ?>
bool(true) +
<?php echo "test ?>
bool(true) +
+<?php
+class test {
+    public $var = 1;
+    private function foo() { echo "foo"; }
+    public function bar() { var_dump(test::foo()); }
+}
+?>
bool(true) Done diff --git a/ext/standard/tests/strings/show_source_basic.phpt b/ext/standard/tests/strings/show_source_basic.phpt index 4f21adf71240..13b31eed12c4 100644 --- a/ext/standard/tests/strings/show_source_basic.phpt +++ b/ext/standard/tests/strings/show_source_basic.phpt @@ -21,7 +21,19 @@ show_source(__FILE__); ?> --EXPECT-- *** Test by calling method or function with its expected arguments *** - -<?php
echo "*** Test by calling method or function with its expected arguments ***\n";
$foo = 'bar';
$baz = "something ".$foo."\n";

if ( $foo == 'bar' )
{
  $baz = 'baz';
}

 /* some code here */

show_source(__FILE__);

?>
 - - +
<?php
+echo "*** Test by calling method or function with its expected arguments ***\n";
+$foo = 'bar';
+$baz = "something ".$foo."\n";
+
+if ( $foo == 'bar' )
+{
+  $baz = 'baz';
+}
+
+ /* some code here */
+
+show_source(__FILE__);
+
+?>
+
diff --git a/ext/standard/tests/strings/show_source_variation1.phpt b/ext/standard/tests/strings/show_source_variation1.phpt index 099dd233a1e9..b467d2aa1b95 100644 --- a/ext/standard/tests/strings/show_source_variation1.phpt +++ b/ext/standard/tests/strings/show_source_variation1.phpt @@ -22,7 +22,19 @@ echo $foo; --EXPECT-- *** Test by calling method or function with its expected arguments and php output *** baz - -<?php
echo "*** Test by calling method or function with its expected arguments and php output ***\n";
$foo = 'bar';
$baz = "something ".$foo."\n";

if ( $foo == 'bar' )
{
  $baz = "baz\n";
}

 /* some code here */
echo $baz;
show_source(__FILE__);
echo $foo;
?>
 - -bar +
<?php
+echo "*** Test by calling method or function with its expected arguments and php output ***\n";
+$foo = 'bar';
+$baz = "something ".$foo."\n";
+
+if ( $foo == 'bar' )
+{
+  $baz = "baz\n";
+}
+
+ /* some code here */
+echo $baz;
+show_source(__FILE__);
+echo $foo;
+?>
+
bar diff --git a/ext/standard/tests/strings/show_source_variation2.phpt b/ext/standard/tests/strings/show_source_variation2.phpt index ca26ef29c9ce..a38b7d45bc60 100644 --- a/ext/standard/tests/strings/show_source_variation2.phpt +++ b/ext/standard/tests/strings/show_source_variation2.phpt @@ -21,7 +21,19 @@ var_dump($source); ?> --EXPECT-- *** Test by calling method or function with its expected arguments and output to variable *** -string(1975) " -<?php
echo "*** Test by calling method or function with its expected arguments and output to variable ***\n";
$foo = 'bar';
$baz = "something ".$foo."\n";

if ( $foo == 'bar' )
{
  $baz = "baz\n";
}

 /* some code here */
$source = show_source(__FILE__, true);

var_dump($source);
?>
 - -" +string(1691) "
<?php
+echo "*** Test by calling method or function with its expected arguments and output to variable ***\n";
+$foo = 'bar';
+$baz = "something ".$foo."\n";
+
+if ( $foo == 'bar' )
+{
+  $baz = "baz\n";
+}
+
+ /* some pre here */
+$source = show_source(__FILE__, true);
+
+var_dump($source);
+?>
+
" diff --git a/sapi/cgi/tests/008.phpt b/sapi/cgi/tests/008.phpt index 05d9d8c190e8..ee439e4929ad 100644 --- a/sapi/cgi/tests/008.phpt +++ b/sapi/cgi/tests/008.phpt @@ -41,10 +41,22 @@ echo "Done\n"; string(%d) "X-Powered-By: PHP/%s Content-type: text/html%r; charset=.*|%r - -
<?php
$test = "var"; //var
/* test class */
class test {
    private $var = array();

    public static function foo(Test $arg) {
        echo "hello";
        var_dump($this);
    }
}

$o = new test;
?>
 - -" +
+<?php
+$test = "var"; //var
+/* test class */
+class test {
+    private $var = array();
+
+    public static function foo(Test $arg) {
+        echo "hello";
+        var_dump($this);
+    }
+}
+
+$o = new test;
+?>
+
" string(%d) "Status: 404 Not Found X-Powered-By: PHP/%s Content-type: text/html%r; charset=.*|%r diff --git a/sapi/cli/tests/014.phpt b/sapi/cli/tests/014.phpt index 734eef0c2ce9..826255c483df 100644 --- a/sapi/cli/tests/014.phpt +++ b/sapi/cli/tests/014.phpt @@ -36,10 +36,22 @@ var_dump(`$php -n -s unknown`); echo "Done\n"; ?> --EXPECT-- -string(1478) " -
<?php
$test = "var"; //var
/* test class */
class test {
    private $var = array();

    public static function foo(Test $arg) {
        echo "hello";
        var_dump($this);
    }
}

$o = new test;
?>
 - -" +string(1145) "
+<?php
+$test = "var"; //var
+/* test class */
+class test {
+    private $var = array();
+
+    public static function foo(Test $arg) {
+        echo "hello";
+        var_dump($this);
+    }
+}
+
+$o = new test;
+?>
+
" Could not open input file: unknown NULL Done diff --git a/tests/strings/004.phpt b/tests/strings/004.phpt index 44bb000d14a3..50517a84815b 100644 --- a/tests/strings/004.phpt +++ b/tests/strings/004.phpt @@ -13,9 +13,5 @@ $var = highlight_string("

", TRUE); echo "\n[$var]\n"; ?> --EXPECT-- - -<br /><?php echo "foo"; ?><br /> - -[ -<br /><?php echo "bar"; ?><br /> -] +
<br /><?php echo "foo"; ?><br />
+[
<br /><?php echo "bar"; ?><br />
] diff --git a/tests/strings/bug26703.phpt b/tests/strings/bug26703.phpt index 4e48845fdf0a..6a7c0d5105b1 100644 --- a/tests/strings/bug26703.phpt +++ b/tests/strings/bug26703.phpt @@ -11,7 +11,4 @@ highlight.html=#000000 highlight_string(''); ?> --EXPECT-- - -<?php echo "foo[] $a \n"; ?> - - +
<?php echo "foo[] $a \n"; ?>
From 950b893269955e5b6e5cdf0e3f69cf21fb0149c8 Mon Sep 17 00:00:00 2001 From: Kamil Tekiela Date: Fri, 11 Aug 2023 21:14:13 +0100 Subject: [PATCH 2/2] Revert to use again --- Zend/tests/bug35655.phpt | 14 +++++------ Zend/tests/bug42767.phpt | 2 +- Zend/tests/bug71086.phpt | 4 ++-- Zend/tests/nowdoc_013.phpt | 12 +++++----- Zend/tests/nowdoc_014.phpt | 8 +++---- Zend/zend_highlight.c | 10 ++++---- .../tests/cache_list/frontcontroller15.phpt | 2 +- .../tests/cache_list/frontcontroller3.phpt | 2 +- .../tests/cache_list/frontcontroller9.phpt | 2 +- ext/phar/tests/frontcontroller15.phpt | 2 +- ext/phar/tests/frontcontroller3.phpt | 2 +- ext/phar/tests/frontcontroller9.phpt | 2 +- .../tests/tar/frontcontroller15.phar.phpt | 2 +- ext/phar/tests/tar/frontcontroller3.phar.phpt | 2 +- ext/phar/tests/tar/frontcontroller9.phar.phpt | 2 +- .../tests/zip/frontcontroller15.phar.phpt | 2 +- ext/phar/tests/zip/frontcontroller3.phar.phpt | 2 +- ext/phar/tests/zip/frontcontroller9.phar.phpt | 2 +- .../general_functions/highlight_heredoc.phpt | 4 ++-- .../tests/strings/highlight_file.phpt | 18 +++++++------- .../tests/strings/show_source_basic.phpt | 20 ++++++++-------- .../tests/strings/show_source_variation1.phpt | 24 +++++++++---------- .../tests/strings/show_source_variation2.phpt | 22 ++++++++--------- sapi/cgi/tests/008.phpt | 22 ++++++++--------- sapi/cli/tests/014.phpt | 22 ++++++++--------- tests/strings/004.phpt | 4 ++-- tests/strings/bug26703.phpt | 2 +- 27 files changed, 106 insertions(+), 106 deletions(-) diff --git a/Zend/tests/bug35655.phpt b/Zend/tests/bug35655.phpt index 6dc67a504f67..2caa3e372e7d 100644 --- a/Zend/tests/bug35655.phpt +++ b/Zend/tests/bug35655.phpt @@ -19,10 +19,10 @@ EOT highlight_string($code); ?> --EXPECT-- -
-<?php
-  $x = <<<EOT
-some string    
-EOT
-  $y = 2;
-?>
+

+<?php
+  $x = <<<EOT
+some string    
+EOT
+  $y = 2;
+?>
diff --git a/Zend/tests/bug42767.phpt b/Zend/tests/bug42767.phpt index a1b18448dc4f..0f0c3a496172 100644 --- a/Zend/tests/bug42767.phpt +++ b/Zend/tests/bug42767.phpt @@ -11,4 +11,4 @@ highlight.html = #000000 highlight_string(' --EXPECT-- -
<?php /*some comment..
+
<?php /*some comment..
diff --git a/Zend/tests/bug71086.phpt b/Zend/tests/bug71086.phpt index f7861ba74128..8e0b7befe8f0 100644 --- a/Zend/tests/bug71086.phpt +++ b/Zend/tests/bug71086.phpt @@ -8,5 +8,5 @@ var_dump($highlightedString); ?> --EXPECT-- -string(126) "
<?php 
- 09 09 09;
" +string(139) "
<?php 
+ 09 09 09;
" diff --git a/Zend/tests/nowdoc_013.phpt b/Zend/tests/nowdoc_013.phpt index 04b1470f9535..e2b9c98015ee 100644 --- a/Zend/tests/nowdoc_013.phpt +++ b/Zend/tests/nowdoc_013.phpt @@ -20,9 +20,9 @@ EOF; highlight_string($code); ?> --EXPECT-- -
<?php
-  $x = <<<'EOT'
-some string    
-EOT
-  $y = 2;
-?>
+
<?php
+  $x = <<<'EOT'
+some string    
+EOT
+  $y = 2;
+?>
diff --git a/Zend/tests/nowdoc_014.phpt b/Zend/tests/nowdoc_014.phpt index 55a575265ed4..b4cd3ac07fca 100644 --- a/Zend/tests/nowdoc_014.phpt +++ b/Zend/tests/nowdoc_014.phpt @@ -18,8 +18,8 @@ EOF; highlight_string($code); ?> --EXPECT-- -
<?php
-  $x = <<<'EOT'
+
<?php
+  $x = <<<'EOT'
 EOT
-  $y = 2;
-?>

+  $y = 2;
+?>
diff --git a/Zend/zend_highlight.c b/Zend/zend_highlight.c index b1bbfc4b50aa..167ee27192ed 100644 --- 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("
", last_color);
+	zend_printf("
", 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("");
+				zend_printf("");
 			}
 			last_color = next_color;
 			if (last_color != syntax_highlighter_ini->highlight_html) {
-				zend_printf("", last_color);
+				zend_printf("", 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("");
+		zend_printf("");
 	}
-	zend_printf("
");
+	zend_printf("
"); /* 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 index 20eac4bf59c5..4c7c1dddec90 100644 --- 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-- -
<?php function hio(){}
+
<?php function hio(){}
diff --git a/ext/phar/tests/cache_list/frontcontroller3.phpt b/ext/phar/tests/cache_list/frontcontroller3.phpt index a5faee6afa53..0d01acb6d1c2 100644 --- 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-- -
<?php function hio(){}
+
<?php function hio(){}
diff --git a/ext/phar/tests/cache_list/frontcontroller9.phpt b/ext/phar/tests/cache_list/frontcontroller9.phpt index c526fda6ac7f..a894b192678e 100644 --- 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-- -
<?php function hio(){}
+
<?php function hio(){}
diff --git a/ext/phar/tests/frontcontroller15.phpt b/ext/phar/tests/frontcontroller15.phpt index efe809e594ad..f821e66bbbde 100644 --- 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-- -
<?php function hio(){}
+
<?php function hio(){}
diff --git a/ext/phar/tests/frontcontroller3.phpt b/ext/phar/tests/frontcontroller3.phpt index bf217cfecdfa..55b42a6f5e29 100644 --- 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-- -
<?php function hio(){}
+
<?php function hio(){}
diff --git a/ext/phar/tests/frontcontroller9.phpt b/ext/phar/tests/frontcontroller9.phpt index f4d6f5a5997b..f18ea4c111db 100644 --- 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-- -
<?php function hio(){}
+
<?php function hio(){}
diff --git a/ext/phar/tests/tar/frontcontroller15.phar.phpt b/ext/phar/tests/tar/frontcontroller15.phar.phpt index 6498c57eeadf..243f9c3e3394 100644 --- 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-- -
<?php function hio(){}
+
<?php function hio(){}
diff --git a/ext/phar/tests/tar/frontcontroller3.phar.phpt b/ext/phar/tests/tar/frontcontroller3.phar.phpt index ecbf5ad69ad4..98c12e27814f 100644 --- 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-- -
<?php function hio(){}
+
<?php function hio(){}
diff --git a/ext/phar/tests/tar/frontcontroller9.phar.phpt b/ext/phar/tests/tar/frontcontroller9.phar.phpt index 63c177c8cb67..997b438367ff 100644 --- 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-- -
<?php function hio(){}
+
<?php function hio(){}
diff --git a/ext/phar/tests/zip/frontcontroller15.phar.phpt b/ext/phar/tests/zip/frontcontroller15.phar.phpt index 1274622898a2..d106af148765 100644 --- 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-- -
<?php function hio(){}
+
<?php function hio(){}
diff --git a/ext/phar/tests/zip/frontcontroller3.phar.phpt b/ext/phar/tests/zip/frontcontroller3.phar.phpt index f4513e08bf15..f0103d3e26c0 100644 --- 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-- -
<?php function hio(){}
+
<?php function hio(){}
diff --git a/ext/phar/tests/zip/frontcontroller9.phar.phpt b/ext/phar/tests/zip/frontcontroller9.phar.phpt index 4b5508e700f3..20e3ab432eb1 100644 --- 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-- -
<?php function hio(){}
+
<?php function hio(){}
diff --git a/ext/standard/tests/general_functions/highlight_heredoc.phpt b/ext/standard/tests/general_functions/highlight_heredoc.phpt index 54025adf1109..d5d25f5eaf63 100644 --- a/ext/standard/tests/general_functions/highlight_heredoc.phpt +++ b/ext/standard/tests/general_functions/highlight_heredoc.phpt @@ -16,7 +16,7 @@ DDDD; highlight_string($str); ?> --EXPECT-- -
+

 $x=<<<DD
 jhdsjkfhjdsh
 DD
@@ -24,4 +24,4 @@ DD
 $a=<<<DDDD
 jhdsjkfhjdsh
 DDDD;
-

+
diff --git a/ext/standard/tests/strings/highlight_file.phpt b/ext/standard/tests/strings/highlight_file.phpt index 9b940e5057a1..048399216c90 100644 --- 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) -
<?php echo "test"; ?>
bool(true) -
<?php echo "test ?>
bool(true) -
-<?php
-class test {
-    public $var = 1;
-    private function foo() { echo "foo"; }
-    public function bar() { var_dump(test::foo()); }
+
<?php echo "test"; ?>
bool(true)
+
<?php echo "test ?>
bool(true)
+

+<?php
+class test {
+    public $var = 1;
+    private function foo() { echo "foo"; }
+    public function bar() { var_dump(test::foo()); }
 }
-?>
bool(true)
+?>
bool(true) Done diff --git a/ext/standard/tests/strings/show_source_basic.phpt b/ext/standard/tests/strings/show_source_basic.phpt index 13b31eed12c4..a4d04c346b42 100644 --- 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 *** -
<?php
-echo "*** Test by calling method or function with its expected arguments ***\n";
-$foo = 'bar';
-$baz = "something ".$foo."\n";
+
<?php
+echo "*** Test by calling method or function with its expected arguments ***\n";
+$foo = 'bar';
+$baz = "something ".$foo."\n";
 
-if ( $foo == 'bar' )
+if ( $foo == 'bar' )
 {
-  $baz = 'baz';
+  $baz = 'baz';
 }
 
- /* some code here */
+ /* some code here */
 
-show_source(__FILE__);
+show_source(__FILE__);
 
-?>
-

+?>
+
diff --git a/ext/standard/tests/strings/show_source_variation1.phpt b/ext/standard/tests/strings/show_source_variation1.phpt index b467d2aa1b95..27977809f013 100644 --- a/ext/standard/tests/strings/show_source_variation1.phpt +++ b/ext/standard/tests/strings/show_source_variation1.phpt @@ -22,19 +22,19 @@ echo $foo; --EXPECT-- *** Test by calling method or function with its expected arguments and php output *** baz -
<?php
-echo "*** Test by calling method or function with its expected arguments and php output ***\n";
-$foo = 'bar';
-$baz = "something ".$foo."\n";
+
<?php
+echo "*** Test by calling method or function with its expected arguments and php output ***\n";
+$foo = 'bar';
+$baz = "something ".$foo."\n";
 
-if ( $foo == 'bar' )
+if ( $foo == 'bar' )
 {
-  $baz = "baz\n";
+  $baz = "baz\n";
 }
 
- /* some code here */
-echo $baz;
-show_source(__FILE__);
-echo $foo;
-?>
-
bar
+ /* some code here */
+echo $baz;
+show_source(__FILE__);
+echo $foo;
+?>
+
bar diff --git a/ext/standard/tests/strings/show_source_variation2.phpt b/ext/standard/tests/strings/show_source_variation2.phpt index a38b7d45bc60..064398356068 100644 --- a/ext/standard/tests/strings/show_source_variation2.phpt +++ b/ext/standard/tests/strings/show_source_variation2.phpt @@ -21,19 +21,19 @@ var_dump($source); ?> --EXPECT-- *** Test by calling method or function with its expected arguments and output to variable *** -string(1691) "
<?php
-echo "*** Test by calling method or function with its expected arguments and output to variable ***\n";
-$foo = 'bar';
-$baz = "something ".$foo."\n";
+string(1705) "
<?php
+echo "*** Test by calling method or function with its expected arguments and output to variable ***\n";
+$foo = 'bar';
+$baz = "something ".$foo."\n";
 
-if ( $foo == 'bar' )
+if ( $foo == 'bar' )
 {
-  $baz = "baz\n";
+  $baz = "baz\n";
 }
 
- /* some pre here */
-$source = show_source(__FILE__, true);
+ /* some code here */
+$source = show_source(__FILE__, true);
 
-var_dump($source);
-?>
-
"
+var_dump($source);
+?>
+
" diff --git a/sapi/cgi/tests/008.phpt b/sapi/cgi/tests/008.phpt index ee439e4929ad..5ba21028b332 100644 --- a/sapi/cgi/tests/008.phpt +++ b/sapi/cgi/tests/008.phpt @@ -41,22 +41,22 @@ echo "Done\n"; string(%d) "X-Powered-By: PHP/%s Content-type: text/html%r; charset=.*|%r -
-<?php
-$test = "var"; //var
+

+<?php
+$test = "var"; //var
 /* test class */
-class test {
-    private $var = array();
+class test {
+    private $var = array();
 
-    public static function foo(Test $arg) {
-        echo "hello";
-        var_dump($this);
+    public static function foo(Test $arg) {
+        echo "hello";
+        var_dump($this);
     }
 }
 
-$o = new test;
-?>
-
"
+$o = new test;
+?>
+
" string(%d) "Status: 404 Not Found X-Powered-By: PHP/%s Content-type: text/html%r; charset=.*|%r diff --git a/sapi/cli/tests/014.phpt b/sapi/cli/tests/014.phpt index 826255c483df..8a13433d643b 100644 --- a/sapi/cli/tests/014.phpt +++ b/sapi/cli/tests/014.phpt @@ -36,22 +36,22 @@ var_dump(`$php -n -s unknown`); echo "Done\n"; ?> --EXPECT-- -string(1145) "
-<?php
-$test = "var"; //var
+string(1158) "

+<?php
+$test = "var"; //var
 /* test class */
-class test {
-    private $var = array();
+class test {
+    private $var = array();
 
-    public static function foo(Test $arg) {
-        echo "hello";
-        var_dump($this);
+    public static function foo(Test $arg) {
+        echo "hello";
+        var_dump($this);
     }
 }
 
-$o = new test;
-?>
-
"
+$o = new test;
+?>
+
" Could not open input file: unknown NULL Done diff --git a/tests/strings/004.phpt b/tests/strings/004.phpt index 50517a84815b..458278831d3f 100644 --- a/tests/strings/004.phpt +++ b/tests/strings/004.phpt @@ -13,5 +13,5 @@ $var = highlight_string("

", TRUE); echo "\n[$var]\n"; ?> --EXPECT-- -
<br /><?php echo "foo"; ?><br />
-[
<br /><?php echo "bar"; ?><br />
] +
<br /><?php echo "foo"; ?><br />
+[
<br /><?php echo "bar"; ?><br />
] diff --git a/tests/strings/bug26703.phpt b/tests/strings/bug26703.phpt index 6a7c0d5105b1..aaa7833f0166 100644 --- a/tests/strings/bug26703.phpt +++ b/tests/strings/bug26703.phpt @@ -11,4 +11,4 @@ highlight.html=#000000 highlight_string(''); ?> --EXPECT-- -
<?php echo "foo[] $a \n"; ?>
+
<?php echo "foo[] $a \n"; ?>