lbarnaud Fri Apr 24 19:47:43 2009 UTC
Modified files:
/php-src/ext/standard/tests/filters php_user_filter_01.phpt
php_user_filter_02.phpt
php_user_filter_03.phpt
/php-src/ext/standard/tests/general_functions var_dump_64bit.phpt
/php-src/ext/standard/tests/network bug20134.phpt
/php-src/ext/standard/tests/strings bug40754.phpt uuencode.phpt
/php-src/ext/standard/tests/url bug47174.phpt
/php-src/ext/standard/tests/versioning php_sapi_name.phpt
/php-src/sapi/cgi/tests 002.phpt 003.phpt 008.phpt 009.phpt
/php-src/sapi/cli/tests 010.phpt
Log:
Fix tests (MFB, etc)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/filters/php_user_filter_01.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/standard/tests/filters/php_user_filter_01.phpt
diff -u php-src/ext/standard/tests/filters/php_user_filter_01.phpt:1.1
php-src/ext/standard/tests/filters/php_user_filter_01.phpt:1.2
--- php-src/ext/standard/tests/filters/php_user_filter_01.phpt:1.1 Sun Jun
25 22:51:55 2006
+++ php-src/ext/standard/tests/filters/php_user_filter_01.phpt Fri Apr 24
19:47:43 2009
@@ -14,4 +14,4 @@
}
?>
--EXPECTF--
-Fatal error: Declaration of bar::filter() must be compatible with that of
php_user_filter::filter() in %s on line %d
+Strict Standards: Declaration of bar::filter() should be compatible with that
of php_user_filter::filter() in %s on line %d
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/filters/php_user_filter_02.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/standard/tests/filters/php_user_filter_02.phpt
diff -u php-src/ext/standard/tests/filters/php_user_filter_02.phpt:1.1
php-src/ext/standard/tests/filters/php_user_filter_02.phpt:1.2
--- php-src/ext/standard/tests/filters/php_user_filter_02.phpt:1.1 Sun Jun
25 22:51:55 2006
+++ php-src/ext/standard/tests/filters/php_user_filter_02.phpt Fri Apr 24
19:47:43 2009
@@ -9,4 +9,4 @@
}
?>
--EXPECTF--
-Fatal error: Declaration of foo::filter() must be compatible with that of
php_user_filter::filter() in %s on line %d
+Strict Standards: Declaration of foo::filter() should be compatible with that
of php_user_filter::filter() in %s on line %d
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/filters/php_user_filter_03.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/standard/tests/filters/php_user_filter_03.phpt
diff -u php-src/ext/standard/tests/filters/php_user_filter_03.phpt:1.1
php-src/ext/standard/tests/filters/php_user_filter_03.phpt:1.2
--- php-src/ext/standard/tests/filters/php_user_filter_03.phpt:1.1 Sun Jun
25 22:51:55 2006
+++ php-src/ext/standard/tests/filters/php_user_filter_03.phpt Fri Apr 24
19:47:43 2009
@@ -9,4 +9,4 @@
}
?>
--EXPECTF--
-Fatal error: Declaration of foo::onCreate() must be compatible with that of
php_user_filter::onCreate() in %s on line %d
+Strict Standards: Declaration of foo::onCreate() should be compatible with
that of php_user_filter::onCreate() in %s on line %d
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/var_dump_64bit.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/standard/tests/general_functions/var_dump_64bit.phpt
diff -u php-src/ext/standard/tests/general_functions/var_dump_64bit.phpt:1.3
php-src/ext/standard/tests/general_functions/var_dump_64bit.phpt:1.4
--- php-src/ext/standard/tests/general_functions/var_dump_64bit.phpt:1.3
Tue May 27 00:04:31 2008
+++ php-src/ext/standard/tests/general_functions/var_dump_64bit.phpt Fri Apr
24 19:47:43 2009
@@ -1907,5 +1907,5 @@
*** Testing error conditions ***
-Warning: Wrong parameter count for var_dump() in %s on line %d
+Warning: var_dump() expects at least 1 parameter, 0 given in %s
Done
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/network/bug20134.phpt?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/standard/tests/network/bug20134.phpt
diff -u php-src/ext/standard/tests/network/bug20134.phpt:1.4
php-src/ext/standard/tests/network/bug20134.phpt:1.5
--- php-src/ext/standard/tests/network/bug20134.phpt:1.4 Tue Mar 6
20:45:15 2007
+++ php-src/ext/standard/tests/network/bug20134.phpt Fri Apr 24 19:47:43 2009
@@ -21,4 +21,4 @@
?>
--EXPECT--
int(1)
-bool(false)
+string(0) ""
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/bug40754.phpt?r1=1.6&r2=1.7&diff_format=u
Index: php-src/ext/standard/tests/strings/bug40754.phpt
diff -u php-src/ext/standard/tests/strings/bug40754.phpt:1.6
php-src/ext/standard/tests/strings/bug40754.phpt:1.7
--- php-src/ext/standard/tests/strings/bug40754.phpt:1.6 Sun Feb 15
07:04:59 2009
+++ php-src/ext/standard/tests/strings/bug40754.phpt Fri Apr 24 19:47:43 2009
@@ -26,9 +26,9 @@
var_dump(substr("abcde", $v, $v));
?>
---EXPECTF--
-unicode(4) "bcde"
-unicode(6) "abcdex"
+--EXPECTF--
+%unicode|string%(4) "bcde"
+%unicode|string%(6) "abcdex"
bool(false)
bool(false)
@@ -59,5 +59,5 @@
Warning: strripos(): Offset is greater than the length of haystack string in
%s on line %d
bool(false)
int(2)
-unicode(8) "abcdeabc"
+string(8) "abcdeabc"
bool(false)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/uuencode.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/standard/tests/strings/uuencode.phpt
diff -u php-src/ext/standard/tests/strings/uuencode.phpt:1.2
php-src/ext/standard/tests/strings/uuencode.phpt:1.3
--- php-src/ext/standard/tests/strings/uuencode.phpt:1.2 Tue May 27
10:50:47 2008
+++ php-src/ext/standard/tests/strings/uuencode.phpt Fri Apr 24 19:47:43 2009
@@ -9,7 +9,7 @@
var_dump(convert_uuencode(""));
var_dump(convert_uudecode(""));
var_dump($enc =
convert_uuencode("~...@#$%^&*()_}{POIUYTREWQQSDFGHJKL:<MNBVCXZ"));
-var_dump(convert_uudecode("!...@#$%^yugfdfghjkluytfbnmloyt"));
+var_dump(base64_encode(convert_uudecode("!...@#$%^yugfdfghjkluytfbnmloyt")));
var_dump(convert_uudecode($enc));
var_dump($enc = convert_uuencode("not very sophisticated"));
var_dump(convert_uudecode($enc));
@@ -28,7 +28,7 @@
unicode(60) "J?B%`(R0E7B8J*"E??7M03TE5651215=145-$1D=(2DM,.CQ-3D)60UA:
`
"
-string(1) "%s"
+string(%d) "%s"
string(42) "~...@#$%^&*()_}{POIUYTREWQQSDFGHJKL:<MNBVCXZ"
unicode(36) "6;F]T('9E<GD@<V]P:&ES=&EC871E9```
`
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/url/bug47174.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/standard/tests/url/bug47174.phpt
diff -u php-src/ext/standard/tests/url/bug47174.phpt:1.2
php-src/ext/standard/tests/url/bug47174.phpt:1.3
--- php-src/ext/standard/tests/url/bug47174.phpt:1.2 Sun Jan 25 18:27:56 2009
+++ php-src/ext/standard/tests/url/bug47174.phpt Fri Apr 24 19:47:43 2009
@@ -2,13 +2,13 @@
Bug #47174 (base64_decode() interprets pad char in mid string as terminator)
--FILE--
<?php
-if (base64_decode("dGVzdA==") == base64_decode("dGVzdA==CRAP")) {
+if (base64_decode(b"dGVzdA==") == base64_decode(b"dGVzdA==CRAP")) {
echo "Same octect data - Signature Valid\n";
} else {
echo "Invalid Signature\n";
}
-$in = base64_encode("foo") . '==' . base64_encode("bar");
+$in = base64_encode(b"foo") . b'==' . base64_encode(b"bar");
var_dump($in, base64_decode($in));
?>
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/versioning/php_sapi_name.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/standard/tests/versioning/php_sapi_name.phpt
diff -u php-src/ext/standard/tests/versioning/php_sapi_name.phpt:1.2
php-src/ext/standard/tests/versioning/php_sapi_name.phpt:1.3
--- php-src/ext/standard/tests/versioning/php_sapi_name.phpt:1.2 Thu Apr
9 13:29:15 2009
+++ php-src/ext/standard/tests/versioning/php_sapi_name.phpt Fri Apr 24
19:47:43 2009
@@ -6,4 +6,4 @@
var_dump(php_sapi_name());
--EXPECTF--
-string(3) "c%ci"
+%unicode|string%(3) "c%ci"
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/tests/002.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/sapi/cgi/tests/002.phpt
diff -u php-src/sapi/cgi/tests/002.phpt:1.1 php-src/sapi/cgi/tests/002.phpt:1.2
--- php-src/sapi/cgi/tests/002.phpt:1.1 Tue Apr 17 19:48:22 2007
+++ php-src/sapi/cgi/tests/002.phpt Fri Apr 24 19:47:43 2009
@@ -29,24 +29,24 @@
?>
--EXPECTF--
string(%d) "X-Powered-By: PHP/%s
-Content-type: text/html
+Content-type: text/html%r; charset=.*|%r
-string(3) "111"
+%unicode|string%(3) "111"
"
string(%d) "X-Powered-By: PHP/%s
-Content-type: text/html
+Content-type: text/html%r; charset=.*|%r
-string(3) "500"
+%unicode|string%(3) "500"
"
string(%d) "X-Powered-By: PHP/%s
-Content-type: text/html
+Content-type: text/html%r; charset=.*|%r
-string(3) "555"
+%unicode|string%(3) "555"
"
string(%d) "X-Powered-By: PHP/%s
-Content-type: text/html
+Content-type: text/html%r; charset=.*|%r
-string(3) "555"
-string(10) "/test/path"
+%unicode|string%(3) "555"
+%unicode|string%(10) "/test/path"
"
Done
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/tests/003.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/sapi/cgi/tests/003.phpt
diff -u php-src/sapi/cgi/tests/003.phpt:1.2 php-src/sapi/cgi/tests/003.phpt:1.3
--- php-src/sapi/cgi/tests/003.phpt:1.2 Thu Nov 1 14:12:39 2007
+++ php-src/sapi/cgi/tests/003.phpt Fri Apr 24 19:47:43 2009
@@ -42,7 +42,7 @@
?>
--EXPECTF--
string(%d) "X-Powered-By: PHP/%s
-Content-type: text/html
+Content-type: text/html%r; charset=.*|%r
<?php
@@ -50,12 +50,12 @@
"
string(%d) "Status: 404 Not Found
X-Powered-By: PHP/%s
-Content-type: text/html
+Content-type: text/html%r; charset=.*|%r
No input file specified.
"
string(%d) "X-Powered-By: PHP/%s
-Content-type: text/html
+Content-type: text/html%r; charset=.*|%r
<?php class test { function foo() {} } ?>
"
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/tests/008.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/sapi/cgi/tests/008.phpt
diff -u php-src/sapi/cgi/tests/008.phpt:1.2 php-src/sapi/cgi/tests/008.phpt:1.3
--- php-src/sapi/cgi/tests/008.phpt:1.2 Thu Nov 1 14:12:39 2007
+++ php-src/sapi/cgi/tests/008.phpt Fri Apr 24 19:47:43 2009
@@ -39,7 +39,7 @@
?>
--EXPECTF--
string(%d) "X-Powered-By: PHP/%s
-Content-type: text/html
+Content-type: text/html%r; charset=.*|%r
<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
/> </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>
@@ -47,7 +47,7 @@
</code>"
string(%d) "Status: 404 Not Found
X-Powered-By: PHP/%s
-Content-type: text/html
+Content-type: text/html%r; charset=.*|%r
No input file specified.
"
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/tests/009.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/sapi/cgi/tests/009.phpt
diff -u php-src/sapi/cgi/tests/009.phpt:1.2 php-src/sapi/cgi/tests/009.phpt:1.3
--- php-src/sapi/cgi/tests/009.phpt:1.2 Sun Jun 3 22:50:08 2007
+++ php-src/sapi/cgi/tests/009.phpt Fri Apr 24 19:47:43 2009
@@ -24,7 +24,7 @@
?>
--EXPECTF--
X-Powered-By: PHP/%s
-Content-type: text/html
+Content-type: text/html%r; charset=.*|%r
string(%d) "%s/x"
Done
http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/tests/010.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/sapi/cli/tests/010.phpt
diff -u php-src/sapi/cli/tests/010.phpt:1.3 php-src/sapi/cli/tests/010.phpt:1.4
--- php-src/sapi/cli/tests/010.phpt:1.3 Sat Jan 20 22:12:45 2007
+++ php-src/sapi/cli/tests/010.phpt Fri Apr 24 19:47:43 2009
@@ -12,8 +12,8 @@
$php = getenv('TEST_PHP_EXECUTABLE');
-$filename = dirname(__FILE__)."/010.test.php";
-$filename_txt = dirname(__FILE__)."/010.test.txt";
+$filename = __DIR__."/010.test.php";
+$filename_txt = __DIR__."/010.test.txt";
$code = '
<?php
@@ -25,23 +25,22 @@
$txt = '
test
-hello
-';
+hello';
file_put_contents($filename_txt, $txt);
var_dump(`cat "$filename_txt" | "$php" -n -F "$filename"`);
-...@unlink($filename);
-...@unlink($filename_txt);
-
-echo "Done\n";
+?>
+===DONE===
+--CLEAN--
+<?php
+...@unlink(__DIR__."/010.test.php");
+...@unlink(__DIR__."/010.test.txt");
?>
--EXPECTF--
-string(38) "
+string(25) "
string(10) "test
hello"
-
-bool(false)
"
-Done
+===DONE===
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
