diff --git a/Zend/tests/bug35655.phpt b/Zend/tests/bug35655.phpt index 47e7a7bd7e2e8..2caa3e372e7d2 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 b57177e4b5e58..0f0c3a4961722 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 3e64f9c13a518..8e0b7befe8f07 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(139) "
<?php 
+ 09 09 09;
" diff --git a/Zend/tests/nowdoc_013.phpt b/Zend/tests/nowdoc_013.phpt index 61543f74e3b16..e2b9c98015eee 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 694490b17d584..b4cd3ac07fca6 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 501eed5757133..167ee27192ed4 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) {
@@ -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 1a9490be9c91c..4c7c1dddec905 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 04dad8a7ca306..0d01acb6d1c25 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 ddc129912164b..a894b192678e0 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 99d2476490b9a..f821e66bbbde0 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 045aca26c1d0b..55b42a6f5e29c 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 54b50b4821226..f18ea4c111dbb 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 941baef6b7a9a..243f9c3e33943 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 edbd20858ab2d..98c12e27814fc 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 2cbfdaa832246..997b438367ffa 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 f10b91f68e15f..d106af1487657 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 9c4581c124356..f0103d3e26c06 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 9f118e6c5b9bd..20e3ab432eb1e 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 ee4e2e8281b02..d5d25f5eaf63e 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 28bde64a18237..048399216c907 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 4f21adf712409..a4d04c346b42d 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 099dd233a1e95..27977809f0133 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 ca26ef29c9cec..064398356068c 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(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' )
+{
+  $baz = "baz\n";
+}
+
+ /* some code here */
+$source = show_source(__FILE__, true);
+
+var_dump($source);
+?>
+
" diff --git a/sapi/cgi/tests/008.phpt b/sapi/cgi/tests/008.phpt index 05d9d8c190e87..5ba21028b3327 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 734eef0c2ce95..8a13433d643bc 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(1158) "

+<?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 44bb000d14a3a..458278831d3fe 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 4e48845fdf0a1..aaa7833f01660 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"; ?>