diff options
25 files changed, 113 insertions, 53 deletions
diff --git a/ext/standard/tests/strings/join_error.phpt b/ext/standard/tests/strings/join_error.phpt index 8113d30dfb..a759e1e86a 100644 --- a/ext/standard/tests/strings/join_error.phpt +++ b/ext/standard/tests/strings/join_error.phpt @@ -45,6 +45,6 @@ NULL -- Testing join() with less than expected no. of arguments -- -Warning: join(): Argument to join must be an array in %s on line %d +Warning: join(): Argument to implode must be an array in %s on line %d NULL Done diff --git a/ext/standard/tests/strings/sprintf_basic7.phpt b/ext/standard/tests/strings/sprintf_basic7.phpt index 4ce6044183..56bae8bd8d 100644 --- a/ext/standard/tests/strings/sprintf_basic7.phpt +++ b/ext/standard/tests/strings/sprintf_basic7.phpt @@ -1,5 +1,11 @@ --TEST-- Test sprintf() function : basic functionality - unsigned format +--SKIPIF-- +<?php +if (PHP_INT_SIZE != 4) { + die("skip this test is for 32bit platform only"); +} +?> --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) diff --git a/ext/standard/tests/strings/sprintf_basic8.phpt b/ext/standard/tests/strings/sprintf_basic8.phpt index 63469e8f04..bb9ecd1a66 100644 --- a/ext/standard/tests/strings/sprintf_basic8.phpt +++ b/ext/standard/tests/strings/sprintf_basic8.phpt @@ -1,5 +1,11 @@ --TEST-- Test sprintf() function : basic functionality - octal format +--SKIPIF-- +<?php +if (PHP_INT_SIZE != 4) { + die("skip this test is for 32bit platform only"); +} +?> --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) diff --git a/ext/standard/tests/strings/sprintf_variation28.phpt b/ext/standard/tests/strings/sprintf_variation28.phpt index 08237f9289..8fad68b0d9 100644 --- a/ext/standard/tests/strings/sprintf_variation28.phpt +++ b/ext/standard/tests/strings/sprintf_variation28.phpt @@ -1,5 +1,11 @@ --TEST-- Test sprintf() function : usage variations - octal formats with integer values +--SKIPIF-- +<?php +if (PHP_INT_SIZE != 4) { + die("skip this test is for 32bit platform only"); +} +?> --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) @@ -323,4 +329,4 @@ string(11) "17777777777" string(30) " 17777777777" string(4) "0-7]" string(1) "o" -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/sprintf_variation29.phpt b/ext/standard/tests/strings/sprintf_variation29.phpt index 271c6a9052..87ee835b76 100644 --- a/ext/standard/tests/strings/sprintf_variation29.phpt +++ b/ext/standard/tests/strings/sprintf_variation29.phpt @@ -1,5 +1,11 @@ --TEST-- Test sprintf() function : usage variations - octal formats with float values +--SKIPIF-- +<?php +if (PHP_INT_SIZE != 4) { + die("skip this test is for 32bit platform only"); +} +?> --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) @@ -163,4 +169,4 @@ string(7) "4002620" string(30) " 4002620" string(4) "0-7]" string(1) "o" -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/sprintf_variation34.phpt b/ext/standard/tests/strings/sprintf_variation34.phpt index 51443d8e6a..c6186b6780 100644 --- a/ext/standard/tests/strings/sprintf_variation34.phpt +++ b/ext/standard/tests/strings/sprintf_variation34.phpt @@ -1,5 +1,11 @@ --TEST-- Test sprintf() function : usage variations - hexa formats with integer values +--SKIPIF-- +<?php +if (PHP_INT_SIZE != 4) { + die("skip this test is for 32bit platform only"); +} +?> --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) @@ -323,4 +329,4 @@ string(8) "7fffffff" string(30) " 7fffffff" string(10) "0-9A-Fa-f]" string(1) "x" -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/sprintf_variation35.phpt b/ext/standard/tests/strings/sprintf_variation35.phpt index c8f03cd05f..ca6ba891dd 100644 --- a/ext/standard/tests/strings/sprintf_variation35.phpt +++ b/ext/standard/tests/strings/sprintf_variation35.phpt @@ -1,5 +1,11 @@ --TEST-- Test sprintf() function : usage variations - hexa formats with float values +--SKIPIF-- +<?php +if (PHP_INT_SIZE != 4) { + die("skip this test is for 32bit platform only"); +} +?> --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) @@ -228,4 +234,4 @@ string(6) "100590" string(30) " 100590" string(10) "0-9A-Fa-f]" string(1) "x" -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/sprintf_variation4.phpt b/ext/standard/tests/strings/sprintf_variation4.phpt index 3c8fab39b1..7fc66f910e 100644 --- a/ext/standard/tests/strings/sprintf_variation4.phpt +++ b/ext/standard/tests/strings/sprintf_variation4.phpt @@ -1,5 +1,11 @@ --TEST-- Test sprintf() function : usage variations - int formats with float values +--SKIPIF-- +<?php +if (PHP_INT_SIZE != 4) { + die("skip this test is for 32bit platform only"); +} +?> --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) @@ -228,4 +234,4 @@ string(7) "1050000" string(30) " 1050000" string(4) "0-9]" string(1) "d" -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/sprintf_variation40.phpt b/ext/standard/tests/strings/sprintf_variation40.phpt index 9c17e6c766..0da6a10b8a 100644 --- a/ext/standard/tests/strings/sprintf_variation40.phpt +++ b/ext/standard/tests/strings/sprintf_variation40.phpt @@ -1,5 +1,11 @@ --TEST-- Test sprintf() function : usage variations - unsigned formats with integer values +--SKIPIF-- +<?php +if (PHP_INT_SIZE != 4) { + die("skip this test is for 32bit platform only"); +} +?> --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) @@ -324,4 +330,4 @@ string(10) "2147483647" string(30) " 2147483647" string(4) "0-9]" string(1) "u" -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/sprintf_variation41.phpt b/ext/standard/tests/strings/sprintf_variation41.phpt index 481712d0fa..219ea0f025 100644 --- a/ext/standard/tests/strings/sprintf_variation41.phpt +++ b/ext/standard/tests/strings/sprintf_variation41.phpt @@ -1,5 +1,11 @@ --TEST-- Test sprintf() function : usage variations - unsigned formats with float values +--SKIPIF-- +<?php +if (PHP_INT_SIZE != 4) { + die("skip this test is for 32bit platform only"); +} +?> --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) @@ -307,4 +313,4 @@ string(7) "1050000" string(30) " 1050000" string(4) "0-9]" string(1) "u" -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/sprintf_variation44.phpt b/ext/standard/tests/strings/sprintf_variation44.phpt index 6659d40301..fd4e0bc5a6 100644 --- a/ext/standard/tests/strings/sprintf_variation44.phpt +++ b/ext/standard/tests/strings/sprintf_variation44.phpt @@ -1,5 +1,11 @@ --TEST-- Test sprintf() function : usage variations - unsigned formats with string values +--SKIPIF-- +<?php +if (PHP_INT_SIZE != 4) { + die("skip this test is for 32bit platform only"); +} +?> --FILE-- <?php /* Prototype : string sprintf(string $format [, mixed $arg1 [, mixed ...]]) @@ -356,4 +362,4 @@ string(4) " 0" string(30) " 0" string(4) "0-9]" string(1) "u" -Done
\ No newline at end of file +Done diff --git a/ext/standard/tests/strings/str_pad.phpt b/ext/standard/tests/strings/str_pad.phpt Binary files differindex c9f1e56d06..5509d9d9e2 100644 --- a/ext/standard/tests/strings/str_pad.phpt +++ b/ext/standard/tests/strings/str_pad.phpt diff --git a/ext/standard/tests/strings/str_repeat.phpt b/ext/standard/tests/strings/str_repeat.phpt Binary files differindex 858575d4ca..49d0ab0986 100644 --- a/ext/standard/tests/strings/str_repeat.phpt +++ b/ext/standard/tests/strings/str_repeat.phpt diff --git a/ext/standard/tests/strings/stripos_variation1.phpt b/ext/standard/tests/strings/stripos_variation1.phpt index 38d2578d95..f3e743cc02 100644 --- a/ext/standard/tests/strings/stripos_variation1.phpt +++ b/ext/standard/tests/strings/stripos_variation1.phpt @@ -118,17 +118,17 @@ int(8) bool(false) -- Iteration 12 -- -Warning: stripos(): needle is not a string or an integer. in %s on line %d +Warning: stripos(): needle is not a string or an integer in %s on line %d bool(false) -Warning: stripos(): needle is not a string or an integer. in %s on line %d +Warning: stripos(): needle is not a string or an integer in %s on line %d bool(false) -- Iteration 13 -- -Warning: stripos(): needle is not a string or an integer. in %s on line %d +Warning: stripos(): needle is not a string or an integer in %s on line %d bool(false) -Warning: stripos(): needle is not a string or an integer. in %s on line %d +Warning: stripos(): needle is not a string or an integer in %s on line %d bool(false) -- Iteration 14 -- int(8) diff --git a/ext/standard/tests/strings/stripos_variation10.phpt b/ext/standard/tests/strings/stripos_variation10.phpt index 5b79b99e32..efdbb52389 100644 --- a/ext/standard/tests/strings/stripos_variation10.phpt +++ b/ext/standard/tests/strings/stripos_variation10.phpt @@ -123,27 +123,27 @@ bool(false) -- Iteration 10 -- -Warning: stripos(): needle is not a string or an integer. in %s on line %d +Warning: stripos(): needle is not a string or an integer in %s on line %d bool(false) -- Iteration 11 -- -Warning: stripos(): needle is not a string or an integer. in %s on line %d +Warning: stripos(): needle is not a string or an integer in %s on line %d bool(false) -- Iteration 12 -- -Warning: stripos(): needle is not a string or an integer. in %s on line %d +Warning: stripos(): needle is not a string or an integer in %s on line %d bool(false) -- Iteration 13 -- -Warning: stripos(): needle is not a string or an integer. in %s on line %d +Warning: stripos(): needle is not a string or an integer in %s on line %d bool(false) -- Iteration 14 -- -Warning: stripos(): needle is not a string or an integer. in %s on line %d +Warning: stripos(): needle is not a string or an integer in %s on line %d bool(false) -- Iteration 15 -- @@ -160,7 +160,7 @@ bool(false) -- Iteration 19 -- -Warning: stripos(): needle is not a string or an integer. in %s on line %d +Warning: stripos(): needle is not a string or an integer in %s on line %d bool(false) -- Iteration 20 -- @@ -171,26 +171,26 @@ bool(false) -- Iteration 22 -- -Warning: stripos(): needle is not a string or an integer. in %s on line %d +Warning: stripos(): needle is not a string or an integer in %s on line %d bool(false) -- Iteration 23 -- -Warning: stripos(): needle is not a string or an integer. in %s on line %d +Warning: stripos(): needle is not a string or an integer in %s on line %d bool(false) -- Iteration 24 -- -Warning: stripos(): needle is not a string or an integer. in %s on line %d +Warning: stripos(): needle is not a string or an integer in %s on line %d bool(false) -- Iteration 25 -- -Warning: stripos(): needle is not a string or an integer. in %s on line %d +Warning: stripos(): needle is not a string or an integer in %s on line %d bool(false) -- Iteration 26 -- -Warning: stripos(): needle is not a string or an integer. in %s on line %d +Warning: stripos(): needle is not a string or an integer in %s on line %d bool(false) *** Done *** diff --git a/ext/standard/tests/strings/stripos_variation11.phpt b/ext/standard/tests/strings/stripos_variation11.phpt index b29b1a87e6..4736761261 100644 --- a/ext/standard/tests/strings/stripos_variation11.phpt +++ b/ext/standard/tests/strings/stripos_variation11.phpt @@ -158,7 +158,7 @@ bool(false) -- Iteration 16 -- bool(false) -Warning: stripos(): Offset not contained in string. in %s on line %d +Warning: stripos(): Offset not contained in string in %s on line %d bool(false) -- Iteration 17 -- bool(false) @@ -166,34 +166,34 @@ bool(false) -- Iteration 18 -- bool(false) -Warning: stripos(): Offset not contained in string. in %s on line %d +Warning: stripos(): Offset not contained in string in %s on line %d bool(false) -- Iteration 19 -- -Warning: stripos(): needle is not a string or an integer. in %s on line %d +Warning: stripos(): needle is not a string or an integer in %s on line %d bool(false) -Warning: stripos(): needle is not a string or an integer. in %s on line %d +Warning: stripos(): needle is not a string or an integer in %s on line %d bool(false) -- Iteration 20 -- bool(false) -Warning: stripos(): Offset not contained in string. in %s on line %d +Warning: stripos(): Offset not contained in string in %s on line %d bool(false) -- Iteration 21 -- bool(false) -Warning: stripos(): Offset not contained in string. in %s on line %d +Warning: stripos(): Offset not contained in string in %s on line %d bool(false) -- Iteration 22 -- bool(false) -Warning: stripos(): Offset not contained in string. in %s on line %d +Warning: stripos(): Offset not contained in string in %s on line %d bool(false) -- Iteration 23 -- bool(false) -Warning: stripos(): Offset not contained in string. in %s on line %d +Warning: stripos(): Offset not contained in string in %s on line %d bool(false) -- Iteration 24 -- @@ -205,11 +205,11 @@ NULL -- Iteration 25 -- bool(false) -Warning: stripos(): Offset not contained in string. in %s on line %d +Warning: stripos(): Offset not contained in string in %s on line %d bool(false) -- Iteration 26 -- bool(false) -Warning: stripos(): Offset not contained in string. in %s on line %d +Warning: stripos(): Offset not contained in string in %s on line %d bool(false) *** Done *** diff --git a/ext/standard/tests/strings/stripos_variation14.phpt b/ext/standard/tests/strings/stripos_variation14.phpt index 4cd2e75bcf..023585dbb7 100644 --- a/ext/standard/tests/strings/stripos_variation14.phpt +++ b/ext/standard/tests/strings/stripos_variation14.phpt @@ -90,11 +90,11 @@ echo "*** Done ***"; int(6) -- Iteration 2 -- -Warning: stripos(): Offset not contained in string. in %s on line %d +Warning: stripos(): Offset not contained in string in %s on line %d bool(false) -- Iteration 3 -- -Warning: stripos(): Offset not contained in string. in %s on line %d +Warning: stripos(): Offset not contained in string in %s on line %d bool(false) -- Iteration 4 -- int(6) diff --git a/ext/standard/tests/strings/stripos_variation15.phpt b/ext/standard/tests/strings/stripos_variation15.phpt index 59ac83f701..2304c1d350 100644 --- a/ext/standard/tests/strings/stripos_variation15.phpt +++ b/ext/standard/tests/strings/stripos_variation15.phpt @@ -94,23 +94,23 @@ bool(false) bool(false) -- Iteration 3 -- -Warning: stripos(): Offset not contained in string. in %s on line %d +Warning: stripos(): Offset not contained in string in %s on line %d bool(false) -- Iteration 4 -- -Warning: stripos(): Offset not contained in string. in %s on line %d +Warning: stripos(): Offset not contained in string in %s on line %d bool(false) -- Iteration 5 -- -Warning: stripos(): Offset not contained in string. in %s on line %d +Warning: stripos(): Offset not contained in string in %s on line %d bool(false) -- Iteration 6 -- -Warning: stripos(): Offset not contained in string. in %s on line %d +Warning: stripos(): Offset not contained in string in %s on line %d bool(false) -- Iteration 7 -- -Warning: stripos(): Offset not contained in string. in %s on line %d +Warning: stripos(): Offset not contained in string in %s on line %d bool(false) -- Iteration 8 -- bool(false) diff --git a/ext/standard/tests/strings/stripos_variation2.phpt b/ext/standard/tests/strings/stripos_variation2.phpt index 2f02b0e51a..e4d8a153e0 100644 --- a/ext/standard/tests/strings/stripos_variation2.phpt +++ b/ext/standard/tests/strings/stripos_variation2.phpt @@ -120,17 +120,17 @@ int(10) int(10) -- Iteration 12 -- -Warning: stripos(): needle is not a string or an integer. in %s on line %d +Warning: stripos(): needle is not a string or an integer in %s on line %d bool(false) -Warning: stripos(): needle is not a string or an integer. in %s on line %d +Warning: stripos(): needle is not a string or an integer in %s on line %d bool(false) -- Iteration 13 -- -Warning: stripos(): needle is not a string or an integer. in %s on line %d +Warning: stripos(): needle is not a string or an integer in %s on line %d bool(false) -Warning: stripos(): needle is not a string or an integer. in %s on line %d +Warning: stripos(): needle is not a string or an integer in %s on line %d bool(false) -- Iteration 14 -- bool(false) diff --git a/ext/standard/tests/strings/stripos_variation7.phpt b/ext/standard/tests/strings/stripos_variation7.phpt index 75d0ddfb84..29a0a20469 100644 --- a/ext/standard/tests/strings/stripos_variation7.phpt +++ b/ext/standard/tests/strings/stripos_variation7.phpt @@ -27,7 +27,7 @@ echo "*** Done ***"; -- With empty heredoc string -- bool(false) -Warning: stripos(): Offset not contained in string. in %s on line %d +Warning: stripos(): Offset not contained in string in %s on line %d bool(false) bool(false) bool(false) diff --git a/ext/standard/tests/strings/stristr.phpt b/ext/standard/tests/strings/stristr.phpt index 5c617a20da..51c4dae97c 100644 --- a/ext/standard/tests/strings/stristr.phpt +++ b/ext/standard/tests/strings/stristr.phpt @@ -24,7 +24,7 @@ NULL Notice: Array to string conversion in %s on line %d -Warning: stristr(): Empty delimiter. in %s on line %d +Warning: stristr(): Empty delimiter in %s on line %d bool(false) bool(false) diff --git a/ext/standard/tests/strings/strpos.phpt b/ext/standard/tests/strings/strpos.phpt Binary files differindex 83dd20a59c..e644681350 100644 --- a/ext/standard/tests/strings/strpos.phpt +++ b/ext/standard/tests/strings/strpos.phpt diff --git a/ext/standard/tests/strings/strstr.phpt b/ext/standard/tests/strings/strstr.phpt Binary files differindex fc00ea098a..ab10c9efbe 100644 --- a/ext/standard/tests/strings/strstr.phpt +++ b/ext/standard/tests/strings/strstr.phpt diff --git a/ext/standard/tests/strings/substr_count_error.phpt b/ext/standard/tests/strings/substr_count_error.phpt index 01d4caa6ad..f8284c3a1d 100644 --- a/ext/standard/tests/strings/substr_count_error.phpt +++ b/ext/standard/tests/strings/substr_count_error.phpt @@ -40,26 +40,26 @@ NULL Notice: Undefined variable: str in %s on line %d -Warning: substr_count(): Offset should be greater than or equal to 0. in %s on line %d +Warning: substr_count(): Offset should be greater than or equal to 0 in %s on line %d bool(false) Notice: Undefined variable: str in %s on line %d -Warning: substr_count(): Offset value 25 exceeds string length. in %s on line %d +Warning: substr_count(): Offset value 25 exceeds string length in %s on line %d bool(false) Notice: Undefined variable: str in %s on line %d -Warning: substr_count(): Offset value 5 exceeds string length. in %s on line %d +Warning: substr_count(): Offset value 5 exceeds string length in %s on line %d bool(false) Notice: Undefined variable: str in %s on line %d -Warning: substr_count(): Length should be greater than 0. in %s on line %d +Warning: substr_count(): Length should be greater than 0 in %s on line %d bool(false) Notice: Undefined variable: str in %s on line %d -Warning: substr_count(): Length should be greater than 0. in %s on line %d +Warning: substr_count(): Length should be greater than 0 in %s on line %d bool(false) Done diff --git a/ext/standard/tests/strings/uuencode.phpt b/ext/standard/tests/strings/uuencode.phpt index 9c77a5072d..3671cd736c 100644 --- a/ext/standard/tests/strings/uuencode.phpt +++ b/ext/standard/tests/strings/uuencode.phpt @@ -35,6 +35,6 @@ string(36) "6;F]T('9E<GD@<V]P:&ES=&EC871E9``` " string(22) "not very sophisticated" -Warning: convert_uudecode(): The given parameter is not a valid uuencoded string. in %s on line %d +Warning: convert_uudecode(): The given parameter is not a valid uuencoded string in %s on line %d bool(false) Done |