cvs: php-src /ext/standard/tests/general_functions 007.phpt /ext/standard/tests/serialize 002.phpt /ext/standard/tests/strings bug24312.phpt
bug36306.phpt crc32.phpt crypt.phpt htmlentities.phpt strrev.phpt strtotitle.phpt strtoupper.phpt

tony2001 Wed Dec 6 13:21:48 2006 UTC Modified files: /php-src/ext/standard/tests/general_functions 007.phpt /php-src/ext/standard/tests/serialize 002.phpt /php-src/ext/standard/tests/strings bug24312.phpt bug36306.phpt crc32.phpt crypt.phpt htmlentities.phpt strrev.phpt strtotitle.phpt strtoupper.phpt Log: fix tests http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/007.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/standard/tests/general_functions/007.phpt diff -u php-src/ext/standard/tests/general_functions/007.phpt:1.3 php-src/ext/standard/tests/general_functions/007.phpt:1.4 --- php-src/ext/standard/tests/general_functions/007.phpt:1.3 Wed May 19 08:54:51 2004 +++ php-src/ext/standard/tests/general_functions/007.phpt Wed Dec 6 13:21:47 2006 @@ -6,13 +6,13 @@ $res = md5(base64_decode(base64_encode($str)))."\n"; return $res; } -echo test(""); -echo test("a"); -echo test("abc"); -echo test("message digest"); -echo test("abcdefghijklmnopqrstuvwxyz"); -echo test("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"); -echo test("12345678901234567890123456789012345678901234567890123456789012345678901234567890"); +echo test(b""); +echo test(b"a"); +echo test(b"abc"); +echo test(b"message digest"); +echo test(b"abcdefghijklmnopqrstuvwxyz"); +echo test(b"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"); +echo test(b"12345678901234567890123456789012345678901234567890123456789012345678901234567890"); ?> --EXPECT-- d41d8cd98f00b204e9800998ecf8427e http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/serialize/002.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/standard/tests/serialize/002.phpt diff -u php-src/ext/standard/tests/serialize/002.phpt:1.5 php-src/ext/standard/tests/serialize/002.phpt:1.6 --- php-src/ext/standard/tests/serialize/002.phpt:1.5 Mon Mar 27 14:19:18 2006 +++ php-src/ext/standard/tests/serialize/002.phpt Wed Dec 6 13:21:48 2006 @@ -46,11 +46,11 @@ bool(false) bool(true) int(823) -unicode(0) "" -unicode(3) "foo" +string(0) "" +string(3) "foo" array(1) { [0]=> - unicode(2) "12" + string(2) "12" } array(2) { [0]=> @@ -62,11 +62,11 @@ } array(3) { [0]=> - unicode(3) "foo" + string(3) "foo" [1]=> - unicode(3) "bar" + string(3) "bar" [2]=> - unicode(3) "baz" + string(3) "baz" } object(stdClass)#%d (0) { } http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/bug24312.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/standard/tests/strings/bug24312.phpt diff -u php-src/ext/standard/tests/strings/bug24312.phpt:1.1 php-src/ext/standard/tests/strings/bug24312.phpt:1.2 --- php-src/ext/standard/tests/strings/bug24312.phpt:1.1 Tue Jun 24 15:23:17 2003 +++ php-src/ext/standard/tests/strings/bug24312.phpt Wed Dec 6 13:21:48 2006 @@ -2,7 +2,7 @@ Bug #24208 (base64_decode() not skipping 0xF0 - 0xFF) --FILE-- <?php -$data = str_repeat("a", 100); +$data = str_repeat(b"a", 100); for ($i = 0xF0; $i < 0xFF + 1; $i++) { $enc = chunk_split(base64_encode($data), 10, chr($i)); var_dump(base64_decode($enc)); http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/bug36306.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/standard/tests/strings/bug36306.phpt diff -u php-src/ext/standard/tests/strings/bug36306.phpt:1.3 php-src/ext/standard/tests/strings/bug36306.phpt:1.4 --- php-src/ext/standard/tests/strings/bug36306.phpt:1.3 Thu Feb 9 15:48:18 2006 +++ php-src/ext/standard/tests/strings/bug36306.phpt Wed Dec 6 13:21:48 2006 @@ -9,7 +9,7 @@ Have to find some small strings to truely reproduce the problem, this example being not a problem */ -echo dechex(crc32("platform independant")) . "\n"; +echo dechex(crc32(b"platform independant")) . "\n"; ?> --EXPECT-- ccd9fe66 http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/crc32.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/standard/tests/strings/crc32.phpt diff -u php-src/ext/standard/tests/strings/crc32.phpt:1.3 php-src/ext/standard/tests/strings/crc32.phpt:1.4 --- php-src/ext/standard/tests/strings/crc32.phpt:1.3 Wed May 19 08:45:23 2004 +++ php-src/ext/standard/tests/strings/crc32.phpt Wed Dec 6 13:21:48 2006 @@ -2,7 +2,7 @@ crc32() function --FILE-- <?php -$input = array("foo", "bar", "baz", "grldsajkopallkjasd"); +$input = array(b"foo", b"bar", b"baz", b"grldsajkopallkjasd"); foreach($input AS $i) { printf("%u\n", crc32($i)); } http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/crypt.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/strings/crypt.phpt diff -u php-src/ext/standard/tests/strings/crypt.phpt:1.2 php-src/ext/standard/tests/strings/crypt.phpt:1.3 --- php-src/ext/standard/tests/strings/crypt.phpt:1.2 Mon May 19 04:57:01 2003 +++ php-src/ext/standard/tests/strings/crypt.phpt Wed Dec 6 13:21:48 2006 @@ -9,15 +9,15 @@ --FILE-- <?php -$str = 'rasmuslerdorf'; -$salt1 = 'rl'; -$res_1 = 'rl.3StKT.4T8M'; -$salt2 = '_J9..rasm'; -$res_2 = '_J9..rasmBYk8r9AiWNc'; -$salt3 = '$1$rasmusle$'; -$res_3 = '$1$rasmusle$rISCgZzpwk3UhDidwXvin0'; -$salt4 = '$2a$07$rasmuslerd............'; -$res_4 = '$2a$07$rasmuslerd............nIdrcHdxcUxWomQX9j6kvERCFjTg7Ra'; +$str = b'rasmuslerdorf'; +$salt1 = b'rl'; +$res_1 = b'rl.3StKT.4T8M'; +$salt2 = b'_J9..rasm'; +$res_2 = b'_J9..rasmBYk8r9AiWNc'; +$salt3 = b'$1$rasmusle$'; +$res_3 = b'$1$rasmusle$rISCgZzpwk3UhDidwXvin0'; +$salt4 = b'$2a$07$rasmuslerd............'; +$res_4 = b'$2a$07$rasmuslerd............nIdrcHdxcUxWomQX9j6kvERCFjTg7Ra'; echo (CRYPT_STD_DES) ? ((crypt($str, $salt1) === $res_1) ? 'STD' : 'STD - ERROR') : 'STD', "\n"; echo (CRYPT_EXT_DES) ? ((crypt($str, $salt2) === $res_2) ? 'EXT' : 'EXT - ERROR') : 'EXT', "\n"; http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/htmlentities.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/standard/tests/strings/htmlentities.phpt diff -u php-src/ext/standard/tests/strings/htmlentities.phpt:1.3 php-src/ext/standard/tests/strings/htmlentities.phpt:1.4 --- php-src/ext/standard/tests/strings/htmlentities.phpt:1.3 Wed Aug 17 14:01:06 2005 +++ php-src/ext/standard/tests/strings/htmlentities.phpt Wed Dec 6 13:21:48 2006 @@ -19,3 +19,9 @@ &lt;&gt;&quot;&amp;&aring;&Auml; <>"&åÄ <>"&åÄ +--UEXPECTF-- +Strict Standards: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %s on line %d +&lt;&gt;&quot;&amp;åÄ +&lt;&gt;&quot;&amp;&aring;&Auml; +<>"&åÄ +<>"&åÄ http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strrev.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/standard/tests/strings/strrev.phpt diff -u php-src/ext/standard/tests/strings/strrev.phpt:1.3 php-src/ext/standard/tests/strings/strrev.phpt:1.4 --- php-src/ext/standard/tests/strings/strrev.phpt:1.3 Wed Dec 7 15:19:30 2005 +++ php-src/ext/standard/tests/strings/strrev.phpt Wed Dec 6 13:21:48 2006 @@ -9,7 +9,7 @@ $str .= chr($i++); } - var_dump(md5(strrev($str))); + var_dump(md5((binary)strrev($str))); var_dump(strrev(NULL)); var_dump(strrev("")); ?> http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strtotitle.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/standard/tests/strings/strtotitle.phpt diff -u php-src/ext/standard/tests/strings/strtotitle.phpt:1.1 php-src/ext/standard/tests/strings/strtotitle.phpt:1.2 --- php-src/ext/standard/tests/strings/strtotitle.phpt:1.1 Sun Mar 26 02:15:47 2006 +++ php-src/ext/standard/tests/strings/strtotitle.phpt Wed Dec 6 13:21:48 2006 @@ -29,7 +29,8 @@ Året Året ßen Året ßen ---UEXPECT-- +--UEXPECTF-- +Strict Standards: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %s on line %d SSen Ssen Året http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strtoupper.phpt?r1=1.6&r2=1.7&diff_format=u Index: php-src/ext/standard/tests/strings/strtoupper.phpt diff -u php-src/ext/standard/tests/strings/strtoupper.phpt:1.6 php-src/ext/standard/tests/strings/strtoupper.phpt:1.7 --- php-src/ext/standard/tests/strings/strtoupper.phpt:1.6 Wed Aug 17 14:01:06 2005 +++ php-src/ext/standard/tests/strings/strtoupper.phpt Wed Dec 6 13:21:48 2006 @@ -21,3 +21,6 @@ ?> --EXPECT-- ÄÖÜ +--UEXPECTF-- +Strict Standards: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %s on line %d +ÄÖÜ