From 829d08e50c1172d8dc4c8e60eb5bda8b2fa22315 Mon Sep 17 00:00:00 2001 From: Antony Dovgal Date: Wed, 4 May 2011 08:24:16 +0000 Subject: [PATCH] fix CLI tests failing because of new OB API --- sapi/cli/tests/007.phpt | 4 ++-- sapi/cli/tests/008.phpt | 4 ++-- sapi/cli/tests/009.phpt | 8 ++++---- sapi/cli/tests/011.phpt | 6 +++--- sapi/cli/tests/012.phpt | 32 ++++++++++++++++---------------- sapi/cli/tests/014.phpt | 4 ++-- 6 files changed, 29 insertions(+), 29 deletions(-) diff --git a/sapi/cli/tests/007.phpt b/sapi/cli/tests/007.phpt index 12fddee01d..0bf40703d9 100644 --- a/sapi/cli/tests/007.phpt +++ b/sapi/cli/tests/007.phpt @@ -45,8 +45,8 @@ string(81) " " -Could not open input file: wrong -NULL +string(33) "Could not open input file: wrong +" string(43) " " Done diff --git a/sapi/cli/tests/008.phpt b/sapi/cli/tests/008.phpt index a833043096..e14338f5f5 100644 --- a/sapi/cli/tests/008.phpt +++ b/sapi/cli/tests/008.phpt @@ -38,6 +38,6 @@ string(%d) " Fatal error: Cannot access private property test::$pri in %s on line %d " -Could not open input file: wrong -NULL +string(33) "Could not open input file: wrong +" Done diff --git a/sapi/cli/tests/009.phpt b/sapi/cli/tests/009.phpt index a881a0730e..33f859fb38 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-- -Either execute direct code, process stdin or use a file. -NULL -Either execute direct code, process stdin or use a file. -NULL +string(57) "Either execute direct code, process stdin or use a file. +" +string(57) "Either execute direct code, process stdin or use a file. +" Done diff --git a/sapi/cli/tests/011.phpt b/sapi/cli/tests/011.phpt index ef49666d3a..e167f94d0c 100644 --- a/sapi/cli/tests/011.phpt +++ b/sapi/cli/tests/011.phpt @@ -49,9 +49,9 @@ echo "Done\n"; --EXPECTF-- string(%d) "No syntax errors detected in %s011.test.php " -Could not open input file: some.unknown -NULL -string(%d) " +string(40) "Could not open input file: some.unknown +" +string(186) " 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 137e0bd781..c1e4f6a63a 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-- -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 +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. +" Done diff --git a/sapi/cli/tests/014.phpt b/sapi/cli/tests/014.phpt index b20478a03d..e8c5203f67 100644 --- a/sapi/cli/tests/014.phpt +++ b/sapi/cli/tests/014.phpt @@ -39,6 +39,6 @@ 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;
?>
 " -Could not open input file: unknown -NULL +string(35) "Could not open input file: unknown +" Done -- 2.40.0