diff --git a/Zend/tests/bug60569.phpt b/Zend/tests/bug60569.phpt index 480c9c8f8a1..ef3bea8edb7 100644 Binary files a/Zend/tests/bug60569.phpt and b/Zend/tests/bug60569.phpt differ diff --git a/Zend/tests/bug78363.phpt b/Zend/tests/bug78363.phpt index 0d17a1961cd..d49d5fcdf42 100644 Binary files a/Zend/tests/bug78363.phpt and b/Zend/tests/bug78363.phpt differ diff --git a/Zend/tests/cast_to_array.phpt b/Zend/tests/cast_to_array.phpt index f43879df5fc..ad8930fc605 100644 Binary files a/Zend/tests/cast_to_array.phpt and b/Zend/tests/cast_to_array.phpt differ diff --git a/Zend/tests/cast_to_object.phpt b/Zend/tests/cast_to_object.phpt index 2b0d22a6ec7..6c3226d7538 100644 Binary files a/Zend/tests/cast_to_object.phpt and b/Zend/tests/cast_to_object.phpt differ diff --git a/Zend/tests/cast_to_string.phpt b/Zend/tests/cast_to_string.phpt index 1fb94dfa8db..eabb51cb137 100644 Binary files a/Zend/tests/cast_to_string.phpt and b/Zend/tests/cast_to_string.phpt differ diff --git a/Zend/tests/settype_array.phpt b/Zend/tests/settype_array.phpt index 57c8e5180ca..232c5d94a9a 100644 Binary files a/Zend/tests/settype_array.phpt and b/Zend/tests/settype_array.phpt differ diff --git a/Zend/tests/settype_object.phpt b/Zend/tests/settype_object.phpt index 9369011127c..7d98168e294 100644 Binary files a/Zend/tests/settype_object.phpt and b/Zend/tests/settype_object.phpt differ diff --git a/Zend/tests/settype_resource.phpt b/Zend/tests/settype_resource.phpt index 884ff3dae39..fa9ca739fa9 100644 Binary files a/Zend/tests/settype_resource.phpt and b/Zend/tests/settype_resource.phpt differ diff --git a/Zend/tests/settype_string.phpt b/Zend/tests/settype_string.phpt index cc90fdfdf4c..a8ad899c006 100644 Binary files a/Zend/tests/settype_string.phpt and b/Zend/tests/settype_string.phpt differ diff --git a/ext/curl/tests/curl_escape.phpt b/ext/curl/tests/curl_escape.phpt index 91dff3f0563..b8f488ff344 100644 Binary files a/ext/curl/tests/curl_escape.phpt and b/ext/curl/tests/curl_escape.phpt differ diff --git a/ext/exif/tests/exif012.phpt b/ext/exif/tests/exif012.phpt index 2abd80943a8..cd44c842f14 100644 Binary files a/ext/exif/tests/exif012.phpt and b/ext/exif/tests/exif012.phpt differ diff --git a/ext/exif/tests/exif013.phpt b/ext/exif/tests/exif013.phpt index 7e01e7fff9b..767b0278bae 100644 Binary files a/ext/exif/tests/exif013.phpt and b/ext/exif/tests/exif013.phpt differ diff --git a/ext/exif/tests/exif014.phpt b/ext/exif/tests/exif014.phpt index b6c590c5f0b..2b347126f2d 100644 Binary files a/ext/exif/tests/exif014.phpt and b/ext/exif/tests/exif014.phpt differ diff --git a/ext/exif/tests/exif015.phpt b/ext/exif/tests/exif015.phpt index 83dc1f52c99..94b7abc2162 100644 Binary files a/ext/exif/tests/exif015.phpt and b/ext/exif/tests/exif015.phpt differ diff --git a/ext/exif/tests/exif020.phpt b/ext/exif/tests/exif020.phpt index 8f3d9befe15..cb9af4d7c8a 100644 --- a/ext/exif/tests/exif020.phpt +++ b/ext/exif/tests/exif020.phpt @@ -1618,7 +1618,7 @@ array(34) { ["Copyright"]=> string(12) "Eric Stewart" ["GPSVersion"]=> - string(4) "" + string(4) "%0%0" ["GPSLatitudeRef"]=> string(1) "N" ["GPSLatitude"]=> @@ -1642,7 +1642,7 @@ array(34) { string(3) "0/1" } ["GPSAltitudeRef"]=> - string(1) "" + string(1) "%0" ["GPSAltitude"]=> string(5) "295/1" ["GPSTimeStamp"]=> diff --git a/ext/exif/tests/exif021.phpt b/ext/exif/tests/exif021.phpt index 7bd2b1efa92..013b5c887ff 100644 --- a/ext/exif/tests/exif021.phpt +++ b/ext/exif/tests/exif021.phpt @@ -1618,7 +1618,7 @@ array(34) { ["Copyright"]=> string(12) "Eric Stewart" ["GPSVersion"]=> - string(4) "" + string(4) "%0%0" ["GPSLatitudeRef"]=> string(1) "N" ["GPSLatitude"]=> @@ -1642,7 +1642,7 @@ array(34) { string(3) "0/1" } ["GPSAltitudeRef"]=> - string(1) "" + string(1) "%0" ["GPSAltitude"]=> string(5) "295/1" ["GPSTimeStamp"]=> diff --git a/ext/exif/tests/exif022.phpt b/ext/exif/tests/exif022.phpt index 80f668013e0..4b0659bbf7f 100644 --- a/ext/exif/tests/exif022.phpt +++ b/ext/exif/tests/exif022.phpt @@ -1642,7 +1642,7 @@ array(45) { ["ExifImageLength"]=> int(1) ["GPSVersion"]=> - string(4) "" + string(4) "%0%0" ["GPSLatitudeRef"]=> string(1) "N" ["GPSLatitude"]=> @@ -1666,7 +1666,7 @@ array(45) { string(3) "0/1" } ["GPSAltitudeRef"]=> - string(1) "" + string(1) "%0" ["GPSAltitude"]=> string(5) "295/1" ["GPSTimeStamp"]=> diff --git a/ext/exif/tests/exif023.phpt b/ext/exif/tests/exif023.phpt index 6bab7e58a2d..b3e2456e7b3 100644 --- a/ext/exif/tests/exif023.phpt +++ b/ext/exif/tests/exif023.phpt @@ -1642,7 +1642,7 @@ array(45) { ["ExifImageLength"]=> int(1) ["GPSVersion"]=> - string(4) "" + string(4) "%0%0" ["GPSLatitudeRef"]=> string(1) "N" ["GPSLatitude"]=> @@ -1666,7 +1666,7 @@ array(45) { string(3) "0/1" } ["GPSAltitudeRef"]=> - string(1) "" + string(1) "%0" ["GPSAltitude"]=> string(5) "295/1" ["GPSTimeStamp"]=> diff --git a/ext/ftp/tests/ftp_fget_basic.phpt b/ext/ftp/tests/ftp_fget_basic.phpt index e2e0ac55405..938d11b767d 100644 --- a/ext/ftp/tests/ftp_fget_basic.phpt +++ b/ext/ftp/tests/ftp_fget_basic.phpt @@ -24,7 +24,7 @@ $position = ftell($fp); //test binary data transfer var_dump(ftp_fget($ftp, $fp, 'binary data.bin', FTP_BINARY)); fseek($fp, $position); -var_dump(urlencode(fgets($fp))); +echo json_encode(fgets($fp)), "\n"; //test non-existent file request ftp_fget($ftp, $fp ,'a warning.txt', FTP_ASCII); @@ -37,6 +37,6 @@ bool(true) bool(true) For sale: baby shoes, never worn. bool(true) -string(21) "BINARYFoo%00Bar%0D%0A" +"BINARYFoo\u0000Bar\r\n" Warning: ftp_fget(): a warning: No such file or directory in %sftp_fget_basic.php on line %d diff --git a/ext/ftp/tests/ftp_get_basic.phpt b/ext/ftp/tests/ftp_get_basic.phpt index 0ce3345266e..1791002765f 100644 --- a/ext/ftp/tests/ftp_get_basic.phpt +++ b/ext/ftp/tests/ftp_get_basic.phpt @@ -23,7 +23,7 @@ unlink($tmpfname); //test binary data transfer $tmpfname = tempnam(__DIR__, "ftp_test"); var_dump(ftp_get($ftp, $tmpfname, 'binary data.bin', FTP_BINARY)); -var_dump(urlencode(file_get_contents($tmpfname))); +echo json_encode(file_get_contents($tmpfname)), "\n"; unlink($tmpfname); //test non-existent file request @@ -34,6 +34,6 @@ bool(true) bool(true) For sale: baby shoes, never worn. bool(true) -string(21) "BINARYFoo%00Bar%0D%0A" +"BINARYFoo\u0000Bar\r\n" Warning: ftp_get(): a warning: No such file or directory in %sftp_get_basic.php on line %d diff --git a/ext/oci8/tests/lob_001.phpt b/ext/oci8/tests/lob_001.phpt index c94f5201e79..2e2a549df8d 100644 Binary files a/ext/oci8/tests/lob_001.phpt and b/ext/oci8/tests/lob_001.phpt differ diff --git a/ext/oci8/tests/lob_003.phpt b/ext/oci8/tests/lob_003.phpt index e06d15109c1..4ffdceecca4 100644 Binary files a/ext/oci8/tests/lob_003.phpt and b/ext/oci8/tests/lob_003.phpt differ diff --git a/ext/oci8/tests/lob_006.phpt b/ext/oci8/tests/lob_006.phpt index 748283870a2..4576e428d6b 100644 Binary files a/ext/oci8/tests/lob_006.phpt and b/ext/oci8/tests/lob_006.phpt differ diff --git a/ext/oci8/tests/lob_019.phpt b/ext/oci8/tests/lob_019.phpt index 248bff70d59..6bdbeb926c1 100644 Binary files a/ext/oci8/tests/lob_019.phpt and b/ext/oci8/tests/lob_019.phpt differ diff --git a/ext/oci8/tests/lob_020.phpt b/ext/oci8/tests/lob_020.phpt index 241b2c7c30f..2057b99723f 100644 Binary files a/ext/oci8/tests/lob_020.phpt and b/ext/oci8/tests/lob_020.phpt differ diff --git a/ext/opcache/tests/compact_literals_collision.phpt b/ext/opcache/tests/compact_literals_collision.phpt index bf553793ce2..617e4dcffab 100644 Binary files a/ext/opcache/tests/compact_literals_collision.phpt and b/ext/opcache/tests/compact_literals_collision.phpt differ diff --git a/ext/pdo_mysql/tests/bug_39483.phpt b/ext/pdo_mysql/tests/bug_39483.phpt index 1d9512904c6..2a72ff3a9c0 100644 Binary files a/ext/pdo_mysql/tests/bug_39483.phpt and b/ext/pdo_mysql/tests/bug_39483.phpt differ diff --git a/ext/spl/tests/array_018.phpt b/ext/spl/tests/array_018.phpt index 8da46a24dba..948e0dca4e5 100644 Binary files a/ext/spl/tests/array_018.phpt and b/ext/spl/tests/array_018.phpt differ diff --git a/ext/spl/tests/iterator_049b.phpt b/ext/spl/tests/iterator_049b.phpt index 54a2c2e0405..1e1176c7169 100644 Binary files a/ext/spl/tests/iterator_049b.phpt and b/ext/spl/tests/iterator_049b.phpt differ diff --git a/ext/spl/tests/serialize_property_tables.phpt b/ext/spl/tests/serialize_property_tables.phpt index 9b507e6f8e5..6626830d294 100644 Binary files a/ext/spl/tests/serialize_property_tables.phpt and b/ext/spl/tests/serialize_property_tables.phpt differ diff --git a/ext/standard/tests/array/array_flip_variation2.phpt b/ext/standard/tests/array/array_flip_variation2.phpt index 8bf704627e7..890b4cd2ec3 100644 Binary files a/ext/standard/tests/array/array_flip_variation2.phpt and b/ext/standard/tests/array/array_flip_variation2.phpt differ diff --git a/ext/standard/tests/array/array_flip_variation3.phpt b/ext/standard/tests/array/array_flip_variation3.phpt index 3c8f41cc3b8..bf979235cf4 100644 Binary files a/ext/standard/tests/array/array_flip_variation3.phpt and b/ext/standard/tests/array/array_flip_variation3.phpt differ diff --git a/ext/standard/tests/array/array_search.phpt b/ext/standard/tests/array/array_search.phpt index 1787e521638..6219efd3202 100644 Binary files a/ext/standard/tests/array/array_search.phpt and b/ext/standard/tests/array/array_search.phpt differ diff --git a/ext/standard/tests/array/array_values.phpt b/ext/standard/tests/array/array_values.phpt index 32200a67f5e..443a46763e0 100644 Binary files a/ext/standard/tests/array/array_values.phpt and b/ext/standard/tests/array/array_values.phpt differ diff --git a/ext/standard/tests/array/array_walk_rec_objects.phpt b/ext/standard/tests/array/array_walk_rec_objects.phpt index a3513437a28..91a97437d21 100644 Binary files a/ext/standard/tests/array/array_walk_rec_objects.phpt and b/ext/standard/tests/array/array_walk_rec_objects.phpt differ diff --git a/ext/standard/tests/array/arsort_variation11.phpt b/ext/standard/tests/array/arsort_variation11.phpt index 2da7a6fce39..b5405ac3d55 100644 Binary files a/ext/standard/tests/array/arsort_variation11.phpt and b/ext/standard/tests/array/arsort_variation11.phpt differ diff --git a/ext/standard/tests/array/asort_variation11.phpt b/ext/standard/tests/array/asort_variation11.phpt index e6112672a67..82eab55993a 100644 Binary files a/ext/standard/tests/array/asort_variation11.phpt and b/ext/standard/tests/array/asort_variation11.phpt differ diff --git a/ext/standard/tests/array/bug26458.phpt b/ext/standard/tests/array/bug26458.phpt index 87c8b519bfd..67c1586d006 100644 Binary files a/ext/standard/tests/array/bug26458.phpt and b/ext/standard/tests/array/bug26458.phpt differ diff --git a/ext/standard/tests/array/krsort_variation8.phpt b/ext/standard/tests/array/krsort_variation8.phpt index ff843f0b972..caa0f219360 100644 Binary files a/ext/standard/tests/array/krsort_variation8.phpt and b/ext/standard/tests/array/krsort_variation8.phpt differ diff --git a/ext/standard/tests/array/ksort_variation8.phpt b/ext/standard/tests/array/ksort_variation8.phpt index fe27e6328df..10ed218211f 100644 Binary files a/ext/standard/tests/array/ksort_variation8.phpt and b/ext/standard/tests/array/ksort_variation8.phpt differ diff --git a/ext/standard/tests/array/natcasesort_variation9.phpt b/ext/standard/tests/array/natcasesort_variation9.phpt index 6bd10338b6b..037db9e742c 100644 Binary files a/ext/standard/tests/array/natcasesort_variation9.phpt and b/ext/standard/tests/array/natcasesort_variation9.phpt differ diff --git a/ext/standard/tests/array/rsort_variation11.phpt b/ext/standard/tests/array/rsort_variation11.phpt index 479f90f0331..fe91f79e181 100644 Binary files a/ext/standard/tests/array/rsort_variation11.phpt and b/ext/standard/tests/array/rsort_variation11.phpt differ diff --git a/ext/standard/tests/array/sort_variation11.phpt b/ext/standard/tests/array/sort_variation11.phpt index f72a79bf9b5..909a5546d29 100644 Binary files a/ext/standard/tests/array/sort_variation11.phpt and b/ext/standard/tests/array/sort_variation11.phpt differ diff --git a/ext/standard/tests/array/uasort_variation3.phpt b/ext/standard/tests/array/uasort_variation3.phpt index 15f1884a7b1..16144c5cc27 100644 Binary files a/ext/standard/tests/array/uasort_variation3.phpt and b/ext/standard/tests/array/uasort_variation3.phpt differ diff --git a/ext/standard/tests/class_object/get_object_vars_variation_004.phpt b/ext/standard/tests/class_object/get_object_vars_variation_004.phpt index 7c21b903adf..710ea93479e 100644 Binary files a/ext/standard/tests/class_object/get_object_vars_variation_004.phpt and b/ext/standard/tests/class_object/get_object_vars_variation_004.phpt differ diff --git a/ext/standard/tests/class_object/get_object_vars_variation_005.phpt b/ext/standard/tests/class_object/get_object_vars_variation_005.phpt index d33ef4879fe..1ad1bb39332 100644 Binary files a/ext/standard/tests/class_object/get_object_vars_variation_005.phpt and b/ext/standard/tests/class_object/get_object_vars_variation_005.phpt differ diff --git a/ext/standard/tests/file/basename.phpt b/ext/standard/tests/file/basename.phpt index c2dbf34f51f..c84825edea6 100644 Binary files a/ext/standard/tests/file/basename.phpt and b/ext/standard/tests/file/basename.phpt differ diff --git a/ext/standard/tests/file/bug26003.phpt b/ext/standard/tests/file/bug26003.phpt index aaf3b34135d..1f317641307 100644 Binary files a/ext/standard/tests/file/bug26003.phpt and b/ext/standard/tests/file/bug26003.phpt differ diff --git a/ext/standard/tests/file/fputcsv_variation17.phpt b/ext/standard/tests/file/fputcsv_variation17.phpt index 581bd2cd77d..9592154f425 100644 Binary files a/ext/standard/tests/file/fputcsv_variation17.phpt and b/ext/standard/tests/file/fputcsv_variation17.phpt differ diff --git a/ext/standard/tests/file/ftruncate.phpt b/ext/standard/tests/file/ftruncate.phpt index 757bbb733d0..2bdefefaaf1 100644 Binary files a/ext/standard/tests/file/ftruncate.phpt and b/ext/standard/tests/file/ftruncate.phpt differ diff --git a/ext/standard/tests/file/readfile_variation10.phpt b/ext/standard/tests/file/readfile_variation10.phpt index a2fc2d79cb5..5afc5622ed1 100644 Binary files a/ext/standard/tests/file/readfile_variation10.phpt and b/ext/standard/tests/file/readfile_variation10.phpt differ diff --git a/ext/standard/tests/general_functions/debug_zval_dump_b.phpt b/ext/standard/tests/general_functions/debug_zval_dump_b.phpt index 0444ade190a..70402f25838 100644 Binary files a/ext/standard/tests/general_functions/debug_zval_dump_b.phpt and b/ext/standard/tests/general_functions/debug_zval_dump_b.phpt differ diff --git a/ext/standard/tests/general_functions/debug_zval_dump_b_64bit.phpt b/ext/standard/tests/general_functions/debug_zval_dump_b_64bit.phpt index 9302593cb2c..07132d92136 100644 Binary files a/ext/standard/tests/general_functions/debug_zval_dump_b_64bit.phpt and b/ext/standard/tests/general_functions/debug_zval_dump_b_64bit.phpt differ diff --git a/ext/standard/tests/general_functions/print_r.phpt b/ext/standard/tests/general_functions/print_r.phpt index 0c0d7759610..112e436d4e7 100644 --- a/ext/standard/tests/general_functions/print_r.phpt +++ b/ext/standard/tests/general_functions/print_r.phpt @@ -271,7 +271,7 @@ closedir($dir_handle); echo "Done\n"; ?> ---EXPECT-- +--EXPECTF-- *** Testing print_r() on integer variables *** -- Iteration 1 -- @@ -565,9 +565,9 @@ Array 0 0 -- Iteration 6 -- - - - +%0 +%0 +%0 -- Iteration 7 -- \0 \0 @@ -589,13 +589,13 @@ PHP PHP PHP -- Iteration 12 -- -abcdn12340567800efgh\xijkl -abcdn12340567800efgh\xijkl -abcdn12340567800efgh\xijkl +abcd%0n1234%005678%000efgh\xijkl +abcd%0n1234%005678%000efgh\xijkl +abcd%0n1234%005678%000efgh\xijkl -- Iteration 13 -- -abcdefghijklmnop0qrstuvwx0yz -abcdefghijklmnop0qrstuvwx0yz -abcdefghijklmnop0qrstuvwx0yz +abcd%0efgh%0ijkl%0mnop%00qrst%0uvwx%00yz +abcd%0efgh%0ijkl%0mnop%00qrst%0uvwx%00yz +abcd%0efgh%0ijkl%0mnop%00qrst%0uvwx%00yz -- Iteration 14 -- 1234 5678 diff --git a/ext/standard/tests/general_functions/print_r_64bit.phpt b/ext/standard/tests/general_functions/print_r_64bit.phpt index 56153e76827..1d61df4f9f5 100644 --- a/ext/standard/tests/general_functions/print_r_64bit.phpt +++ b/ext/standard/tests/general_functions/print_r_64bit.phpt @@ -275,7 +275,7 @@ closedir($dir_handle); echo "Done\n"; ?> ---EXPECT-- +--EXPECTF-- *** Testing print_r() on integer variables *** -- Iteration 1 -- @@ -569,9 +569,9 @@ Array 0 0 -- Iteration 6 -- - - - +%0 +%0 +%0 -- Iteration 7 -- \0 \0 @@ -593,13 +593,13 @@ PHP PHP PHP -- Iteration 12 -- -abcdn12340567800efgh\xijkl -abcdn12340567800efgh\xijkl -abcdn12340567800efgh\xijkl +abcd%0n1234%005678%000efgh\xijkl +abcd%0n1234%005678%000efgh\xijkl +abcd%0n1234%005678%000efgh\xijkl -- Iteration 13 -- -abcdefghijklmnop0qrstuvwx0yz -abcdefghijklmnop0qrstuvwx0yz -abcdefghijklmnop0qrstuvwx0yz +abcd%0efgh%0ijkl%0mnop%00qrst%0uvwx%00yz +abcd%0efgh%0ijkl%0mnop%00qrst%0uvwx%00yz +abcd%0efgh%0ijkl%0mnop%00qrst%0uvwx%00yz -- Iteration 14 -- 1234 5678 diff --git a/ext/standard/tests/general_functions/var_dump.phpt b/ext/standard/tests/general_functions/var_dump.phpt index 58dea7b61ed..32f5c9ab393 100644 --- a/ext/standard/tests/general_functions/var_dump.phpt +++ b/ext/standard/tests/general_functions/var_dump.phpt @@ -427,7 +427,7 @@ string(1) " " -- Iteration 5 -- string(1) "0" -- Iteration 6 -- -string(1) "" +string(1) "%0" -- Iteration 7 -- string(2) "\0" -- Iteration 8 -- @@ -439,9 +439,9 @@ string(3) "PHP" -- Iteration 11 -- string(3) "PHP" -- Iteration 12 -- -string(29) "abcdn12340567800efgh\xijkl" +string(29) "abcd%0n1234%005678%000efgh\xijkl" -- Iteration 13 -- -string(34) "abcdefghijklmnop0qrstuvwx0yz" +string(34) "abcd%0efgh%0ijkl%0mnop%00qrst%0uvwx%00yz" -- Iteration 14 -- string(22) "1234 5678 @@ -1081,7 +1081,7 @@ array(14) { [4]=> string(1) "0" [5]=> - string(1) "" + string(1) "%0" [6]=> string(2) "\0" [7]=> @@ -1093,9 +1093,9 @@ array(14) { [10]=> string(3) "PHP" [11]=> - string(29) "abcdn12340567800efgh\xijkl" + string(29) "abcd%0n1234%005678%000efgh\xijkl" [12]=> - string(34) "abcdefghijklmnop0qrstuvwx0yz" + string(34) "abcd%0efgh%0ijkl%0mnop%00qrst%0uvwx%00yz" [13]=> string(22) "1234 5678 diff --git a/ext/standard/tests/general_functions/var_dump_64bit.phpt b/ext/standard/tests/general_functions/var_dump_64bit.phpt index e6ac7f15cb0..463308427a3 100644 --- a/ext/standard/tests/general_functions/var_dump_64bit.phpt +++ b/ext/standard/tests/general_functions/var_dump_64bit.phpt @@ -274,7 +274,7 @@ closedir($dir_handle); echo "Done\n"; ?> ---EXPECT-- +--EXPECTF-- *** Testing var_dump() on integer variables *** -- Iteration 1 -- int(0) @@ -427,7 +427,7 @@ string(1) " " -- Iteration 5 -- string(1) "0" -- Iteration 6 -- -string(1) "" +string(1) "%0" -- Iteration 7 -- string(2) "\0" -- Iteration 8 -- @@ -439,9 +439,9 @@ string(3) "PHP" -- Iteration 11 -- string(3) "PHP" -- Iteration 12 -- -string(29) "abcdn12340567800efgh\xijkl" +string(29) "abcd%0n1234%005678%000efgh\xijkl" -- Iteration 13 -- -string(34) "abcdefghijklmnop0qrstuvwx0yz" +string(34) "abcd%0efgh%0ijkl%0mnop%00qrst%0uvwx%00yz" -- Iteration 14 -- string(22) "1234 5678 @@ -1081,7 +1081,7 @@ array(14) { [4]=> string(1) "0" [5]=> - string(1) "" + string(1) "%0" [6]=> string(2) "\0" [7]=> @@ -1093,9 +1093,9 @@ array(14) { [10]=> string(3) "PHP" [11]=> - string(29) "abcdn12340567800efgh\xijkl" + string(29) "abcd%0n1234%005678%000efgh\xijkl" [12]=> - string(34) "abcdefghijklmnop0qrstuvwx0yz" + string(34) "abcd%0efgh%0ijkl%0mnop%00qrst%0uvwx%00yz" [13]=> string(22) "1234 5678 diff --git a/ext/standard/tests/math/bug62112.phpt b/ext/standard/tests/math/bug62112.phpt index eb6b0889de8..ead5526e745 100644 Binary files a/ext/standard/tests/math/bug62112.phpt and b/ext/standard/tests/math/bug62112.phpt differ diff --git a/ext/standard/tests/serialize/serialization_miscTypes_001.phpt b/ext/standard/tests/serialize/serialization_miscTypes_001.phpt index 50a96b2f7b4..ea5a0fd808f 100644 Binary files a/ext/standard/tests/serialize/serialization_miscTypes_001.phpt and b/ext/standard/tests/serialize/serialization_miscTypes_001.phpt differ diff --git a/ext/standard/tests/serialize/serialization_objects_001.phpt b/ext/standard/tests/serialize/serialization_objects_001.phpt index d1f26604fc6..f310914bf7f 100644 Binary files a/ext/standard/tests/serialize/serialization_objects_001.phpt and b/ext/standard/tests/serialize/serialization_objects_001.phpt differ diff --git a/ext/standard/tests/serialize/serialization_objects_002.phpt b/ext/standard/tests/serialize/serialization_objects_002.phpt index 211ba10187a..26766d80f07 100644 Binary files a/ext/standard/tests/serialize/serialization_objects_002.phpt and b/ext/standard/tests/serialize/serialization_objects_002.phpt differ diff --git a/ext/standard/tests/strings/addcslashes_001.phpt b/ext/standard/tests/strings/addcslashes_001.phpt index e8fdf2b69ad..878ac4bf74c 100644 Binary files a/ext/standard/tests/strings/addcslashes_001.phpt and b/ext/standard/tests/strings/addcslashes_001.phpt differ diff --git a/ext/standard/tests/strings/addcslashes_003.phpt b/ext/standard/tests/strings/addcslashes_003.phpt index 7736a9f58f9..8abcb358431 100644 Binary files a/ext/standard/tests/strings/addcslashes_003.phpt and b/ext/standard/tests/strings/addcslashes_003.phpt differ diff --git a/ext/standard/tests/strings/basename.phpt b/ext/standard/tests/strings/basename.phpt index 1f69bf4bcee..303aa6c2a8c 100644 Binary files a/ext/standard/tests/strings/basename.phpt and b/ext/standard/tests/strings/basename.phpt differ diff --git a/ext/standard/tests/strings/basename_basic.phpt b/ext/standard/tests/strings/basename_basic.phpt index 80d4789c7c9..7506045a74b 100644 Binary files a/ext/standard/tests/strings/basename_basic.phpt and b/ext/standard/tests/strings/basename_basic.phpt differ diff --git a/ext/standard/tests/strings/bug39621.phpt b/ext/standard/tests/strings/bug39621.phpt index 9297050a997..d6ba790d80e 100644 Binary files a/ext/standard/tests/strings/bug39621.phpt and b/ext/standard/tests/strings/bug39621.phpt differ diff --git a/ext/standard/tests/strings/bug40915.phpt b/ext/standard/tests/strings/bug40915.phpt index 88674ee9538..9759700737d 100644 Binary files a/ext/standard/tests/strings/bug40915.phpt and b/ext/standard/tests/strings/bug40915.phpt differ diff --git a/ext/standard/tests/strings/bug60801.phpt b/ext/standard/tests/strings/bug60801.phpt index 9587bdafa4a..a87f4756a4a 100644 Binary files a/ext/standard/tests/strings/bug60801.phpt and b/ext/standard/tests/strings/bug60801.phpt differ diff --git a/ext/standard/tests/strings/chop_basic.phpt b/ext/standard/tests/strings/chop_basic.phpt index c9302a80ae4..4a11f9c3a00 100644 Binary files a/ext/standard/tests/strings/chop_basic.phpt and b/ext/standard/tests/strings/chop_basic.phpt differ diff --git a/ext/standard/tests/strings/chop_variation3.phpt b/ext/standard/tests/strings/chop_variation3.phpt index be545a1cdc3..f1ffce9a039 100644 Binary files a/ext/standard/tests/strings/chop_variation3.phpt and b/ext/standard/tests/strings/chop_variation3.phpt differ diff --git a/ext/standard/tests/strings/chop_variation4.phpt b/ext/standard/tests/strings/chop_variation4.phpt index 0bb1c702031..8b49b253cd7 100644 Binary files a/ext/standard/tests/strings/chop_variation4.phpt and b/ext/standard/tests/strings/chop_variation4.phpt differ diff --git a/ext/standard/tests/strings/chunk_split_variation5.phpt b/ext/standard/tests/strings/chunk_split_variation5.phpt index 9e59d676587..8f51c001eec 100644 Binary files a/ext/standard/tests/strings/chunk_split_variation5.phpt and b/ext/standard/tests/strings/chunk_split_variation5.phpt differ diff --git a/ext/standard/tests/strings/chunk_split_variation7.phpt b/ext/standard/tests/strings/chunk_split_variation7.phpt index 9844f2097b1..7a2af6aa274 100644 Binary files a/ext/standard/tests/strings/chunk_split_variation7.phpt and b/ext/standard/tests/strings/chunk_split_variation7.phpt differ diff --git a/ext/standard/tests/strings/chunk_split_variation9.phpt b/ext/standard/tests/strings/chunk_split_variation9.phpt index 526a2cd569c..c2d76676fd8 100644 Binary files a/ext/standard/tests/strings/chunk_split_variation9.phpt and b/ext/standard/tests/strings/chunk_split_variation9.phpt differ diff --git a/ext/standard/tests/strings/fprintf_variation_004.phpt b/ext/standard/tests/strings/fprintf_variation_004.phpt index 103ca579f4e..a72f46b359b 100644 Binary files a/ext/standard/tests/strings/fprintf_variation_004.phpt and b/ext/standard/tests/strings/fprintf_variation_004.phpt differ diff --git a/ext/standard/tests/strings/htmlspecialchars_decode_variation6.phpt b/ext/standard/tests/strings/htmlspecialchars_decode_variation6.phpt index 9a828b911d2..4539707ca67 100644 Binary files a/ext/standard/tests/strings/htmlspecialchars_decode_variation6.phpt and b/ext/standard/tests/strings/htmlspecialchars_decode_variation6.phpt differ diff --git a/ext/standard/tests/strings/implode1.phpt b/ext/standard/tests/strings/implode1.phpt index ca121102112..7092efe9424 100644 Binary files a/ext/standard/tests/strings/implode1.phpt and b/ext/standard/tests/strings/implode1.phpt differ diff --git a/ext/standard/tests/strings/join_variation4.phpt b/ext/standard/tests/strings/join_variation4.phpt index 314345547cc..21774b4bca2 100644 Binary files a/ext/standard/tests/strings/join_variation4.phpt and b/ext/standard/tests/strings/join_variation4.phpt differ diff --git a/ext/standard/tests/strings/join_variation6.phpt b/ext/standard/tests/strings/join_variation6.phpt index 010e449085a..44573274a63 100644 Binary files a/ext/standard/tests/strings/join_variation6.phpt and b/ext/standard/tests/strings/join_variation6.phpt differ diff --git a/ext/standard/tests/strings/lcfirst.phpt b/ext/standard/tests/strings/lcfirst.phpt index fc0b954199f..d98b3a9cb0e 100644 Binary files a/ext/standard/tests/strings/lcfirst.phpt and b/ext/standard/tests/strings/lcfirst.phpt differ diff --git a/ext/standard/tests/strings/md5_file.phpt b/ext/standard/tests/strings/md5_file.phpt index c975c85cb71..7acb81c3a41 100644 Binary files a/ext/standard/tests/strings/md5_file.phpt and b/ext/standard/tests/strings/md5_file.phpt differ diff --git a/ext/standard/tests/strings/parse_str_basic3.phpt b/ext/standard/tests/strings/parse_str_basic3.phpt index a15edd529f4..387bf7589e6 100644 Binary files a/ext/standard/tests/strings/parse_str_basic3.phpt and b/ext/standard/tests/strings/parse_str_basic3.phpt differ diff --git a/ext/standard/tests/strings/printf.phpt b/ext/standard/tests/strings/printf.phpt index 8ff95eb5d65..25b361cb81f 100644 --- a/ext/standard/tests/strings/printf.phpt +++ b/ext/standard/tests/strings/printf.phpt @@ -486,8 +486,8 @@ Array [4] => 99 ) - - +%0 +%0 C ½ c @@ -595,7 +595,7 @@ Array ( [0] => %5s [1] => %-5s - [2] => %05s + [2] => %r%%r05s [3] => %'#5s ) diff --git a/ext/standard/tests/strings/printf_64bit.phpt b/ext/standard/tests/strings/printf_64bit.phpt index a37ad49c3de..083b7b2979d 100644 --- a/ext/standard/tests/strings/printf_64bit.phpt +++ b/ext/standard/tests/strings/printf_64bit.phpt @@ -486,8 +486,8 @@ Array [4] => 99 ) - - +%0 +%0 C ½ c @@ -595,7 +595,7 @@ Array ( [0] => %5s [1] => %-5s - [2] => %05s + [2] => %r%%r05s [3] => %'#5s ) diff --git a/ext/standard/tests/strings/quoted_printable_encode_002.phpt b/ext/standard/tests/strings/quoted_printable_encode_002.phpt index b01b6957c90..795c30fb253 100644 Binary files a/ext/standard/tests/strings/quoted_printable_encode_002.phpt and b/ext/standard/tests/strings/quoted_printable_encode_002.phpt differ diff --git a/ext/standard/tests/strings/rtrim.phpt b/ext/standard/tests/strings/rtrim.phpt index b4cd2ac6acd..21e91c1ac36 100644 Binary files a/ext/standard/tests/strings/rtrim.phpt and b/ext/standard/tests/strings/rtrim.phpt differ diff --git a/ext/standard/tests/strings/sprintf_variation15.phpt b/ext/standard/tests/strings/sprintf_variation15.phpt index e23fe1147f4..3b1abe756a4 100644 Binary files a/ext/standard/tests/strings/sprintf_variation15.phpt and b/ext/standard/tests/strings/sprintf_variation15.phpt differ diff --git a/ext/standard/tests/strings/sprintf_variation27.phpt b/ext/standard/tests/strings/sprintf_variation27.phpt index d0430d20494..0d4516e01b2 100644 Binary files a/ext/standard/tests/strings/sprintf_variation27.phpt and b/ext/standard/tests/strings/sprintf_variation27.phpt differ diff --git a/ext/standard/tests/strings/sprintf_variation54.phpt b/ext/standard/tests/strings/sprintf_variation54.phpt index 51a4e488273..e925293ceef 100644 Binary files a/ext/standard/tests/strings/sprintf_variation54.phpt and b/ext/standard/tests/strings/sprintf_variation54.phpt differ diff --git a/ext/standard/tests/strings/str_repeat.phpt b/ext/standard/tests/strings/str_repeat.phpt index 6eef67ae578..3351e7f8713 100644 Binary files a/ext/standard/tests/strings/str_repeat.phpt and b/ext/standard/tests/strings/str_repeat.phpt differ diff --git a/ext/standard/tests/strings/str_replace_variation2.phpt b/ext/standard/tests/strings/str_replace_variation2.phpt index 77dc6ae8226..957c990555e 100644 Binary files a/ext/standard/tests/strings/str_replace_variation2.phpt and b/ext/standard/tests/strings/str_replace_variation2.phpt differ diff --git a/ext/standard/tests/strings/str_split_variation3.phpt b/ext/standard/tests/strings/str_split_variation3.phpt index dc8d9783fb8..7003d62eaa1 100644 Binary files a/ext/standard/tests/strings/str_split_variation3.phpt and b/ext/standard/tests/strings/str_split_variation3.phpt differ diff --git a/ext/standard/tests/strings/strcasecmp.phpt b/ext/standard/tests/strings/strcasecmp.phpt index 3c07539bd55..04452067d48 100644 Binary files a/ext/standard/tests/strings/strcasecmp.phpt and b/ext/standard/tests/strings/strcasecmp.phpt differ diff --git a/ext/standard/tests/strings/strcmp.phpt b/ext/standard/tests/strings/strcmp.phpt index d5f338844ea..a36873830ce 100644 Binary files a/ext/standard/tests/strings/strcmp.phpt and b/ext/standard/tests/strings/strcmp.phpt differ diff --git a/ext/standard/tests/strings/strcspn_variation5.phpt b/ext/standard/tests/strings/strcspn_variation5.phpt index e6fcae92200..699e638754a 100644 Binary files a/ext/standard/tests/strings/strcspn_variation5.phpt and b/ext/standard/tests/strings/strcspn_variation5.phpt differ diff --git a/ext/standard/tests/strings/strcspn_variation9.phpt b/ext/standard/tests/strings/strcspn_variation9.phpt index 6fd70827a52..d4286e2ca11 100644 Binary files a/ext/standard/tests/strings/strcspn_variation9.phpt and b/ext/standard/tests/strings/strcspn_variation9.phpt differ diff --git a/ext/standard/tests/strings/stripslashes_basic.phpt b/ext/standard/tests/strings/stripslashes_basic.phpt index f1da924fee6..60c4d995cb1 100644 Binary files a/ext/standard/tests/strings/stripslashes_basic.phpt and b/ext/standard/tests/strings/stripslashes_basic.phpt differ diff --git a/ext/standard/tests/strings/stripslashes_variation2.phpt b/ext/standard/tests/strings/stripslashes_variation2.phpt index d0d474d14d3..ecf6ae8a6f6 100644 Binary files a/ext/standard/tests/strings/stripslashes_variation2.phpt and b/ext/standard/tests/strings/stripslashes_variation2.phpt differ diff --git a/ext/standard/tests/strings/strlen.phpt b/ext/standard/tests/strings/strlen.phpt index 374001eed98..426154504b6 100644 Binary files a/ext/standard/tests/strings/strlen.phpt and b/ext/standard/tests/strings/strlen.phpt differ diff --git a/ext/standard/tests/strings/strpos.phpt b/ext/standard/tests/strings/strpos.phpt index 267bc590c5b..449601f6e54 100644 Binary files a/ext/standard/tests/strings/strpos.phpt and b/ext/standard/tests/strings/strpos.phpt differ diff --git a/ext/standard/tests/strings/strrchr_variation1.phpt b/ext/standard/tests/strings/strrchr_variation1.phpt index a913a2045a4..3e71728ef88 100644 Binary files a/ext/standard/tests/strings/strrchr_variation1.phpt and b/ext/standard/tests/strings/strrchr_variation1.phpt differ diff --git a/ext/standard/tests/strings/strrchr_variation12.phpt b/ext/standard/tests/strings/strrchr_variation12.phpt index abe5bfae650..84b9eb762f2 100644 Binary files a/ext/standard/tests/strings/strrchr_variation12.phpt and b/ext/standard/tests/strings/strrchr_variation12.phpt differ diff --git a/ext/standard/tests/strings/strrev_variation1.phpt b/ext/standard/tests/strings/strrev_variation1.phpt index 0ed3acd5b51..3c4fb79a6c8 100644 Binary files a/ext/standard/tests/strings/strrev_variation1.phpt and b/ext/standard/tests/strings/strrev_variation1.phpt differ diff --git a/ext/standard/tests/strings/strrev_variation2.phpt b/ext/standard/tests/strings/strrev_variation2.phpt index 92f45d7df90..45036f6f881 100644 Binary files a/ext/standard/tests/strings/strrev_variation2.phpt and b/ext/standard/tests/strings/strrev_variation2.phpt differ diff --git a/ext/standard/tests/strings/strrev_variation3.phpt b/ext/standard/tests/strings/strrev_variation3.phpt index c83a241d099..eab673f9743 100644 Binary files a/ext/standard/tests/strings/strrev_variation3.phpt and b/ext/standard/tests/strings/strrev_variation3.phpt differ diff --git a/ext/standard/tests/strings/strspn_variation5.phpt b/ext/standard/tests/strings/strspn_variation5.phpt index 229fc1fbb6c..25dd888bbfe 100644 Binary files a/ext/standard/tests/strings/strspn_variation5.phpt and b/ext/standard/tests/strings/strspn_variation5.phpt differ diff --git a/ext/standard/tests/strings/strspn_variation9.phpt b/ext/standard/tests/strings/strspn_variation9.phpt index 49d590bee84..50387865aef 100644 Binary files a/ext/standard/tests/strings/strspn_variation9.phpt and b/ext/standard/tests/strings/strspn_variation9.phpt differ diff --git a/ext/standard/tests/strings/strstr.phpt b/ext/standard/tests/strings/strstr.phpt index 52088fb88ba..f5a2d80318b 100644 Binary files a/ext/standard/tests/strings/strstr.phpt and b/ext/standard/tests/strings/strstr.phpt differ diff --git a/ext/standard/tests/strings/strtolower-win32.phpt b/ext/standard/tests/strings/strtolower-win32.phpt index 368a81ad93b..516248346cf 100644 Binary files a/ext/standard/tests/strings/strtolower-win32.phpt and b/ext/standard/tests/strings/strtolower-win32.phpt differ diff --git a/ext/standard/tests/strings/strtolower.phpt b/ext/standard/tests/strings/strtolower.phpt index 3a685880571..efea4022d05 100644 Binary files a/ext/standard/tests/strings/strtolower.phpt and b/ext/standard/tests/strings/strtolower.phpt differ diff --git a/ext/standard/tests/strings/strtoupper1-win32.phpt b/ext/standard/tests/strings/strtoupper1-win32.phpt index 98a314a7b41..c9328462cf7 100644 Binary files a/ext/standard/tests/strings/strtoupper1-win32.phpt and b/ext/standard/tests/strings/strtoupper1-win32.phpt differ diff --git a/ext/standard/tests/strings/strtoupper1.phpt b/ext/standard/tests/strings/strtoupper1.phpt index 864053d22de..f0254905dc8 100644 Binary files a/ext/standard/tests/strings/strtoupper1.phpt and b/ext/standard/tests/strings/strtoupper1.phpt differ diff --git a/ext/standard/tests/strings/substr.phpt b/ext/standard/tests/strings/substr.phpt index 8f172cee611..c870e1de0fb 100644 Binary files a/ext/standard/tests/strings/substr.phpt and b/ext/standard/tests/strings/substr.phpt differ diff --git a/ext/standard/tests/strings/trim1.phpt b/ext/standard/tests/strings/trim1.phpt index 849b972c117..e0cdbea1c89 100644 Binary files a/ext/standard/tests/strings/trim1.phpt and b/ext/standard/tests/strings/trim1.phpt differ diff --git a/ext/standard/tests/strings/ucfirst.phpt b/ext/standard/tests/strings/ucfirst.phpt index 1d8ecd7630c..1cae286d98a 100644 Binary files a/ext/standard/tests/strings/ucfirst.phpt and b/ext/standard/tests/strings/ucfirst.phpt differ diff --git a/ext/standard/tests/strings/vprintf_variation10.phpt b/ext/standard/tests/strings/vprintf_variation10.phpt index 56a964a89f1..26282b73cf4 100644 Binary files a/ext/standard/tests/strings/vprintf_variation10.phpt and b/ext/standard/tests/strings/vprintf_variation10.phpt differ diff --git a/ext/standard/tests/strings/vprintf_variation7.phpt b/ext/standard/tests/strings/vprintf_variation7.phpt index 5cda7611a54..a4dbe73c061 100644 Binary files a/ext/standard/tests/strings/vprintf_variation7.phpt and b/ext/standard/tests/strings/vprintf_variation7.phpt differ diff --git a/ext/standard/tests/strings/vprintf_variation9.phpt b/ext/standard/tests/strings/vprintf_variation9.phpt index 7a1da7e69da..70b28c21761 100644 Binary files a/ext/standard/tests/strings/vprintf_variation9.phpt and b/ext/standard/tests/strings/vprintf_variation9.phpt differ diff --git a/run-tests.php b/run-tests.php index 64d0980e686..9450a47151d 100755 --- a/run-tests.php +++ b/run-tests.php @@ -2627,6 +2627,7 @@ COMMAND $cmd $wanted_re = str_replace('%x', '[0-9a-fA-F]+', $wanted_re); $wanted_re = str_replace('%f', '[+-]?\.?\d+\.?\d*(?:[Ee][+-]?\d+)?', $wanted_re); $wanted_re = str_replace('%c', '.', $wanted_re); + $wanted_re = str_replace('%0', '\x00', $wanted_re); // %f allows two points "-.0.0" but that is the best *simple* expression } diff --git a/scripts/dev/bless_tests.php b/scripts/dev/bless_tests.php index 674bbeda8eb..fa49647fcf4 100755 --- a/scripts/dev/bless_tests.php +++ b/scripts/dev/bless_tests.php @@ -72,6 +72,7 @@ function normalizeOutput(string $out): string { 'Resource ID#%d used as offset, casting to integer (%d)', $out); $out = preg_replace('/string\(\d+\) "([^"]*%d)/', 'string(%d) "$1', $out); + $out = str_replace("\0", '%0', $out); return $out; } @@ -86,6 +87,7 @@ function formatToRegex(string $format): string { $result = str_replace('%x', '[0-9a-fA-F]+', $result); $result = str_replace('%f', '[+-]?\.?\d+\.?\d*(?:[Ee][+-]?\d+)?', $result); $result = str_replace('%c', '.', $result); + $result = str_replace('%0', '\0', $result); return "/^$result$/s"; } @@ -113,7 +115,7 @@ function generateMinimallyDifferingOutput(string $out, string $oldExpect) { function insertOutput(string $phpt, string $out): string { return preg_replace_callback('/--EXPECTF?--.*?(--CLEAN--|$)/sD', function($matches) use($out) { - $hasWildcard = preg_match('/%[resSaAwidxfc]/', $out); + $hasWildcard = preg_match('/%[resSaAwidxfc0]/', $out); $F = $hasWildcard ? 'F' : ''; return "--EXPECT$F--\n" . $out . "\n" . $matches[1]; }, $phpt);