diff options
Diffstat (limited to 'sapi/cli')
| -rw-r--r-- | sapi/cli/php_cli.c | 8 | ||||
| -rw-r--r-- | sapi/cli/tests/007.phpt | 8 | ||||
| -rw-r--r-- | sapi/cli/tests/008.phpt | 8 | ||||
| -rw-r--r-- | sapi/cli/tests/009.phpt | 8 | ||||
| -rw-r--r-- | sapi/cli/tests/011.phpt | 4 | ||||
| -rw-r--r-- | sapi/cli/tests/012.phpt | 32 | ||||
| -rw-r--r-- | sapi/cli/tests/014.phpt | 4 |
7 files changed, 36 insertions, 36 deletions
diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c index e5dcfa1e71..635445e92f 100644 --- a/sapi/cli/php_cli.c +++ b/sapi/cli/php_cli.c @@ -797,7 +797,7 @@ int main(int argc, char *argv[]) } request_started = 1; php_cli_usage(argv[0]); - php_output_end_all(TSRMLS_C); + php_end_ob_buffers(1 TSRMLS_CC); exit_status=0; goto out; @@ -807,7 +807,7 @@ int main(int argc, char *argv[]) } request_started = 1; php_print_info(0xFFFFFFFF TSRMLS_CC); - php_output_end_all(TSRMLS_C); + php_end_ob_buffers(1 TSRMLS_CC); exit_status=0; goto out; @@ -821,7 +821,7 @@ int main(int argc, char *argv[]) php_printf("\n[Zend Modules]\n"); print_extensions(TSRMLS_C); php_printf("\n"); - php_output_end_all(TSRMLS_C); + php_end_ob_buffers(1 TSRMLS_CC); exit_status=0; goto out; @@ -844,7 +844,7 @@ int main(int argc, char *argv[]) #endif get_zend_version() ); - php_output_end_all(TSRMLS_C); + php_end_ob_buffers(1 TSRMLS_CC); exit_status=0; goto out; diff --git a/sapi/cli/tests/007.phpt b/sapi/cli/tests/007.phpt index ca0200ec7b..12fddee01d 100644 --- a/sapi/cli/tests/007.phpt +++ b/sapi/cli/tests/007.phpt @@ -32,8 +32,8 @@ class test { /* {{{ */ file_put_contents($filename, $code); -var_dump(`"$php" -n -w "$filename"`); -var_dump(`"$php" -n -w "wrong"`); +var_dump(`$php -n -w "$filename"`); +var_dump(`$php -n -w "wrong"`); var_dump(`echo "<?php /* comment */ class test {\n // comment \n function foo() {} } ?>" | $php -n -w`); @unlink($filename); @@ -45,8 +45,8 @@ string(81) " <?php class test { public $var = "test"; private $pri; function foo() { } } ?> " -string(33) "Could not open input file: wrong -" +Could not open input file: wrong +NULL string(43) "<?php class test { function foo() {} } ?> " Done diff --git a/sapi/cli/tests/008.phpt b/sapi/cli/tests/008.phpt index 1f77a5bb2f..a833043096 100644 --- a/sapi/cli/tests/008.phpt +++ b/sapi/cli/tests/008.phpt @@ -26,8 +26,8 @@ var_dump(test::$pri); file_put_contents($filename, $code); -var_dump(`"$php" -n -f "$filename"`); -var_dump(`"$php" -n -f "wrong"`); +var_dump(`$php -n -f "$filename"`); +var_dump(`$php -n -f "wrong"`); @unlink($filename); @@ -38,6 +38,6 @@ string(%d) " Fatal error: Cannot access private property test::$pri in %s on line %d " -string(33) "Could not open input file: wrong -" +Could not open input file: wrong +NULL Done diff --git a/sapi/cli/tests/009.phpt b/sapi/cli/tests/009.phpt index 33f859fb38..a881a0730e 100644 --- a/sapi/cli/tests/009.phpt +++ b/sapi/cli/tests/009.phpt @@ -13,8 +13,8 @@ var_dump(`$php -n -r "echo hello;" -a`); echo "Done\n"; ?> --EXPECTF-- -string(57) "Either execute direct code, process stdin or use a file. -" -string(57) "Either execute direct code, process stdin or use a file. -" +Either execute direct code, process stdin or use a file. +NULL +Either execute direct code, process stdin or use a file. +NULL Done diff --git a/sapi/cli/tests/011.phpt b/sapi/cli/tests/011.phpt index 6154693517..ef49666d3a 100644 --- a/sapi/cli/tests/011.phpt +++ b/sapi/cli/tests/011.phpt @@ -49,8 +49,8 @@ echo "Done\n"; --EXPECTF-- string(%d) "No syntax errors detected in %s011.test.php " -string(40) "Could not open input file: some.unknown -" +Could not open input file: some.unknown +NULL string(%d) " Parse error: %s expecting %s{%s in %s on line %d Errors parsing %s011.test.php diff --git a/sapi/cli/tests/012.phpt b/sapi/cli/tests/012.phpt index c1e4f6a63a..137e0bd781 100644 --- a/sapi/cli/tests/012.phpt +++ b/sapi/cli/tests/012.phpt @@ -19,20 +19,20 @@ var_dump(`"$php" -n -r '' -r ''`); echo "Done\n"; ?> --EXPECTF-- -string(32) "You can use -R or -F only once. -" -string(32) "You can use -R or -F only once. -" -string(32) "You can use -R or -F only once. -" -string(32) "You can use -R or -F only once. -" -string(26) "You can use -f only once. -" -string(26) "You can use -B only once. -" -string(26) "You can use -E only once. -" -string(26) "You can use -r only once. -" +You can use -R or -F only once. +NULL +You can use -R or -F only once. +NULL +You can use -R or -F only once. +NULL +You can use -R or -F only once. +NULL +You can use -f only once. +NULL +You can use -B only once. +NULL +You can use -E only once. +NULL +You can use -r only once. +NULL Done diff --git a/sapi/cli/tests/014.phpt b/sapi/cli/tests/014.phpt index e8c5203f67..b20478a03d 100644 --- a/sapi/cli/tests/014.phpt +++ b/sapi/cli/tests/014.phpt @@ -39,6 +39,6 @@ string(1478) "<code><span style="color: #000000"> <br /><span style="color: #0000BB"><?php<br />$test </span><span style="color: #007700">= </span><span style="color: #DD0000">"var"</span><span style="color: #007700">; </span><span style="color: #FF8000">//var<br />/* test class */<br /></span><span style="color: #007700">class </span><span style="color: #0000BB">test </span><span style="color: #007700">{<br /> private </span><span style="color: #0000BB">$var </span><span style="color: #007700">= array();<br /><br /> public static function </span><span style="color: #0000BB">foo</span><span style="color: #007700">(</span><span style="color: #0000BB">Test $arg</span><span style="color: #007700">) {<br /> echo </span><span style="color: #DD0000">"hello"</span><span style="color: #007700">;<br /> </span><span style="color: #0000BB">var_dump</span><span style="color: #007700">(</span><span style="color: #0000BB">$this</span><span style="color: #007700">);<br /> }<br />}<br /><br /></span><span style="color: #0000BB">$o </span><span style="color: #007700">= new </span><span style="color: #0000BB">test</span><span style="color: #007700">;<br /></span><span style="color: #0000BB">?><br /></span> </span> </code>" -string(35) "Could not open input file: unknown -" +Could not open input file: unknown +NULL Done |