fix CLI tests failing because of new OB API

tony2001 · tony2001 · commit 829d08e50c11 · 2011-05-04T08:24:16.000Z
diff --git a/sapi/cli/tests/007.phpt b/sapi/cli/tests/007.phpt
@@ -45,8 +45,8 @@ string(81) "
 <?php
  class test { public $var = "test"; private $pri; function foo() { } } ?>
 "
-Could not open input file: wrong
-NULL
+string(33) "Could not open input file: wrong
+"
 string(43) "<?php  class test { function foo() {} } ?>
 "
 Done
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -39,6 +39,6 @@ string(1478) "<code><span style="color: #000000">
 <br /><span style="color: #0000BB">&lt;?php<br />$test&nbsp;</span><span style="color: #007700">=&nbsp;</span><span style="color: #DD0000">"var"</span><span style="color: #007700">;&nbsp;</span><span style="color: #FF8000">//var<br />/*&nbsp;test&nbsp;class&nbsp;*/<br /></span><span style="color: #007700">class&nbsp;</span><span style="color: #0000BB">test&nbsp;</span><span style="color: #007700">{<br />&nbsp;&nbsp;&nbsp;&nbsp;private&nbsp;</span><span style="color: #0000BB">$var&nbsp;</span><span style="color: #007700">=&nbsp;array();<br /><br />&nbsp;&nbsp;&nbsp;&nbsp;public&nbsp;static&nbsp;function&nbsp;</span><span style="color: #0000BB">foo</span><span style="color: #007700">(</span><span style="color: #0000BB">Test&nbsp;$arg</span><span style="color: #007700">)&nbsp;{<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;echo&nbsp;</span><span style="color: #DD0000">"hello"</span><span style="color: #007700">;<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span style="color: #0000BB">var_dump</span><span style="color: #007700">(</span><span style="color: #0000BB">$this</span><span style="color: #007700">);<br />&nbsp;&nbsp;&nbsp;&nbsp;}<br />}<br /><br /></span><span style="color: #0000BB">$o&nbsp;</span><span style="color: #007700">=&nbsp;new&nbsp;</span><span style="color: #0000BB">test</span><span style="color: #007700">;<br /></span><span style="color: #0000BB">?&gt;<br /></span>
 </span>
 </code>"
-Could not open input file: unknown
-NULL
+string(35) "Could not open input file: unknown
+"
 Done

Original file line number	Diff line number	Diff line change
`@@ -45,8 +45,8 @@ string(81) "`
`45`	`45`	`<?php`
`46`	`46`	`class test { public $var = "test"; private $pri; function foo() { } } ?>`
`47`	`47`	`"`
`48`		`-Could not open input file: wrong`
`49`		`-NULL`
	`48`	`+string(33) "Could not open input file: wrong`
	`49`	`+"`
`50`	`50`	`string(43) "<?php class test { function foo() {} } ?>`
`51`	`51`	`"`
`52`	`52`	`Done`
Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,6 @@ string(%d) "`
`38`	`38`
`39`	`39`	`Fatal error: Cannot access private property test::$pri in %s on line %d`
`40`	`40`	`"`
`41`		`-Could not open input file: wrong`
`42`		`-NULL`
	`41`	`+string(33) "Could not open input file: wrong`
	`42`	`+"`
`43`	`43`	`Done`
Original file line number	Diff line number	Diff line change
`@@ -49,9 +49,9 @@ echo "Done\n";`
`49`	`49`	`--EXPECTF--`
`50`	`50`	`string(%d) "No syntax errors detected in %s011.test.php`
`51`	`51`	`"`
`52`		`-Could not open input file: some.unknown`
`53`		`-NULL`
`54`		`-string(%d) "`
	`52`	`+string(40) "Could not open input file: some.unknown`
	`53`	`+"`
	`54`	`+string(186) "`
`55`	`55`	`Parse error: %s expecting %s{%s in %s on line %d`
`56`	`56`	`Errors parsing %s011.test.php`
`57`	`57`	`"`