cvs: php-src /ext/pcre/tests invalid_utf8_offset.phpt /ext/standard/tests/file 007_variation11.phpt 007_variation13.phpt 007_variation15.phpt
007_variation19.phpt 007_variation21.phpt 007_variation23.phpt 007_variation3.phpt 007_variation5.phpt 007_variation7.phpt bug27508.phpt bug46347.phpt
copy_variation9.phpt file_get_contents_variation5.phpt file_get_contents_variation8.phpt file_get_contents_variation9.phpt
file_put_contents_variation5.phpt file_put_contents_variation8.phpt fread_socket_variation1.phpt include_streams.phpt pathinfo_basic.phpt
pathinfo_basic1.phpt pathinfo_basic2.phpt pathinfo_variation1.phpt pathinfo_variaton.phpt proc_open01.phpt readfile_variation10.phpt
stream_rfc2397_002.phpt unlink_error.phpt /ext/standard/tests/general_functions debug_zval_dump_b_64bit.phpt getopt.phpt /ext/standard/tests/network
inet.phpt socket_get_status_basic.phpt /ext/standard/tests/serialize bug43614.phpt /ext/standard/tests/streams bug46426.phpt stream_get_con!
tents_001.phpt /ext/standard/tests/strings bug40915.phpt bug44703.phpt htmlentities01.phpt printf_64bit.phpt sha1.phpt /tests/classes
inheritance_003.phpt inheritance_004.phpt method_override_optional_arg_001.phpt method_override_optional_arg_002.phpt type_hinting_005a.phpt
type_hinting_005b.phpt type_hinting_005c.phpt type_hinting_005d.phpt

lbarnaud Sat Apr 25 21:12:24 2009 UTC Modified files: /php-src/ext/pcre/tests invalid_utf8_offset.phpt /php-src/ext/standard/tests/file 007_variation11.phpt 007_variation13.phpt 007_variation15.phpt 007_variation19.phpt 007_variation21.phpt 007_variation23.phpt 007_variation3.phpt 007_variation5.phpt 007_variation7.phpt bug27508.phpt bug46347.phpt copy_variation9.phpt file_get_contents_variation5.phpt file_get_contents_variation8.phpt file_get_contents_variation9.phpt file_put_contents_variation5.phpt file_put_contents_variation8.phpt fread_socket_variation1.phpt include_streams.phpt pathinfo_basic.phpt pathinfo_basic1.phpt pathinfo_basic2.phpt pathinfo_variation1.phpt pathinfo_variaton.phpt proc_open01.phpt readfile_variation10.phpt stream_rfc2397_002.phpt unlink_error.phpt /php-src/ext/standard/tests/general_functions debug_zval_dump_b_64bit.phpt getopt.phpt /php-src/ext/standard/tests/network inet.phpt socket_get_status_basic.phpt /php-src/ext/standard/tests/serialize bug43614.phpt /php-src/ext/standard/tests/streams bug46426.phpt stream_get_contents_001.phpt /php-src/ext/standard/tests/strings bug40915.phpt bug44703.phpt htmlentities01.phpt printf_64bit.phpt sha1.phpt /php-src/tests/classes inheritance_003.phpt inheritance_004.phpt method_override_optional_arg_001.phpt method_override_optional_arg_002.phpt type_hinting_005a.phpt type_hinting_005b.phpt type_hinting_005c.phpt type_hinting_005d.phpt Log: Fixed tests (mostly MFB)

http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/invalid_utf8_offset.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/pcre/tests/invalid_utf8_offset.phpt diff -u php-src/ext/pcre/tests/invalid_utf8_offset.phpt:1.3 php-src/ext/pcre/tests/invalid_utf8_offset.phpt:1.4 --- php-src/ext/pcre/tests/invalid_utf8_offset.phpt:1.3 Tue May 27 13:54:30 2008 +++ php-src/ext/pcre/tests/invalid_utf8_offset.phpt Sat Apr 25 21:12:23 2009 @@ -9,13 +9,13 @@ --FILE-- <?php -$string = "\xc3\xa9 uma string utf8 bem formada"; +$string = b"\xc3\xa9 uma string utf8 bem formada"; -var_dump(preg_match('~.*~u', $string, $m, 0, 1)); +var_dump(preg_match(b'~.*~u', $string, $m, 0, 1)); var_dump($m); var_dump(preg_last_error() == PREG_BAD_UTF8_OFFSET_ERROR); -var_dump(preg_match('~.*~u', $string, $m, 0, 2)); +var_dump(preg_match(b'~.*~u', $string, $m, 0, 2)); var_dump($m); var_dump(preg_last_error() == PREG_NO_ERROR); @@ -29,7 +29,7 @@ int(1) array(1) { [0]=> - unicode(28) " uma string utf8 bem formada" + string(28) " uma string utf8 bem formada" } bool(true) Done http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/007_variation11.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/standard/tests/file/007_variation11.phpt diff -u php-src/ext/standard/tests/file/007_variation11.phpt:1.3 php-src/ext/standard/tests/file/007_variation11.phpt:1.4 --- php-src/ext/standard/tests/file/007_variation11.phpt:1.3 Tue May 27 09:34:52 2008 +++ php-src/ext/standard/tests/file/007_variation11.phpt Sat Apr 25 21:12:23 2009 @@ -62,14 +62,14 @@ --EXPECTF-- *** Test fopen() & fclose() functions: with 'wt' mode *** resource(%d) of type (stream) -unicode(6) "stream" +%unicode|string%(6) "stream" int(0) int(37) int(37) -bool(false) +string(0) "" int(0) bool(true) -unicode(7) "Unknown" +%unicode|string%(7) "Unknown" int(37) int(0) bool(true) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/007_variation13.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/standard/tests/file/007_variation13.phpt diff -u php-src/ext/standard/tests/file/007_variation13.phpt:1.3 php-src/ext/standard/tests/file/007_variation13.phpt:1.4 --- php-src/ext/standard/tests/file/007_variation13.phpt:1.3 Tue May 27 09:34:52 2008 +++ php-src/ext/standard/tests/file/007_variation13.phpt Sat Apr 25 21:12:23 2009 @@ -54,12 +54,12 @@ --EXPECTF-- *** Test fopen() & fclose() functions: with 'at' mode *** resource(%d) of type (stream) -unicode(6) "stream" +%unicode|string%(6) "stream" int(37) -bool(false) +string(0) "" int(0) bool(true) -unicode(7) "Unknown" +%unicode|string%(7) "Unknown" int(57) bool(true) *** Done *** http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/007_variation15.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/standard/tests/file/007_variation15.phpt diff -u php-src/ext/standard/tests/file/007_variation15.phpt:1.3 php-src/ext/standard/tests/file/007_variation15.phpt:1.4 --- php-src/ext/standard/tests/file/007_variation15.phpt:1.3 Tue May 27 09:34:52 2008 +++ php-src/ext/standard/tests/file/007_variation15.phpt Sat Apr 25 21:12:23 2009 @@ -21,7 +21,7 @@ and fclose function */ $file_path = dirname(__FILE__); -$string = "abcdefghij\nmnopqrst\tuvwxyz\n0123456789"; +$string = b"abcdefghij\nmnopqrst\tuvwxyz\n0123456789"; $file = $file_path."/007_variation15.tmp"; echo "*** Test fopen() & fclose() functions: with 'xt' mode ***\n"; @@ -45,16 +45,14 @@ --EXPECTF-- *** Test fopen() & fclose() functions: with 'xt' mode *** resource(%d) of type (stream) -unicode(6) "stream" +%unicode|string%(6) "stream" int(0) - -Notice: fwrite(): 37 character unicode buffer downcoded for binary stream runtime_encoding in %s on line %d int(37) int(37) -bool(false) +string(0) "" int(0) bool(true) -unicode(7) "Unknown" +%unicode|string%(7) "Unknown" -Warning: fopen(%s): failed to open stream: File exists in %s on line %d +Warning: fopen(%s): failed to open stream: File exists in %s on line %s *** Done *** http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/007_variation19.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/standard/tests/file/007_variation19.phpt diff -u php-src/ext/standard/tests/file/007_variation19.phpt:1.3 php-src/ext/standard/tests/file/007_variation19.phpt:1.4 --- php-src/ext/standard/tests/file/007_variation19.phpt:1.3 Tue May 27 09:34:52 2008 +++ php-src/ext/standard/tests/file/007_variation19.phpt Sat Apr 25 21:12:23 2009 @@ -25,7 +25,7 @@ create_files($file_path, 1, "text_with_new_line", 0755, 20, "wb", "007_variation", 19, "bytes"); $file = $file_path."/007_variation19.tmp"; -$string = "abcdefghij\nmnopqrst\tuvwxyz\n0123456789"; +$string = b"abcdefghij\nmnopqrst\tuvwxyz\n0123456789"; echo "*** Test fopen() & fclose() functions: with 'wb' mode ***\n"; $file_handle = fopen($file, "wb"); //opening the file "wb" mode @@ -57,16 +57,14 @@ --EXPECTF-- *** Test fopen() & fclose() functions: with 'wb' mode *** resource(%d) of type (stream) -unicode(6) "stream" +%unicode|string%(6) "stream" int(0) - -Notice: fwrite(): 37 character unicode buffer downcoded for binary stream runtime_encoding in %s on line %d int(37) int(37) -bool(false) +string(0) "" int(0) bool(true) -unicode(7) "Unknown" +%unicode|string%(7) "Unknown" int(37) int(0) bool(true) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/007_variation21.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/standard/tests/file/007_variation21.phpt diff -u php-src/ext/standard/tests/file/007_variation21.phpt:1.3 php-src/ext/standard/tests/file/007_variation21.phpt:1.4 --- php-src/ext/standard/tests/file/007_variation21.phpt:1.3 Tue May 27 09:34:52 2008 +++ php-src/ext/standard/tests/file/007_variation21.phpt Sat Apr 25 21:12:23 2009 @@ -24,7 +24,7 @@ create_files($file_path, 1, "text_with_new_line", 0755, 20, "w", "007_variation", 21, "bytes"); $file = $file_path."/007_variation21.tmp"; -$string = "abcdefghij\nmnopqrst\tuvwxyz\n0123456789"; +$string = b"abcdefghij\nmnopqrst\tuvwxyz\n0123456789"; echo "*** Test fopen() & fclose() functions: with 'ab' mode ***\n"; $file_handle = fopen($file, "ab"); //opening the file "ab" mode @@ -49,14 +49,12 @@ --EXPECTF-- *** Test fopen() & fclose() functions: with 'ab' mode *** resource(%d) of type (stream) -unicode(6) "stream" - -Notice: fwrite(): 37 character unicode buffer downcoded for binary stream runtime_encoding in %s on line %d +%unicode|string%(6) "stream" int(37) -bool(false) +string(0) "" int(0) bool(true) -unicode(7) "Unknown" +%unicode|string%(7) "Unknown" int(57) bool(true) *** Done *** http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/007_variation23.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/standard/tests/file/007_variation23.phpt diff -u php-src/ext/standard/tests/file/007_variation23.phpt:1.3 php-src/ext/standard/tests/file/007_variation23.phpt:1.4 --- php-src/ext/standard/tests/file/007_variation23.phpt:1.3 Tue May 27 09:34:52 2008 +++ php-src/ext/standard/tests/file/007_variation23.phpt Sat Apr 25 21:12:23 2009 @@ -21,7 +21,7 @@ and fclose function */ $file_path = dirname(__FILE__); -$string = "abcdefghij\nmnopqrst\tuvwxyz\n0123456789"; +$string = b"abcdefghij\nmnopqrst\tuvwxyz\n0123456789"; $file = $file_path."/007_variation23.tmp"; echo "*** Test fopen() & fclose() functions: with 'xb' mode ***\n"; @@ -45,16 +45,14 @@ --EXPECTF-- *** Test fopen() & fclose() functions: with 'xb' mode *** resource(%d) of type (stream) -unicode(6) "stream" +%unicode|string%(6) "stream" int(0) - -Notice: fwrite(): 37 character unicode buffer downcoded for binary stream runtime_encoding in %s on line %d int(37) int(37) -bool(false) +string(0) "" int(0) bool(true) -unicode(7) "Unknown" +%unicode|string%(7) "Unknown" -Warning: fopen(%s): failed to open stream: File exists in %s on line %d +Warning: fopen(%s): failed to open stream: File exists in %s on line %s *** Done *** http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/007_variation3.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/standard/tests/file/007_variation3.phpt diff -u php-src/ext/standard/tests/file/007_variation3.phpt:1.3 php-src/ext/standard/tests/file/007_variation3.phpt:1.4 --- php-src/ext/standard/tests/file/007_variation3.phpt:1.3 Tue May 27 09:34:52 2008 +++ php-src/ext/standard/tests/file/007_variation3.phpt Sat Apr 25 21:12:23 2009 @@ -25,7 +25,7 @@ create_files($file_path, 1, "text_with_new_line", 0755, 20, "w", "007_variation", 3, "bytes"); $file = $file_path."/007_variation3.tmp"; -$string = "abcdefghij\nmnopqrst\tuvwxyz\n0123456789"; +$string = b"abcdefghij\nmnopqrst\tuvwxyz\n0123456789"; echo "*** Test fopen() & fclose() functions: with 'w' mode ***\n"; $file_handle = fopen($file, "w"); //opening the file "w" mode @@ -35,7 +35,7 @@ var_dump( fwrite($file_handle, $string) ); //Check for write operation; passes; expected:size of the $string var_dump( ftell($file_handle) ); //File pointer position after write operation, expected at the end of the file rewind($file_handle); -var_dump( fread($file_handle, 100) ); //Check for read operation; fails; expected: bool(false) +var_dump( fread($file_handle, 100) ); //Check for read operation; fails; expected: empty string var_dump( ftell($file_handle) ); //File pointer position after read operation, expected at the begining of the file var_dump( fclose($file_handle) ); //Check for close operation on the file handle var_dump( get_resource_type($file_handle) ); //Check whether resource is lost after close operation @@ -57,16 +57,14 @@ --EXPECTF-- *** Test fopen() & fclose() functions: with 'w' mode *** resource(%d) of type (stream) -unicode(6) "stream" +%unicode|string%(6) "stream" int(0) - -Notice: fwrite(): 37 character unicode buffer downcoded for binary stream runtime_encoding in %s on line %d int(37) int(37) -bool(false) +string(0) "" int(0) bool(true) -unicode(7) "Unknown" +%unicode|string%(7) "Unknown" int(37) int(0) bool(true) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/007_variation5.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/standard/tests/file/007_variation5.phpt diff -u php-src/ext/standard/tests/file/007_variation5.phpt:1.3 php-src/ext/standard/tests/file/007_variation5.phpt:1.4 --- php-src/ext/standard/tests/file/007_variation5.phpt:1.3 Tue May 27 09:34:52 2008 +++ php-src/ext/standard/tests/file/007_variation5.phpt Sat Apr 25 21:12:23 2009 @@ -24,7 +24,7 @@ create_files($file_path, 1, "text_with_new_line", 0755, 20, "w", "007_variation", 5, "bytes"); $file = $file_path."/007_variation5.tmp"; -$string = "abcdefghij\nmnopqrst\tuvwxyz\n0123456789"; +$string = b"abcdefghij\nmnopqrst\tuvwxyz\n0123456789"; echo "*** Test fopen() & fclose() functions: with 'a' mode ***\n"; $file_handle = fopen($file, "a"); //opening the file "a" mode @@ -49,14 +49,12 @@ --EXPECTF-- *** Test fopen() & fclose() functions: with 'a' mode *** resource(%d) of type (stream) -unicode(6) "stream" - -Notice: fwrite(): 37 character unicode buffer downcoded for binary stream runtime_encoding in %s on line %d +%unicode|string%(6) "stream" int(37) -bool(false) +string(0) "" int(0) bool(true) -unicode(7) "Unknown" +%unicode|string%(7) "Unknown" int(57) bool(true) *** Done *** http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/007_variation7.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/standard/tests/file/007_variation7.phpt diff -u php-src/ext/standard/tests/file/007_variation7.phpt:1.3 php-src/ext/standard/tests/file/007_variation7.phpt:1.4 --- php-src/ext/standard/tests/file/007_variation7.phpt:1.3 Tue May 27 09:34:52 2008 +++ php-src/ext/standard/tests/file/007_variation7.phpt Sat Apr 25 21:12:23 2009 @@ -21,7 +21,7 @@ and fclose function */ $file_path = dirname(__FILE__); -$string = "abcdefghij\nmnopqrst\tuvwxyz\n0123456789"; +$string = b"abcdefghij\nmnopqrst\tuvwxyz\n0123456789"; $file = $file_path."/007_variation7.tmp"; echo "*** Test fopen() & fclose() functions: with 'x' mode ***\n"; @@ -45,16 +45,14 @@ --EXPECTF-- *** Test fopen() & fclose() functions: with 'x' mode *** resource(%d) of type (stream) -unicode(6) "stream" +%unicode|string%(6) "stream" int(0) - -Notice: fwrite(): 37 character unicode buffer downcoded for binary stream runtime_encoding in %s on line %d int(37) int(37) -bool(false) +string(0) "" int(0) bool(true) -unicode(7) "Unknown" +%unicode|string%(7) "Unknown" -Warning: fopen(%s): failed to open stream: File exists in %s on line %d +Warning: fopen(%s): failed to open stream: File exists in %s on line %s *** Done *** http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/bug27508.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/standard/tests/file/bug27508.phpt diff -u php-src/ext/standard/tests/file/bug27508.phpt:1.5 php-src/ext/standard/tests/file/bug27508.phpt:1.6 --- php-src/ext/standard/tests/file/bug27508.phpt:1.5 Mon Aug 18 21:26:30 2008 +++ php-src/ext/standard/tests/file/bug27508.phpt Sat Apr 25 21:12:23 2009 @@ -46,7 +46,7 @@ or die("Failed to register protocol"); $tmp_dir = __DIR__; -$tn = tempnam($tmp_dir, 'foo'); +$tn = (binary) tempnam($tmp_dir, 'foo'); if (!$tn) { die("tempnam failed"); } http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/bug46347.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/file/bug46347.phpt diff -u php-src/ext/standard/tests/file/bug46347.phpt:1.2 php-src/ext/standard/tests/file/bug46347.phpt:1.3 --- php-src/ext/standard/tests/file/bug46347.phpt:1.2 Mon Feb 2 19:25:30 2009 +++ php-src/ext/standard/tests/file/bug46347.phpt Sat Apr 25 21:12:23 2009 @@ -17,8 +17,8 @@ <?php unlink(__DIR__.'/parse.ini'); ?> ---EXPECT-- +--EXPECTF-- array(1) { - ["part1.*.part2"]=> - string(1) "1" + [%u|b%"part1.*.part2"]=> + %unicode|string%(1) "1" } http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/copy_variation9.phpt?r1=1.8&r2=1.9&diff_format=u Index: php-src/ext/standard/tests/file/copy_variation9.phpt diff -u php-src/ext/standard/tests/file/copy_variation9.phpt:1.8 php-src/ext/standard/tests/file/copy_variation9.phpt:1.9 --- php-src/ext/standard/tests/file/copy_variation9.phpt:1.8 Tue Oct 21 12:48:37 2008 +++ php-src/ext/standard/tests/file/copy_variation9.phpt Sat Apr 25 21:12:23 2009 @@ -56,7 +56,7 @@ unlink(dirname(__FILE__)."/copy_copy_variation9.tmp"); unlink(dirname(__FILE__)."/copy_variation9.tmp"); ?> ---EXPECT-- +--EXPECTF-- *** Test copy() function: destination with/without write permissions *** -- With write permissions -- http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/file_get_contents_variation5.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/standard/tests/file/file_get_contents_variation5.phpt diff -u php-src/ext/standard/tests/file/file_get_contents_variation5.phpt:1.3 php-src/ext/standard/tests/file/file_get_contents_variation5.phpt:1.4 --- php-src/ext/standard/tests/file/file_get_contents_variation5.phpt:1.3 Mon Feb 16 20:08:02 2009 +++ php-src/ext/standard/tests/file/file_get_contents_variation5.phpt Sat Apr 25 21:12:23 2009 @@ -25,7 +25,7 @@ $filename = 'FileGetContentsVar5.tmp'; $absFile = dirname(__FILE__).'/'.$filename; $h = fopen($absFile,"w"); -fwrite($h, "contents read"); +fwrite($h, b"contents read"); fclose($h); @@ -183,27 +183,27 @@ string(%d) "contents read" --empty string DQ-- -Error: 2 - file_get_contents() expects parameter 4 to be long, string given, %s(%d) +Error: 2 - file_get_contents() expects parameter 4 to be long, %unicode_string_optional% given, %s(%d) NULL --empty string SQ-- -Error: 2 - file_get_contents() expects parameter 4 to be long, string given, %s(%d) +Error: 2 - file_get_contents() expects parameter 4 to be long, %unicode_string_optional% given, %s(%d) NULL --string DQ-- -Error: 2 - file_get_contents() expects parameter 4 to be long, string given, %s(%d) +Error: 2 - file_get_contents() expects parameter 4 to be long, %unicode_string_optional% given, %s(%d) NULL --string SQ-- -Error: 2 - file_get_contents() expects parameter 4 to be long, string given, %s(%d) +Error: 2 - file_get_contents() expects parameter 4 to be long, %unicode_string_optional% given, %s(%d) NULL --mixed case string-- -Error: 2 - file_get_contents() expects parameter 4 to be long, string given, %s(%d) +Error: 2 - file_get_contents() expects parameter 4 to be long, %unicode_string_optional% given, %s(%d) NULL --heredoc-- -Error: 2 - file_get_contents() expects parameter 4 to be long, string given, %s(%d) +Error: 2 - file_get_contents() expects parameter 4 to be long, %unicode_string_optional% given, %s(%d) NULL --instance of classWithToString-- http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/file_get_contents_variation8.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/file/file_get_contents_variation8.phpt diff -u php-src/ext/standard/tests/file/file_get_contents_variation8.phpt:1.2 php-src/ext/standard/tests/file/file_get_contents_variation8.phpt:1.3 --- php-src/ext/standard/tests/file/file_get_contents_variation8.phpt:1.2 Wed Nov 26 17:48:40 2008 +++ php-src/ext/standard/tests/file/file_get_contents_variation8.phpt Sat Apr 25 21:12:23 2009 @@ -52,26 +52,34 @@ Warning: file_get_contents(1): failed to open stream: No such file or directory in %s on line %d bool(false) -- Iteration 2 -- + +Warning: file_get_contents(): Filename cannot be empty in %s on line %d bool(false) -- Iteration 3 -- + +Warning: file_get_contents(): Filename cannot be empty in %s on line %d bool(false) -- Iteration 4 -- + +Warning: file_get_contents(): Filename cannot be empty in %s on line %d bool(false) -- Iteration 5 -- Warning: file_get_contents( ): failed to open stream: No such file or directory in %s on line %d bool(false) -- Iteration 6 -- + +Warning: file_get_contents(): Filename cannot be empty in %s on line %d bool(false) -- Iteration 7 -- -Notice: Array to string conversion in %s on line %d +Notice: Array to string conversion in %s -Warning: file_get_contents(Array): failed to open stream: No such file or directory in %s on line %d +Warning: file_get_contents(Array): failed to open stream: No such file or directory in %s bool(false) -- Iteration 8 -- -Warning: file_get_contents(/no/such/file/dir): failed to open stream: No such file or directory in %s on line %d +Warning: file_get_contents(/no/such/file/dir): failed to open stream: %s in %s on line %d bool(false) -- Iteration 9 -- @@ -79,4 +87,3 @@ bool(false) *** Done *** - http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/file_get_contents_variation9.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/file/file_get_contents_variation9.phpt diff -u php-src/ext/standard/tests/file/file_get_contents_variation9.phpt:1.2 php-src/ext/standard/tests/file/file_get_contents_variation9.phpt:1.3 --- php-src/ext/standard/tests/file/file_get_contents_variation9.phpt:1.2 Wed Nov 26 17:48:40 2008 +++ php-src/ext/standard/tests/file/file_get_contents_variation9.phpt Sat Apr 25 21:12:23 2009 @@ -25,7 +25,7 @@ $h = fopen($filename,"w"); //Data should be more than the size of a link. for ($i = 1; $i <= 10; $i++) { - fwrite($h, "Here is a repeated amount of data"); + fwrite($h, b"Here is a repeated amount of data"); } fclose($h); http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/file_put_contents_variation5.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/standard/tests/file/file_put_contents_variation5.phpt diff -u php-src/ext/standard/tests/file/file_put_contents_variation5.phpt:1.3 php-src/ext/standard/tests/file/file_put_contents_variation5.phpt:1.4 --- php-src/ext/standard/tests/file/file_put_contents_variation5.phpt:1.3 Mon Jan 19 16:15:17 2009 +++ php-src/ext/standard/tests/file/file_put_contents_variation5.phpt Sat Apr 25 21:12:23 2009 @@ -5,7 +5,8 @@ --FILE-- <?php -$thisTestDir = basename(__FILE__, ".php") . ".dir"; + +$thisTestDir = dirname(__FILE__) . '/' .basename(__FILE__, ".php") . ".directory"; mkdir($thisTestDir); chdir($thisTestDir); @@ -23,7 +24,7 @@ set_include_path(";; ; ;c:\\rubbish"); runtest(); -chdir(dirname(__FILE__)); +chdir(dirname('__FILE__')); rmdir($thisTestDir); http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/file_put_contents_variation8.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/file/file_put_contents_variation8.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fread_socket_variation1.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/file/fread_socket_variation1.phpt diff -u php-src/ext/standard/tests/file/fread_socket_variation1.phpt:1.2 php-src/ext/standard/tests/file/fread_socket_variation1.phpt:1.3 --- php-src/ext/standard/tests/file/fread_socket_variation1.phpt:1.2 Wed Mar 19 17:26:36 2008 +++ php-src/ext/standard/tests/file/fread_socket_variation1.phpt Sat Apr 25 21:12:23 2009 @@ -13,4 +13,4 @@ ?> --EXPECT-- -bool(false) +string(0) "" http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/include_streams.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/standard/tests/file/include_streams.phpt diff -u php-src/ext/standard/tests/file/include_streams.phpt:1.3 php-src/ext/standard/tests/file/include_streams.phpt:1.4 --- php-src/ext/standard/tests/file/include_streams.phpt:1.3 Tue May 27 09:34:53 2008 +++ php-src/ext/standard/tests/file/include_streams.phpt Sat Apr 25 21:12:23 2009 @@ -6,6 +6,7 @@ <?php echo __FILE__ . "\n";?> EOD; +/*<?*/ class mystream { @@ -31,7 +32,7 @@ $this->options = $options; $split = parse_url($path); - if ($split["host"] !== "GLOBALS" || + if ($split["host"] !== b"GLOBALS" || empty($split["path"]) || empty($GLOBALS[substr($split["path"],1)])) { return false; http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/pathinfo_basic.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/standard/tests/file/pathinfo_basic.phpt diff -u php-src/ext/standard/tests/file/pathinfo_basic.phpt:1.3 php-src/ext/standard/tests/file/pathinfo_basic.phpt:1.4 --- php-src/ext/standard/tests/file/pathinfo_basic.phpt:1.3 Tue May 27 09:34:54 2008 +++ php-src/ext/standard/tests/file/pathinfo_basic.phpt Sat Apr 25 21:12:23 2009 @@ -68,184 +68,184 @@ --EXPECTF-- *** Testing basic functions of pathinfo() *** -- Iteration 1 -- -unicode(%d) "%s/foo" -unicode(12) "symlink.link" -unicode(4) "link" -unicode(7) "symlink" -array(4) { - [u"dirname"]=> - unicode(%d) "%s/foo" - [u"basename"]=> - unicode(12) "symlink.link" - [u"extension"]=> - unicode(4) "link" - [u"filename"]=> - unicode(7) "symlink" +%unicode|string%(%d) "%s/foo" +%unicode|string%(12) "symlink.link" +%unicode|string%(4) "link" +%unicode|string%(7) "symlink" +array(4) { + [%u|b%"dirname"]=> + %unicode|string%(%d) "%s/foo" + [%u|b%"basename"]=> + %unicode|string%(12) "symlink.link" + [%u|b%"extension"]=> + %unicode|string%(4) "link" + [%u|b%"filename"]=> + %unicode|string%(7) "symlink" } -- Iteration 2 -- -unicode(1) "." -unicode(17) "www.example.co.in" -unicode(2) "in" -unicode(14) "www.example.co" -array(4) { - [u"dirname"]=> - unicode(1) "." - [u"basename"]=> - unicode(17) "www.example.co.in" - [u"extension"]=> - unicode(2) "in" - [u"filename"]=> - unicode(14) "www.example.co" +%unicode|string%(1) "." +%unicode|string%(17) "www.example.co.in" +%unicode|string%(2) "in" +%unicode|string%(14) "www.example.co" +array(4) { + [%u|b%"dirname"]=> + %unicode|string%(1) "." + [%u|b%"basename"]=> + %unicode|string%(17) "www.example.co.in" + [%u|b%"extension"]=> + %unicode|string%(2) "in" + [%u|b%"filename"]=> + %unicode|string%(14) "www.example.co" } -- Iteration 3 -- -unicode(13) "/var/www/html" -unicode(12) "example.html" -unicode(4) "html" -unicode(7) "example" -array(4) { - [u"dirname"]=> - unicode(13) "/var/www/html" - [u"basename"]=> - unicode(12) "example.html" - [u"extension"]=> - unicode(4) "html" - [u"filename"]=> - unicode(7) "example" +%unicode|string%(13) "/var/www/html" +%unicode|string%(12) "example.html" +%unicode|string%(4) "html" +%unicode|string%(7) "example" +array(4) { + [%u|b%"dirname"]=> + %unicode|string%(13) "/var/www/html" + [%u|b%"basename"]=> + %unicode|string%(12) "example.html" + [%u|b%"extension"]=> + %unicode|string%(4) "html" + [%u|b%"filename"]=> + %unicode|string%(7) "example" } -- Iteration 4 -- -unicode(4) "/dir" -unicode(11) "test.tar.gz" -unicode(2) "gz" -unicode(8) "test.tar" -array(4) { - [u"dirname"]=> - unicode(4) "/dir" - [u"basename"]=> - unicode(11) "test.tar.gz" - [u"extension"]=> - unicode(2) "gz" - [u"filename"]=> - unicode(8) "test.tar" +%unicode|string%(4) "/dir" +%unicode|string%(11) "test.tar.gz" +%unicode|string%(2) "gz" +%unicode|string%(8) "test.tar" +array(4) { + [%u|b%"dirname"]=> + %unicode|string%(4) "/dir" + [%u|b%"basename"]=> + %unicode|string%(11) "test.tar.gz" + [%u|b%"extension"]=> + %unicode|string%(2) "gz" + [%u|b%"filename"]=> + %unicode|string%(8) "test.tar" } -- Iteration 5 -- -unicode(%d) "%s/foo" -unicode(12) "symlink.link" -unicode(4) "link" -unicode(7) "symlink" -array(4) { - [u"dirname"]=> - unicode(%d) "%s/foo" - [u"basename"]=> - unicode(12) "symlink.link" - [u"extension"]=> - unicode(4) "link" - [u"filename"]=> - unicode(7) "symlink" +%unicode|string%(%d) "%s/foo" +%unicode|string%(12) "symlink.link" +%unicode|string%(4) "link" +%unicode|string%(7) "symlink" +array(4) { + [%u|b%"dirname"]=> + %unicode|string%(%d) "%s/foo" + [%u|b%"basename"]=> + %unicode|string%(12) "symlink.link" + [%u|b%"extension"]=> + %unicode|string%(4) "link" + [%u|b%"filename"]=> + %unicode|string%(7) "symlink" } -- Iteration 6 -- -unicode(%d) "%s/foo" -unicode(12) "symlink.link" -unicode(4) "link" -unicode(7) "symlink" -array(4) { - [u"dirname"]=> - unicode(%d) "%s/foo" - [u"basename"]=> - unicode(12) "symlink.link" - [u"extension"]=> - unicode(4) "link" - [u"filename"]=> - unicode(7) "symlink" +%unicode|string%(%d) "%s/foo" +%unicode|string%(12) "symlink.link" +%unicode|string%(4) "link" +%unicode|string%(7) "symlink" +array(4) { + [%u|b%"dirname"]=> + %unicode|string%(%d) "%s/foo" + [%u|b%"basename"]=> + %unicode|string%(12) "symlink.link" + [%u|b%"extension"]=> + %unicode|string%(4) "link" + [%u|b%"filename"]=> + %unicode|string%(7) "symlink" } -- Iteration 7 -- -unicode(%d) "%s/foo" -unicode(12) "symlink.link" -unicode(4) "link" -unicode(7) "symlink" -array(4) { - [u"dirname"]=> - unicode(%d) "%s/foo" - [u"basename"]=> - unicode(12) "symlink.link" - [u"extension"]=> - unicode(4) "link" - [u"filename"]=> - unicode(7) "symlink" +%unicode|string%(%d) "%s/foo" +%unicode|string%(12) "symlink.link" +%unicode|string%(4) "link" +%unicode|string%(7) "symlink" +array(4) { + [%u|b%"dirname"]=> + %unicode|string%(%d) "%s/foo" + [%u|b%"basename"]=> + %unicode|string%(12) "symlink.link" + [%u|b%"extension"]=> + %unicode|string%(4) "link" + [%u|b%"filename"]=> + %unicode|string%(7) "symlink" } -- Iteration 8 -- -unicode(%d) "%s/foo" -unicode(12) "symlink.link" -unicode(4) "link" -unicode(7) "symlink" -array(4) { - [u"dirname"]=> - unicode(%d) "%s/foo" - [u"basename"]=> - unicode(12) "symlink.link" - [u"extension"]=> - unicode(4) "link" - [u"filename"]=> - unicode(7) "symlink" +%unicode|string%(%d) "%s/foo" +%unicode|string%(12) "symlink.link" +%unicode|string%(4) "link" +%unicode|string%(7) "symlink" +array(4) { + [%u|b%"dirname"]=> + %unicode|string%(%d) "%s/foo" + [%u|b%"basename"]=> + %unicode|string%(12) "symlink.link" + [%u|b%"extension"]=> + %unicode|string%(4) "link" + [%u|b%"filename"]=> + %unicode|string%(7) "symlink" } -- Iteration 9 -- -unicode(%d) "%s/foo" -unicode(12) "symlink.link" -unicode(4) "link" -unicode(7) "symlink" -array(4) { - [u"dirname"]=> - unicode(%d) "%s/foo" - [u"basename"]=> - unicode(12) "symlink.link" - [u"extension"]=> - unicode(4) "link" - [u"filename"]=> - unicode(7) "symlink" +%unicode|string%(%d) "%s/foo" +%unicode|string%(12) "symlink.link" +%unicode|string%(4) "link" +%unicode|string%(7) "symlink" +array(4) { + [%u|b%"dirname"]=> + %unicode|string%(%d) "%s/foo" + [%u|b%"basename"]=> + %unicode|string%(12) "symlink.link" + [%u|b%"extension"]=> + %unicode|string%(4) "link" + [%u|b%"filename"]=> + %unicode|string%(7) "symlink" } -- Iteration 10 -- -unicode(%d) "%s/foo" -unicode(12) "symlink.link" -unicode(4) "link" -unicode(7) "symlink" -array(4) { - [u"dirname"]=> - unicode(%d) "%s/foo" - [u"basename"]=> - unicode(12) "symlink.link" - [u"extension"]=> - unicode(4) "link" - [u"filename"]=> - unicode(7) "symlink" +%unicode|string%(%d) "%s/foo" +%unicode|string%(12) "symlink.link" +%unicode|string%(4) "link" +%unicode|string%(7) "symlink" +array(4) { + [%u|b%"dirname"]=> + %unicode|string%(%d) "%s/foo" + [%u|b%"basename"]=> + %unicode|string%(12) "symlink.link" + [%u|b%"extension"]=> + %unicode|string%(4) "link" + [%u|b%"filename"]=> + %unicode|string%(7) "symlink" } -- Iteration 11 -- -unicode(%d) "%s/foo" -unicode(12) "symlink.link" -unicode(4) "link" -unicode(7) "symlink" -array(4) { - [u"dirname"]=> - unicode(%d) "%s/foo" - [u"basename"]=> - unicode(12) "symlink.link" - [u"extension"]=> - unicode(4) "link" - [u"filename"]=> - unicode(7) "symlink" +%unicode|string%(%d) "%s/foo" +%unicode|string%(12) "symlink.link" +%unicode|string%(4) "link" +%unicode|string%(7) "symlink" +array(4) { + [%u|b%"dirname"]=> + %unicode|string%(%d) "%s/foo" + [%u|b%"basename"]=> + %unicode|string%(12) "symlink.link" + [%u|b%"extension"]=> + %unicode|string%(4) "link" + [%u|b%"filename"]=> + %unicode|string%(7) "symlink" } -- Iteration 12 -- -unicode(%d) "%s/foo" -unicode(12) "symlink.link" -unicode(4) "link" -unicode(7) "symlink" -array(4) { - [u"dirname"]=> - unicode(%d) "%s/foo" - [u"basename"]=> - unicode(12) "symlink.link" - [u"extension"]=> - unicode(4) "link" - [u"filename"]=> - unicode(7) "symlink" +%unicode|string%(%d) "%s/foo" +%unicode|string%(12) "symlink.link" +%unicode|string%(4) "link" +%unicode|string%(7) "symlink" +array(4) { + [%u|b%"dirname"]=> + %unicode|string%(%d) "%s/foo" + [%u|b%"basename"]=> + %unicode|string%(12) "symlink.link" + [%u|b%"extension"]=> + %unicode|string%(4) "link" + [%u|b%"filename"]=> + %unicode|string%(7) "symlink" } -- Iteration 13 -- string(%d) "%s/foo" @@ -253,149 +253,149 @@ string(4) "link" string(7) "symlink" array(4) { - [u"dirname"]=> + [%u|b%"dirname"]=> string(%d) "%s/foo" - [u"basename"]=> + [%u|b%"basename"]=> string(12) "symlink.link" - [u"extension"]=> + [%u|b%"extension"]=> string(4) "link" - [u"filename"]=> + [%u|b%"filename"]=> string(7) "symlink" } -- Iteration 14 -- -unicode(1) "." -unicode(1) "." -unicode(0) "" -unicode(0) "" -array(4) { - [u"dirname"]=> - unicode(1) "." - [u"basename"]=> - unicode(1) "." - [u"extension"]=> - unicode(0) "" - [u"filename"]=> - unicode(0) "" +%unicode|string%(1) "." +%unicode|string%(1) "." +%unicode|string%(0) "" +%unicode|string%(0) "" +array(4) { + [%u|b%"dirname"]=> + %unicode|string%(1) "." + [%u|b%"basename"]=> + %unicode|string%(1) "." + [%u|b%"extension"]=> + %unicode|string%(0) "" + [%u|b%"filename"]=> + %unicode|string%(0) "" } -- Iteration 15 -- -unicode(%d) "%s" -unicode(3) "foo" -string(0) "" -unicode(3) "foo" +%unicode|string%(%d) "%s" +%unicode|string%(3) "foo" +%unicode|string%(0) "" +%unicode|string%(3) "foo" array(3) { - [u"dirname"]=> - unicode(%d) "%s" - [u"basename"]=> - unicode(3) "foo" - [u"filename"]=> - unicode(3) "foo" + [%u|b%"dirname"]=> + %unicode|string%(%d) "%s" + [%u|b%"basename"]=> + %unicode|string%(3) "foo" + [%u|b%"filename"]=> + %unicode|string%(3) "foo" } -- Iteration 16 -- -unicode(%d) "%s" -unicode(3) "foo" -string(0) "" -unicode(3) "foo" +%unicode|string%(%d) "%s" +%unicode|string%(3) "foo" +%unicode|string%(0) "" +%unicode|string%(3) "foo" array(3) { - [u"dirname"]=> - unicode(%d) "%s" - [u"basename"]=> - unicode(3) "foo" - [u"filename"]=> - unicode(3) "foo" + [%u|b%"dirname"]=> + %unicode|string%(%d) "%s" + [%u|b%"basename"]=> + %unicode|string%(3) "foo" + [%u|b%"filename"]=> + %unicode|string%(3) "foo" } -- Iteration 17 -- -unicode(%d) "%s/.." -unicode(3) "foo" -string(0) "" -unicode(3) "foo" +%unicode|string%(%d) "%s/.." +%unicode|string%(3) "foo" +%unicode|string%(0) "" +%unicode|string%(3) "foo" array(3) { - [u"dirname"]=> - unicode(%d) "%s/.." - [u"basename"]=> - unicode(3) "foo" - [u"filename"]=> - unicode(3) "foo" + [%u|b%"dirname"]=> + %unicode|string%(%d) "%s/.." + [%u|b%"basename"]=> + %unicode|string%(3) "foo" + [%u|b%"filename"]=> + %unicode|string%(3) "foo" } -- Iteration 18 -- -unicode(6) "../foo" -unicode(3) "bar" -string(0) "" -unicode(3) "bar" +%unicode|string%(6) "../foo" +%unicode|string%(3) "bar" +%unicode|string%(0) "" +%unicode|string%(3) "bar" array(3) { - [u"dirname"]=> - unicode(6) "../foo" - [u"basename"]=> - unicode(3) "bar" - [u"filename"]=> - unicode(3) "bar" + [%u|b%"dirname"]=> + %unicode|string%(6) "../foo" + [%u|b%"basename"]=> + %unicode|string%(3) "bar" + [%u|b%"filename"]=> + %unicode|string%(3) "bar" } -- Iteration 19 -- -unicode(5) "./foo" -unicode(3) "bar" -string(0) "" -unicode(3) "bar" +%unicode|string%(5) "./foo" +%unicode|string%(3) "bar" +%unicode|string%(0) "" +%unicode|string%(3) "bar" array(3) { - [u"dirname"]=> - unicode(5) "./foo" - [u"basename"]=> - unicode(3) "bar" - [u"filename"]=> - unicode(3) "bar" + [%u|b%"dirname"]=> + %unicode|string%(5) "./foo" + [%u|b%"basename"]=> + %unicode|string%(3) "bar" + [%u|b%"filename"]=> + %unicode|string%(3) "bar" } -- Iteration 20 -- -unicode(5) "//foo" -unicode(3) "bar" -string(0) "" -unicode(3) "bar" +%unicode|string%(5) "//foo" +%unicode|string%(3) "bar" +%unicode|string%(0) "" +%unicode|string%(3) "bar" array(3) { - [u"dirname"]=> - unicode(5) "//foo" - [u"basename"]=> - unicode(3) "bar" - [u"filename"]=> - unicode(3) "bar" + [%u|b%"dirname"]=> + %unicode|string%(5) "//foo" + [%u|b%"basename"]=> + %unicode|string%(3) "bar" + [%u|b%"filename"]=> + %unicode|string%(3) "bar" } -- Iteration 21 -- -unicode(5) "~/PHP" -unicode(8) "php5.2.0" -unicode(1) "0" -unicode(6) "php5.2" -array(4) { - [u"dirname"]=> - unicode(5) "~/PHP" - [u"basename"]=> - unicode(8) "php5.2.0" - [u"extension"]=> - unicode(1) "0" - [u"filename"]=> - unicode(6) "php5.2" +%unicode|string%(5) "~/PHP" +%unicode|string%(8) "php5.2.0" +%unicode|string%(1) "0" +%unicode|string%(6) "php5.2" +array(4) { + [%u|b%"dirname"]=> + %unicode|string%(5) "~/PHP" + [%u|b%"basename"]=> + %unicode|string%(8) "php5.2.0" + [%u|b%"extension"]=> + %unicode|string%(1) "0" + [%u|b%"filename"]=> + %unicode|string%(6) "php5.2" } -- Iteration 22 -- -unicode(13) "/home/example" -unicode(4) "test" -string(0) "" -unicode(4) "test" +%unicode|string%(13) "/home/example" +%unicode|string%(4) "test" +%unicode|string%(0) "" +%unicode|string%(4) "test" array(3) { - [u"dirname"]=> - unicode(13) "/home/example" - [u"basename"]=> - unicode(4) "test" - [u"filename"]=> - unicode(4) "test" + [%u|b%"dirname"]=> + %unicode|string%(13) "/home/example" + [%u|b%"basename"]=> + %unicode|string%(4) "test" + [%u|b%"filename"]=> + %unicode|string%(4) "test" } -- Iteration 23 -- -unicode(23) "http://httpd.apache.org" -unicode(24) "core.html#acceptpathinfo" -unicode(19) "html#acceptpathinfo" -unicode(4) "core" -array(4) { - [u"dirname"]=> - unicode(23) "http://httpd.apache.org" - [u"basename"]=> - unicode(24) "core.html#acceptpathinfo" - [u"extension"]=> - unicode(19) "html#acceptpathinfo" - [u"filename"]=> - unicode(4) "core" +%unicode|string%(23) "http://httpd.apache.org" +%unicode|string%(24) "core.html#acceptpathinfo" +%unicode|string%(19) "html#acceptpathinfo" +%unicode|string%(4) "core" +array(4) { + [%u|b%"dirname"]=> + %unicode|string%(23) "http://httpd.apache.org" + [%u|b%"basename"]=> + %unicode|string%(24) "core.html#acceptpathinfo" + [%u|b%"extension"]=> + %unicode|string%(19) "html#acceptpathinfo" + [%u|b%"filename"]=> + %unicode|string%(4) "core" } Done http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/pathinfo_basic1.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/file/pathinfo_basic1.phpt diff -u php-src/ext/standard/tests/file/pathinfo_basic1.phpt:1.2 php-src/ext/standard/tests/file/pathinfo_basic1.phpt:1.3 --- php-src/ext/standard/tests/file/pathinfo_basic1.phpt:1.2 Wed Nov 26 17:48:41 2008 +++ php-src/ext/standard/tests/file/pathinfo_basic1.phpt Sat Apr 25 21:12:23 2009 @@ -71,540 +71,540 @@ echo "Done\n"; ?> ---EXPECT-- +--EXPECTF-- *** Testing basic functions of pathinfo() *** -- Iteration 1 -- -string(0) "" -unicode(0) "" -string(0) "" -unicode(0) "" +%unicode|string%(0) "" +%unicode|string%(0) "" +%unicode|string%(0) "" +%unicode|string%(0) "" array(2) { - [u"basename"]=> - unicode(0) "" - [u"filename"]=> - unicode(0) "" + [%u|b%"basename"]=> + %unicode|string%(0) "" + [%u|b%"filename"]=> + %unicode|string%(0) "" } -- Iteration 2 -- -unicode(1) "." -unicode(1) " " -string(0) "" -unicode(1) " " -array(3) { - [u"dirname"]=> - unicode(1) "." - [u"basename"]=> - unicode(1) " " - [u"filename"]=> - unicode(1) " " +%unicode|string%(1) "." +%unicode|string%(1) " " +%unicode|string%(0) "" +%unicode|string%(1) " " +array(3) { + [%u|b%"dirname"]=> + %unicode|string%(1) "." + [%u|b%"basename"]=> + %unicode|string%(1) " " + [%u|b%"filename"]=> + %unicode|string%(1) " " } -- Iteration 3 -- -unicode(1) "." -unicode(2) "c:" -string(0) "" -unicode(2) "c:" -array(3) { - [u"dirname"]=> - unicode(1) "." - [u"basename"]=> - unicode(2) "c:" - [u"filename"]=> - unicode(2) "c:" +%unicode|string%(1) "." +%unicode|string%(2) "c:" +%unicode|string%(0) "" +%unicode|string%(2) "c:" +array(3) { + [%u|b%"dirname"]=> + %unicode|string%(1) "." + [%u|b%"basename"]=> + %unicode|string%(2) "c:" + [%u|b%"filename"]=> + %unicode|string%(2) "c:" } -- Iteration 4 -- -unicode(1) "." -unicode(3) "c:\" -string(0) "" -unicode(3) "c:\" -array(3) { - [u"dirname"]=> - unicode(1) "." - [u"basename"]=> - unicode(3) "c:\" - [u"filename"]=> - unicode(3) "c:\" +%unicode|string%(1) "." +%unicode|string%(3) "c:\" +%unicode|string%(0) "" +%unicode|string%(3) "c:\" +array(3) { + [%u|b%"dirname"]=> + %unicode|string%(1) "." + [%u|b%"basename"]=> + %unicode|string%(3) "c:\" + [%u|b%"filename"]=> + %unicode|string%(3) "c:\" } -- Iteration 5 -- -unicode(1) "." -unicode(2) "c:" -string(0) "" -unicode(2) "c:" -array(3) { - [u"dirname"]=> - unicode(1) "." - [u"basename"]=> - unicode(2) "c:" - [u"filename"]=> - unicode(2) "c:" +%unicode|string%(1) "." +%unicode|string%(2) "c:" +%unicode|string%(0) "" +%unicode|string%(2) "c:" +array(3) { + [%u|b%"dirname"]=> + %unicode|string%(1) "." + [%u|b%"basename"]=> + %unicode|string%(2) "c:" + [%u|b%"filename"]=> + %unicode|string%(2) "c:" } -- Iteration 6 -- -unicode(1) "." -unicode(5) "afile" -string(0) "" -unicode(5) "afile" -array(3) { - [u"dirname"]=> - unicode(1) "." - [u"basename"]=> - unicode(5) "afile" - [u"filename"]=> - unicode(5) "afile" +%unicode|string%(1) "." +%unicode|string%(5) "afile" +%unicode|string%(0) "" +%unicode|string%(5) "afile" +array(3) { + [%u|b%"dirname"]=> + %unicode|string%(1) "." + [%u|b%"basename"]=> + %unicode|string%(5) "afile" + [%u|b%"filename"]=> + %unicode|string%(5) "afile" } -- Iteration 7 -- -unicode(1) "." -unicode(12) "c:\test\adir" -string(0) "" -unicode(12) "c:\test\adir" -array(3) { - [u"dirname"]=> - unicode(1) "." - [u"basename"]=> - unicode(12) "c:\test\adir" - [u"filename"]=> - unicode(12) "c:\test\adir" +%unicode|string%(1) "." +%unicode|string%(12) "c:\test\adir" +%unicode|string%(0) "" +%unicode|string%(12) "c:\test\adir" +array(3) { + [%u|b%"dirname"]=> + %unicode|string%(1) "." + [%u|b%"basename"]=> + %unicode|string%(12) "c:\test\adir" + [%u|b%"filename"]=> + %unicode|string%(12) "c:\test\adir" } -- Iteration 8 -- -unicode(1) "." -unicode(13) "c:\test\adir\" -string(0) "" -unicode(13) "c:\test\adir\" -array(3) { - [u"dirname"]=> - unicode(1) "." - [u"basename"]=> - unicode(13) "c:\test\adir\" - [u"filename"]=> - unicode(13) "c:\test\adir\" +%unicode|string%(1) "." +%unicode|string%(13) "c:\test\adir\" +%unicode|string%(0) "" +%unicode|string%(13) "c:\test\adir\" +array(3) { + [%u|b%"dirname"]=> + %unicode|string%(1) "." + [%u|b%"basename"]=> + %unicode|string%(13) "c:\test\adir\" + [%u|b%"filename"]=> + %unicode|string%(13) "c:\test\adir\" } -- Iteration 9 -- -unicode(12) "/usr/include" -unicode(4) "arpa" -string(0) "" -unicode(4) "arpa" -array(3) { - [u"dirname"]=> - unicode(12) "/usr/include" - [u"basename"]=> - unicode(4) "arpa" - [u"filename"]=> - unicode(4) "arpa" +%unicode|string%(12) "/usr/include" +%unicode|string%(4) "arpa" +%unicode|string%(0) "" +%unicode|string%(4) "arpa" +array(3) { + [%u|b%"dirname"]=> + %unicode|string%(12) "/usr/include" + [%u|b%"basename"]=> + %unicode|string%(4) "arpa" + [%u|b%"filename"]=> + %unicode|string%(4) "arpa" } -- Iteration 10 -- -unicode(12) "/usr/include" -unicode(4) "arpa" -string(0) "" -unicode(4) "arpa" -array(3) { - [u"dirname"]=> - unicode(12) "/usr/include" - [u"basename"]=> - unicode(4) "arpa" - [u"filename"]=> - unicode(4) "arpa" +%unicode|string%(12) "/usr/include" +%unicode|string%(4) "arpa" +%unicode|string%(0) "" +%unicode|string%(4) "arpa" +array(3) { + [%u|b%"dirname"]=> + %unicode|string%(12) "/usr/include" + [%u|b%"basename"]=> + %unicode|string%(4) "arpa" + [%u|b%"filename"]=> + %unicode|string%(4) "arpa" } -- Iteration 11 -- -unicode(11) "usr/include" -unicode(4) "arpa" -string(0) "" -unicode(4) "arpa" -array(3) { - [u"dirname"]=> - unicode(11) "usr/include" - [u"basename"]=> - unicode(4) "arpa" - [u"filename"]=> - unicode(4) "arpa" +%unicode|string%(11) "usr/include" +%unicode|string%(4) "arpa" +%unicode|string%(0) "" +%unicode|string%(4) "arpa" +array(3) { + [%u|b%"dirname"]=> + %unicode|string%(11) "usr/include" + [%u|b%"basename"]=> + %unicode|string%(4) "arpa" + [%u|b%"filename"]=> + %unicode|string%(4) "arpa" } -- Iteration 12 -- -unicode(11) "usr/include" -unicode(4) "arpa" -string(0) "" -unicode(4) "arpa" -array(3) { - [u"dirname"]=> - unicode(11) "usr/include" - [u"basename"]=> - unicode(4) "arpa" - [u"filename"]=> - unicode(4) "arpa" +%unicode|string%(11) "usr/include" +%unicode|string%(4) "arpa" +%unicode|string%(0) "" +%unicode|string%(4) "arpa" +array(3) { + [%u|b%"dirname"]=> + %unicode|string%(11) "usr/include" + [%u|b%"basename"]=> + %unicode|string%(4) "arpa" + [%u|b%"filename"]=> + %unicode|string%(4) "arpa" } -- Iteration 13 -- -unicode(1) "." -unicode(13) "c:\test\afile" -string(0) "" -unicode(13) "c:\test\afile" -array(3) { - [u"dirname"]=> - unicode(1) "." - [u"basename"]=> - unicode(13) "c:\test\afile" - [u"filename"]=> - unicode(13) "c:\test\afile" +%unicode|string%(1) "." +%unicode|string%(13) "c:\test\afile" +%unicode|string%(0) "" +%unicode|string%(13) "c:\test\afile" +array(3) { + [%u|b%"dirname"]=> + %unicode|string%(1) "." + [%u|b%"basename"]=> + %unicode|string%(13) "c:\test\afile" + [%u|b%"filename"]=> + %unicode|string%(13) "c:\test\afile" } -- Iteration 14 -- -unicode(1) "." -unicode(13) "c:\test\afile" -string(0) "" -unicode(13) "c:\test\afile" -array(3) { - [u"dirname"]=> - unicode(1) "." - [u"basename"]=> - unicode(13) "c:\test\afile" - [u"filename"]=> - unicode(13) "c:\test\afile" +%unicode|string%(1) "." +%unicode|string%(13) "c:\test\afile" +%unicode|string%(0) "" +%unicode|string%(13) "c:\test\afile" +array(3) { + [%u|b%"dirname"]=> + %unicode|string%(1) "." + [%u|b%"basename"]=> + %unicode|string%(13) "c:\test\afile" + [%u|b%"filename"]=> + %unicode|string%(13) "c:\test\afile" } -- Iteration 15 -- -unicode(8) "c://test" -unicode(5) "afile" -string(0) "" -unicode(5) "afile" -array(3) { - [u"dirname"]=> - unicode(8) "c://test" - [u"basename"]=> - unicode(5) "afile" - [u"filename"]=> - unicode(5) "afile" +%unicode|string%(8) "c://test" +%unicode|string%(5) "afile" +%unicode|string%(0) "" +%unicode|string%(5) "afile" +array(3) { + [%u|b%"dirname"]=> + %unicode|string%(8) "c://test" + [%u|b%"basename"]=> + %unicode|string%(5) "afile" + [%u|b%"filename"]=> + %unicode|string%(5) "afile" } -- Iteration 16 -- -unicode(1) "." -unicode(14) "c:\test\afile\" -string(0) "" -unicode(14) "c:\test\afile\" -array(3) { - [u"dirname"]=> - unicode(1) "." - [u"basename"]=> - unicode(14) "c:\test\afile\" - [u"filename"]=> - unicode(14) "c:\test\afile\" +%unicode|string%(1) "." +%unicode|string%(14) "c:\test\afile\" +%unicode|string%(0) "" +%unicode|string%(14) "c:\test\afile\" +array(3) { + [%u|b%"dirname"]=> + %unicode|string%(1) "." + [%u|b%"basename"]=> + %unicode|string%(14) "c:\test\afile\" + [%u|b%"filename"]=> + %unicode|string%(14) "c:\test\afile\" } -- Iteration 17 -- -unicode(1) "." -unicode(16) "c:\test\prog.exe" -unicode(3) "exe" -unicode(12) "c:\test\prog" -array(4) { - [u"dirname"]=> - unicode(1) "." - [u"basename"]=> - unicode(16) "c:\test\prog.exe" - [u"extension"]=> - unicode(3) "exe" - [u"filename"]=> - unicode(12) "c:\test\prog" +%unicode|string%(1) "." +%unicode|string%(16) "c:\test\prog.exe" +%unicode|string%(3) "exe" +%unicode|string%(12) "c:\test\prog" +array(4) { + [%u|b%"dirname"]=> + %unicode|string%(1) "." + [%u|b%"basename"]=> + %unicode|string%(16) "c:\test\prog.exe" + [%u|b%"extension"]=> + %unicode|string%(3) "exe" + [%u|b%"filename"]=> + %unicode|string%(12) "c:\test\prog" } -- Iteration 18 -- -unicode(1) "." -unicode(16) "c:\test\prog.exe" -unicode(3) "exe" -unicode(12) "c:\test\prog" -array(4) { - [u"dirname"]=> - unicode(1) "." - [u"basename"]=> - unicode(16) "c:\test\prog.exe" - [u"extension"]=> - unicode(3) "exe" - [u"filename"]=> - unicode(12) "c:\test\prog" +%unicode|string%(1) "." +%unicode|string%(16) "c:\test\prog.exe" +%unicode|string%(3) "exe" +%unicode|string%(12) "c:\test\prog" +array(4) { + [%u|b%"dirname"]=> + %unicode|string%(1) "." + [%u|b%"basename"]=> + %unicode|string%(16) "c:\test\prog.exe" + [%u|b%"extension"]=> + %unicode|string%(3) "exe" + [%u|b%"filename"]=> + %unicode|string%(12) "c:\test\prog" } -- Iteration 19 -- -unicode(7) "c:/test" -unicode(8) "prog.exe" -unicode(3) "exe" -unicode(4) "prog" -array(4) { - [u"dirname"]=> - unicode(7) "c:/test" - [u"basename"]=> - unicode(8) "prog.exe" - [u"extension"]=> - unicode(3) "exe" - [u"filename"]=> - unicode(4) "prog" +%unicode|string%(7) "c:/test" +%unicode|string%(8) "prog.exe" +%unicode|string%(3) "exe" +%unicode|string%(4) "prog" +array(4) { + [%u|b%"dirname"]=> + %unicode|string%(7) "c:/test" + [%u|b%"basename"]=> + %unicode|string%(8) "prog.exe" + [%u|b%"extension"]=> + %unicode|string%(3) "exe" + [%u|b%"filename"]=> + %unicode|string%(4) "prog" } -- Iteration 20 -- -unicode(17) "/usr/include/arpa" -unicode(6) "inet.h" -unicode(1) "h" -unicode(4) "inet" -array(4) { - [u"dirname"]=> - unicode(17) "/usr/include/arpa" - [u"basename"]=> - unicode(6) "inet.h" - [u"extension"]=> - unicode(1) "h" - [u"filename"]=> - unicode(4) "inet" +%unicode|string%(17) "/usr/include/arpa" +%unicode|string%(6) "inet.h" +%unicode|string%(1) "h" +%unicode|string%(4) "inet" +array(4) { + [%u|b%"dirname"]=> + %unicode|string%(17) "/usr/include/arpa" + [%u|b%"basename"]=> + %unicode|string%(6) "inet.h" + [%u|b%"extension"]=> + %unicode|string%(1) "h" + [%u|b%"filename"]=> + %unicode|string%(4) "inet" } -- Iteration 21 -- -unicode(19) "//usr/include//arpa" -unicode(6) "inet.h" -unicode(1) "h" -unicode(4) "inet" -array(4) { - [u"dirname"]=> - unicode(19) "//usr/include//arpa" - [u"basename"]=> - unicode(6) "inet.h" - [u"extension"]=> - unicode(1) "h" - [u"filename"]=> - unicode(4) "inet" +%unicode|string%(19) "//usr/include//arpa" +%unicode|string%(6) "inet.h" +%unicode|string%(1) "h" +%unicode|string%(4) "inet" +array(4) { + [%u|b%"dirname"]=> + %unicode|string%(19) "//usr/include//arpa" + [%u|b%"basename"]=> + %unicode|string%(6) "inet.h" + [%u|b%"extension"]=> + %unicode|string%(1) "h" + [%u|b%"filename"]=> + %unicode|string%(4) "inet" } -- Iteration 22 -- -unicode(1) "." -unicode(1) "\" -string(0) "" -unicode(1) "\" -array(3) { - [u"dirname"]=> - unicode(1) "." - [u"basename"]=> - unicode(1) "\" - [u"filename"]=> - unicode(1) "\" +%unicode|string%(1) "." +%unicode|string%(1) "\" +%unicode|string%(0) "" +%unicode|string%(1) "\" +array(3) { + [%u|b%"dirname"]=> + %unicode|string%(1) "." + [%u|b%"basename"]=> + %unicode|string%(1) "\" + [%u|b%"filename"]=> + %unicode|string%(1) "\" } -- Iteration 23 -- -unicode(1) "." -unicode(2) "\\" -string(0) "" -unicode(2) "\\" -array(3) { - [u"dirname"]=> - unicode(1) "." - [u"basename"]=> - unicode(2) "\\" - [u"filename"]=> - unicode(2) "\\" +%unicode|string%(1) "." +%unicode|string%(2) "\\" +%unicode|string%(0) "" +%unicode|string%(2) "\\" +array(3) { + [%u|b%"dirname"]=> + %unicode|string%(1) "." + [%u|b%"basename"]=> + %unicode|string%(2) "\\" + [%u|b%"filename"]=> + %unicode|string%(2) "\\" } -- Iteration 24 -- -unicode(1) "/" -unicode(0) "" -string(0) "" -unicode(0) "" -array(3) { - [u"dirname"]=> - unicode(1) "/" - [u"basename"]=> - unicode(0) "" - [u"filename"]=> - unicode(0) "" +%unicode|string%(1) "/" +%unicode|string%(0) "" +%unicode|string%(0) "" +%unicode|string%(0) "" +array(3) { + [%u|b%"dirname"]=> + %unicode|string%(1) "/" + [%u|b%"basename"]=> + %unicode|string%(0) "" + [%u|b%"filename"]=> + %unicode|string%(0) "" } -- Iteration 25 -- -unicode(1) "/" -unicode(0) "" -string(0) "" -unicode(0) "" -array(3) { - [u"dirname"]=> - unicode(1) "/" - [u"basename"]=> - unicode(0) "" - [u"filename"]=> - unicode(0) "" +%unicode|string%(1) "/" +%unicode|string%(0) "" +%unicode|string%(0) "" +%unicode|string%(0) "" +array(3) { + [%u|b%"dirname"]=> + %unicode|string%(1) "/" + [%u|b%"basename"]=> + %unicode|string%(0) "" + [%u|b%"filename"]=> + %unicode|string%(0) "" } -- Iteration 26 -- -unicode(1) "/" -unicode(0) "" -string(0) "" -unicode(0) "" -array(3) { - [u"dirname"]=> - unicode(1) "/" - [u"basename"]=> - unicode(0) "" - [u"filename"]=> - unicode(0) "" +%unicode|string%(1) "/" +%unicode|string%(0) "" +%unicode|string%(0) "" +%unicode|string%(0) "" +array(3) { + [%u|b%"dirname"]=> + %unicode|string%(1) "/" + [%u|b%"basename"]=> + %unicode|string%(0) "" + [%u|b%"filename"]=> + %unicode|string%(0) "" } -- Iteration 27 -- -unicode(17) "/usr/include/arpa" -unicode(6) "inet.h" -unicode(1) "h" -unicode(4) "inet" -array(4) { - [u"dirname"]=> - unicode(17) "/usr/include/arpa" - [u"basename"]=> - unicode(6) "inet.h" - [u"extension"]=> - unicode(1) "h" - [u"filename"]=> - unicode(4) "inet" +%unicode|string%(17) "/usr/include/arpa" +%unicode|string%(6) "inet.h" +%unicode|string%(1) "h" +%unicode|string%(4) "inet" +array(4) { + [%u|b%"dirname"]=> + %unicode|string%(17) "/usr/include/arpa" + [%u|b%"basename"]=> + %unicode|string%(6) "inet.h" + [%u|b%"extension"]=> + %unicode|string%(1) "h" + [%u|b%"filename"]=> + %unicode|string%(4) "inet" } -- Iteration 28 -- -unicode(27) "c:\windows/system32\drivers" -unicode(9) "etc\hosts" -string(0) "" -unicode(9) "etc\hosts" -array(3) { - [u"dirname"]=> - unicode(27) "c:\windows/system32\drivers" - [u"basename"]=> - unicode(9) "etc\hosts" - [u"filename"]=> - unicode(9) "etc\hosts" +%unicode|string%(27) "c:\windows/system32\drivers" +%unicode|string%(9) "etc\hosts" +%unicode|string%(0) "" +%unicode|string%(9) "etc\hosts" +array(3) { + [%u|b%"dirname"]=> + %unicode|string%(27) "c:\windows/system32\drivers" + [%u|b%"basename"]=> + %unicode|string%(9) "etc\hosts" + [%u|b%"filename"]=> + %unicode|string%(9) "etc\hosts" } -- Iteration 29 -- -unicode(12) "/usr\include" -unicode(11) "arpa\inet.h" -unicode(1) "h" -unicode(9) "arpa\inet" -array(4) { - [u"dirname"]=> - unicode(12) "/usr\include" - [u"basename"]=> - unicode(11) "arpa\inet.h" - [u"extension"]=> - unicode(1) "h" - [u"filename"]=> - unicode(9) "arpa\inet" +%unicode|string%(12) "/usr\include" +%unicode|string%(11) "arpa\inet.h" +%unicode|string%(1) "h" +%unicode|string%(9) "arpa\inet" +array(4) { + [%u|b%"dirname"]=> + %unicode|string%(12) "/usr\include" + [%u|b%"basename"]=> + %unicode|string%(11) "arpa\inet.h" + [%u|b%"extension"]=> + %unicode|string%(1) "h" + [%u|b%"filename"]=> + %unicode|string%(9) "arpa\inet" } -- Iteration 30 -- -unicode(1) "." -unicode(25) " c:\test\adir\afile.txt" -unicode(3) "txt" -unicode(21) " c:\test\adir\afile" -array(4) { - [u"dirname"]=> - unicode(1) "." - [u"basename"]=> - unicode(25) " c:\test\adir\afile.txt" - [u"extension"]=> - unicode(3) "txt" - [u"filename"]=> - unicode(21) " c:\test\adir\afile" +%unicode|string%(1) "." +%unicode|string%(25) " c:\test\adir\afile.txt" +%unicode|string%(3) "txt" +%unicode|string%(21) " c:\test\adir\afile" +array(4) { + [%u|b%"dirname"]=> + %unicode|string%(1) "." + [%u|b%"basename"]=> + %unicode|string%(25) " c:\test\adir\afile.txt" + [%u|b%"extension"]=> + %unicode|string%(3) "txt" + [%u|b%"filename"]=> + %unicode|string%(21) " c:\test\adir\afile" } -- Iteration 31 -- -unicode(1) "." -unicode(25) "c:\test\adir\afile.txt " -unicode(6) "txt " -unicode(18) "c:\test\adir\afile" -array(4) { - [u"dirname"]=> - unicode(1) "." - [u"basename"]=> - unicode(25) "c:\test\adir\afile.txt " - [u"extension"]=> - unicode(6) "txt " - [u"filename"]=> - unicode(18) "c:\test\adir\afile" +%unicode|string%(1) "." +%unicode|string%(25) "c:\test\adir\afile.txt " +%unicode|string%(6) "txt " +%unicode|string%(18) "c:\test\adir\afile" +array(4) { + [%u|b%"dirname"]=> + %unicode|string%(1) "." + [%u|b%"basename"]=> + %unicode|string%(25) "c:\test\adir\afile.txt " + [%u|b%"extension"]=> + %unicode|string%(6) "txt " + [%u|b%"filename"]=> + %unicode|string%(18) "c:\test\adir\afile" } -- Iteration 32 -- -unicode(1) "." -unicode(28) " c:\test\adir\afile.txt " -unicode(6) "txt " -unicode(21) " c:\test\adir\afile" -array(4) { - [u"dirname"]=> - unicode(1) "." - [u"basename"]=> - unicode(28) " c:\test\adir\afile.txt " - [u"extension"]=> - unicode(6) "txt " - [u"filename"]=> - unicode(21) " c:\test\adir\afile" +%unicode|string%(1) "." +%unicode|string%(28) " c:\test\adir\afile.txt " +%unicode|string%(6) "txt " +%unicode|string%(21) " c:\test\adir\afile" +array(4) { + [%u|b%"dirname"]=> + %unicode|string%(1) "." + [%u|b%"basename"]=> + %unicode|string%(28) " c:\test\adir\afile.txt " + [%u|b%"extension"]=> + %unicode|string%(6) "txt " + [%u|b%"filename"]=> + %unicode|string%(21) " c:\test\adir\afile" } -- Iteration 33 -- -unicode(20) " /usr/include/arpa" -unicode(6) "inet.h" -unicode(1) "h" -unicode(4) "inet" -array(4) { - [u"dirname"]=> - unicode(20) " /usr/include/arpa" - [u"basename"]=> - unicode(6) "inet.h" - [u"extension"]=> - unicode(1) "h" - [u"filename"]=> - unicode(4) "inet" +%unicode|string%(20) " /usr/include/arpa" +%unicode|string%(6) "inet.h" +%unicode|string%(1) "h" +%unicode|string%(4) "inet" +array(4) { + [%u|b%"dirname"]=> + %unicode|string%(20) " /usr/include/arpa" + [%u|b%"basename"]=> + %unicode|string%(6) "inet.h" + [%u|b%"extension"]=> + %unicode|string%(1) "h" + [%u|b%"filename"]=> + %unicode|string%(4) "inet" } -- Iteration 34 -- -unicode(17) "/usr/include/arpa" -unicode(9) "inet.h " -unicode(4) "h " -unicode(4) "inet" -array(4) { - [u"dirname"]=> - unicode(17) "/usr/include/arpa" - [u"basename"]=> - unicode(9) "inet.h " - [u"extension"]=> - unicode(4) "h " - [u"filename"]=> - unicode(4) "inet" +%unicode|string%(17) "/usr/include/arpa" +%unicode|string%(9) "inet.h " +%unicode|string%(4) "h " +%unicode|string%(4) "inet" +array(4) { + [%u|b%"dirname"]=> + %unicode|string%(17) "/usr/include/arpa" + [%u|b%"basename"]=> + %unicode|string%(9) "inet.h " + [%u|b%"extension"]=> + %unicode|string%(4) "h " + [%u|b%"filename"]=> + %unicode|string%(4) "inet" } -- Iteration 35 -- -unicode(20) " /usr/include/arpa" -unicode(9) "inet.h " -unicode(4) "h " -unicode(4) "inet" -array(4) { - [u"dirname"]=> - unicode(20) " /usr/include/arpa" - [u"basename"]=> - unicode(9) "inet.h " - [u"extension"]=> - unicode(4) "h " - [u"filename"]=> - unicode(4) "inet" +%unicode|string%(20) " /usr/include/arpa" +%unicode|string%(9) "inet.h " +%unicode|string%(4) "h " +%unicode|string%(4) "inet" +array(4) { + [%u|b%"dirname"]=> + %unicode|string%(20) " /usr/include/arpa" + [%u|b%"basename"]=> + %unicode|string%(9) "inet.h " + [%u|b%"extension"]=> + %unicode|string%(4) "h " + [%u|b%"filename"]=> + %unicode|string%(4) "inet" } -- Iteration 36 -- -unicode(1) "." -unicode(3) " c:" -string(0) "" -unicode(3) " c:" -array(3) { - [u"dirname"]=> - unicode(1) "." - [u"basename"]=> - unicode(3) " c:" - [u"filename"]=> - unicode(3) " c:" +%unicode|string%(1) "." +%unicode|string%(3) " c:" +%unicode|string%(0) "" +%unicode|string%(3) " c:" +array(3) { + [%u|b%"dirname"]=> + %unicode|string%(1) "." + [%u|b%"basename"]=> + %unicode|string%(3) " c:" + [%u|b%"filename"]=> + %unicode|string%(3) " c:" } -- Iteration 37 -- -unicode(1) "." -unicode(24) " c:\test\adir\afile.txt" -unicode(3) "txt" -unicode(20) " c:\test\adir\afile" -array(4) { - [u"dirname"]=> - unicode(1) "." - [u"basename"]=> - unicode(24) " c:\test\adir\afile.txt" - [u"extension"]=> - unicode(3) "txt" - [u"filename"]=> - unicode(20) " c:\test\adir\afile" +%unicode|string%(1) "." +%unicode|string%(24) " c:\test\adir\afile.txt" +%unicode|string%(3) "txt" +%unicode|string%(20) " c:\test\adir\afile" +array(4) { + [%u|b%"dirname"]=> + %unicode|string%(1) "." + [%u|b%"basename"]=> + %unicode|string%(24) " c:\test\adir\afile.txt" + [%u|b%"extension"]=> + %unicode|string%(3) "txt" + [%u|b%"filename"]=> + %unicode|string%(20) " c:\test\adir\afile" } -- Iteration 38 -- -unicode(1) "/" -unicode(3) "usr" -string(0) "" -unicode(3) "usr" -array(3) { - [u"dirname"]=> - unicode(1) "/" - [u"basename"]=> - unicode(3) "usr" - [u"filename"]=> - unicode(3) "usr" +%unicode|string%(1) "/" +%unicode|string%(3) "usr" +%unicode|string%(0) "" +%unicode|string%(3) "usr" +array(3) { + [%u|b%"dirname"]=> + %unicode|string%(1) "/" + [%u|b%"basename"]=> + %unicode|string%(3) "usr" + [%u|b%"filename"]=> + %unicode|string%(3) "usr" } -- Iteration 39 -- -unicode(1) "/" -unicode(3) "usr" -string(0) "" -unicode(3) "usr" -array(3) { - [u"dirname"]=> - unicode(1) "/" - [u"basename"]=> - unicode(3) "usr" - [u"filename"]=> - unicode(3) "usr" +%unicode|string%(1) "/" +%unicode|string%(3) "usr" +%unicode|string%(0) "" +%unicode|string%(3) "usr" +array(3) { + [%u|b%"dirname"]=> + %unicode|string%(1) "/" + [%u|b%"basename"]=> + %unicode|string%(3) "usr" + [%u|b%"filename"]=> + %unicode|string%(3) "usr" } Done http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/pathinfo_basic2.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/file/pathinfo_basic2.phpt diff -u php-src/ext/standard/tests/file/pathinfo_basic2.phpt:1.2 php-src/ext/standard/tests/file/pathinfo_basic2.phpt:1.3 --- php-src/ext/standard/tests/file/pathinfo_basic2.phpt:1.2 Wed Nov 26 17:48:41 2008 +++ php-src/ext/standard/tests/file/pathinfo_basic2.phpt Sat Apr 25 21:12:23 2009 @@ -48,226 +48,226 @@ echo "Done\n"; ?> ---EXPECT-- +--EXPECTF-- *** Testing basic functions of pathinfo() *** -- Iteration 1 -- -unicode(1) "." -unicode(10) "c:\..\dir1" -unicode(5) "\dir1" -unicode(4) "c:\." -array(4) { - [u"dirname"]=> - unicode(1) "." - [u"basename"]=> - unicode(10) "c:\..\dir1" - [u"extension"]=> - unicode(5) "\dir1" - [u"filename"]=> - unicode(4) "c:\." +%unicode|string%(1) "." +%unicode|string%(10) "c:\..\dir1" +%unicode|string%(5) "\dir1" +%unicode|string%(4) "c:\." +array(4) { + [%u|b%"dirname"]=> + %unicode|string%(1) "." + [%u|b%"basename"]=> + %unicode|string%(10) "c:\..\dir1" + [%u|b%"extension"]=> + %unicode|string%(5) "\dir1" + [%u|b%"filename"]=> + %unicode|string%(4) "c:\." } -- Iteration 2 -- -unicode(1) "." -unicode(33) "c:\test\..\test2\.\adir\afile.txt" -unicode(3) "txt" -unicode(29) "c:\test\..\test2\.\adir\afile" -array(4) { - [u"dirname"]=> - unicode(1) "." - [u"basename"]=> - unicode(33) "c:\test\..\test2\.\adir\afile.txt" - [u"extension"]=> - unicode(3) "txt" - [u"filename"]=> - unicode(29) "c:\test\..\test2\.\adir\afile" +%unicode|string%(1) "." +%unicode|string%(33) "c:\test\..\test2\.\adir\afile.txt" +%unicode|string%(3) "txt" +%unicode|string%(29) "c:\test\..\test2\.\adir\afile" +array(4) { + [%u|b%"dirname"]=> + %unicode|string%(1) "." + [%u|b%"basename"]=> + %unicode|string%(33) "c:\test\..\test2\.\adir\afile.txt" + [%u|b%"extension"]=> + %unicode|string%(3) "txt" + [%u|b%"filename"]=> + %unicode|string%(29) "c:\test\..\test2\.\adir\afile" } -- Iteration 3 -- -unicode(22) "/usr/include/../arpa/." -unicode(6) "inet.h" -unicode(1) "h" -unicode(4) "inet" -array(4) { - [u"dirname"]=> - unicode(22) "/usr/include/../arpa/." - [u"basename"]=> - unicode(6) "inet.h" - [u"extension"]=> - unicode(1) "h" - [u"filename"]=> - unicode(4) "inet" +%unicode|string%(22) "/usr/include/../arpa/." +%unicode|string%(6) "inet.h" +%unicode|string%(1) "h" +%unicode|string%(4) "inet" +array(4) { + [%u|b%"dirname"]=> + %unicode|string%(22) "/usr/include/../arpa/." + [%u|b%"basename"]=> + %unicode|string%(6) "inet.h" + [%u|b%"extension"]=> + %unicode|string%(1) "h" + [%u|b%"filename"]=> + %unicode|string%(4) "inet" } -- Iteration 4 -- -unicode(1) "." -unicode(23) "c:\test\adir\afile..txt" -unicode(3) "txt" -unicode(19) "c:\test\adir\afile." -array(4) { - [u"dirname"]=> - unicode(1) "." - [u"basename"]=> - unicode(23) "c:\test\adir\afile..txt" - [u"extension"]=> - unicode(3) "txt" - [u"filename"]=> - unicode(19) "c:\test\adir\afile." +%unicode|string%(1) "." +%unicode|string%(23) "c:\test\adir\afile..txt" +%unicode|string%(3) "txt" +%unicode|string%(19) "c:\test\adir\afile." +array(4) { + [%u|b%"dirname"]=> + %unicode|string%(1) "." + [%u|b%"basename"]=> + %unicode|string%(23) "c:\test\adir\afile..txt" + [%u|b%"extension"]=> + %unicode|string%(3) "txt" + [%u|b%"filename"]=> + %unicode|string%(19) "c:\test\adir\afile." } -- Iteration 5 -- -unicode(17) "/usr/include/arpa" -unicode(7) "inet..h" -unicode(1) "h" -unicode(5) "inet." -array(4) { - [u"dirname"]=> - unicode(17) "/usr/include/arpa" - [u"basename"]=> - unicode(7) "inet..h" - [u"extension"]=> - unicode(1) "h" - [u"filename"]=> - unicode(5) "inet." +%unicode|string%(17) "/usr/include/arpa" +%unicode|string%(7) "inet..h" +%unicode|string%(1) "h" +%unicode|string%(5) "inet." +array(4) { + [%u|b%"dirname"]=> + %unicode|string%(17) "/usr/include/arpa" + [%u|b%"basename"]=> + %unicode|string%(7) "inet..h" + [%u|b%"extension"]=> + %unicode|string%(1) "h" + [%u|b%"filename"]=> + %unicode|string%(5) "inet." } -- Iteration 6 -- -unicode(1) "." -unicode(19) "c:\test\adir\afile." -unicode(0) "" -unicode(18) "c:\test\adir\afile" -array(4) { - [u"dirname"]=> - unicode(1) "." - [u"basename"]=> - unicode(19) "c:\test\adir\afile." - [u"extension"]=> - unicode(0) "" - [u"filename"]=> - unicode(18) "c:\test\adir\afile" +%unicode|string%(1) "." +%unicode|string%(19) "c:\test\adir\afile." +%unicode|string%(0) "" +%unicode|string%(18) "c:\test\adir\afile" +array(4) { + [%u|b%"dirname"]=> + %unicode|string%(1) "." + [%u|b%"basename"]=> + %unicode|string%(19) "c:\test\adir\afile." + [%u|b%"extension"]=> + %unicode|string%(0) "" + [%u|b%"filename"]=> + %unicode|string%(18) "c:\test\adir\afile" } -- Iteration 7 -- -unicode(17) "/usr/include/arpa" -unicode(5) "inet." -unicode(0) "" -unicode(4) "inet" -array(4) { - [u"dirname"]=> - unicode(17) "/usr/include/arpa" - [u"basename"]=> - unicode(5) "inet." - [u"extension"]=> - unicode(0) "" - [u"filename"]=> - unicode(4) "inet" +%unicode|string%(17) "/usr/include/arpa" +%unicode|string%(5) "inet." +%unicode|string%(0) "" +%unicode|string%(4) "inet" +array(4) { + [%u|b%"dirname"]=> + %unicode|string%(17) "/usr/include/arpa" + [%u|b%"basename"]=> + %unicode|string%(5) "inet." + [%u|b%"extension"]=> + %unicode|string%(0) "" + [%u|b%"filename"]=> + %unicode|string%(4) "inet" } -- Iteration 8 -- -unicode(17) "/usr/include/arpa" -unicode(6) "inet,h" -string(0) "" -unicode(6) "inet,h" +%unicode|string%(17) "/usr/include/arpa" +%unicode|string%(6) "inet,h" +%unicode|string%(0) "" +%unicode|string%(6) "inet,h" array(3) { - [u"dirname"]=> - unicode(17) "/usr/include/arpa" - [u"basename"]=> - unicode(6) "inet,h" - [u"filename"]=> - unicode(6) "inet,h" + [%u|b%"dirname"]=> + %unicode|string%(17) "/usr/include/arpa" + [%u|b%"basename"]=> + %unicode|string%(6) "inet,h" + [%u|b%"filename"]=> + %unicode|string%(6) "inet,h" } -- Iteration 9 -- -unicode(1) "." -unicode(11) "c:afile.txt" -unicode(3) "txt" -unicode(7) "c:afile" -array(4) { - [u"dirname"]=> - unicode(1) "." - [u"basename"]=> - unicode(11) "c:afile.txt" - [u"extension"]=> - unicode(3) "txt" - [u"filename"]=> - unicode(7) "c:afile" +%unicode|string%(1) "." +%unicode|string%(11) "c:afile.txt" +%unicode|string%(3) "txt" +%unicode|string%(7) "c:afile" +array(4) { + [%u|b%"dirname"]=> + %unicode|string%(1) "." + [%u|b%"basename"]=> + %unicode|string%(11) "c:afile.txt" + [%u|b%"extension"]=> + %unicode|string%(3) "txt" + [%u|b%"filename"]=> + %unicode|string%(7) "c:afile" } -- Iteration 10 -- -unicode(1) "." -unicode(22) "..\.\..\test\afile.txt" -unicode(3) "txt" -unicode(18) "..\.\..\test\afile" -array(4) { - [u"dirname"]=> - unicode(1) "." - [u"basename"]=> - unicode(22) "..\.\..\test\afile.txt" - [u"extension"]=> - unicode(3) "txt" - [u"filename"]=> - unicode(18) "..\.\..\test\afile" +%unicode|string%(1) "." +%unicode|string%(22) "..\.\..\test\afile.txt" +%unicode|string%(3) "txt" +%unicode|string%(18) "..\.\..\test\afile" +array(4) { + [%u|b%"dirname"]=> + %unicode|string%(1) "." + [%u|b%"basename"]=> + %unicode|string%(22) "..\.\..\test\afile.txt" + [%u|b%"extension"]=> + %unicode|string%(3) "txt" + [%u|b%"filename"]=> + %unicode|string%(18) "..\.\..\test\afile" } -- Iteration 11 -- -unicode(12) ".././../test" -unicode(5) "afile" -string(0) "" -unicode(5) "afile" +%unicode|string%(12) ".././../test" +%unicode|string%(5) "afile" +%unicode|string%(0) "" +%unicode|string%(5) "afile" array(3) { - [u"dirname"]=> - unicode(12) ".././../test" - [u"basename"]=> - unicode(5) "afile" - [u"filename"]=> - unicode(5) "afile" + [%u|b%"dirname"]=> + %unicode|string%(12) ".././../test" + [%u|b%"basename"]=> + %unicode|string%(5) "afile" + [%u|b%"filename"]=> + %unicode|string%(5) "afile" } -- Iteration 12 -- -unicode(1) "." -unicode(1) "." -unicode(0) "" -unicode(0) "" -array(4) { - [u"dirname"]=> - unicode(1) "." - [u"basename"]=> - unicode(1) "." - [u"extension"]=> - unicode(0) "" - [u"filename"]=> - unicode(0) "" +%unicode|string%(1) "." +%unicode|string%(1) "." +%unicode|string%(0) "" +%unicode|string%(0) "" +array(4) { + [%u|b%"dirname"]=> + %unicode|string%(1) "." + [%u|b%"basename"]=> + %unicode|string%(1) "." + [%u|b%"extension"]=> + %unicode|string%(0) "" + [%u|b%"filename"]=> + %unicode|string%(0) "" } -- Iteration 13 -- -unicode(1) "." -unicode(2) ".." -unicode(0) "" -unicode(1) "." -array(4) { - [u"dirname"]=> - unicode(1) "." - [u"basename"]=> - unicode(2) ".." - [u"extension"]=> - unicode(0) "" - [u"filename"]=> - unicode(1) "." +%unicode|string%(1) "." +%unicode|string%(2) ".." +%unicode|string%(0) "" +%unicode|string%(1) "." +array(4) { + [%u|b%"dirname"]=> + %unicode|string%(1) "." + [%u|b%"basename"]=> + %unicode|string%(2) ".." + [%u|b%"extension"]=> + %unicode|string%(0) "" + [%u|b%"filename"]=> + %unicode|string%(1) "." } -- Iteration 14 -- -unicode(1) "." -unicode(3) "..." -unicode(0) "" -unicode(2) ".." -array(4) { - [u"dirname"]=> - unicode(1) "." - [u"basename"]=> - unicode(3) "..." - [u"extension"]=> - unicode(0) "" - [u"filename"]=> - unicode(2) ".." +%unicode|string%(1) "." +%unicode|string%(3) "..." +%unicode|string%(0) "" +%unicode|string%(2) ".." +array(4) { + [%u|b%"dirname"]=> + %unicode|string%(1) "." + [%u|b%"basename"]=> + %unicode|string%(3) "..." + [%u|b%"extension"]=> + %unicode|string%(0) "" + [%u|b%"filename"]=> + %unicode|string%(2) ".." } -- Iteration 15 -- -unicode(12) "/usr/lib/..." -unicode(5) "afile" -string(0) "" -unicode(5) "afile" +%unicode|string%(12) "/usr/lib/..." +%unicode|string%(5) "afile" +%unicode|string%(0) "" +%unicode|string%(5) "afile" array(3) { - [u"dirname"]=> - unicode(12) "/usr/lib/..." - [u"basename"]=> - unicode(5) "afile" - [u"filename"]=> - unicode(5) "afile" + [%u|b%"dirname"]=> + %unicode|string%(12) "/usr/lib/..." + [%u|b%"basename"]=> + %unicode|string%(5) "afile" + [%u|b%"filename"]=> + %unicode|string%(5) "afile" } Done http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/pathinfo_variation1.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/file/pathinfo_variation1.phpt diff -u php-src/ext/standard/tests/file/pathinfo_variation1.phpt:1.2 php-src/ext/standard/tests/file/pathinfo_variation1.phpt:1.3 --- php-src/ext/standard/tests/file/pathinfo_variation1.phpt:1.2 Wed Nov 26 17:48:40 2008 +++ php-src/ext/standard/tests/file/pathinfo_variation1.phpt Sat Apr 25 21:12:23 2009 @@ -109,31 +109,31 @@ *** Testing pathinfo() : usage variation *** --int 0-- -unicode(1) "." +%unicode|string%(1) "." --int 1-- -unicode(1) "." +%unicode|string%(1) "." --int 12345-- -unicode(1) "." +%unicode|string%(1) "." --int -12345-- -unicode(1) "." +%unicode|string%(1) "." --float 10.5-- -unicode(1) "." +%unicode|string%(1) "." --float -10.5-- -unicode(1) "." +%unicode|string%(1) "." --float 12.3456789000e10-- -unicode(1) "." +%unicode|string%(1) "." --float -12.3456789000e10-- -unicode(1) "." +%unicode|string%(1) "." --float .5-- -unicode(1) "." +%unicode|string%(1) "." --empty array-- Error: 2 - pathinfo() expects parameter 1 to be string (Unicode or binary), array given, %s(%d) @@ -152,40 +152,40 @@ NULL --uppercase NULL-- -string(0) "" +%unicode|string%(0) "" --lowercase null-- -string(0) "" +%unicode|string%(0) "" --lowercase true-- -unicode(1) "." +%unicode|string%(1) "." --lowercase false-- -string(0) "" +%unicode|string%(0) "" --uppercase TRUE-- -unicode(1) "." +%unicode|string%(1) "." --uppercase FALSE-- -string(0) "" +%unicode|string%(0) "" --empty string DQ-- -string(0) "" +%unicode|string%(0) "" --empty string SQ-- -string(0) "" +%unicode|string%(0) "" --instance of classWithToString-- -unicode(1) "." +%unicode|string%(1) "." --instance of classWithoutToString-- Error: 2 - pathinfo() expects parameter 1 to be string (Unicode or binary), object given, %s(%d) NULL --undefined var-- -string(0) "" +%unicode|string%(0) "" --unset var-- -string(0) "" +%unicode|string%(0) "" ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/pathinfo_variaton.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/standard/tests/file/pathinfo_variaton.phpt diff -u php-src/ext/standard/tests/file/pathinfo_variaton.phpt:1.3 php-src/ext/standard/tests/file/pathinfo_variaton.phpt:1.4 --- php-src/ext/standard/tests/file/pathinfo_variaton.phpt:1.3 Tue May 27 09:34:54 2008 +++ php-src/ext/standard/tests/file/pathinfo_variaton.phpt Sat Apr 25 21:12:23 2009 @@ -96,108 +96,108 @@ Notice: Undefined variable: fp in %s on line %d -- Iteration 1 -- array(3) { - [u"dirname"]=> - unicode(1) "." - [u"basename"]=> - unicode(1) "0" - [u"filename"]=> - unicode(1) "0" -} -unicode(1) "." -unicode(1) "0" -string(0) "" -unicode(1) "0" + [%u|b%"dirname"]=> + %unicode|string%(1) "." + [%u|b%"basename"]=> + %unicode|string%(1) "0" + [%u|b%"filename"]=> + %unicode|string%(1) "0" +} +%unicode|string%(1) "." +%unicode|string%(1) "0" +%unicode|string%(0) "" +%unicode|string%(1) "0" -- Iteration 2 -- array(3) { - [u"dirname"]=> - unicode(1) "." - [u"basename"]=> - unicode(4) "1234" - [u"filename"]=> - unicode(4) "1234" -} -unicode(1) "." -unicode(4) "1234" -string(0) "" -unicode(4) "1234" + [%u|b%"dirname"]=> + %unicode|string%(1) "." + [%u|b%"basename"]=> + %unicode|string%(4) "1234" + [%u|b%"filename"]=> + %unicode|string%(4) "1234" +} +%unicode|string%(1) "." +%unicode|string%(4) "1234" +%unicode|string%(0) "" +%unicode|string%(4) "1234" -- Iteration 3 -- array(3) { - [u"dirname"]=> - unicode(1) "." - [u"basename"]=> - unicode(5) "-1234" - [u"filename"]=> - unicode(5) "-1234" -} -unicode(1) "." -unicode(5) "-1234" -string(0) "" -unicode(5) "-1234" + [%u|b%"dirname"]=> + %unicode|string%(1) "." + [%u|b%"basename"]=> + %unicode|string%(5) "-1234" + [%u|b%"filename"]=> + %unicode|string%(5) "-1234" +} +%unicode|string%(1) "." +%unicode|string%(5) "-1234" +%unicode|string%(0) "" +%unicode|string%(5) "-1234" -- Iteration 4 -- array(4) { - [u"dirname"]=> - unicode(1) "." - [u"basename"]=> - unicode(6) "2.3456" - [u"extension"]=> - unicode(4) "3456" - [u"filename"]=> - unicode(1) "2" -} -unicode(1) "." -unicode(6) "2.3456" -unicode(4) "3456" -unicode(1) "2" + [%u|b%"dirname"]=> + %unicode|string%(1) "." + [%u|b%"basename"]=> + %unicode|string%(6) "2.3456" + [%u|b%"extension"]=> + %unicode|string%(4) "3456" + [%u|b%"filename"]=> + %unicode|string%(1) "2" +} +%unicode|string%(1) "." +%unicode|string%(6) "2.3456" +%unicode|string%(4) "3456" +%unicode|string%(1) "2" -- Iteration 5 -- array(3) { - [u"dirname"]=> - unicode(1) "." - [u"basename"]=> - unicode(1) "1" - [u"filename"]=> - unicode(1) "1" -} -unicode(1) "." -unicode(1) "1" -string(0) "" -unicode(1) "1" + [%u|b%"dirname"]=> + %unicode|string%(1) "." + [%u|b%"basename"]=> + %unicode|string%(1) "1" + [%u|b%"filename"]=> + %unicode|string%(1) "1" +} +%unicode|string%(1) "." +%unicode|string%(1) "1" +%unicode|string%(0) "" +%unicode|string%(1) "1" -- Iteration 6 -- array(2) { - [u"basename"]=> - unicode(0) "" - [u"filename"]=> - unicode(0) "" -} -string(0) "" -unicode(0) "" -string(0) "" -unicode(0) "" + [%u|b%"basename"]=> + %unicode|string%(0) "" + [%u|b%"filename"]=> + %unicode|string%(0) "" +} +%unicode|string%(0) "" +%unicode|string%(0) "" +%unicode|string%(0) "" +%unicode|string%(0) "" -- Iteration 7 -- array(3) { - [u"dirname"]=> - unicode(1) "." - [u"basename"]=> - unicode(11) "array(1, 2)" - [u"filename"]=> - unicode(11) "array(1, 2)" -} -unicode(1) "." -unicode(11) "array(1, 2)" -string(0) "" -unicode(11) "array(1, 2)" + [%u|b%"dirname"]=> + %unicode|string%(1) "." + [%u|b%"basename"]=> + %unicode|string%(11) "array(1, 2)" + [%u|b%"filename"]=> + %unicode|string%(11) "array(1, 2)" +} +%unicode|string%(1) "." +%unicode|string%(11) "array(1, 2)" +%unicode|string%(0) "" +%unicode|string%(11) "array(1, 2)" -- Iteration 8 -- array(3) { - [u"dirname"]=> - unicode(1) "." - [u"basename"]=> - unicode(21) "array( array(), null)" - [u"filename"]=> - unicode(21) "array( array(), null)" -} -unicode(1) "." -unicode(21) "array( array(), null)" -string(0) "" -unicode(21) "array( array(), null)" + [%u|b%"dirname"]=> + %unicode|string%(1) "." + [%u|b%"basename"]=> + %unicode|string%(21) "array( array(), null)" + [%u|b%"filename"]=> + %unicode|string%(21) "array( array(), null)" +} +%unicode|string%(1) "." +%unicode|string%(21) "array( array(), null)" +%unicode|string%(0) "" +%unicode|string%(21) "array( array(), null)" -- Iteration 9 -- Warning: pathinfo() expects parameter 1 to be string (Unicode or binary), object given in %s on line %d @@ -216,227 +216,227 @@ NULL -- Iteration 10 -- array(3) { - [u"dirname"]=> - unicode(1) "." - [u"basename"]=> - unicode(1) " " - [u"filename"]=> - unicode(1) " " -} -unicode(1) "." -unicode(1) " " -string(0) "" -unicode(1) " " + [%u|b%"dirname"]=> + %unicode|string%(1) "." + [%u|b%"basename"]=> + %unicode|string%(1) " " + [%u|b%"filename"]=> + %unicode|string%(1) " " +} +%unicode|string%(1) "." +%unicode|string%(1) " " +%unicode|string%(0) "" +%unicode|string%(1) " " -- Iteration 11 -- array(3) { - [u"dirname"]=> - unicode(1) "." - [u"basename"]=> - unicode(1) " " - [u"filename"]=> - unicode(1) " " -} -unicode(1) "." -unicode(1) " " -string(0) "" -unicode(1) " " + [%u|b%"dirname"]=> + %unicode|string%(1) "." + [%u|b%"basename"]=> + %unicode|string%(1) " " + [%u|b%"filename"]=> + %unicode|string%(1) " " +} +%unicode|string%(1) "." +%unicode|string%(1) " " +%unicode|string%(0) "" +%unicode|string%(1) " " -- Iteration 12 -- array(2) { - [u"basename"]=> - unicode(0) "" - [u"filename"]=> - unicode(0) "" -} -string(0) "" -unicode(0) "" -string(0) "" -unicode(0) "" + [%u|b%"basename"]=> + %unicode|string%(0) "" + [%u|b%"filename"]=> + %unicode|string%(0) "" +} +%unicode|string%(0) "" +%unicode|string%(0) "" +%unicode|string%(0) "" +%unicode|string%(0) "" -- Iteration 13 -- array(2) { - [u"basename"]=> - unicode(0) "" - [u"filename"]=> - unicode(0) "" -} -string(0) "" -unicode(0) "" -string(0) "" -unicode(0) "" + [%u|b%"basename"]=> + %unicode|string%(0) "" + [%u|b%"filename"]=> + %unicode|string%(0) "" +} +%unicode|string%(0) "" +%unicode|string%(0) "" +%unicode|string%(0) "" +%unicode|string%(0) "" -- Iteration 14 -- array(2) { - [u"basename"]=> - unicode(0) "" - [u"filename"]=> - unicode(0) "" -} -string(0) "" -unicode(0) "" -string(0) "" -unicode(0) "" + [%u|b%"basename"]=> + %unicode|string%(0) "" + [%u|b%"filename"]=> + %unicode|string%(0) "" +} +%unicode|string%(0) "" +%unicode|string%(0) "" +%unicode|string%(0) "" +%unicode|string%(0) "" -- Iteration 15 -- array(2) { - [u"basename"]=> - unicode(0) "" - [u"filename"]=> - unicode(0) "" -} -string(0) "" -unicode(0) "" -string(0) "" -unicode(0) "" + [%u|b%"basename"]=> + %unicode|string%(0) "" + [%u|b%"filename"]=> + %unicode|string%(0) "" +} +%unicode|string%(0) "" +%unicode|string%(0) "" +%unicode|string%(0) "" +%unicode|string%(0) "" -- Iteration 16 -- array(2) { - [u"basename"]=> - unicode(0) "" - [u"filename"]=> - unicode(0) "" -} -string(0) "" -unicode(0) "" -string(0) "" -unicode(0) "" + [%u|b%"basename"]=> + %unicode|string%(0) "" + [%u|b%"filename"]=> + %unicode|string%(0) "" +} +%unicode|string%(0) "" +%unicode|string%(0) "" +%unicode|string%(0) "" +%unicode|string%(0) "" -- Iteration 17 -- array(4) { - [u"dirname"]=> - unicode(1) "." - [u"basename"]=> - unicode(11) "www.foo.com" - [u"extension"]=> - unicode(3) "com" - [u"filename"]=> - unicode(7) "www.foo" -} -unicode(1) "." -unicode(11) "www.foo.com" -unicode(3) "com" -unicode(7) "www.foo" + [%u|b%"dirname"]=> + %unicode|string%(1) "." + [%u|b%"basename"]=> + %unicode|string%(11) "www.foo.com" + [%u|b%"extension"]=> + %unicode|string%(3) "com" + [%u|b%"filename"]=> + %unicode|string%(7) "www.foo" +} +%unicode|string%(1) "." +%unicode|string%(11) "www.foo.com" +%unicode|string%(3) "com" +%unicode|string%(7) "www.foo" -- Iteration 18 -- array(4) { - [u"dirname"]=> - unicode(17) "/var/html/testdir" - [u"basename"]=> - unicode(12) "example.html" - [u"extension"]=> - unicode(4) "html" - [u"filename"]=> - unicode(7) "example" -} -unicode(17) "/var/html/testdir" -unicode(12) "example.html" -unicode(4) "html" -unicode(7) "example" + [%u|b%"dirname"]=> + %unicode|string%(17) "/var/html/testdir" + [%u|b%"basename"]=> + %unicode|string%(12) "example.html" + [%u|b%"extension"]=> + %unicode|string%(4) "html" + [%u|b%"filename"]=> + %unicode|string%(7) "example" +} +%unicode|string%(17) "/var/html/testdir" +%unicode|string%(12) "example.html" +%unicode|string%(4) "html" +%unicode|string%(7) "example" -- Iteration 19 -- array(3) { - [u"dirname"]=> - unicode(12) "/testdir/foo" - [u"basename"]=> - unicode(4) "test" - [u"filename"]=> - unicode(4) "test" -} -unicode(12) "/testdir/foo" -unicode(4) "test" -string(0) "" -unicode(4) "test" + [%u|b%"dirname"]=> + %unicode|string%(12) "/testdir/foo" + [%u|b%"basename"]=> + %unicode|string%(4) "test" + [%u|b%"filename"]=> + %unicode|string%(4) "test" +} +%unicode|string%(12) "/testdir/foo" +%unicode|string%(4) "test" +%unicode|string%(0) "" +%unicode|string%(4) "test" -- Iteration 20 -- array(4) { - [u"dirname"]=> - unicode(4) "/foo" - [u"basename"]=> - unicode(12) "symlink.link" - [u"extension"]=> - unicode(4) "link" - [u"filename"]=> - unicode(7) "symlink" -} -unicode(4) "/foo" -unicode(12) "symlink.link" -unicode(4) "link" -unicode(7) "symlink" + [%u|b%"dirname"]=> + %unicode|string%(4) "/foo" + [%u|b%"basename"]=> + %unicode|string%(12) "symlink.link" + [%u|b%"extension"]=> + %unicode|string%(4) "link" + [%u|b%"filename"]=> + %unicode|string%(7) "symlink" +} +%unicode|string%(4) "/foo" +%unicode|string%(12) "symlink.link" +%unicode|string%(4) "link" +%unicode|string%(7) "symlink" -- Iteration 21 -- array(3) { - [u"dirname"]=> - unicode(1) "." - [u"basename"]=> - unicode(5) "12345" - [u"filename"]=> - unicode(5) "12345" -} -unicode(1) "." -unicode(5) "12345" -string(0) "" -unicode(5) "12345" + [%u|b%"dirname"]=> + %unicode|string%(1) "." + [%u|b%"basename"]=> + %unicode|string%(5) "12345" + [%u|b%"filename"]=> + %unicode|string%(5) "12345" +} +%unicode|string%(1) "." +%unicode|string%(5) "12345" +%unicode|string%(0) "" +%unicode|string%(5) "12345" -- Iteration 22 -- array(4) { - [u"dirname"]=> - unicode(1) "." - [u"basename"]=> - unicode(15) "www.example.com" - [u"extension"]=> - unicode(3) "com" - [u"filename"]=> - unicode(11) "www.example" -} -unicode(1) "." -unicode(15) "www.example.com" -unicode(3) "com" -unicode(11) "www.example" + [%u|b%"dirname"]=> + %unicode|string%(1) "." + [%u|b%"basename"]=> + %unicode|string%(15) "www.example.com" + [%u|b%"extension"]=> + %unicode|string%(3) "com" + [%u|b%"filename"]=> + %unicode|string%(11) "www.example" +} +%unicode|string%(1) "." +%unicode|string%(15) "www.example.com" +%unicode|string%(3) "com" +%unicode|string%(11) "www.example" -- Iteration 23 -- array(3) { - [u"dirname"]=> - unicode(12) "/testdir/foo" - [u"basename"]=> - unicode(4) "test" - [u"filename"]=> - unicode(4) "test" -} -unicode(12) "/testdir/foo" -unicode(4) "test" -string(0) "" -unicode(4) "test" + [%u|b%"dirname"]=> + %unicode|string%(12) "/testdir/foo" + [%u|b%"basename"]=> + %unicode|string%(4) "test" + [%u|b%"filename"]=> + %unicode|string%(4) "test" +} +%unicode|string%(12) "/testdir/foo" +%unicode|string%(4) "test" +%unicode|string%(0) "" +%unicode|string%(4) "test" -- Iteration 24 -- array(4) { - [u"dirname"]=> - unicode(6) "../foo" - [u"basename"]=> - unicode(9) "test.link" - [u"extension"]=> - unicode(4) "link" - [u"filename"]=> - unicode(4) "test" -} -unicode(6) "../foo" -unicode(9) "test.link" -unicode(4) "link" -unicode(4) "test" + [%u|b%"dirname"]=> + %unicode|string%(6) "../foo" + [%u|b%"basename"]=> + %unicode|string%(9) "test.link" + [%u|b%"extension"]=> + %unicode|string%(4) "link" + [%u|b%"filename"]=> + %unicode|string%(4) "test" +} +%unicode|string%(6) "../foo" +%unicode|string%(9) "test.link" +%unicode|string%(4) "link" +%unicode|string%(4) "test" -- Iteration 25 -- array(4) { - [u"dirname"]=> - unicode(76) "./test/work/scratch/mydir/yourdir/ourdir/test1/test2/test3/test4/test5/test6" - [u"basename"]=> - unicode(8) "test.tmp" - [u"extension"]=> - unicode(3) "tmp" - [u"filename"]=> - unicode(4) "test" -} -unicode(76) "./test/work/scratch/mydir/yourdir/ourdir/test1/test2/test3/test4/test5/test6" -unicode(8) "test.tmp" -unicode(3) "tmp" -unicode(4) "test" + [%u|b%"dirname"]=> + %unicode|string%(76) "./test/work/scratch/mydir/yourdir/ourdir/test1/test2/test3/test4/test5/test6" + [%u|b%"basename"]=> + %unicode|string%(8) "test.tmp" + [%u|b%"extension"]=> + %unicode|string%(3) "tmp" + [%u|b%"filename"]=> + %unicode|string%(4) "test" +} +%unicode|string%(76) "./test/work/scratch/mydir/yourdir/ourdir/test1/test2/test3/test4/test5/test6" +%unicode|string%(8) "test.tmp" +%unicode|string%(3) "tmp" +%unicode|string%(4) "test" -- Iteration 26 -- array(4) { - [u"dirname"]=> - unicode(1) "." - [u"basename"]=> - unicode(5) "2.345" - [u"extension"]=> - unicode(3) "345" - [u"filename"]=> - unicode(1) "2" -} -unicode(1) "." -unicode(5) "2.345" -unicode(3) "345" -unicode(1) "2" + [%u|b%"dirname"]=> + %unicode|string%(1) "." + [%u|b%"basename"]=> + %unicode|string%(5) "2.345" + [%u|b%"extension"]=> + %unicode|string%(3) "345" + [%u|b%"filename"]=> + %unicode|string%(1) "2" +} +%unicode|string%(1) "." +%unicode|string%(5) "2.345" +%unicode|string%(3) "345" +%unicode|string%(1) "2" Done http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/proc_open01.phpt?r1=1.6&r2=1.7&diff_format=u Index: php-src/ext/standard/tests/file/proc_open01.phpt diff -u php-src/ext/standard/tests/file/proc_open01.phpt:1.6 php-src/ext/standard/tests/file/proc_open01.phpt:1.7 --- php-src/ext/standard/tests/file/proc_open01.phpt:1.6 Thu Aug 14 23:43:21 2008 +++ php-src/ext/standard/tests/file/proc_open01.phpt Sat Apr 25 21:12:23 2009 @@ -11,14 +11,14 @@ $proc = proc_open( "$php -n", array(0 => array('pipe', 'r'), 1 => array('pipe', 'w')), - $pipes + $pipes, getcwd(), array(), array('binary_pipes' => true) ); if ($proc === false) { print "something went wrong.\n"; } var_dump($pipes); stream_set_blocking($pipes[1], FALSE); -$test_string = "yay!\n"; +$test_string = b"yay!\n"; fwrite($pipes[0], $test_string); fflush($pipes[0]); fclose($pipes[0]); @@ -57,7 +57,7 @@ [1]=> resource(%d) of type (stream) } -string(5) "yay! +%unicode|string%(5) "yay! " array(3) { [0]=> http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/readfile_variation10.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/file/readfile_variation10.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/stream_rfc2397_002.phpt?r1=1.6&r2=1.7&diff_format=u Index: php-src/ext/standard/tests/file/stream_rfc2397_002.phpt diff -u php-src/ext/standard/tests/file/stream_rfc2397_002.phpt:1.6 php-src/ext/standard/tests/file/stream_rfc2397_002.phpt:1.7 --- php-src/ext/standard/tests/file/stream_rfc2397_002.phpt:1.6 Tue May 27 09:34:54 2008 +++ php-src/ext/standard/tests/file/stream_rfc2397_002.phpt Sat Apr 25 21:12:23 2009 @@ -54,7 +54,7 @@ NULL Warning: fopen(data://): failed to open stream: rfc2397: no comma in URL in %sstream_rfc2397_002.php on line %d -bool(false) +NULL NULL array(8) { [u"wrapper_type"]=> @@ -77,15 +77,15 @@ NULL Warning: fopen(data://;base64): failed to open stream: rfc2397: no comma in URL in %sstream_rfc2397_002.php on line %d -bool(false) +NULL NULL Warning: fopen(data://foo,): failed to open stream: rfc2397: illegal media type in %sstream_rfc2397_002.php on line %d -bool(false) +NULL NULL Warning: fopen(data://foo=bar,): failed to open stream: rfc2397: illegal media type in %sstream_rfc2397_002.php on line %d -bool(false) +NULL NULL array(9) { [u"wrapper_type"]=> @@ -110,7 +110,7 @@ NULL Warning: fopen(data://text/plain;foo,): failed to open stream: rfc2397: illegal parameter in %sstream_rfc2397_002.php on line %d -bool(false) +NULL NULL array(10) { [u"wrapper_type"]=> @@ -137,7 +137,7 @@ unicode(3) "bar" Warning: fopen(data://text/plain;foo=bar;bla,): failed to open stream: rfc2397: illegal parameter in %sstream_rfc2397_002.php on line %d -bool(false) +NULL NULL array(10) { [u"wrapper_type"]=> @@ -164,7 +164,7 @@ unicode(3) "bar" Warning: fopen(data://text/plain;foo=bar;bar=baz): failed to open stream: rfc2397: no comma in URL in %sstream_rfc2397_002.php on line %d -bool(false) +NULL NULL array(11) { [u"wrapper_type"]=> http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/unlink_error.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/file/unlink_error.phpt diff -u php-src/ext/standard/tests/file/unlink_error.phpt:1.2 php-src/ext/standard/tests/file/unlink_error.phpt:1.3 --- php-src/ext/standard/tests/file/unlink_error.phpt:1.2 Tue May 27 09:34:55 2008 +++ php-src/ext/standard/tests/file/unlink_error.phpt Sat Apr 25 21:12:23 2009 @@ -73,6 +73,7 @@ Warning: unlink() expects at most 2 parameters, 3 given in %s on line %d bool(false) +bool(true) -- Testing unlink() on invalid arguments -- @@ -88,7 +89,7 @@ bool(false) bool(false) -Warning: unlink() expects parameter 2 to be resource, Unicode string given in %s on line %d +Warning: unlink() expects parameter 2 to be resource, %unicode_string_optional% given in %s on line %d bool(false) Warning: unlink() expects parameter 2 to be resource, boolean given in %s on line %d http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/debug_zval_dump_b_64bit.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/standard/tests/general_functions/debug_zval_dump_b_64bit.phpt diff -u php-src/ext/standard/tests/general_functions/debug_zval_dump_b_64bit.phpt:1.3 php-src/ext/standard/tests/general_functions/debug_zval_dump_b_64bit.phpt:1.4 --- php-src/ext/standard/tests/general_functions/debug_zval_dump_b_64bit.phpt:1.3 Tue May 27 00:04:31 2008 +++ php-src/ext/standard/tests/general_functions/debug_zval_dump_b_64bit.phpt Sat Apr 25 21:12:23 2009 @@ -102,7 +102,7 @@ echo "Done\n"; ?> --EXPECTF-- -Strict Standards: Call-time pass-by-reference has been deprecated in %s on line %d +Deprecated: Call-time pass-by-reference has been deprecated in %s on line %d *** Testing debug_zval_dump() on scalar and non-scalar variables *** -- Iteration 1 -- long(0) refcount(3) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/getopt.phpt?r1=1.6&r2=1.7&diff_format=u Index: php-src/ext/standard/tests/general_functions/getopt.phpt diff -u php-src/ext/standard/tests/general_functions/getopt.phpt:1.6 php-src/ext/standard/tests/general_functions/getopt.phpt:1.7 --- php-src/ext/standard/tests/general_functions/getopt.phpt:1.6 Tue May 27 00:04:31 2008 +++ php-src/ext/standard/tests/general_functions/getopt.phpt Sat Apr 25 21:12:23 2009 @@ -11,14 +11,14 @@ ?> --EXPECT-- array(5) { - [u"v"]=> + ["v"]=> bool(false) - [u"h"]=> + ["h"]=> bool(false) - [u"d"]=> - unicode(4) "test" - [u"m"]=> - unicode(4) "1234" - [u"t"]=> + ["d"]=> + string(4) "test" + ["m"]=> + string(4) "1234" + ["t"]=> bool(false) } http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/network/inet.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/standard/tests/network/inet.phpt diff -u php-src/ext/standard/tests/network/inet.phpt:1.5 php-src/ext/standard/tests/network/inet.phpt:1.6 --- php-src/ext/standard/tests/network/inet.phpt:1.5 Wed Jan 7 20:32:35 2009 +++ php-src/ext/standard/tests/network/inet.phpt Sat Apr 25 21:12:23 2009 @@ -8,10 +8,10 @@ --FILE-- <?php -$packed = pack("CCCC", 127, 0, 0, 1); +$packed = chr(127) . chr(0) . chr(0) . chr(1); var_dump(inet_ntop((binary)$packed)); -$packed = pack("CCCC", 255, 255, 255, 0); +$packed = chr(255) . chr(255) . chr(255) . chr(0); var_dump(inet_ntop((binary)$packed)); var_dump(inet_ntop()); @@ -31,15 +31,15 @@ b"0.0.0.0", ); foreach ($array as $val) { - var_dump($packed = inet_pton($val)); + var_dump(bin2hex($packed = inet_pton($val))); var_dump(inet_ntop($packed)); } echo "Done\n"; ?> ---EXPECTF-- -unicode(9) "127.0.0.1" -unicode(13) "255.255.255.0" +--EXPECTF-- +%unicode|string%(9) "127.0.0.1" +%unicode|string%(13) "255.255.255.0" Warning: inet_ntop() expects exactly 1 parameter, 0 given in %s on line %d bool(false) @@ -64,12 +64,12 @@ Warning: inet_pton(): Unrecognized address abra in %s on line %d bool(false) -string(%d) "%s" -unicode(9) "127.0.0.1" -string(%d) "%s" -unicode(14) "66.163.161.116" -string(%d) "%s" -unicode(15) "255.255.255.255" -string(%d) "%s" -unicode(7) "0.0.0.0" +%unicode|string%(%d) "7f000001" +%unicode|string%(9) "127.0.0.1" +%unicode|string%(%d) "42a3a174" +%unicode|string%(14) "66.163.161.116" +%unicode|string%(%d) "ffffffff" +%unicode|string%(15) "255.255.255.255" +%unicode|string%(%d) "00000000" +%unicode|string%(7) "0.0.0.0" Done http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/network/socket_get_status_basic.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/standard/tests/network/socket_get_status_basic.phpt diff -u php-src/ext/standard/tests/network/socket_get_status_basic.phpt:1.4 php-src/ext/standard/tests/network/socket_get_status_basic.phpt:1.5 --- php-src/ext/standard/tests/network/socket_get_status_basic.phpt:1.4 Sat Jan 24 22:02:13 2009 +++ php-src/ext/standard/tests/network/socket_get_status_basic.phpt Sat Apr 25 21:12:23 2009 @@ -11,7 +11,7 @@ --EXPECTF-- array(8) { [u"stream_type"]=> - unicode(%d) "tcp_socket%s" + unicode(%d) "tcp_socket%S" [u"mode"]=> unicode(2) "r+" [u"unread_bytes"]=> http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/serialize/bug43614.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/serialize/bug43614.phpt diff -u php-src/ext/standard/tests/serialize/bug43614.phpt:1.2 php-src/ext/standard/tests/serialize/bug43614.phpt:1.3 --- php-src/ext/standard/tests/serialize/bug43614.phpt:1.2 Wed Mar 19 03:12:39 2008 +++ php-src/ext/standard/tests/serialize/bug43614.phpt Sat Apr 25 21:12:23 2009 @@ -7,7 +7,7 @@ var_dump($a = unserialize('a:2:{s:2:"10";i:1;s:2:"01";i:2;}')); var_dump($a['10']); -var_dump($a['01']); +var_dump($a[b'01']); ?> --EXPECT-- http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/streams/bug46426.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/streams/bug46426.phpt diff -u php-src/ext/standard/tests/streams/bug46426.phpt:1.2 php-src/ext/standard/tests/streams/bug46426.phpt:1.3 --- php-src/ext/standard/tests/streams/bug46426.phpt:1.2 Thu Oct 30 14:31:01 2008 +++ php-src/ext/standard/tests/streams/bug46426.phpt Sat Apr 25 21:12:23 2009 @@ -5,7 +5,7 @@ $tmp = tmpfile(); -fwrite($tmp, "12345"); +fwrite($tmp, b"12345"); echo stream_get_contents($tmp, 2, 1); echo "\n"; http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/streams/stream_get_contents_001.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/standard/tests/streams/stream_get_contents_001.phpt diff -u php-src/ext/standard/tests/streams/stream_get_contents_001.phpt:1.1 php-src/ext/standard/tests/streams/stream_get_contents_001.phpt:1.2 --- php-src/ext/standard/tests/streams/stream_get_contents_001.phpt:1.1 Thu Oct 30 15:50:33 2008 +++ php-src/ext/standard/tests/streams/stream_get_contents_001.phpt Sat Apr 25 21:12:23 2009 @@ -5,7 +5,7 @@ $tmp = tmpfile(); -fwrite($tmp, "12345"); +fwrite($tmp, b"12345"); echo stream_get_contents($tmp, 2, 5), "--\n"; echo stream_get_contents($tmp, 2), "--\n"; http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/bug40915.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/strings/bug40915.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/bug44703.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/standard/tests/strings/bug44703.phpt diff -u php-src/ext/standard/tests/strings/bug44703.phpt:1.4 php-src/ext/standard/tests/strings/bug44703.phpt:1.5 --- php-src/ext/standard/tests/strings/bug44703.phpt:1.4 Fri Jun 13 00:18:57 2008 +++ php-src/ext/standard/tests/strings/bug44703.phpt Sat Apr 25 21:12:23 2009 @@ -3,44 +3,44 @@ --FILE-- <?php -var_dump(htmlspecialchars("<a href='test'>Test</a>", ENT_COMPAT, 1)); -var_dump(htmlspecialchars("<a href='test'>Test</a>", ENT_COMPAT, 12)); -var_dump(htmlspecialchars("<a href='test'>Test</a>", ENT_COMPAT, 125)); -var_dump(htmlspecialchars("<a href='test'>Test</a>", ENT_COMPAT, 1252)); -var_dump(htmlspecialchars("<a href='test'>Test</a>", ENT_COMPAT, 12526)); +var_dump(htmlspecialchars(b"<a href='test'>Test</a>", ENT_COMPAT, 1)); +var_dump(htmlspecialchars(b"<a href='test'>Test</a>", ENT_COMPAT, 12)); +var_dump(htmlspecialchars(b"<a href='test'>Test</a>", ENT_COMPAT, 125)); +var_dump(htmlspecialchars(b"<a href='test'>Test</a>", ENT_COMPAT, 1252)); +var_dump(htmlspecialchars(b"<a href='test'>Test</a>", ENT_COMPAT, 12526)); -var_dump(htmlspecialchars("<>", ENT_COMPAT, 866)); -var_dump(htmlspecialchars("<>", ENT_COMPAT, 8666)); +var_dump(htmlspecialchars(b"<>", ENT_COMPAT, 866)); +var_dump(htmlspecialchars(b"<>", ENT_COMPAT, 8666)); -var_dump(htmlspecialchars("<>", ENT_COMPAT, NULL)); +var_dump(htmlspecialchars(b"<>", ENT_COMPAT, NULL)); -var_dump(htmlspecialchars("<>", ENT_COMPAT, 'SJIS')); -var_dump(htmlspecialchars("<>", ENT_COMPAT, 'SjiS')); +var_dump(htmlspecialchars(b"<>", ENT_COMPAT, 'SJIS')); +var_dump(htmlspecialchars(b"<>", ENT_COMPAT, 'SjiS')); -var_dump(htmlspecialchars("<>", ENT_COMPAT, str_repeat('a', 100))); +var_dump(htmlspecialchars(b"<>", ENT_COMPAT, str_repeat('a', 100))); ?> --EXPECTF-- Warning: htmlspecialchars(): charset `1' not supported, assuming iso-8859-1 in %s on line %d -unicode(35) "&lt;a href='test'&gt;Test&lt;/a&gt;" +string(35) "&lt;a href='test'&gt;Test&lt;/a&gt;" Warning: htmlspecialchars(): charset `12' not supported, assuming iso-8859-1 in %s on line %d -unicode(35) "&lt;a href='test'&gt;Test&lt;/a&gt;" +string(35) "&lt;a href='test'&gt;Test&lt;/a&gt;" Warning: htmlspecialchars(): charset `125' not supported, assuming iso-8859-1 in %s on line %d -unicode(35) "&lt;a href='test'&gt;Test&lt;/a&gt;" -unicode(35) "&lt;a href='test'&gt;Test&lt;/a&gt;" +string(35) "&lt;a href='test'&gt;Test&lt;/a&gt;" +string(35) "&lt;a href='test'&gt;Test&lt;/a&gt;" Warning: htmlspecialchars(): charset `12526' not supported, assuming iso-8859-1 in %s on line %d -unicode(35) "&lt;a href='test'&gt;Test&lt;/a&gt;" -unicode(8) "&lt;&gt;" +string(35) "&lt;a href='test'&gt;Test&lt;/a&gt;" +string(8) "&lt;&gt;" Warning: htmlspecialchars(): charset `8666' not supported, assuming iso-8859-1 in %s on line %d -unicode(8) "&lt;&gt;" -unicode(8) "&lt;&gt;" -unicode(8) "&lt;&gt;" -unicode(8) "&lt;&gt;" +string(8) "&lt;&gt;" +string(8) "&lt;&gt;" +string(8) "&lt;&gt;" +string(8) "&lt;&gt;" Warning: htmlspecialchars(): charset `aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' not supported, assuming iso-8859-1 in %s on line %d -unicode(8) "&lt;&gt;" +string(8) "&lt;&gt;" http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/htmlentities01.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/standard/tests/strings/htmlentities01.phpt diff -u php-src/ext/standard/tests/strings/htmlentities01.phpt:1.3 php-src/ext/standard/tests/strings/htmlentities01.phpt:1.4 --- php-src/ext/standard/tests/strings/htmlentities01.phpt:1.3 Fri Jun 13 00:18:57 2008 +++ php-src/ext/standard/tests/strings/htmlentities01.phpt Sat Apr 25 21:12:23 2009 @@ -5,9 +5,9 @@ mbstring.internal_encoding=pass --FILE-- <?php - var_dump(htmlentities("\x82\x86\x99\x9f", ENT_QUOTES, 'cp1252')); - var_dump(htmlentities("\x80\xa2\xa3\xa4\xa5", ENT_QUOTES, 'cp1252')); + var_dump(htmlentities(b"\x82\x86\x99\x9f", ENT_QUOTES, 'cp1252')); + var_dump(htmlentities(b"\x80\xa2\xa3\xa4\xa5", ENT_QUOTES, 'cp1252')); ?> --EXPECT-- -unicode(28) "&sbquo;&dagger;&trade;&Yuml;" -unicode(32) "&euro;&cent;&pound;&curren;&yen;" +string(28) "&sbquo;&dagger;&trade;&Yuml;" +string(32) "&euro;&cent;&pound;&curren;&yen;" http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/printf_64bit.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/standard/tests/strings/printf_64bit.phpt diff -u php-src/ext/standard/tests/strings/printf_64bit.phpt:1.5 php-src/ext/standard/tests/strings/printf_64bit.phpt:1.6 --- php-src/ext/standard/tests/strings/printf_64bit.phpt:1.5 Mon Jun 4 01:23:22 2007 +++ php-src/ext/standard/tests/strings/printf_64bit.phpt Sat Apr 25 21:12:23 2009 @@ -227,7 +227,7 @@ --EXPECTF-- *** Output for zero argument *** -Warning: Wrong parameter count for printf() in %s on line %d +Warning: printf() expects at least 1 parameter, 0 given in %s on line %d *** Output for insufficient number of arguments *** @@ -645,10 +645,10 @@ -123456 123456 -123456 -120000 --120000 -+120000 --120000 +1.2e+5 +-1.2e+5 ++1.2e+5 +-1.2e+5 123456 -123456 1.0E+5 @@ -657,10 +657,10 @@ -123456 123456 -123456 -120000 --120000 -+120000 --120000 +1.2E+5 +-1.2E+5 ++1.2E+5 +-1.2E+5 *** Output for '%%%.2f' as the format parameter *** %12345678900.00 @@ -669,6 +669,8 @@ % *** Output for precision value more than maximum *** + +Notice: printf(): Requested precision of 988 digits was truncated to PHP maximum of %d digits in %s on line %d 12345678900.0000000000000000000000000000000000000000 *** Output for invalid width(-15) specifier *** http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/sha1.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/standard/tests/strings/sha1.phpt diff -u php-src/ext/standard/tests/strings/sha1.phpt:1.5 php-src/ext/standard/tests/strings/sha1.phpt:1.6 --- php-src/ext/standard/tests/strings/sha1.phpt:1.5 Tue May 27 10:50:46 2008 +++ php-src/ext/standard/tests/strings/sha1.phpt Sat Apr 25 21:12:23 2009 @@ -19,8 +19,8 @@ var_dump($val1 === $val2); } -var_dump(sha1($str, true)); -var_dump(sha1_file($filename, true)); +var_dump(bin2hex(sha1($str, true))); +var_dump(bin2hex(sha1_file($filename, true))); @unlink($filename); @@ -44,8 +44,8 @@ unicode(40) "da39a3ee5e6b4b0d3255bfef95601890afd80709" unicode(40) "da39a3ee5e6b4b0d3255bfef95601890afd80709" bool(true) -string(20) "%s" -string(20) "%s" +unicode(40) "da39a3ee5e6b4b0d3255bfef95601890afd80709" +unicode(40) "da39a3ee5e6b4b0d3255bfef95601890afd80709" Warning: sha1_file(%ssha1.dat): failed to open stream: No such file or directory in %s on line %d Done http://cvs.php.net/viewvc.cgi/php-src/tests/classes/inheritance_003.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/tests/classes/inheritance_003.phpt diff -u php-src/tests/classes/inheritance_003.phpt:1.1 php-src/tests/classes/inheritance_003.phpt:1.2 --- php-src/tests/classes/inheritance_003.phpt:1.1 Tue May 30 23:11:13 2006 +++ php-src/tests/classes/inheritance_003.phpt Sat Apr 25 21:12:23 2009 @@ -17,4 +17,5 @@ ===DONE=== --EXPECTF-- -Fatal error: Declaration of B::f() must be compatible with that of A::f() in %sinheritance_003.php on line %d +Strict Standards: Declaration of B::f() should be compatible with that of A::f() in %sinheritance_003.php on line %d +===DONE=== http://cvs.php.net/viewvc.cgi/php-src/tests/classes/inheritance_004.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/tests/classes/inheritance_004.phpt diff -u php-src/tests/classes/inheritance_004.phpt:1.1 php-src/tests/classes/inheritance_004.phpt:1.2 --- php-src/tests/classes/inheritance_004.phpt:1.1 Tue May 30 23:11:13 2006 +++ php-src/tests/classes/inheritance_004.phpt Sat Apr 25 21:12:23 2009 @@ -17,4 +17,5 @@ ===DONE=== --EXPECTF-- -Fatal error: Declaration of B::f() must be compatible with that of A::f() in %sinheritance_004.php on line %d +Strict Standards: Declaration of B::f() should be compatible with that of A::f() in %sinheritance_004.php on line %d +===DONE=== http://cvs.php.net/viewvc.cgi/php-src/tests/classes/method_override_optional_arg_001.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/tests/classes/method_override_optional_arg_001.phpt diff -u php-src/tests/classes/method_override_optional_arg_001.phpt:1.1 php-src/tests/classes/method_override_optional_arg_001.phpt:1.2 --- php-src/tests/classes/method_override_optional_arg_001.phpt:1.1 Wed Mar 19 17:56:08 2008 +++ php-src/tests/classes/method_override_optional_arg_001.phpt Sat Apr 25 21:12:23 2009 @@ -28,4 +28,6 @@ ?> --EXPECTF-- -Fatal error: Declaration of C::foo() must be compatible with that of A::foo() in %s on line %d +Strict Standards: Declaration of C::foo() should be compatible with that of A::foo() in %s on line %d +int(1) +int(3) http://cvs.php.net/viewvc.cgi/php-src/tests/classes/method_override_optional_arg_002.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/tests/classes/method_override_optional_arg_002.phpt diff -u php-src/tests/classes/method_override_optional_arg_002.phpt:1.1 php-src/tests/classes/method_override_optional_arg_002.phpt:1.2 --- php-src/tests/classes/method_override_optional_arg_002.phpt:1.1 Wed Mar 19 17:56:08 2008 +++ php-src/tests/classes/method_override_optional_arg_002.phpt Sat Apr 25 21:12:23 2009 @@ -18,4 +18,5 @@ ?> --EXPECTF-- -Fatal error: Declaration of B::foo() must be compatible with that of A::foo() in %s on line %d +Strict Standards: Declaration of B::foo() should be compatible with that of A::foo() in %s on line %d +foo http://cvs.php.net/viewvc.cgi/php-src/tests/classes/type_hinting_005a.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/tests/classes/type_hinting_005a.phpt diff -u php-src/tests/classes/type_hinting_005a.phpt:1.1 php-src/tests/classes/type_hinting_005a.phpt:1.2 --- php-src/tests/classes/type_hinting_005a.phpt:1.1 Fri Dec 5 22:12:04 2008 +++ php-src/tests/classes/type_hinting_005a.phpt Sat Apr 25 21:12:23 2009 @@ -12,4 +12,7 @@ ?> ==DONE== --EXPECTF-- -Fatal error: Declaration of D2::f() must be compatible with that of C::f() in %s on line 8 \ No newline at end of file +Strict Standards: Declaration of D2::f() should be compatible with that of C::f() in %s on line 8 +Compatible hint. +Class hint, should be array. +==DONE== \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/tests/classes/type_hinting_005b.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/tests/classes/type_hinting_005b.phpt diff -u php-src/tests/classes/type_hinting_005b.phpt:1.1 php-src/tests/classes/type_hinting_005b.phpt:1.2 --- php-src/tests/classes/type_hinting_005b.phpt:1.1 Fri Dec 5 22:12:04 2008 +++ php-src/tests/classes/type_hinting_005b.phpt Sat Apr 25 21:12:23 2009 @@ -9,4 +9,6 @@ ?> ==DONE== --EXPECTF-- -Fatal error: Declaration of D::f() must be compatible with that of C::f() in %s on line 5 \ No newline at end of file +Strict Standards: Declaration of D::f() should be compatible with that of C::f() in %s on line 5 +No hint, should be array. +==DONE== \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/tests/classes/type_hinting_005c.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/tests/classes/type_hinting_005c.phpt diff -u php-src/tests/classes/type_hinting_005c.phpt:1.1 php-src/tests/classes/type_hinting_005c.phpt:1.2 --- php-src/tests/classes/type_hinting_005c.phpt:1.1 Fri Dec 5 22:12:04 2008 +++ php-src/tests/classes/type_hinting_005c.phpt Sat Apr 25 21:12:23 2009 @@ -9,4 +9,6 @@ ?> ==DONE== --EXPECTF-- -Fatal error: Declaration of D::f() must be compatible with that of C::f() in %s on line 5 \ No newline at end of file +Strict Standards: Declaration of D::f() should be compatible with that of C::f() in %s on line 5 +Array hint, should be class. +==DONE== \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/tests/classes/type_hinting_005d.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/tests/classes/type_hinting_005d.phpt diff -u php-src/tests/classes/type_hinting_005d.phpt:1.1 php-src/tests/classes/type_hinting_005d.phpt:1.2 --- php-src/tests/classes/type_hinting_005d.phpt:1.1 Fri Dec 5 22:12:03 2008 +++ php-src/tests/classes/type_hinting_005d.phpt Sat Apr 25 21:12:23 2009 @@ -9,4 +9,6 @@ ?> ==DONE== --EXPECTF-- -Fatal error: Declaration of D::f() must be compatible with that of C::f() in %s on line 5 \ No newline at end of file +Strict Standards: Declaration of D::f() should be compatible with that of C::f() in %s on line 5 +Array hint, should be nothing. +==DONE== \ No newline at end of file