tony2001 Wed, 04 May 2011 08:24:16 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=310754
Log:
fix CLI tests failing because of new OB API
Changed paths:
U php/php-src/trunk/sapi/cli/tests/007.phpt
U php/php-src/trunk/sapi/cli/tests/008.phpt
U php/php-src/trunk/sapi/cli/tests/009.phpt
U php/php-src/trunk/sapi/cli/tests/011.phpt
U php/php-src/trunk/sapi/cli/tests/012.phpt
U php/php-src/trunk/sapi/cli/tests/014.phpt
Modified: php/php-src/trunk/sapi/cli/tests/007.phpt
===================================================================
--- php/php-src/trunk/sapi/cli/tests/007.phpt 2011-05-04 07:53:22 UTC (rev
310753)
+++ php/php-src/trunk/sapi/cli/tests/007.phpt 2011-05-04 08:24:16 UTC (rev
310754)
@@ -45,8 +45,8 @@
<?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
Modified: php/php-src/trunk/sapi/cli/tests/008.phpt
===================================================================
--- php/php-src/trunk/sapi/cli/tests/008.phpt 2011-05-04 07:53:22 UTC (rev
310753)
+++ php/php-src/trunk/sapi/cli/tests/008.phpt 2011-05-04 08:24:16 UTC (rev
310754)
@@ -38,6 +38,6 @@
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
Modified: php/php-src/trunk/sapi/cli/tests/009.phpt
===================================================================
--- php/php-src/trunk/sapi/cli/tests/009.phpt 2011-05-04 07:53:22 UTC (rev
310753)
+++ php/php-src/trunk/sapi/cli/tests/009.phpt 2011-05-04 08:24:16 UTC (rev
310754)
@@ -13,8 +13,8 @@
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
Modified: php/php-src/trunk/sapi/cli/tests/011.phpt
===================================================================
--- php/php-src/trunk/sapi/cli/tests/011.phpt 2011-05-04 07:53:22 UTC (rev
310753)
+++ php/php-src/trunk/sapi/cli/tests/011.phpt 2011-05-04 08:24:16 UTC (rev
310754)
@@ -49,9 +49,9 @@
--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
"
Modified: php/php-src/trunk/sapi/cli/tests/012.phpt
===================================================================
--- php/php-src/trunk/sapi/cli/tests/012.phpt 2011-05-04 07:53:22 UTC (rev
310753)
+++ php/php-src/trunk/sapi/cli/tests/012.phpt 2011-05-04 08:24:16 UTC (rev
310754)
@@ -19,20 +19,20 @@
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
Modified: php/php-src/trunk/sapi/cli/tests/014.phpt
===================================================================
--- php/php-src/trunk/sapi/cli/tests/014.phpt 2011-05-04 07:53:22 UTC (rev
310753)
+++ php/php-src/trunk/sapi/cli/tests/014.phpt 2011-05-04 08:24:16 UTC (rev
310754)
@@ -39,6 +39,6 @@
<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
/> </spa!
n><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>"
-Could not open input file: unknown
-NULL
+string(35) "Could not open input file: unknown
+"
Done
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
