From ea256a218bd509a53b0524a17824c3a5597df75e Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Fri, 28 May 2021 13:08:25 +0200 Subject: [PATCH] Add %0 format to run-tests.php This format matches against null bytes, and prevents the test expectation from being interpreted as binary data. bless_tests.php will automatically replace \0 with %0 as well. --- Zend/tests/bug60569.phpt | Bin 297 -> 300 bytes Zend/tests/bug78363.phpt | Bin 201 -> 202 bytes Zend/tests/cast_to_array.phpt | Bin 1051 -> 1056 bytes Zend/tests/cast_to_object.phpt | Bin 1167 -> 1168 bytes Zend/tests/cast_to_string.phpt | Bin 784 -> 785 bytes Zend/tests/settype_array.phpt | Bin 1071 -> 1076 bytes Zend/tests/settype_object.phpt | Bin 1187 -> 1188 bytes Zend/tests/settype_resource.phpt | Bin 1247 -> 1248 bytes Zend/tests/settype_string.phpt | Bin 804 -> 805 bytes ext/curl/tests/curl_escape.phpt | Bin 690 -> 692 bytes ext/exif/tests/exif012.phpt | Bin 1921 -> 1924 bytes ext/exif/tests/exif013.phpt | Bin 1924 -> 1927 bytes ext/exif/tests/exif014.phpt | Bin 2433 -> 2436 bytes ext/exif/tests/exif015.phpt | Bin 2436 -> 2439 bytes ext/exif/tests/exif020.phpt | 4 ++-- ext/exif/tests/exif021.phpt | 4 ++-- ext/exif/tests/exif022.phpt | 4 ++-- ext/exif/tests/exif023.phpt | 4 ++-- ext/ftp/tests/ftp_fget_basic.phpt | 4 ++-- ext/ftp/tests/ftp_get_basic.phpt | 4 ++-- ext/oci8/tests/lob_001.phpt | Bin 2098 -> 2118 bytes ext/oci8/tests/lob_003.phpt | Bin 1689 -> 1699 bytes ext/oci8/tests/lob_006.phpt | Bin 1721 -> 1731 bytes ext/oci8/tests/lob_019.phpt | Bin 1573 -> 1583 bytes ext/oci8/tests/lob_020.phpt | Bin 3454 -> 3464 bytes .../tests/compact_literals_collision.phpt | Bin 275 -> 292 bytes ext/pdo_mysql/tests/bug_39483.phpt | Bin 717 -> 720 bytes ext/spl/tests/array_018.phpt | Bin 631 -> 633 bytes ext/spl/tests/iterator_049b.phpt | Bin 613 -> 631 bytes ext/spl/tests/serialize_property_tables.phpt | Bin 1021 -> 1028 bytes .../tests/array/array_flip_variation2.phpt | Bin 2021 -> 2022 bytes .../tests/array/array_flip_variation3.phpt | Bin 2673 -> 2676 bytes ext/standard/tests/array/array_search.phpt | Bin 538 -> 540 bytes ext/standard/tests/array/array_values.phpt | Bin 2870 -> 2873 bytes .../tests/array/array_walk_rec_objects.phpt | Bin 921 -> 926 bytes .../tests/array/arsort_variation11.phpt | Bin 3092 -> 3101 bytes .../tests/array/asort_variation11.phpt | Bin 3082 -> 3091 bytes ext/standard/tests/array/bug26458.phpt | Bin 389 -> 391 bytes .../tests/array/krsort_variation8.phpt | Bin 3102 -> 3111 bytes .../tests/array/ksort_variation8.phpt | Bin 3088 -> 3097 bytes .../tests/array/natcasesort_variation9.phpt | Bin 1609 -> 1612 bytes .../tests/array/rsort_variation11.phpt | Bin 2534 -> 2539 bytes .../tests/array/sort_variation11.phpt | Bin 2891 -> 2896 bytes .../tests/array/uasort_variation3.phpt | Bin 2036 -> 2038 bytes .../get_object_vars_variation_004.phpt | Bin 791 -> 800 bytes .../get_object_vars_variation_005.phpt | Bin 638 -> 647 bytes ext/standard/tests/file/basename.phpt | Bin 6453 -> 6458 bytes ext/standard/tests/file/bug26003.phpt | Bin 215 -> 217 bytes .../tests/file/fputcsv_variation17.phpt | Bin 739 -> 742 bytes ext/standard/tests/file/ftruncate.phpt | Bin 1179 -> 1190 bytes .../tests/file/readfile_variation10.phpt | Bin 1451 -> 1452 bytes .../general_functions/debug_zval_dump_b.phpt | Bin 4250 -> 4253 bytes .../debug_zval_dump_b_64bit.phpt | Bin 4343 -> 4346 bytes .../tests/general_functions/print_r.phpt | 20 +++++++++--------- .../general_functions/print_r_64bit.phpt | 20 +++++++++--------- .../tests/general_functions/var_dump.phpt | 12 +++++------ .../general_functions/var_dump_64bit.phpt | 14 ++++++------ ext/standard/tests/math/bug62112.phpt | Bin 146 -> 148 bytes .../serialization_miscTypes_001.phpt | Bin 7219 -> 7222 bytes .../serialize/serialization_objects_001.phpt | Bin 2136 -> 2144 bytes .../serialize/serialization_objects_002.phpt | Bin 7073 -> 7083 bytes .../tests/strings/addcslashes_001.phpt | Bin 1566 -> 1576 bytes .../tests/strings/addcslashes_003.phpt | Bin 1158 -> 1160 bytes ext/standard/tests/strings/basename.phpt | Bin 1217 -> 1220 bytes .../tests/strings/basename_basic.phpt | Bin 2939 -> 2944 bytes ext/standard/tests/strings/bug39621.phpt | Bin 864 -> 867 bytes ext/standard/tests/strings/bug40915.phpt | Bin 344 -> 347 bytes ext/standard/tests/strings/bug60801.phpt | Bin 489 -> 493 bytes ext/standard/tests/strings/chop_basic.phpt | Bin 672 -> 675 bytes .../tests/strings/chop_variation3.phpt | Bin 1808 -> 1815 bytes .../tests/strings/chop_variation4.phpt | Bin 1743 -> 1769 bytes .../tests/strings/chunk_split_variation5.phpt | Bin 2086 -> 2091 bytes .../tests/strings/chunk_split_variation7.phpt | Bin 2261 -> 2264 bytes .../tests/strings/chunk_split_variation9.phpt | Bin 3145 -> 3156 bytes .../tests/strings/fprintf_variation_004.phpt | Bin 584 -> 586 bytes .../htmlspecialchars_decode_variation6.phpt | Bin 1322 -> 1325 bytes ext/standard/tests/strings/implode1.phpt | Bin 6067 -> 6099 bytes .../tests/strings/join_variation4.phpt | Bin 1981 -> 2019 bytes .../tests/strings/join_variation6.phpt | Bin 543 -> 547 bytes ext/standard/tests/strings/lcfirst.phpt | Bin 5411 -> 5414 bytes ext/standard/tests/strings/md5_file.phpt | Bin 2318 -> 2319 bytes .../tests/strings/parse_str_basic3.phpt | Bin 4171 -> 4175 bytes ext/standard/tests/strings/printf.phpt | 6 +++--- ext/standard/tests/strings/printf_64bit.phpt | 6 +++--- .../strings/quoted_printable_encode_002.phpt | Bin 7304 -> 7505 bytes ext/standard/tests/strings/rtrim.phpt | Bin 1974 -> 1977 bytes .../tests/strings/sprintf_variation15.phpt | Bin 5750 -> 5759 bytes .../tests/strings/sprintf_variation27.phpt | Bin 1872 -> 1921 bytes .../tests/strings/sprintf_variation54.phpt | Bin 2179 -> 2183 bytes ext/standard/tests/strings/str_repeat.phpt | Bin 2638 -> 2646 bytes .../tests/strings/str_replace_variation2.phpt | Bin 12378 -> 12473 bytes .../tests/strings/str_split_variation3.phpt | Bin 2686 -> 2689 bytes ext/standard/tests/strings/strcasecmp.phpt | Bin 18630 -> 18641 bytes ext/standard/tests/strings/strcmp.phpt | Bin 17602 -> 17617 bytes .../tests/strings/strcspn_variation5.phpt | Bin 2419 -> 2428 bytes .../tests/strings/strcspn_variation9.phpt | Bin 2628 -> 2640 bytes .../tests/strings/stripslashes_basic.phpt | Bin 1897 -> 1899 bytes .../strings/stripslashes_variation2.phpt | Bin 9369 -> 9382 bytes ext/standard/tests/strings/strlen.phpt | Bin 6053 -> 6059 bytes ext/standard/tests/strings/strpos.phpt | Bin 7799 -> 7804 bytes .../tests/strings/strrchr_variation1.phpt | Bin 4019 -> 4028 bytes .../tests/strings/strrchr_variation12.phpt | Bin 955 -> 970 bytes .../tests/strings/strrev_variation1.phpt | Bin 2818 -> 2820 bytes .../tests/strings/strrev_variation2.phpt | Bin 2832 -> 2834 bytes .../tests/strings/strrev_variation3.phpt | Bin 1507 -> 1509 bytes .../tests/strings/strspn_variation5.phpt | Bin 2414 -> 2423 bytes .../tests/strings/strspn_variation9.phpt | Bin 2627 -> 2639 bytes ext/standard/tests/strings/strstr.phpt | Bin 9563 -> 9607 bytes .../tests/strings/strtolower-win32.phpt | Bin 4265 -> 4267 bytes ext/standard/tests/strings/strtolower.phpt | Bin 3228 -> 3230 bytes .../tests/strings/strtoupper1-win32.phpt | Bin 4273 -> 4275 bytes ext/standard/tests/strings/strtoupper1.phpt | Bin 3235 -> 3237 bytes ext/standard/tests/strings/substr.phpt | Bin 3814 -> 3817 bytes ext/standard/tests/strings/trim1.phpt | Bin 1254 -> 1257 bytes ext/standard/tests/strings/ucfirst.phpt | Bin 4651 -> 4654 bytes .../tests/strings/vprintf_variation10.phpt | Bin 2692 -> 2712 bytes .../tests/strings/vprintf_variation7.phpt | Bin 2004 -> 2007 bytes .../tests/strings/vprintf_variation9.phpt | Bin 1486 -> 1490 bytes run-tests.php | 1 + scripts/dev/bless_tests.php | 4 +++- 120 files changed, 55 insertions(+), 52 deletions(-) diff --git a/Zend/tests/bug60569.phpt b/Zend/tests/bug60569.phpt index 480c9c8f8a1285956616a119825520471bbe88b5..ef3bea8edb78625a4259c00169d339ce108b7c2a 100644 GIT binary patch delta 52 zcmZ34I=|h1*PEp+*F0sqN4mF1yzHIe-(LD4HR-yi;EM} HQ>t2Px# delta 19 bcmbQh+0VIQ6B84I(&UTGdYd0Jtz`rNKu!jg diff --git a/Zend/tests/cast_to_string.phpt b/Zend/tests/cast_to_string.phpt index 1fb94dfa8dbc66a43e32418965356de81a5e0bda..eabb51cb1377655cd57d200e6a60ca73d01eac6e 100644 GIT binary patch delta 14 VcmbQhHj!-s6O*dJW=1A{MgSXk0_^|* delta 13 UcmbQpHi2yc6C=ZBCMJGH02hG*m;e9( diff --git a/Zend/tests/settype_array.phpt b/Zend/tests/settype_array.phpt index 57c8e5180ca274ccf0bace7631cbe767d331bc28..232c5d94a9a6639d2381720686929a0a38a7f916 100644 GIT binary patch delta 63 zcmZ3_v4vwp2NRR3!DI&}h0QCOEEqXd4N6jrOMoKJnRVn;4YX7Z$`Xr=m11q}xD*sJ R^GY;~HMwfJT=Mf$xd1@@5l#RA delta 37 tcmdnOv7Tc?2NNU1WCtdN&8wI!7}*#~Qj1F%Cck3VVP?=`m@LgA2>{Jm38nx5 diff --git a/Zend/tests/settype_object.phpt b/Zend/tests/settype_object.phpt index 9369011127c623bae15a5afdfc848aeab9bb2a45..7d98168e294b45e122c0af7e4c38f846fd11a428 100644 GIT binary patch delta 19 bcmZ3?xrB4WF(xKegUNzS`kTKotz`rNK%xd$ delta 18 acmZ3&xtMdqF(yWa$%0J!o4+%yWdr~^QU(G5 diff --git a/Zend/tests/settype_resource.phpt b/Zend/tests/settype_resource.phpt index 884ff3dae39b7350be22d12ba7718c9832a97cd0..fa9ca739fa9002a493d3756cc199e58282a45be6 100644 GIT binary patch delta 14 Vcmcc5`G9i)Gn1;pW=7_Fi~uEX1Y!UH delta 18 ZcmaFBd7pCuGZTZ-WCte2%__`$7y&lL1ttIh diff --git a/Zend/tests/settype_string.phpt b/Zend/tests/settype_string.phpt index cc90fdfdf4ca7e34a88dda92e8faaca61090334e..a8ad899c006dea4579bb1cb12ef69c53da96f3b6 100644 GIT binary patch delta 15 WcmZ3&wv=sy2osa4!Ddk=entQxJp)Yu delta 14 VcmZ3=wuEhi2ood2W-%syMgSc90{8#` diff --git a/ext/curl/tests/curl_escape.phpt b/ext/curl/tests/curl_escape.phpt index 91dff3f0563399af12a60edb592973a8b1b88aba..b8f488ff344d12467d881b7bbc10ed2e57fd3ba3 100644 GIT binary patch delta 19 acmdnQx`lOvCljOFWKX74R#k%}B`yFtiUi&O delta 16 XcmdnOx`}mzC(~pvrc@S&Bqc5YEPez+ diff --git a/ext/exif/tests/exif012.phpt b/ext/exif/tests/exif012.phpt index 2abd80943a85650eb03119e3857eee507fffc33d..cd44c842f147ce23b609db1ce0098bc9b5f42f04 100644 GIT binary patch delta 24 fcmZqVZ{gpd%F3c@plYyLowb~iN!4KTe6~jbN<0R1 delta 21 ccmZqSZ{**g%F4vRuvwF}oRN`X@*=iJ05^ICcK`qY diff --git a/ext/exif/tests/exif013.phpt b/ext/exif/tests/exif013.phpt index 7e01e7fff9b3d490c5ae280eec5b7b224ddf9777..767b0278bae03eaf9ff093fb5c26320c4be1b364 100644 GIT binary patch delta 24 fcmZqSZ|C2j!OEg)plYyLi?y7QN!4KTBDO~WODP6} delta 21 ccmZqYZ{gpd!OFzIuvv$-oRN`X@=~@(060knh5!Hn diff --git a/ext/exif/tests/exif014.phpt b/ext/exif/tests/exif014.phpt index b6c590c5f0b5e6cb8e6306ba019cd03a55094bca..2b347126f2d516df57b99b539060fcf7236eb8a4 100644 GIT binary patch delta 24 fcmZn^ZV}#~%Fd!{plYyLoxPlqN!4KTe2zx|ODG0{ delta 21 ccmZn>ZWP|2%Fe{VuvwG6oRN`X@*<8$060bkg#Z8m diff --git a/ext/exif/tests/exif015.phpt b/ext/exif/tests/exif015.phpt index 83dc1f52c9952768d13cb3790a90ff1cb429893e..94b7abc21624ed4d0edd611d5ba17c0e951a2387 100644 GIT binary patch delta 24 fcmZn>ZWrF5!Oo&;plYyLi@ltYN!4KTB92D@Oce%^ delta 21 ccmZn{ZV}#~!Oq0Muvv$_oRN`X@=}gR067%}lmGw# 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 c94f5201e790ae173490f6d8ff86686860e455c9..2e2a549df8d445d3877c2890bcd01ad2ee8866fe 100644 GIT binary patch delta 57 ccmdlaa7mut{J;1UnZ498At(S4HM7WnTyYclHIx diff --git a/ext/oci8/tests/lob_003.phpt b/ext/oci8/tests/lob_003.phpt index e06d15109c15d2eb67f04c3815b2d103346b608f..4ffdceecca414a45a5c477913710e5167ee58712 100644 GIT binary patch delta 41 gcmbQqyO?)F6Pu!{0VXUiDay=CSK@NX&r9V30M+ISRR910 delta 31 fcmZ3?JCk=q6Pq{#92A!nW#*+Tak=E@rE&oPY+45S diff --git a/ext/oci8/tests/lob_006.phpt b/ext/oci8/tests/lob_006.phpt index 748283870a21bd07f29b1f4a1858f2732732acbf..4576e428d6bfd93d9347cab11f18416025e4f705 100644 GIT binary patch delta 32 XcmdnVdzg2_WHu31157x1E}IMhim(Tm delta 46 pcmX@iyOVdrWHvPhILOv5NlXS3nIHnl(ksr-O;zG@$fR8YbcNy-EQB`%lzyi_g#k}eJ( diff --git a/ext/oci8/tests/lob_020.phpt b/ext/oci8/tests/lob_020.phpt index 241b2c7c30f282bd079fa8dc97914d805f016e75..2057b99723fde0543d5d1483a4a8a5acc06c0406 100644 GIT binary patch delta 52 vcmew-)gis%1QVC40Ss{wKBJ1QRO*2yDK@l*}%~z@WrcTvC*om#$%|sh|WB_u;Z(1_1KT3K0MR diff --git a/ext/opcache/tests/compact_literals_collision.phpt b/ext/opcache/tests/compact_literals_collision.phpt index bf553793ce2090e1ff0b7ed3d09c238887cd26cd..617e4dcffabaf2c1e7ee859c123aaed313f40579 100644 GIT binary patch delta 87 tcmbQtw1jEGl>j$gU9RGiqRhN>4GT>LB~=4dsKk|)lb=|kVW3H*Dgf=k6-WR8 delta 70 rcmZ3&G?{6_6?uHurS%)E3B3rz(j1}ISCO3TSlEYUE~Bp?d_XS)xf diff --git a/ext/pdo_mysql/tests/bug_39483.phpt b/ext/pdo_mysql/tests/bug_39483.phpt index 1d9512904c67e85b272e2278d0cdc0b13ea2918a..2a72ff3a9c0a5e0df286a716a1f3a74a58c35225 100644 GIT binary patch delta 24 fcmX@hdVzIACKIFEdX{xVCe!3BCL0z8D;I{zYnW63M_dKv diff --git a/ext/spl/tests/array_018.phpt b/ext/spl/tests/array_018.phpt index 8da46a24dba9f16bf9bd6ec290d250408987e94c..948e0dca4e53b37ea36292d61e9c80cc124b7f9a 100644 GIT binary patch delta 24 fcmey)@{?slHzT9lMsS)mEY6rdo?Y>+~*$sjRgg=U&uwOjyS5GP*% diff --git a/ext/spl/tests/serialize_property_tables.phpt b/ext/spl/tests/serialize_property_tables.phpt index 9b507e6f8e576045b8fcf662de8bea14cd1b95ae..6626830d294b68daadec3b796ed9a37d0dc75fbc 100644 GIT binary patch delta 100 zcmey%-omk=f{D>>as^YcpsImyrDIW1Vx@mlR%&vIs=?&@%rcX|F(pcZWP%HFT=Gkk maw>f?^RiP@d@_q6D&!{jFx!hkRX}tGm*f{Erl*1pkOKhVVk0;J delta 91 zcmZqS_{+Ybf@yLkQ!qb+Z>3{VQDUWkQdVkm3B%;OOts=bvEYInm;BPCoJya}yzJBz gpUh&goXq5YW=9c-JVZxuNq$jcdMZex3{x!^0MI}mE?kM{y`~87XloC`2nIsv1n*$aw$&pZiZb)kHH&Rg8C@kAl9afLONuh{(lv}V6_m15E0wrh^7B%;0OaipO8@`> diff --git a/ext/standard/tests/array/array_values.phpt b/ext/standard/tests/array/array_values.phpt index 32200a67f5ebd891c629cfaf590a1114178200d9..443a46763e033ea3c8cc4458874235552973e4e7 100644 GIT binary patch delta 49 zcmdlcwo`0_A`7G2W<{0>tg@;G21;BC3ekoJv9@+VMsZ0|W?s66p{9b8s=?+noLP(j DJhBY5 delta 52 zcmdlfwoPn delta 61 rcmbO$F-2lSJnQBJRv#udhQy@g6o$#axujuCIqqMZFLEehm--I?KnN0} diff --git a/ext/standard/tests/array/asort_variation11.phpt b/ext/standard/tests/array/asort_variation11.phpt index e6112672a679d09b409cf114a636f485cfc658d6..82eab55993ac1247b94cf439829661f49c2817ee 100644 GIT binary patch delta 73 ycmeB@m@Kg&f|b#2a|CN2BZsO%Vp4L7s=;JEE@?Ptvp?51#?6O0QgO@gW&{BDUleQr delta 63 ucmbO%(Iv4Vf^~BwYab&ULt;{L3d7|0Y|>EX<_NBBjGIqzq+*xb%?JQ!;}Zt} diff --git a/ext/standard/tests/array/bug26458.phpt b/ext/standard/tests/array/bug26458.phpt index 87c8b519bfd643cbaecbf5c279dd4136c77e06d2..67c1586d0060b6eb19d9941bb5e4d3dbe11c8110 100644 GIT binary patch delta 24 bcmZo=ZfBnGi%HdBay+BLWNAic2vZFJT3!Ze delta 22 acmZo?Ze^bEi;-b+BBR1&8AfL?OAP=^?FGUB diff --git a/ext/standard/tests/array/krsort_variation8.phpt b/ext/standard/tests/array/krsort_variation8.phpt index ff843f0b972845a5d0378c1efadf87425ed2f925..caa0f21936027432533b2c9c43666b43f56b3fa6 100644 GIT binary patch delta 71 vcmbOyv0P$9CM%=c=1kTqCJt4D#H8dDRfEYo+|me+FZY?v*Ej-jOJ4*4U0tq;AM`i#Ft1_cP&G(QN={KV*u0OWn-Kud#tTFM delta 31 ncmX@ZbCPGnEhc7NU9O2A^f&V|uVG|kNK8sjVc2|-rJE4|ul@>E diff --git a/ext/standard/tests/array/rsort_variation11.phpt b/ext/standard/tests/array/rsort_variation11.phpt index 479f90f03315ddfad5c8b83bf29a0c67278587df..fe91f79e18184777fdf17c4b5626d6d80c7ca8f3 100644 GIT binary patch delta 48 ucmaDR{91T}ATy)eWI$63C2T&tqhD$tc0p_d7YmDTmWWg4Uqr< diff --git a/ext/standard/tests/array/uasort_variation3.phpt b/ext/standard/tests/array/uasort_variation3.phpt index 15f1884a7b13d29edb301fdb090781ce2bf99cba..16144c5cc277d31083dc4a97c792e5bdb4d9438f 100644 GIT binary patch delta 26 icmeyu|BZixFdK`Tt}fTawf2)k*={hY8cfz>KL!AKP6(&~ delta 24 gcmeyy|Al{pFdMV3F4x4h_LIZdZZI-THef#n0BJi24gdfE 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 7c21b903adfc021c13bdca9b8d03d58fb59c6fc5..710ea93479eb94506c2b25764ff91205f40c0779 100644 GIT binary patch delta 96 zcmbQvwt#KJKSo10U0trkqN2n~4HHd;YAywZXeCtxM^%F)rC3`#AU89wM8m{L6Dpyl OYA{)gsZfrfk|Y410T!PC delta 87 zcmZ3$Hl1z5KSmv0U9QBUqQpuK6HSF`E(L{XB?d=^B&AqeJ0K@BuSCPdNE0Hg#V}c) KsZa{9bP@o!yA!ei 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 d33ef4879fe02ce7a2b503dff51a78e350fd3ccf..1ad1bb3933293d9f4486d3c06a5e6a18e24d5544 100644 GIT binary patch delta 100 zcmeyz($2c!ETf^Dt}a(%QBh*0hOwqXHJ5@yw34cUqpCrYQmm~VkeiuTqG4jB36;=N RHJBX5q%v8SNm-7tG5`YY7h(Va delta 87 zcmZo?{l~K5ETfLDE>~hvQDUWrv8F;bmx4mH5`!Z{l2WX#9gvfmSE6BJqzMt$Vwn7o K(On9!v4RcKerL_Ef LRfEkfLL1ot(QFhP delta 53 wcmdmGwAE-sBj4sGz6s2X43iZFg(s^E2|-zYaF(|?_v8j4c1DKHokAPg0FEUMi2wiq diff --git a/ext/standard/tests/file/bug26003.phpt b/ext/standard/tests/file/bug26003.phpt index aaf3b34135d2d7e909c961b8523a525abad51649..1f31764130712f82c0204d2d220e5ccf51a9c359 100644 GIT binary patch delta 19 acmcc4c$0C$WJb4%lkM154N{f3YPkSLhXwNh delta 16 Xcmcb~c%5;=c0s#Lh46* ---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 eb6b0889de80ee1a97313e8e742557caafdc75e2..ead5526e7453276bea22e77903806c5f15c05c3b 100644 GIT binary patch delta 29 kcmbQlIE8USotT@hE?03$QD$DchKZ(vl98%`seuv~0DoQwZ2$lO delta 27 icmbQjIEisWortb3S8+*EW?s66iKc>*5re6L5*Gk&*apx5 diff --git a/ext/standard/tests/serialize/serialization_miscTypes_001.phpt b/ext/standard/tests/serialize/serialization_miscTypes_001.phpt index 50a96b2f7b4899268d5db17a2e4aceb429dbef42..ea5a0fd808f91323c8f0976e6e7771eae3231021 100644 GIT binary patch delta 37 tcmdmNvCU$`el|w8&HLH-`59FwJBq1tn`tU2Wu)fh0J`C!4Z)kfLKdBLL-aAfW&N delta 57 ucmaDLa6@22JPRj7Zfb5)YEd!69zF&B!ZPL7cF0F6u|+W-In diff --git a/ext/standard/tests/strings/addcslashes_001.phpt b/ext/standard/tests/strings/addcslashes_001.phpt index e8fdf2b69ad28b085ba383ecfd5b0da244af88a4..878ac4bf74c764318d956730d4d752a747c34744 100644 GIT binary patch delta 104 zcmbQovw~;CF(wu_U0tq;aYmDWGZ`|e8cfz@UJRlxGWUR}I2IQWwHQLZU~vWU^jO_N pR2eInw};hTM%AFCs5CV#F{d~+CXqWPEhdSJms5$$B|k5f3jitV9ZmoM delta 72 zcmZ3%GmmG(F(zhRU9O37Mw9pZiZb)kHOw^?l+yC^Az}dk(+kl6 diff --git a/ext/standard/tests/strings/basename_basic.phpt b/ext/standard/tests/strings/basename_basic.phpt index 80d4789c7c92bef0e8e0076d6e1b3c9093b3a949..7506045a74bcf537834d9758953802a877a45067 100644 GIT binary patch delta 50 rcmew@)*!xtg`LrDGYk6!W+qjG$q%`NC$HcVf-%p*n5rNVcJ2}YbI1+~ delta 40 ocmZn=|1GwGg?%$C`vhi2hRM^pRDt9^F!>Zr2678emgi0c0OMN^U9RGiqRhN>4MSs11*O7@iVB9we9Tge43o8(Edl*03lRVS diff --git a/ext/standard/tests/strings/bug40915.phpt b/ext/standard/tests/strings/bug40915.phpt index 88674ee9538a309928ad1d6fb0573a86d5c6b900..9759700737dfaf93a0ec2d2e24cd5d1c0e2a6dd5 100644 GIT binary patch delta 32 ncmcb?bem}d7bBzFWG+SpCRKyU+KkHFss=GtN?b1ad8u3gh0+J3 delta 28 jcmcc3bc1OF7vp4ZMg>NO$-0cnTnsT)N?b1ad8u3gX~_n& diff --git a/ext/standard/tests/strings/bug60801.phpt b/ext/standard/tests/strings/bug60801.phpt index 9587bdafa4aa29168c99ce462a403c140c4d9f86..a87f4756a4aff5c9a7c2445071b5636ebcadd2e6 100644 GIT binary patch delta 45 zcmaFK{FZq`10$o`1<5LL Kx#Z`iasdDe^%a=_ delta 83 zcmbQvH-T?MISaF{F4x2!-OVdlw3zG}%JYkIQW!E)b8_;zAe0hUaY<2TUb=>nv8I9& PSO!y-5|>MUUMd#=JHZ*c diff --git a/ext/standard/tests/strings/chop_variation4.phpt b/ext/standard/tests/strings/chop_variation4.phpt index 0bb1c7020316fbb8880378aa7cb009660a14c36b..8b49b253cd7724f702115cec9dfafc43aaaaeee7 100644 GIT binary patch delta 249 zcmX@l`;vD<95bWat(MWXLU68x}BMf=$T~ gyM3tcGDo-zs6Cxc6UiSyU-79LKwaXJpO?x70O_tq=>Px# delta 222 zcmaFKd!Bbg9P{LO=2%9C$@`ck;N&M}b#;b})SR4rC9dL4KqyzC2T^Iomm2a z`lhldGchns-oqlP#Q;&pS)N~%lLFUoXbLg_Sqi9}mGucw?`u{YkX~&zC0%Sbpt{2x Z?hb~@b!?h&Cj*_&%K){~B|k5f3jll;J~aRU diff --git a/ext/standard/tests/strings/chunk_split_variation5.phpt b/ext/standard/tests/strings/chunk_split_variation5.phpt index 9e59d6765877650794a6bf8bd9eb994c4374349b..8f51c001eecf059495648e037a2477b4329abbbb 100644 GIT binary patch delta 50 tcmZ1`uv%b43Jas#<`kA{MkZB*$q!f$fT)FRIS@*0vI=_;jM>XR699(24-x3d`nHmTE>uhRKgu4*GbkkHrPu?30>kEd_DDtmsG13x diff --git a/ext/standard/tests/strings/chunk_split_variation9.phpt b/ext/standard/tests/strings/chunk_split_variation9.phpt index 526a2cd569c6d984850dcf4c31d762415cd41dc9..c2d76676fd84566da56e55bec433132c7e799f5c 100644 GIT binary patch delta 96 zcmX>paYbT-Fbj*Dt}fTazjm8LSY9%_sTve3l;kUvs2ZdemnbA>s2Y^!Wycp6s2b#C zmS|`ys2Y@KmSiZDsTw2}W#*R_s~RYz=A~rjsT!m!6qgibsv6{_s~T*ss_7BeWM=A~rjF{CRLmlS0(z>% delta 24 fcmX@ba)M=p1(N^+7Xz0wmufLrGM7t!UMd#=N}2_g diff --git a/ext/standard/tests/strings/htmlspecialchars_decode_variation6.phpt b/ext/standard/tests/strings/htmlspecialchars_decode_variation6.phpt index 9a828b911d2b4c8254e3540b8798f168950d375a..4539707ca67897b534ec35ffb683b7860bf30d65 100644 GIT binary patch delta 32 ncmZ3*wU%qcWM&pOU0tq;8*L_EV%B9+HJHSb3?wI~up9#br|AjX delta 34 pcmZ3>wTf%QWM*bvU9O26Z6;r4)@5XvY|W@TS)IiW$Vz891^~D)3F80& diff --git a/ext/standard/tests/strings/implode1.phpt b/ext/standard/tests/strings/implode1.phpt index ca121102112c5700d959f29e5221cee5425ff38f..7092efe94248b5bd2a54d272afa3f0d961a2bfdd 100644 GIT binary patch delta 289 zcmdn2e_4Nny#TMOL3w6LhN^*{o}Q|~WKRK0G?5+wLo|`&0^MjLF@os2<_l`ns~RMw zmXxQa<{1>16lLb6!}+>q#+GP8hG_f%j{r0g{9FZ0X#ud6$e!~SLU(4LkRv}z04Q-y NKENZs`IFE=764#kT)6-M delta 257 zcmcbtzgd5Sy#N9xP+U@!nU@ad>zWx`!h|MYWEBa5%NW9hp*jOR0?sAot@ zEh$e;%`+%2Day=ChjDeyj4jbb4E2mnOiWM(4N@bbemj^ diff --git a/ext/standard/tests/strings/join_variation6.phpt b/ext/standard/tests/strings/join_variation6.phpt index 010e449085a572e2b3d038212ad54e05665f2845..44573274a63530ca86f1f0692fdf4cea2e568851 100644 GIT binary patch delta 38 rcmbQwvY2JVbVf$E$26E^K^iW@QlooR3KyW7e;LW;+6}c delta 33 pcmZ3?GM{C`bjHau7<~j86x@qaQ}c8f6v8tyOHy?hCjVg61^}~$3S9sI diff --git a/ext/standard/tests/strings/lcfirst.phpt b/ext/standard/tests/strings/lcfirst.phpt index fc0b954199f2ad36d5d5e78d581d1d8ee5bed552..d98b3a9cb0eed6e4a92a74ac572df2933233c27f 100644 GIT binary patch delta 45 ocmZ3iwM=UR55Iz{ff847Nl|8Ax`v^qf)Wzf2+ZBA$^VNL03(MCfdBvi delta 42 ncmZ3cwODHd55Fvf5?66aQD$DchM}f{5`t$0;%(O9|HTRb`<4rW diff --git a/ext/standard/tests/strings/md5_file.phpt b/ext/standard/tests/strings/md5_file.phpt index c975c85cb719043f99dde2f9e8d41756ecab3e0b..7acb81c3a412b9a5841f9fc409a2a66ec2d819c4 100644 GIT binary patch delta 14 VcmeAZ>KEEzz`>+yFximfE&v{`1S$Xk delta 13 UcmeAd>J!>vz`@8c*@)vV02;Fc)c^nh diff --git a/ext/standard/tests/strings/parse_str_basic3.phpt b/ext/standard/tests/strings/parse_str_basic3.phpt index a15edd529f44896fd0e30ac785d04a6165000b46..387bf7589e62cf1d7a9604ffc706bf91e96fb7d4 100644 GIT binary patch delta 43 xcmX@Da9&}J+268oGB7YG+6i;U47Msk)COp}foojL*zy4+=UR`DYNzV-K 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 b01b6957c902f9c9b51ddbb60ef75c61c3599fa3..795c30fb25376036aaaeb0406d3cc71be184ec16 100644 GIT binary patch delta 423 rcmeCMylA!ICL^QU=9`SIO!cY;0}AU0)_Q}1_P;O||8G`fO%ewHy{t1sb>A=_pC|c01plbQ~&?~ diff --git a/ext/standard/tests/strings/rtrim.phpt b/ext/standard/tests/strings/rtrim.phpt index b4cd2ac6acd51506ef54bde9b5da4de143adad41..21e91c1ac361cd630d2993e0dc48c5053b5fea06 100644 GIT binary patch delta 28 jcmdnSzmtCh2OFc?W)8McMov`&15-0|3sr;3DeOT2Xif&V delta 24 fcmdnVzm0zb2is;&wopcP1_M(wa|?#a>FhxOP+tYe diff --git a/ext/standard/tests/strings/sprintf_variation15.phpt b/ext/standard/tests/strings/sprintf_variation15.phpt index e23fe1147f4b5fd737082a05497dd9c55aa4ceac..3b1abe756a418e35bde60148f43e8ba4c1fc33e3 100644 GIT binary patch delta 132 zcmeyS^IvDfaTXRgU0tq;xwf0xS?{tZs~RYA6_*rc=A~;GYAPrpagBgn1vI{@fdX7P eNS+f-o(qX@0@AMlG-0v>uQrpa!R8!ZE=~Z?4NaTaD>U9O3_wwpOv@3O}*C~*~+6lLb6YZz)OC?R-8K%N3Bmq7up79`7w aD$9l7nt=2wC@@T(D5}lKu(_0%ixU8L?;rdC diff --git a/ext/standard/tests/strings/sprintf_variation27.phpt b/ext/standard/tests/strings/sprintf_variation27.phpt index d0430d204943ad0029d1b5268613881284ee39a0..0d4516e01b2b94d0eec7a39494384da2b25abe80 100644 GIT binary patch literal 1921 zcmd6n&raJw5XR5lr}(rYiW9sd0Sbh)MJNptQV*5Lp@&FlWt`X&*pa=ast}LHyLHCv z#9l*sK$XbBf4-f~H@}%#N2%HLW~P*wg}Fh#%HqTC^%Mgz`i#4z0 zPzWNOVUcDJ+T{2ho5-#_>iZ(hg;H17Kc?jQNRVWWV1B=ZKSKBhC50tw6t; zCvq&r!2xuZ=|4ypPOd#hxwVP$)$Z}o)mhGSkAe%;QLy%c+=tM5PVUOB9kXz&- zMbQYe?hLTm&iYd;E*g4^yNh$UTR2B8oXMtIuBKLHZ(KQPb;gZ~TDne^a=UWe!gz5o zYE@#m@}-60Mnx?-@hjzGd~RU`4o0m?3|G=;yFOOsIdP++mW=UAxfmxcjO}Nv1Zjj> W|Mw$%x?4DByM;6QXdM3g6n_D0oDFUO literal 1872 zcmd6n&raJw5XQN7pW@RB6eoB^0~82pi%=RQBo39D1BXaxt^>A$z?ZI7gbz*V3H-+Y0on zX(oq492`Iwg?>Ul^K$Jn%AHM&FLqCWj_!nzT820|4Walp7=-A6mOFf1a{N-FyUDsK zOjz$_nM-p4$i0ZH<=%b$K%*kakb_fW7p7SgIJUcwKGIWg#@#5dGDEoip&CKH6?U+Hp=>e=w4!b!$>rF@K&7RKKOtHy9amhU;D Sr`v&XwjCIQ|AoQ-hT;#d=lv-F diff --git a/ext/standard/tests/strings/sprintf_variation54.phpt b/ext/standard/tests/strings/sprintf_variation54.phpt index 51a4e48827345387795fd45b14bf111b62019edf..e925293ceef7c3448d52b17ce0df0ed251af8196 100644 GIT binary patch delta 55 zcmZn`Y!}?HkxfL^fQu_xp**uBLm@3Or#RJ$OVwcVVKy5na!q8zawZlxU0tq;eny+`FvT)4sTxcUEE9PVvoe HShH9F_z4eQ diff --git a/ext/standard/tests/strings/str_replace_variation2.phpt b/ext/standard/tests/strings/str_replace_variation2.phpt index 77dc6ae822626d675a37aee513f7404dcf9366d3..957c990555ea5aae2cb4831991935e18dec28717 100644 GIT binary patch delta 956 zcmcbWurqPPPZkz8U0tq;`;8~-vrZINHQ-W!0#yTpC}$T{gUN<+%9B;uYbO`5HQ|x} zk3&vzb0`NJBM!-FlOKpnOqS%rYVhXOTk2aelC*>g_lmgBGio2a#4|PaTGJa+F-%$HQ8S*b8@<9 z7XdY|ahMPC{COr|%x#d+Xp|clP23 delta 869 zcmdm)cq?JUPZnlfU9O4yjVBwhP849^Qh)*mgD7VghRG9^l_%@4*G?{BYr-Y@ADe{Y z=6DV^Mr<;HljC$_C#!K`nzwm3mpUFTi+M1$0Nn>M?-_3ccFXpu$4*w~$D=b#08?`F ze*t4mmuz+wGQkuDI{{>il}NV;Quw*~hx)ld!_aGTm00HFe$g&`3SMLP064THwlgwJ zzAvH428ou<0+QRAgb|h@+Z8w&yMi(A>WGKIs4S( zCdVsuVUyfEdA(vYHVKfGag)C&Vd~mEQP~zVNH;%JF~t;x$MtnJ?6z#)r!K;X5>Ar^ lB%e=yqgjXDQRlQCU`T8}sBMYUYAnhF^>Dj1ZnB3#AprFW%LxDg diff --git a/ext/standard/tests/strings/str_split_variation3.phpt b/ext/standard/tests/strings/str_split_variation3.phpt index dc8d9783fb8560f8d81d60a10c67e62c41c10fb0..7003d62eaa1fb9d8d5b7e4b5da86c8e334b68df7 100644 GIT binary patch delta 46 zcmew-(kQyYiG{^YSC?zzTieY|ES=2Ess;*^8QH}-67y0NR1NY$k@4b0#trxQnN$rX-{-#wqBaWLgHY0wR|_77G5Mv0C(jjH593PN34@r70wR+q q2#ay48mKEI=A|g8J5Jsxp@iTzfVd!qbpl%4a7C&Hn+-&!nE(LqMkL+< delta 118 zcmcaOk@46>#trxQ85t%&;J*kY18t-ypA$F?W#vl)qTxEhAd)*{nP0MbPwod5s; diff --git a/ext/standard/tests/strings/strcmp.phpt b/ext/standard/tests/strings/strcmp.phpt index d5f338844eab2ebf92c9e359a493f9917a0fe57c..a36873830cedd4f73fe21421b367e2d5d5594e51 100644 GIT binary patch delta 166 zcmX@q$#}7oal>qWCRKyUf5qh{2MDlF<`M7);+Y_!{eseyeKhzdUl4c)jA zUN6HxNf<2pUKk?kZ=*HYK=d_CL6$z))QbXYAQ1-Oh6-ja@d^io5Cp0I_{ArT_o{ delta 191 zcmccE$#|%fal>qWMuyFE`8gRG879v&m!2H0!9Q6}Fk~{1u+QWO0r|-R!W@%N3#)@= zwI<)^=a_6Sar69T01#VSPe){ m6cL#`*H8!>UjQV3M?{U2L0us+FGWF}Ve&p>m(4xmuDSqAEjGXa diff --git a/ext/standard/tests/strings/strcspn_variation5.phpt b/ext/standard/tests/strings/strcspn_variation5.phpt index e6fcae92200b1c438d6ea46b20481a76309410e6..699e638754a9fac3ea29a6cc2070263cafd9ca6a 100644 GIT binary patch delta 91 zcmew?^haoe4LhUTW*hcXj1sB_<@rT9DXIn;sX00MTu@roVDdzE-N^+UtlFvu4y&*$ WQBu&=<;u(}(J;{Da>>t2TmX=O8czTK diff --git a/ext/standard/tests/strings/strcspn_variation9.phpt b/ext/standard/tests/strings/strcspn_variation9.phpt index 6fd70827a52d701ead5864d12ea849dd0880583b..d4286e2ca11b26876e816cadc6a6810bc60c8290 100644 GIT binary patch delta 109 zcmX>iazSK65F3k|t}fSPPbS~Zi`cF(GN~F&u46Zwyq3d+Mb!YvImo6ZplXnjnv;{S eYEYhEl#_xg7=tXx4ple#J*NrCBq;TUGXelUTq1G+ delta 103 zcmca0aztc95F4|uF4tsFCg07A*{(1$GEA;#H=Dek!-R=}VX`8p7B53aYEDi*LwSBt lP6}9r4lphRN%sX0S74q~_%0GfeiEp3KC+F!`DEL`H_ql`5S6 gvw@rhxgZc{i~L3)Ctbk~$l1JH(HBI0Q`*1?09R=lIRF3v diff --git a/ext/standard/tests/strings/strlen.phpt b/ext/standard/tests/strings/strlen.phpt index 374001eed986c46c1f11390e1209ec434724075b..426154504b66bf9c8c1ae0ded52d42255f2134bf 100644 GIT binary patch delta 55 ycmZ3gzgmC84*@1sgUP%?iXbXcP-(KQpfZH{3q-{TsROCaEkf>$Ao`5(O=bYQt`C&} delta 76 zcmZ3jzf^z24*^Do$pS)(ObiB-9R(F9+Y2hgm@5R8Ca)0O29!?_QfFk?+$rSF$j6|r ZkXfu?Yp0NzSE6A$IZ!}k^Jn25%m5lV6!-uD diff --git a/ext/standard/tests/strings/strpos.phpt b/ext/standard/tests/strings/strpos.phpt index 267bc590c5be3b3cbd40e74a03f315b55f1fd012..449601f6e5480939ceb1e017b60c9d0bc67c39ae 100644 GIT binary patch delta 98 zcmexv^T%exRbdBJ19gSWVg*|}h0MGX4HGj>u7LdF%#zIfJcax;1$Bbbn}tO5nfX-> X6cUq?Q(`JADytM!4L19UYqA3X1G61g delta 45 ucmexk^WA2{RbfVk$=8KtVdQ2}5q)M}28G0=)&qJeu$V4f5QptrT3QM&`FW`dKn528n;}L# delta 246 zcmX@bzMFkR3lp=hF4x3;ItpCHB}JKe=^AF53Q7#&`9(P?N+?2;KQak3GE9EWBw5ek zk(!f}uYjt^5Tp;Tg?Jv=zH&_aun2*zRpPQib}3X0DumTqEiEktm;Ag`1t5b907ZgC AUH||9 diff --git a/ext/standard/tests/strings/strrev_variation1.phpt b/ext/standard/tests/strings/strrev_variation1.phpt index 0ed3acd5b5136f470fb7cf57b396a9d2d90d093a..3c4fb79a6c82b8a168a422a3277fabcda0a6ef53 100644 GIT binary patch delta 32 ocmZn?YZ2QJ!ph>NtIIWUo$cl+taq81R1GH2;}F~2!BNEo0HlTq_5c6? delta 30 mcmZn>YZBWK!pf|x%QbPG?dGYhcbOO&CNJO++uX%b#RLG6`w3nE diff --git a/ext/standard/tests/strings/strrev_variation2.phpt b/ext/standard/tests/strings/strrev_variation2.phpt index 92f45d7df90f477c62d9c884cf760bf9e68a0fb9..45036f6f881adf5af0a4d83d43ac10c3f348f498 100644 GIT binary patch delta 32 ocmbOrHc4zl5G#wDt}fTab+(%)vA$+vQZ<;ofL(0!6pk7u0H~D;D*ylh delta 30 mcmbOvHbHDd5G%8;F4x3$wwoujzGh-%n7oi(Z1XgZ8YTdh!U>W9 diff --git a/ext/standard/tests/strings/strrev_variation3.phpt b/ext/standard/tests/strings/strrev_variation3.phpt index c83a241d099ceed541f8339d5508c33a3ab9748d..eab673f974396daba77f23db06b4d04853a9320f 100644 GIT binary patch delta 21 dcmaFN{givdO=d>7%{Q4f7@1TJCNr@<1OQsR2Rr}( delta 18 acmaFL{g`{hP3FzFm^By~878x^J_G(A@fhR) diff --git a/ext/standard/tests/strings/strspn_variation9.phpt b/ext/standard/tests/strings/strspn_variation9.phpt index 49d590bee84f85909c435e3373c2a29f1f818644..50387865aefcd5f684516074679f59097840b158 100644 GIT binary patch delta 93 zcmX>sa$aPE4;!P~W*;_HCMH#b$weI5EUE@T#(fSg0ab&H)SR4rRfF>UqMQ_va#&=858Gy6HdQ7@hRG!y**pvkN(#EVT$y<#8b*^Za4PUJWTfWg`VtW|6B z1p#RoQ%q14#taio#j5d>pbi#s?a5(6*u{6@5SJ5Hz-msJurXHghgij9v8vrBB8^p? zQ`88ncrgy~yQ213)N4%+78A!RzEI2>tGKYZ8dmWFad^mY6Ys#Pq*NjSi@5CO{}M4g E0DgX&n*aa+ delta 484 zcmZqozU{SP9X~IFLSj;KN=!vXWt9TM%}i7%D0mCja352moWY2(b0a diff --git a/ext/standard/tests/strings/ucfirst.phpt b/ext/standard/tests/strings/ucfirst.phpt index 1d8ecd7630c211d1c2343327d2984647235397c4..1cae286d98a9af00bfe7c827fb79b6bfc3406483 100644 GIT binary patch delta 45 ocmZ3jvQA|~0*`{Kff847Nl|8Ax`v^qf)Wzf2+ZAF%d?IZ05P2m+W-In delta 42 ncmZ3dvRY+B0*@?%5?66aQD$DchM}f{5`t$0;%#o=S;qogup6EC-|8zn<*Fe9lMT4U mC;#CL0h$3)#t0H+M6jT`L4sg8sKFo(BUff#iH3=}CKmv4?HY9e delta 120 zcmbOs+9JB)EXU+?953}56o8ORK|!Hfp;e(8!~lsnK*TPAIbdl9paP)Gt3E7362Bo<~}U9O1-EhnF65wT|A%FHX#Fx2GY($!V)EJ-a&EXmBzQ!r8hs$o!Y R2Fn_w%Nm1aCo8gU1OU-v7Dxa9 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);