diff options
Diffstat (limited to 'ext/standard/tests')
1627 files changed, 7230 insertions, 5861 deletions
diff --git a/ext/standard/tests/array/005.phpt b/ext/standard/tests/array/005.phpt index 99b1fc27d7..c82f5f7fd0 100644 --- a/ext/standard/tests/array/005.phpt +++ b/ext/standard/tests/array/005.phpt @@ -87,7 +87,7 @@ echo"Done"; Warning: array_shift() expects exactly 1 parameter, 0 given in %s on line %d NULL -Warning: array_shift() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_shift() expects parameter 1 to be array, int given in %s on line %d NULL Warning: array_shift() expects parameter 1 to be array, string given in %s on line %d diff --git a/ext/standard/tests/array/009.phpt b/ext/standard/tests/array/009.phpt index c338265b5e..017456917e 100644 --- a/ext/standard/tests/array/009.phpt +++ b/ext/standard/tests/array/009.phpt @@ -501,7 +501,7 @@ NULL Warning: next() expects exactly 1 parameter, 2 given in %s on line %d NULL -Warning: key() expects parameter 1 to be array, integer given in %s on line %d +Warning: key() expects parameter 1 to be array, int given in %s on line %d NULL Warning: key() expects parameter 1 to be array, float given in %s on line %d @@ -510,7 +510,7 @@ NULL Warning: key() expects parameter 1 to be array, string given in %s on line %d NULL -Warning: current() expects parameter 1 to be array, integer given in %s on line %d +Warning: current() expects parameter 1 to be array, int given in %s on line %d NULL Warning: current() expects parameter 1 to be array, float given in %s on line %d @@ -519,7 +519,7 @@ NULL Warning: current() expects parameter 1 to be array, string given in %s on line %d NULL -Warning: next() expects parameter 1 to be array, integer given in %s on line %d +Warning: next() expects parameter 1 to be array, int given in %s on line %d NULL Warning: next() expects parameter 1 to be array, float given in %s on line %d @@ -528,7 +528,7 @@ NULL Warning: next() expects parameter 1 to be array, string given in %s on line %d NULL -Warning: reset() expects parameter 1 to be array, integer given in %s on line %d +Warning: reset() expects parameter 1 to be array, int given in %s on line %d NULL Warning: reset() expects parameter 1 to be array, float given in %s on line %d diff --git a/ext/standard/tests/array/array_change_key_case.phpt b/ext/standard/tests/array/array_change_key_case.phpt index 0721c00623..ca9a21128b 100644 --- a/ext/standard/tests/array/array_change_key_case.phpt +++ b/ext/standard/tests/array/array_change_key_case.phpt @@ -60,7 +60,7 @@ foreach ($arrays as $item) { echo "end\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing basic operations *** ** Iteration 1 ** array(0) { diff --git a/ext/standard/tests/array/array_change_key_case_errors.phpt b/ext/standard/tests/array/array_change_key_case_errors.phpt index ec506f767d..5577b620fd 100644 --- a/ext/standard/tests/array/array_change_key_case_errors.phpt +++ b/ext/standard/tests/array/array_change_key_case_errors.phpt @@ -14,10 +14,10 @@ var_dump( array_change_key_case($item, $item["one"], "CASE_UPPER") ); // more th echo "end\n"; ?> --EXPECTF-- -Warning: array_change_key_case() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_change_key_case() expects parameter 1 to be array, int given in %s on line %d NULL -Warning: array_change_key_case() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_change_key_case() expects parameter 1 to be array, int given in %s on line %d NULL Warning: array_change_key_case() expects at least 1 parameter, 0 given in %s on line %d diff --git a/ext/standard/tests/array/array_change_key_case_variation.phpt b/ext/standard/tests/array/array_change_key_case_variation.phpt index cad38e4ac7..3f8d502ffe 100644 --- a/ext/standard/tests/array/array_change_key_case_variation.phpt +++ b/ext/standard/tests/array/array_change_key_case_variation.phpt @@ -21,7 +21,7 @@ var_dump( array_change_key_case( array("ONE" => 1, "one" => 1, "One" => 2), 5 ) echo "end\n"; ?> --EXPECTF-- -Warning: array_change_key_case() expects parameter 2 to be integer, string given in %s on line %d +Warning: array_change_key_case() expects parameter 2 to be int, string given in %s on line %d NULL array(4) { ["ONE"]=> @@ -38,7 +38,7 @@ array(1) { int(4) } -Warning: array_change_key_case() expects parameter 2 to be integer, string given in %s on line %d +Warning: array_change_key_case() expects parameter 2 to be int, string given in %s on line %d NULL array(1) { ["ONE"]=> diff --git a/ext/standard/tests/array/array_change_key_case_variation1.phpt b/ext/standard/tests/array/array_change_key_case_variation1.phpt index 5526759c0a..14626deb86 100644 --- a/ext/standard/tests/array/array_change_key_case_variation1.phpt +++ b/ext/standard/tests/array/array_change_key_case_variation1.phpt @@ -3,7 +3,7 @@ Test array_change_key_case() function : usage variations - Pass different data t --FILE-- <?php /* Prototype : array array_change_key_case(array $input [, int $case]) - * Description: Retuns an array with all string keys lowercased [or uppercased] + * Description: Returns an array with all string keys lowercased [or uppercased] * Source code: ext/standard/array.c */ @@ -99,22 +99,22 @@ echo "Done"; -- Iteration 1 -- -Warning: array_change_key_case() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_change_key_case() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 2 -- -Warning: array_change_key_case() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_change_key_case() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 3 -- -Warning: array_change_key_case() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_change_key_case() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 4 -- -Warning: array_change_key_case() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_change_key_case() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 5 -- @@ -154,22 +154,22 @@ NULL -- Iteration 12 -- -Warning: array_change_key_case() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_change_key_case() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 13 -- -Warning: array_change_key_case() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_change_key_case() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 14 -- -Warning: array_change_key_case() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_change_key_case() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 15 -- -Warning: array_change_key_case() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_change_key_case() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 16 -- diff --git a/ext/standard/tests/array/array_change_key_case_variation2.phpt b/ext/standard/tests/array/array_change_key_case_variation2.phpt index f23f0b8a6d..b0b90bd926 100644 --- a/ext/standard/tests/array/array_change_key_case_variation2.phpt +++ b/ext/standard/tests/array/array_change_key_case_variation2.phpt @@ -5,7 +5,7 @@ Test array_change_key_case() function : usage variations - Pass different data t --FILE-- <?php /* Prototype : array array_change_key_case(array $input [, int $case]) - * Description: Retuns an array with all string keys lowercased [or uppercased] + * Description: Returns an array with all string keys lowercased [or uppercased] * Source code: ext/standard/array.c */ @@ -239,32 +239,32 @@ array(3) { -- Iteration 16 -- -Warning: array_change_key_case() expects parameter 2 to be integer, string given in %s on line %d +Warning: array_change_key_case() expects parameter 2 to be int, string given in %s on line %d NULL -- Iteration 17 -- -Warning: array_change_key_case() expects parameter 2 to be integer, string given in %s on line %d +Warning: array_change_key_case() expects parameter 2 to be int, string given in %s on line %d NULL -- Iteration 18 -- -Warning: array_change_key_case() expects parameter 2 to be integer, array given in %s on line %d +Warning: array_change_key_case() expects parameter 2 to be int, array given in %s on line %d NULL -- Iteration 19 -- -Warning: array_change_key_case() expects parameter 2 to be integer, string given in %s on line %d +Warning: array_change_key_case() expects parameter 2 to be int, string given in %s on line %d NULL -- Iteration 20 -- -Warning: array_change_key_case() expects parameter 2 to be integer, string given in %s on line %d +Warning: array_change_key_case() expects parameter 2 to be int, string given in %s on line %d NULL -- Iteration 21 -- -Warning: array_change_key_case() expects parameter 2 to be integer, string given in %s on line %d +Warning: array_change_key_case() expects parameter 2 to be int, string given in %s on line %d NULL -- Iteration 22 -- diff --git a/ext/standard/tests/array/array_change_key_case_variation3.phpt b/ext/standard/tests/array/array_change_key_case_variation3.phpt index eb27f60646..726b0eb553 100644 --- a/ext/standard/tests/array/array_change_key_case_variation3.phpt +++ b/ext/standard/tests/array/array_change_key_case_variation3.phpt @@ -3,7 +3,7 @@ Test array_change_key_case() function : usage variations - different data types --FILE-- <?php /* Prototype : array array_change_key_case(array $input [, int $case]) - * Description: Retuns an array with all string keys lowercased [or uppercased] + * Description: Returns an array with all string keys lowercased [or uppercased] * Source code: ext/standard/array.c */ @@ -100,7 +100,7 @@ foreach($inputs as $key => $input) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_change_key_case() : usage variations *** -- Iteration 1 : int data -- diff --git a/ext/standard/tests/array/array_change_key_case_variation4.phpt b/ext/standard/tests/array/array_change_key_case_variation4.phpt index 38ff4df3b5..52017177cc 100644 --- a/ext/standard/tests/array/array_change_key_case_variation4.phpt +++ b/ext/standard/tests/array/array_change_key_case_variation4.phpt @@ -3,7 +3,7 @@ Test array_change_key_case() function : usage variations - different int values --FILE-- <?php /* Prototype : array array_change_key_case(array $input [, int $case]) - * Description: Retuns an array with all string keys lowercased [or uppercased] + * Description: Returns an array with all string keys lowercased [or uppercased] * Source code: ext/standard/array.c */ @@ -22,7 +22,7 @@ for ($i = -5; $i <=5; $i += 1){ echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_change_key_case() : usage variations *** -- $sort argument is -5 -- diff --git a/ext/standard/tests/array/array_change_key_case_variation5.phpt b/ext/standard/tests/array/array_change_key_case_variation5.phpt index ece783ce5f..e39fb1cafe 100644 --- a/ext/standard/tests/array/array_change_key_case_variation5.phpt +++ b/ext/standard/tests/array/array_change_key_case_variation5.phpt @@ -3,7 +3,7 @@ Test array_change_key_case() function : usage variations - position of internal --FILE-- <?php /* Prototype : array array_change_key_case(array $input [, int $case]) - * Description: Retuns an array with all string keys lowercased [or uppercased] + * Description: Returns an array with all string keys lowercased [or uppercased] * Source code: ext/standard/array.c */ @@ -25,7 +25,7 @@ echo key($input) . " => " . current ($input) . "\n"; echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_change_key_case() : usage variations *** -- Call array_change_key_case() -- diff --git a/ext/standard/tests/array/array_change_key_case_variation6.phpt b/ext/standard/tests/array/array_change_key_case_variation6.phpt index d5ac22ba31..383993c38c 100644 --- a/ext/standard/tests/array/array_change_key_case_variation6.phpt +++ b/ext/standard/tests/array/array_change_key_case_variation6.phpt @@ -3,7 +3,7 @@ Test array_change_key_case() function : usage variations - multidimensional arra --FILE-- <?php /* Prototype : array array_change_key_case(array $input [, int $case]) - * Description: Retuns an array with all string keys lowercased [or uppercased] + * Description: Returns an array with all string keys lowercased [or uppercased] * Source code: ext/standard/array.c */ @@ -25,7 +25,7 @@ var_dump(array_change_key_case($input['English'], CASE_UPPER)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_change_key_case() : usage variations *** -- Pass a two-dimensional array as $input argument -- diff --git a/ext/standard/tests/array/array_change_key_case_variation7.phpt b/ext/standard/tests/array/array_change_key_case_variation7.phpt index 75df822bbc..0f1268dd48 100644 --- a/ext/standard/tests/array/array_change_key_case_variation7.phpt +++ b/ext/standard/tests/array/array_change_key_case_variation7.phpt @@ -3,7 +3,7 @@ Test array_change_key_case() function : usage variations - referenced variables --FILE-- <?php /* Prototype : array array_change_key_case(array $input [, int $case]) - * Description: Retuns an array with all string keys lowercased [or uppercased] + * Description: Returns an array with all string keys lowercased [or uppercased] * Source code: ext/standard/array.c */ @@ -28,7 +28,7 @@ var_dump($new_input); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_change_key_case() : usage variations *** -- $input argument is a reference to array -- diff --git a/ext/standard/tests/array/array_change_key_case_variation8.phpt b/ext/standard/tests/array/array_change_key_case_variation8.phpt index 380821602b..6024225fb1 100644 --- a/ext/standard/tests/array/array_change_key_case_variation8.phpt +++ b/ext/standard/tests/array/array_change_key_case_variation8.phpt @@ -35,7 +35,7 @@ foreach($inputs as $input) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_change_key_case() : usage variations *** -- $case = default -- diff --git a/ext/standard/tests/array/array_chunk_basic1.phpt b/ext/standard/tests/array/array_chunk_basic1.phpt index c16d2988e3..b84b0871f4 100644 --- a/ext/standard/tests/array/array_chunk_basic1.phpt +++ b/ext/standard/tests/array/array_chunk_basic1.phpt @@ -39,7 +39,7 @@ foreach ($input_arrays as $input_array){ echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing array_chunk() : basic functionality *** -- Iteration 1 -- diff --git a/ext/standard/tests/array/array_chunk_basic2.phpt b/ext/standard/tests/array/array_chunk_basic2.phpt index 3ef9851b0e..10dcc9e5ba 100644 --- a/ext/standard/tests/array/array_chunk_basic2.phpt +++ b/ext/standard/tests/array/array_chunk_basic2.phpt @@ -39,7 +39,7 @@ foreach ($input_arrays as $input_array){ echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing array_chunk() : basic functionality *** -- Iteration 1 -- diff --git a/ext/standard/tests/array/array_chunk_variation1.phpt b/ext/standard/tests/array/array_chunk_variation1.phpt index cc53bd5654..e48f28f8be 100644 --- a/ext/standard/tests/array/array_chunk_variation1.phpt +++ b/ext/standard/tests/array/array_chunk_variation1.phpt @@ -59,10 +59,10 @@ $values = array( /*20*/ new stdclass(), // undefined data -/*21*/ @undefined_var, +/*21*/ @$undefined_var, // unset data -/*22*/ @unset_var +/*22*/ @$unset_var ); @@ -83,46 +83,46 @@ echo "Done"; -- Iteration 1 -- -Warning: array_chunk() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_chunk() expects parameter 1 to be array, int given in %s on line %d NULL -Warning: array_chunk() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_chunk() expects parameter 1 to be array, int given in %s on line %d NULL -Warning: array_chunk() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_chunk() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 2 -- -Warning: array_chunk() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_chunk() expects parameter 1 to be array, int given in %s on line %d NULL -Warning: array_chunk() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_chunk() expects parameter 1 to be array, int given in %s on line %d NULL -Warning: array_chunk() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_chunk() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 3 -- -Warning: array_chunk() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_chunk() expects parameter 1 to be array, int given in %s on line %d NULL -Warning: array_chunk() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_chunk() expects parameter 1 to be array, int given in %s on line %d NULL -Warning: array_chunk() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_chunk() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 4 -- -Warning: array_chunk() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_chunk() expects parameter 1 to be array, int given in %s on line %d NULL -Warning: array_chunk() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_chunk() expects parameter 1 to be array, int given in %s on line %d NULL -Warning: array_chunk() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_chunk() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 5 -- @@ -204,46 +204,46 @@ NULL -- Iteration 12 -- -Warning: array_chunk() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_chunk() expects parameter 1 to be array, bool given in %s on line %d NULL -Warning: array_chunk() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_chunk() expects parameter 1 to be array, bool given in %s on line %d NULL -Warning: array_chunk() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_chunk() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 13 -- -Warning: array_chunk() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_chunk() expects parameter 1 to be array, bool given in %s on line %d NULL -Warning: array_chunk() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_chunk() expects parameter 1 to be array, bool given in %s on line %d NULL -Warning: array_chunk() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_chunk() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 14 -- -Warning: array_chunk() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_chunk() expects parameter 1 to be array, bool given in %s on line %d NULL -Warning: array_chunk() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_chunk() expects parameter 1 to be array, bool given in %s on line %d NULL -Warning: array_chunk() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_chunk() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 15 -- -Warning: array_chunk() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_chunk() expects parameter 1 to be array, bool given in %s on line %d NULL -Warning: array_chunk() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_chunk() expects parameter 1 to be array, bool given in %s on line %d NULL -Warning: array_chunk() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_chunk() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 16 -- @@ -303,23 +303,23 @@ NULL -- Iteration 21 -- -Warning: array_chunk() expects parameter 1 to be array, string given in %s on line %d +Warning: array_chunk() expects parameter 1 to be array, null given in %s on line %d NULL -Warning: array_chunk() expects parameter 1 to be array, string given in %s on line %d +Warning: array_chunk() expects parameter 1 to be array, null given in %s on line %d NULL -Warning: array_chunk() expects parameter 1 to be array, string given in %s on line %d +Warning: array_chunk() expects parameter 1 to be array, null given in %s on line %d NULL -- Iteration 22 -- -Warning: array_chunk() expects parameter 1 to be array, string given in %s on line %d +Warning: array_chunk() expects parameter 1 to be array, null given in %s on line %d NULL -Warning: array_chunk() expects parameter 1 to be array, string given in %s on line %d +Warning: array_chunk() expects parameter 1 to be array, null given in %s on line %d NULL -Warning: array_chunk() expects parameter 1 to be array, string given in %s on line %d +Warning: array_chunk() expects parameter 1 to be array, null given in %s on line %d NULL Done diff --git a/ext/standard/tests/array/array_chunk_variation2.phpt b/ext/standard/tests/array/array_chunk_variation2.phpt index 738249eae1..b3f66a005a 100644 --- a/ext/standard/tests/array/array_chunk_variation2.phpt +++ b/ext/standard/tests/array/array_chunk_variation2.phpt @@ -62,10 +62,10 @@ $values = array ( /*21*/ new stdclass(), // undefined data -/*22*/ @undefined_var, +/*22*/ @$undefined_var, // unset data -/*23*/ @unset_var +/*23*/ @$unset_var ); @@ -177,57 +177,57 @@ NULL -- Iteration 6 -- -Warning: array_chunk() expects parameter 2 to be integer, array given in %s on line %d +Warning: array_chunk() expects parameter 2 to be int, array given in %s on line %d NULL -Warning: array_chunk() expects parameter 2 to be integer, array given in %s on line %d +Warning: array_chunk() expects parameter 2 to be int, array given in %s on line %d NULL -Warning: array_chunk() expects parameter 2 to be integer, array given in %s on line %d +Warning: array_chunk() expects parameter 2 to be int, array given in %s on line %d NULL -- Iteration 7 -- -Warning: array_chunk() expects parameter 2 to be integer, array given in %s on line %d +Warning: array_chunk() expects parameter 2 to be int, array given in %s on line %d NULL -Warning: array_chunk() expects parameter 2 to be integer, array given in %s on line %d +Warning: array_chunk() expects parameter 2 to be int, array given in %s on line %d NULL -Warning: array_chunk() expects parameter 2 to be integer, array given in %s on line %d +Warning: array_chunk() expects parameter 2 to be int, array given in %s on line %d NULL -- Iteration 8 -- -Warning: array_chunk() expects parameter 2 to be integer, array given in %s on line %d +Warning: array_chunk() expects parameter 2 to be int, array given in %s on line %d NULL -Warning: array_chunk() expects parameter 2 to be integer, array given in %s on line %d +Warning: array_chunk() expects parameter 2 to be int, array given in %s on line %d NULL -Warning: array_chunk() expects parameter 2 to be integer, array given in %s on line %d +Warning: array_chunk() expects parameter 2 to be int, array given in %s on line %d NULL -- Iteration 9 -- -Warning: array_chunk() expects parameter 2 to be integer, array given in %s on line %d +Warning: array_chunk() expects parameter 2 to be int, array given in %s on line %d NULL -Warning: array_chunk() expects parameter 2 to be integer, array given in %s on line %d +Warning: array_chunk() expects parameter 2 to be int, array given in %s on line %d NULL -Warning: array_chunk() expects parameter 2 to be integer, array given in %s on line %d +Warning: array_chunk() expects parameter 2 to be int, array given in %s on line %d NULL -- Iteration 10 -- -Warning: array_chunk() expects parameter 2 to be integer, array given in %s on line %d +Warning: array_chunk() expects parameter 2 to be int, array given in %s on line %d NULL -Warning: array_chunk() expects parameter 2 to be integer, array given in %s on line %d +Warning: array_chunk() expects parameter 2 to be int, array given in %s on line %d NULL -Warning: array_chunk() expects parameter 2 to be integer, array given in %s on line %d +Warning: array_chunk() expects parameter 2 to be int, array given in %s on line %d NULL -- Iteration 11 -- @@ -352,78 +352,78 @@ NULL -- Iteration 17 -- -Warning: array_chunk() expects parameter 2 to be integer, string given in %s on line %d +Warning: array_chunk() expects parameter 2 to be int, string given in %s on line %d NULL -Warning: array_chunk() expects parameter 2 to be integer, string given in %s on line %d +Warning: array_chunk() expects parameter 2 to be int, string given in %s on line %d NULL -Warning: array_chunk() expects parameter 2 to be integer, string given in %s on line %d +Warning: array_chunk() expects parameter 2 to be int, string given in %s on line %d NULL -- Iteration 18 -- -Warning: array_chunk() expects parameter 2 to be integer, string given in %s on line %d +Warning: array_chunk() expects parameter 2 to be int, string given in %s on line %d NULL -Warning: array_chunk() expects parameter 2 to be integer, string given in %s on line %d +Warning: array_chunk() expects parameter 2 to be int, string given in %s on line %d NULL -Warning: array_chunk() expects parameter 2 to be integer, string given in %s on line %d +Warning: array_chunk() expects parameter 2 to be int, string given in %s on line %d NULL -- Iteration 19 -- -Warning: array_chunk() expects parameter 2 to be integer, string given in %s on line %d +Warning: array_chunk() expects parameter 2 to be int, string given in %s on line %d NULL -Warning: array_chunk() expects parameter 2 to be integer, string given in %s on line %d +Warning: array_chunk() expects parameter 2 to be int, string given in %s on line %d NULL -Warning: array_chunk() expects parameter 2 to be integer, string given in %s on line %d +Warning: array_chunk() expects parameter 2 to be int, string given in %s on line %d NULL -- Iteration 20 -- -Warning: array_chunk() expects parameter 2 to be integer, string given in %s on line %d +Warning: array_chunk() expects parameter 2 to be int, string given in %s on line %d NULL -Warning: array_chunk() expects parameter 2 to be integer, string given in %s on line %d +Warning: array_chunk() expects parameter 2 to be int, string given in %s on line %d NULL -Warning: array_chunk() expects parameter 2 to be integer, string given in %s on line %d +Warning: array_chunk() expects parameter 2 to be int, string given in %s on line %d NULL -- Iteration 21 -- -Warning: array_chunk() expects parameter 2 to be integer, object given in %s on line %d +Warning: array_chunk() expects parameter 2 to be int, object given in %s on line %d NULL -Warning: array_chunk() expects parameter 2 to be integer, object given in %s on line %d +Warning: array_chunk() expects parameter 2 to be int, object given in %s on line %d NULL -Warning: array_chunk() expects parameter 2 to be integer, object given in %s on line %d +Warning: array_chunk() expects parameter 2 to be int, object given in %s on line %d NULL -- Iteration 22 -- -Warning: array_chunk() expects parameter 2 to be integer, string given in %s on line %d +Warning: array_chunk(): Size parameter expected to be greater than 0 in %s on line %d NULL -Warning: array_chunk() expects parameter 2 to be integer, string given in %s on line %d +Warning: array_chunk(): Size parameter expected to be greater than 0 in %s on line %d NULL -Warning: array_chunk() expects parameter 2 to be integer, string given in %s on line %d +Warning: array_chunk(): Size parameter expected to be greater than 0 in %s on line %d NULL -- Iteration 23 -- -Warning: array_chunk() expects parameter 2 to be integer, string given in %s on line %d +Warning: array_chunk(): Size parameter expected to be greater than 0 in %s on line %d NULL -Warning: array_chunk() expects parameter 2 to be integer, string given in %s on line %d +Warning: array_chunk(): Size parameter expected to be greater than 0 in %s on line %d NULL -Warning: array_chunk() expects parameter 2 to be integer, string given in %s on line %d +Warning: array_chunk(): Size parameter expected to be greater than 0 in %s on line %d NULL Done diff --git a/ext/standard/tests/array/array_chunk_variation3.phpt b/ext/standard/tests/array/array_chunk_variation3.phpt index 542172cab6..228490e442 100644 --- a/ext/standard/tests/array/array_chunk_variation3.phpt +++ b/ext/standard/tests/array/array_chunk_variation3.phpt @@ -53,10 +53,10 @@ $values = array( /*16*/ new stdclass(), // undefined data -/*17*/ @undefined_var, +/*17*/ @$undefined_var, // unset data -/*18*/ @unset_var +/*18*/ @$unset_var ); @@ -241,7 +241,7 @@ array(1) { -- Iteration 16 -- -Warning: array_chunk() expects parameter 3 to be boolean, object given in %s on line %d +Warning: array_chunk() expects parameter 3 to be bool, object given in %s on line %d NULL -- Iteration 17 -- diff --git a/ext/standard/tests/array/array_chunk_variation4.phpt b/ext/standard/tests/array/array_chunk_variation4.phpt index e7d83899b7..d82f9fcc5f 100644 --- a/ext/standard/tests/array/array_chunk_variation4.phpt +++ b/ext/standard/tests/array/array_chunk_variation4.phpt @@ -34,7 +34,7 @@ var_dump( array_chunk($input_array, $size, false) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_chunk() : usage variations *** -- Testing array_chunk() by supplying an array containing different sub arrays & 'preserve_key' as defualt -- diff --git a/ext/standard/tests/array/array_chunk_variation6.phpt b/ext/standard/tests/array/array_chunk_variation6.phpt index ae81301fce..96344b074f 100644 --- a/ext/standard/tests/array/array_chunk_variation6.phpt +++ b/ext/standard/tests/array/array_chunk_variation6.phpt @@ -47,7 +47,7 @@ foreach ($input_arrays as $input_array){ echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_chunk() : usage variations *** -- Testing array_chunk() by supplying various arrays -- diff --git a/ext/standard/tests/array/array_chunk_variation7.phpt b/ext/standard/tests/array/array_chunk_variation7.phpt index 7ba5c279bf..513487fab8 100644 --- a/ext/standard/tests/array/array_chunk_variation7.phpt +++ b/ext/standard/tests/array/array_chunk_variation7.phpt @@ -34,7 +34,7 @@ var_dump( array_chunk($input_array, $size, false) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_chunk() : usage variations *** -- Testing array_chunk(), input array containing references diff --git a/ext/standard/tests/array/array_column_error.phpt b/ext/standard/tests/array/array_column_error.phpt index bdcbec0062..26a09aff24 100644 --- a/ext/standard/tests/array/array_column_error.phpt +++ b/ext/standard/tests/array/array_column_error.phpt @@ -57,7 +57,7 @@ NULL -- Testing array_column() function with int as first parameter -- -Warning: array_column() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_column() expects parameter 1 to be array, int given in %s on line %d NULL -- Testing array_column() column key parameter should be a string or an integer (testing bool) -- diff --git a/ext/standard/tests/array/array_column_variant.phpt b/ext/standard/tests/array/array_column_variant.phpt index 0af0869497..576a2526cc 100644 --- a/ext/standard/tests/array/array_column_variant.phpt +++ b/ext/standard/tests/array/array_column_variant.phpt @@ -18,7 +18,7 @@ echo "-- pass null as second parameter and no third param to get back array_valu var_dump(array_column($rows, null)); echo "Done\n"; ---EXPECTF-- +--EXPECT-- -- pass null as second parameter to get back all columns indexed by third parameter -- array(2) { [3]=> diff --git a/ext/standard/tests/array/array_column_variant_objects.phpt b/ext/standard/tests/array/array_column_variant_objects.phpt index 80e1839736..dc9c0e7e8f 100644 --- a/ext/standard/tests/array/array_column_variant_objects.phpt +++ b/ext/standard/tests/array/array_column_variant_objects.phpt @@ -78,7 +78,7 @@ var_dump(array_column($records, 'last_name', 'first_name')); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_column() : object property fetching (numeric property names) *** -- first_name column from recordset -- array(3) { diff --git a/ext/standard/tests/array/array_combine_basic.phpt b/ext/standard/tests/array/array_combine_basic.phpt index 52a6237c2d..6079f4119e 100644 --- a/ext/standard/tests/array/array_combine_basic.phpt +++ b/ext/standard/tests/array/array_combine_basic.phpt @@ -29,7 +29,7 @@ var_dump( array_combine($keys_array, $values_array) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_combine() : basic functionality *** array(2) { [1]=> diff --git a/ext/standard/tests/array/array_combine_variation1.phpt b/ext/standard/tests/array/array_combine_variation1.phpt index 0240af2dce..f9978f5476 100644 --- a/ext/standard/tests/array/array_combine_variation1.phpt +++ b/ext/standard/tests/array/array_combine_variation1.phpt @@ -101,19 +101,19 @@ echo "Done"; *** Testing array_combine() : Passing non-array values to $keys argument *** -- Iteration 1 -- -Warning: array_combine() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_combine() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 2 -- -Warning: array_combine() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_combine() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 3 -- -Warning: array_combine() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_combine() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 4 -- -Warning: array_combine() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_combine() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 5 -- @@ -145,19 +145,19 @@ Warning: array_combine() expects parameter 1 to be array, null given in %s on li NULL -- Iteration 12 -- -Warning: array_combine() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_combine() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 13 -- -Warning: array_combine() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_combine() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 14 -- -Warning: array_combine() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_combine() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 15 -- -Warning: array_combine() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_combine() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 16 -- diff --git a/ext/standard/tests/array/array_combine_variation2.phpt b/ext/standard/tests/array/array_combine_variation2.phpt index 41821d3f74..2d888df694 100644 --- a/ext/standard/tests/array/array_combine_variation2.phpt +++ b/ext/standard/tests/array/array_combine_variation2.phpt @@ -101,19 +101,19 @@ echo "Done"; *** Testing array_combine() : Passing non-array values to $values argument *** -- Iteration 1 -- -Warning: array_combine() expects parameter 2 to be array, integer given in %s on line %d +Warning: array_combine() expects parameter 2 to be array, int given in %s on line %d NULL -- Iteration 2 -- -Warning: array_combine() expects parameter 2 to be array, integer given in %s on line %d +Warning: array_combine() expects parameter 2 to be array, int given in %s on line %d NULL -- Iteration 3 -- -Warning: array_combine() expects parameter 2 to be array, integer given in %s on line %d +Warning: array_combine() expects parameter 2 to be array, int given in %s on line %d NULL -- Iteration 4 -- -Warning: array_combine() expects parameter 2 to be array, integer given in %s on line %d +Warning: array_combine() expects parameter 2 to be array, int given in %s on line %d NULL -- Iteration 5 -- @@ -145,19 +145,19 @@ Warning: array_combine() expects parameter 2 to be array, null given in %s on li NULL -- Iteration 12 -- -Warning: array_combine() expects parameter 2 to be array, boolean given in %s on line %d +Warning: array_combine() expects parameter 2 to be array, bool given in %s on line %d NULL -- Iteration 13 -- -Warning: array_combine() expects parameter 2 to be array, boolean given in %s on line %d +Warning: array_combine() expects parameter 2 to be array, bool given in %s on line %d NULL -- Iteration 14 -- -Warning: array_combine() expects parameter 2 to be array, boolean given in %s on line %d +Warning: array_combine() expects parameter 2 to be array, bool given in %s on line %d NULL -- Iteration 15 -- -Warning: array_combine() expects parameter 2 to be array, boolean given in %s on line %d +Warning: array_combine() expects parameter 2 to be array, bool given in %s on line %d NULL -- Iteration 16 -- diff --git a/ext/standard/tests/array/array_combine_variation3.phpt b/ext/standard/tests/array/array_combine_variation3.phpt index 9e2e27cd08..ba349c3921 100644 --- a/ext/standard/tests/array/array_combine_variation3.phpt +++ b/ext/standard/tests/array/array_combine_variation3.phpt @@ -84,7 +84,7 @@ foreach($arrays as $array) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_combine() : Passing different types of arrays to both $keys and $values argument *** -- Iteration 1 -- array(2) { diff --git a/ext/standard/tests/array/array_combine_variation6.phpt b/ext/standard/tests/array/array_combine_variation6.phpt index 5bd3652a4e..1e51c9886e 100644 --- a/ext/standard/tests/array/array_combine_variation6.phpt +++ b/ext/standard/tests/array/array_combine_variation6.phpt @@ -30,7 +30,7 @@ var_dump( array_combine($arr_binary, $arr_normal) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_combine() : binary safe checking *** array(2) { ["hello"]=> diff --git a/ext/standard/tests/array/array_count_values2.phpt b/ext/standard/tests/array/array_count_values2.phpt index 549b77d9f2..8aaf445f93 100644 --- a/ext/standard/tests/array/array_count_values2.phpt +++ b/ext/standard/tests/array/array_count_values2.phpt @@ -18,11 +18,11 @@ $array1 = array(1, var_dump(array_count_values($array1)); ?> --EXPECTF-- -Warning: array_count_values(): Can only count STRING and INTEGER values! in %s on line %s +Warning: array_count_values(): Can only count STRING and INTEGER values! in %s on line %d -Warning: array_count_values(): Can only count STRING and INTEGER values! in %s on line %s +Warning: array_count_values(): Can only count STRING and INTEGER values! in %s on line %d -Warning: array_count_values(): Can only count STRING and INTEGER values! in %s on line %s +Warning: array_count_values(): Can only count STRING and INTEGER values! in %s on line %d array(8) { [1]=> int(2) diff --git a/ext/standard/tests/array/array_count_values_error.phpt b/ext/standard/tests/array/array_count_values_error.phpt index 88223f4e50..5e0deb1b6d 100644 --- a/ext/standard/tests/array/array_count_values_error.phpt +++ b/ext/standard/tests/array/array_count_values_error.phpt @@ -45,6 +45,6 @@ NULL -- Testing array_count_values() function integer arguments -- -Warning: array_count_values() expects parameter 1 to be array, integer given in %sarray_count_values_error.php on line 26 +Warning: array_count_values() expects parameter 1 to be array, int given in %sarray_count_values_error.php on line 26 NULL Done diff --git a/ext/standard/tests/array/array_count_values_variation.phpt b/ext/standard/tests/array/array_count_values_variation.phpt index 0bc55b0de2..00f13c8a5b 100644 --- a/ext/standard/tests/array/array_count_values_variation.phpt +++ b/ext/standard/tests/array/array_count_values_variation.phpt @@ -36,7 +36,7 @@ echo "Done"; <?php unlink("array_count_file"); ?> ---EXPECTF-- +--EXPECT-- *** Testing array_count_values() : parameter variations *** array(3) { ["bobv"]=> diff --git a/ext/standard/tests/array/array_diff_1.phpt b/ext/standard/tests/array/array_diff_1.phpt index a25d19d5ca..a7ee015346 100644 --- a/ext/standard/tests/array/array_diff_1.phpt +++ b/ext/standard/tests/array/array_diff_1.phpt @@ -11,5 +11,5 @@ array_diff($a, $b, $c); echo "OK!"; ?> --EXPECTF-- -Warning: array_diff(): Argument #2 is not an array in %s +Warning: array_diff(): Expected parameter 2 to be an array, int given in %s OK! diff --git a/ext/standard/tests/array/array_diff_assoc_basic.phpt b/ext/standard/tests/array/array_diff_assoc_basic.phpt index ecf0c7079e..92be673501 100644 --- a/ext/standard/tests/array/array_diff_assoc_basic.phpt +++ b/ext/standard/tests/array/array_diff_assoc_basic.phpt @@ -36,7 +36,7 @@ var_dump(array_diff_assoc($array_string_key, $array_numeric_key)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_diff_assoc() : basic functionality *** -- Compare Default keys to numeric keys -- array(3) { diff --git a/ext/standard/tests/array/array_diff_assoc_variation1.phpt b/ext/standard/tests/array/array_diff_assoc_variation1.phpt index 7d771c8da9..2172e695d3 100644 --- a/ext/standard/tests/array/array_diff_assoc_variation1.phpt +++ b/ext/standard/tests/array/array_diff_assoc_variation1.phpt @@ -103,131 +103,131 @@ echo "Done"; -- Iteration 1 -- -Warning: array_diff_assoc(): Argument #1 is not an array in %s on line %d +Warning: array_diff_assoc(): Expected parameter 1 to be an array, int given in %s on line %d NULL -- Iteration 2 -- -Warning: array_diff_assoc(): Argument #1 is not an array in %s on line %d +Warning: array_diff_assoc(): Expected parameter 1 to be an array, int given in %s on line %d NULL -- Iteration 3 -- -Warning: array_diff_assoc(): Argument #1 is not an array in %s on line %d +Warning: array_diff_assoc(): Expected parameter 1 to be an array, int given in %s on line %d NULL -- Iteration 4 -- -Warning: array_diff_assoc(): Argument #1 is not an array in %s on line %d +Warning: array_diff_assoc(): Expected parameter 1 to be an array, int given in %s on line %d NULL -- Iteration 5 -- -Warning: array_diff_assoc(): Argument #1 is not an array in %s on line %d +Warning: array_diff_assoc(): Expected parameter 1 to be an array, float given in %s on line %d NULL -- Iteration 6 -- -Warning: array_diff_assoc(): Argument #1 is not an array in %s on line %d +Warning: array_diff_assoc(): Expected parameter 1 to be an array, float given in %s on line %d NULL -- Iteration 7 -- -Warning: array_diff_assoc(): Argument #1 is not an array in %s on line %d +Warning: array_diff_assoc(): Expected parameter 1 to be an array, float given in %s on line %d NULL -- Iteration 8 -- -Warning: array_diff_assoc(): Argument #1 is not an array in %s on line %d +Warning: array_diff_assoc(): Expected parameter 1 to be an array, float given in %s on line %d NULL -- Iteration 9 -- -Warning: array_diff_assoc(): Argument #1 is not an array in %s on line %d +Warning: array_diff_assoc(): Expected parameter 1 to be an array, float given in %s on line %d NULL -- Iteration 10 -- -Warning: array_diff_assoc(): Argument #1 is not an array in %s on line %d +Warning: array_diff_assoc(): Expected parameter 1 to be an array, null given in %s on line %d NULL -- Iteration 11 -- -Warning: array_diff_assoc(): Argument #1 is not an array in %s on line %d +Warning: array_diff_assoc(): Expected parameter 1 to be an array, null given in %s on line %d NULL -- Iteration 12 -- -Warning: array_diff_assoc(): Argument #1 is not an array in %s on line %d +Warning: array_diff_assoc(): Expected parameter 1 to be an array, bool given in %s on line %d NULL -- Iteration 13 -- -Warning: array_diff_assoc(): Argument #1 is not an array in %s on line %d +Warning: array_diff_assoc(): Expected parameter 1 to be an array, bool given in %s on line %d NULL -- Iteration 14 -- -Warning: array_diff_assoc(): Argument #1 is not an array in %s on line %d +Warning: array_diff_assoc(): Expected parameter 1 to be an array, bool given in %s on line %d NULL -- Iteration 15 -- -Warning: array_diff_assoc(): Argument #1 is not an array in %s on line %d +Warning: array_diff_assoc(): Expected parameter 1 to be an array, bool given in %s on line %d NULL -- Iteration 16 -- -Warning: array_diff_assoc(): Argument #1 is not an array in %s on line %d +Warning: array_diff_assoc(): Expected parameter 1 to be an array, string given in %s on line %d NULL -- Iteration 17 -- -Warning: array_diff_assoc(): Argument #1 is not an array in %s on line %d +Warning: array_diff_assoc(): Expected parameter 1 to be an array, string given in %s on line %d NULL -- Iteration 18 -- -Warning: array_diff_assoc(): Argument #1 is not an array in %s on line %d +Warning: array_diff_assoc(): Expected parameter 1 to be an array, string given in %s on line %d NULL -- Iteration 19 -- -Warning: array_diff_assoc(): Argument #1 is not an array in %s on line %d +Warning: array_diff_assoc(): Expected parameter 1 to be an array, string given in %s on line %d NULL -- Iteration 20 -- -Warning: array_diff_assoc(): Argument #1 is not an array in %s on line %d +Warning: array_diff_assoc(): Expected parameter 1 to be an array, string given in %s on line %d NULL -- Iteration 21 -- -Warning: array_diff_assoc(): Argument #1 is not an array in %s on line %d +Warning: array_diff_assoc(): Expected parameter 1 to be an array, string given in %s on line %d NULL -- Iteration 22 -- -Warning: array_diff_assoc(): Argument #1 is not an array in %s on line %d +Warning: array_diff_assoc(): Expected parameter 1 to be an array, string given in %s on line %d NULL -- Iteration 23 -- -Warning: array_diff_assoc(): Argument #1 is not an array in %s on line %d +Warning: array_diff_assoc(): Expected parameter 1 to be an array, object given in %s on line %d NULL -- Iteration 24 -- -Warning: array_diff_assoc(): Argument #1 is not an array in %s on line %d +Warning: array_diff_assoc(): Expected parameter 1 to be an array, null given in %s on line %d NULL -- Iteration 25 -- -Warning: array_diff_assoc(): Argument #1 is not an array in %s on line %d +Warning: array_diff_assoc(): Expected parameter 1 to be an array, null given in %s on line %d NULL -- Iteration 26 -- -Warning: array_diff_assoc(): Argument #1 is not an array in %s on line %d +Warning: array_diff_assoc(): Expected parameter 1 to be an array, resource given in %s on line %d NULL Done diff --git a/ext/standard/tests/array/array_diff_assoc_variation10.phpt b/ext/standard/tests/array/array_diff_assoc_variation10.phpt index c2f052e83a..fcddbb394d 100644 --- a/ext/standard/tests/array/array_diff_assoc_variation10.phpt +++ b/ext/standard/tests/array/array_diff_assoc_variation10.phpt @@ -31,7 +31,7 @@ var_dump(array_diff_assoc($array2, $array1)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_diff_assoc() : usage variations *** array(3) { [0]=> diff --git a/ext/standard/tests/array/array_diff_assoc_variation2.phpt b/ext/standard/tests/array/array_diff_assoc_variation2.phpt index de90a36ea0..a57f10fce0 100644 --- a/ext/standard/tests/array/array_diff_assoc_variation2.phpt +++ b/ext/standard/tests/array/array_diff_assoc_variation2.phpt @@ -103,131 +103,131 @@ echo "Done"; -- Iteration 1 -- -Warning: array_diff_assoc(): Argument #2 is not an array in %s on line %d +Warning: array_diff_assoc(): Expected parameter 2 to be an array, int given in %s on line %d NULL -- Iteration 2 -- -Warning: array_diff_assoc(): Argument #2 is not an array in %s on line %d +Warning: array_diff_assoc(): Expected parameter 2 to be an array, int given in %s on line %d NULL -- Iteration 3 -- -Warning: array_diff_assoc(): Argument #2 is not an array in %s on line %d +Warning: array_diff_assoc(): Expected parameter 2 to be an array, int given in %s on line %d NULL -- Iteration 4 -- -Warning: array_diff_assoc(): Argument #2 is not an array in %s on line %d +Warning: array_diff_assoc(): Expected parameter 2 to be an array, int given in %s on line %d NULL -- Iteration 5 -- -Warning: array_diff_assoc(): Argument #2 is not an array in %s on line %d +Warning: array_diff_assoc(): Expected parameter 2 to be an array, float given in %s on line %d NULL -- Iteration 6 -- -Warning: array_diff_assoc(): Argument #2 is not an array in %s on line %d +Warning: array_diff_assoc(): Expected parameter 2 to be an array, float given in %s on line %d NULL -- Iteration 7 -- -Warning: array_diff_assoc(): Argument #2 is not an array in %s on line %d +Warning: array_diff_assoc(): Expected parameter 2 to be an array, float given in %s on line %d NULL -- Iteration 8 -- -Warning: array_diff_assoc(): Argument #2 is not an array in %s on line %d +Warning: array_diff_assoc(): Expected parameter 2 to be an array, float given in %s on line %d NULL -- Iteration 9 -- -Warning: array_diff_assoc(): Argument #2 is not an array in %s on line %d +Warning: array_diff_assoc(): Expected parameter 2 to be an array, float given in %s on line %d NULL -- Iteration 10 -- -Warning: array_diff_assoc(): Argument #2 is not an array in %s on line %d +Warning: array_diff_assoc(): Expected parameter 2 to be an array, null given in %s on line %d NULL -- Iteration 11 -- -Warning: array_diff_assoc(): Argument #2 is not an array in %s on line %d +Warning: array_diff_assoc(): Expected parameter 2 to be an array, null given in %s on line %d NULL -- Iteration 12 -- -Warning: array_diff_assoc(): Argument #2 is not an array in %s on line %d +Warning: array_diff_assoc(): Expected parameter 2 to be an array, bool given in %s on line %d NULL -- Iteration 13 -- -Warning: array_diff_assoc(): Argument #2 is not an array in %s on line %d +Warning: array_diff_assoc(): Expected parameter 2 to be an array, bool given in %s on line %d NULL -- Iteration 14 -- -Warning: array_diff_assoc(): Argument #2 is not an array in %s on line %d +Warning: array_diff_assoc(): Expected parameter 2 to be an array, bool given in %s on line %d NULL -- Iteration 15 -- -Warning: array_diff_assoc(): Argument #2 is not an array in %s on line %d +Warning: array_diff_assoc(): Expected parameter 2 to be an array, bool given in %s on line %d NULL -- Iteration 16 -- -Warning: array_diff_assoc(): Argument #2 is not an array in %s on line %d +Warning: array_diff_assoc(): Expected parameter 2 to be an array, string given in %s on line %d NULL -- Iteration 17 -- -Warning: array_diff_assoc(): Argument #2 is not an array in %s on line %d +Warning: array_diff_assoc(): Expected parameter 2 to be an array, string given in %s on line %d NULL -- Iteration 18 -- -Warning: array_diff_assoc(): Argument #2 is not an array in %s on line %d +Warning: array_diff_assoc(): Expected parameter 2 to be an array, string given in %s on line %d NULL -- Iteration 19 -- -Warning: array_diff_assoc(): Argument #2 is not an array in %s on line %d +Warning: array_diff_assoc(): Expected parameter 2 to be an array, string given in %s on line %d NULL -- Iteration 20 -- -Warning: array_diff_assoc(): Argument #2 is not an array in %s on line %d +Warning: array_diff_assoc(): Expected parameter 2 to be an array, string given in %s on line %d NULL -- Iteration 21 -- -Warning: array_diff_assoc(): Argument #2 is not an array in %s on line %d +Warning: array_diff_assoc(): Expected parameter 2 to be an array, string given in %s on line %d NULL -- Iteration 22 -- -Warning: array_diff_assoc(): Argument #2 is not an array in %s on line %d +Warning: array_diff_assoc(): Expected parameter 2 to be an array, string given in %s on line %d NULL -- Iteration 23 -- -Warning: array_diff_assoc(): Argument #2 is not an array in %s on line %d +Warning: array_diff_assoc(): Expected parameter 2 to be an array, object given in %s on line %d NULL -- Iteration 24 -- -Warning: array_diff_assoc(): Argument #2 is not an array in %s on line %d +Warning: array_diff_assoc(): Expected parameter 2 to be an array, null given in %s on line %d NULL -- Iteration 25 -- -Warning: array_diff_assoc(): Argument #2 is not an array in %s on line %d +Warning: array_diff_assoc(): Expected parameter 2 to be an array, null given in %s on line %d NULL -- Iteration 26 -- -Warning: array_diff_assoc(): Argument #2 is not an array in %s on line %d +Warning: array_diff_assoc(): Expected parameter 2 to be an array, resource given in %s on line %d NULL Done diff --git a/ext/standard/tests/array/array_diff_assoc_variation4.phpt b/ext/standard/tests/array/array_diff_assoc_variation4.phpt index 6dbfdfd796..8cb05f8562 100644 --- a/ext/standard/tests/array/array_diff_assoc_variation4.phpt +++ b/ext/standard/tests/array/array_diff_assoc_variation4.phpt @@ -99,7 +99,7 @@ foreach($inputs as $key => $input) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_diff_assoc() : usage variations *** -- Iteration 1 -- diff --git a/ext/standard/tests/array/array_diff_assoc_variation5.phpt b/ext/standard/tests/array/array_diff_assoc_variation5.phpt index ff9766c72b..e761a91d92 100644 --- a/ext/standard/tests/array/array_diff_assoc_variation5.phpt +++ b/ext/standard/tests/array/array_diff_assoc_variation5.phpt @@ -47,7 +47,7 @@ var_dump(array_diff_assoc($arr_default_int, $arr_float, $arr_string, $arr_string echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_diff_assoc() : usage variations *** -- Result of comparing integers and floating point numbers: -- array(1) { diff --git a/ext/standard/tests/array/array_diff_assoc_variation6.phpt b/ext/standard/tests/array/array_diff_assoc_variation6.phpt index 4018b406d5..2ea2c461c6 100644 --- a/ext/standard/tests/array/array_diff_assoc_variation6.phpt +++ b/ext/standard/tests/array/array_diff_assoc_variation6.phpt @@ -75,7 +75,7 @@ foreach($inputs as $input) { }; echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_diff_assoc() : usage variations *** -- Iteration 1 -- diff --git a/ext/standard/tests/array/array_diff_assoc_variation7.phpt b/ext/standard/tests/array/array_diff_assoc_variation7.phpt index 799defe825..0d3caf6c71 100644 --- a/ext/standard/tests/array/array_diff_assoc_variation7.phpt +++ b/ext/standard/tests/array/array_diff_assoc_variation7.phpt @@ -45,7 +45,7 @@ var_dump(array_diff_assoc($arr2, $arr1)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_diff_assoc() : usage variations *** -- Results when $a = a: -- array(3) { diff --git a/ext/standard/tests/array/array_diff_assoc_variation8.phpt b/ext/standard/tests/array/array_diff_assoc_variation8.phpt index 0acab2a20e..8569703435 100644 --- a/ext/standard/tests/array/array_diff_assoc_variation8.phpt +++ b/ext/standard/tests/array/array_diff_assoc_variation8.phpt @@ -30,7 +30,7 @@ var_dump(array_diff_assoc($array_assoc, $array_index)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_diff_assoc() : variation *** array(2) { [0]=> diff --git a/ext/standard/tests/array/array_diff_assoc_variation9.phpt b/ext/standard/tests/array/array_diff_assoc_variation9.phpt index 84ebf9d91d..1ef4f73248 100644 --- a/ext/standard/tests/array/array_diff_assoc_variation9.phpt +++ b/ext/standard/tests/array/array_diff_assoc_variation9.phpt @@ -37,7 +37,7 @@ var_dump(array_diff_assoc($array1, $array2['sub_arraya'])); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_diff_assoc() : usage variations *** -- Compare two 2-D arrays -- array(2) { diff --git a/ext/standard/tests/array/array_diff_basic.phpt b/ext/standard/tests/array/array_diff_basic.phpt index 668f6fe3e7..418dbc5b39 100644 --- a/ext/standard/tests/array/array_diff_basic.phpt +++ b/ext/standard/tests/array/array_diff_basic.phpt @@ -52,7 +52,7 @@ var_dump(array_diff($array_int1, $array_int2, $array_string1, $array_string2)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_diff() : basic functionality *** -- Test indexed array with integers as elements -- array(2) { diff --git a/ext/standard/tests/array/array_diff_key.phpt b/ext/standard/tests/array/array_diff_key.phpt index 765431f124..4110a65a6c 100644 --- a/ext/standard/tests/array/array_diff_key.phpt +++ b/ext/standard/tests/array/array_diff_key.phpt @@ -62,7 +62,7 @@ function comp_func($a, $b) { } ?> ---EXPECTF-- +--EXPECT-- ------ Test 1 -------- array(4) { [1]=> diff --git a/ext/standard/tests/array/array_diff_key_variation1.phpt b/ext/standard/tests/array/array_diff_key_variation1.phpt index 6a4366b823..3e689a0e8f 100644 --- a/ext/standard/tests/array/array_diff_key_variation1.phpt +++ b/ext/standard/tests/array/array_diff_key_variation1.phpt @@ -102,209 +102,209 @@ fclose($fp); --int 0-- -Warning: array_diff_key(): Argument #1 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 1 to be an array, int given in %s on line %d NULL -Warning: array_diff_key(): Argument #1 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 1 to be an array, int given in %s on line %d NULL --int 1-- -Warning: array_diff_key(): Argument #1 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 1 to be an array, int given in %s on line %d NULL -Warning: array_diff_key(): Argument #1 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 1 to be an array, int given in %s on line %d NULL --int 12345-- -Warning: array_diff_key(): Argument #1 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 1 to be an array, int given in %s on line %d NULL -Warning: array_diff_key(): Argument #1 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 1 to be an array, int given in %s on line %d NULL --int -12345-- -Warning: array_diff_key(): Argument #1 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 1 to be an array, int given in %s on line %d NULL -Warning: array_diff_key(): Argument #1 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 1 to be an array, int given in %s on line %d NULL --float 10.5-- -Warning: array_diff_key(): Argument #1 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 1 to be an array, float given in %s on line %d NULL -Warning: array_diff_key(): Argument #1 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 1 to be an array, float given in %s on line %d NULL --float -10.5-- -Warning: array_diff_key(): Argument #1 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 1 to be an array, float given in %s on line %d NULL -Warning: array_diff_key(): Argument #1 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 1 to be an array, float given in %s on line %d NULL --float 12.3456789000e10-- -Warning: array_diff_key(): Argument #1 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 1 to be an array, float given in %s on line %d NULL -Warning: array_diff_key(): Argument #1 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 1 to be an array, float given in %s on line %d NULL --float -12.3456789000e10-- -Warning: array_diff_key(): Argument #1 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 1 to be an array, float given in %s on line %d NULL -Warning: array_diff_key(): Argument #1 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 1 to be an array, float given in %s on line %d NULL --float .5-- -Warning: array_diff_key(): Argument #1 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 1 to be an array, float given in %s on line %d NULL -Warning: array_diff_key(): Argument #1 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 1 to be an array, float given in %s on line %d NULL --uppercase NULL-- -Warning: array_diff_key(): Argument #1 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 1 to be an array, null given in %s on line %d NULL -Warning: array_diff_key(): Argument #1 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 1 to be an array, null given in %s on line %d NULL --lowercase null-- -Warning: array_diff_key(): Argument #1 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 1 to be an array, null given in %s on line %d NULL -Warning: array_diff_key(): Argument #1 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 1 to be an array, null given in %s on line %d NULL --lowercase true-- -Warning: array_diff_key(): Argument #1 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 1 to be an array, bool given in %s on line %d NULL -Warning: array_diff_key(): Argument #1 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 1 to be an array, bool given in %s on line %d NULL --lowercase false-- -Warning: array_diff_key(): Argument #1 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 1 to be an array, bool given in %s on line %d NULL -Warning: array_diff_key(): Argument #1 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 1 to be an array, bool given in %s on line %d NULL --uppercase TRUE-- -Warning: array_diff_key(): Argument #1 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 1 to be an array, bool given in %s on line %d NULL -Warning: array_diff_key(): Argument #1 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 1 to be an array, bool given in %s on line %d NULL --uppercase FALSE-- -Warning: array_diff_key(): Argument #1 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 1 to be an array, bool given in %s on line %d NULL -Warning: array_diff_key(): Argument #1 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 1 to be an array, bool given in %s on line %d NULL --empty string DQ-- -Warning: array_diff_key(): Argument #1 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 1 to be an array, string given in %s on line %d NULL -Warning: array_diff_key(): Argument #1 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 1 to be an array, string given in %s on line %d NULL --empty string SQ-- -Warning: array_diff_key(): Argument #1 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 1 to be an array, string given in %s on line %d NULL -Warning: array_diff_key(): Argument #1 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 1 to be an array, string given in %s on line %d NULL --string DQ-- -Warning: array_diff_key(): Argument #1 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 1 to be an array, string given in %s on line %d NULL -Warning: array_diff_key(): Argument #1 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 1 to be an array, string given in %s on line %d NULL --string SQ-- -Warning: array_diff_key(): Argument #1 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 1 to be an array, string given in %s on line %d NULL -Warning: array_diff_key(): Argument #1 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 1 to be an array, string given in %s on line %d NULL --mixed case string-- -Warning: array_diff_key(): Argument #1 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 1 to be an array, string given in %s on line %d NULL -Warning: array_diff_key(): Argument #1 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 1 to be an array, string given in %s on line %d NULL --heredoc-- -Warning: array_diff_key(): Argument #1 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 1 to be an array, string given in %s on line %d NULL -Warning: array_diff_key(): Argument #1 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 1 to be an array, string given in %s on line %d NULL --instance of classWithToString-- -Warning: array_diff_key(): Argument #1 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 1 to be an array, object given in %s on line %d NULL -Warning: array_diff_key(): Argument #1 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 1 to be an array, object given in %s on line %d NULL --instance of classWithoutToString-- -Warning: array_diff_key(): Argument #1 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 1 to be an array, object given in %s on line %d NULL -Warning: array_diff_key(): Argument #1 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 1 to be an array, object given in %s on line %d NULL --undefined var-- -Warning: array_diff_key(): Argument #1 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 1 to be an array, null given in %s on line %d NULL -Warning: array_diff_key(): Argument #1 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 1 to be an array, null given in %s on line %d NULL --unset var-- -Warning: array_diff_key(): Argument #1 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 1 to be an array, null given in %s on line %d NULL -Warning: array_diff_key(): Argument #1 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 1 to be an array, null given in %s on line %d NULL --resource-- -Warning: array_diff_key(): Argument #1 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 1 to be an array, resource given in %s on line %d NULL -Warning: array_diff_key(): Argument #1 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 1 to be an array, resource given in %s on line %d NULL ===DONE=== diff --git a/ext/standard/tests/array/array_diff_key_variation2.phpt b/ext/standard/tests/array/array_diff_key_variation2.phpt index 9c67eb3231..fb0bcd6796 100644 --- a/ext/standard/tests/array/array_diff_key_variation2.phpt +++ b/ext/standard/tests/array/array_diff_key_variation2.phpt @@ -103,209 +103,209 @@ fclose($fp); --int 0-- -Warning: array_diff_key(): Argument #2 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 2 to be an array, int given in %s on line %d NULL -Warning: array_diff_key(): Argument #2 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 2 to be an array, int given in %s on line %d NULL --int 1-- -Warning: array_diff_key(): Argument #2 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 2 to be an array, int given in %s on line %d NULL -Warning: array_diff_key(): Argument #2 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 2 to be an array, int given in %s on line %d NULL --int 12345-- -Warning: array_diff_key(): Argument #2 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 2 to be an array, int given in %s on line %d NULL -Warning: array_diff_key(): Argument #2 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 2 to be an array, int given in %s on line %d NULL --int -12345-- -Warning: array_diff_key(): Argument #2 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 2 to be an array, int given in %s on line %d NULL -Warning: array_diff_key(): Argument #2 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 2 to be an array, int given in %s on line %d NULL --float 10.5-- -Warning: array_diff_key(): Argument #2 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 2 to be an array, float given in %s on line %d NULL -Warning: array_diff_key(): Argument #2 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 2 to be an array, float given in %s on line %d NULL --float -10.5-- -Warning: array_diff_key(): Argument #2 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 2 to be an array, float given in %s on line %d NULL -Warning: array_diff_key(): Argument #2 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 2 to be an array, float given in %s on line %d NULL --float 12.3456789000e10-- -Warning: array_diff_key(): Argument #2 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 2 to be an array, float given in %s on line %d NULL -Warning: array_diff_key(): Argument #2 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 2 to be an array, float given in %s on line %d NULL --float -12.3456789000e10-- -Warning: array_diff_key(): Argument #2 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 2 to be an array, float given in %s on line %d NULL -Warning: array_diff_key(): Argument #2 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 2 to be an array, float given in %s on line %d NULL --float .5-- -Warning: array_diff_key(): Argument #2 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 2 to be an array, float given in %s on line %d NULL -Warning: array_diff_key(): Argument #2 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 2 to be an array, float given in %s on line %d NULL --uppercase NULL-- -Warning: array_diff_key(): Argument #2 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 2 to be an array, null given in %s on line %d NULL -Warning: array_diff_key(): Argument #2 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 2 to be an array, null given in %s on line %d NULL --lowercase null-- -Warning: array_diff_key(): Argument #2 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 2 to be an array, null given in %s on line %d NULL -Warning: array_diff_key(): Argument #2 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 2 to be an array, null given in %s on line %d NULL --lowercase true-- -Warning: array_diff_key(): Argument #2 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 2 to be an array, bool given in %s on line %d NULL -Warning: array_diff_key(): Argument #2 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 2 to be an array, bool given in %s on line %d NULL --lowercase false-- -Warning: array_diff_key(): Argument #2 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 2 to be an array, bool given in %s on line %d NULL -Warning: array_diff_key(): Argument #2 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 2 to be an array, bool given in %s on line %d NULL --uppercase TRUE-- -Warning: array_diff_key(): Argument #2 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 2 to be an array, bool given in %s on line %d NULL -Warning: array_diff_key(): Argument #2 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 2 to be an array, bool given in %s on line %d NULL --uppercase FALSE-- -Warning: array_diff_key(): Argument #2 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 2 to be an array, bool given in %s on line %d NULL -Warning: array_diff_key(): Argument #2 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 2 to be an array, bool given in %s on line %d NULL --empty string DQ-- -Warning: array_diff_key(): Argument #2 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 2 to be an array, string given in %s on line %d NULL -Warning: array_diff_key(): Argument #2 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 2 to be an array, string given in %s on line %d NULL --empty string SQ-- -Warning: array_diff_key(): Argument #2 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 2 to be an array, string given in %s on line %d NULL -Warning: array_diff_key(): Argument #2 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 2 to be an array, string given in %s on line %d NULL --string DQ-- -Warning: array_diff_key(): Argument #2 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 2 to be an array, string given in %s on line %d NULL -Warning: array_diff_key(): Argument #2 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 2 to be an array, string given in %s on line %d NULL --string SQ-- -Warning: array_diff_key(): Argument #2 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 2 to be an array, string given in %s on line %d NULL -Warning: array_diff_key(): Argument #2 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 2 to be an array, string given in %s on line %d NULL --mixed case string-- -Warning: array_diff_key(): Argument #2 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 2 to be an array, string given in %s on line %d NULL -Warning: array_diff_key(): Argument #2 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 2 to be an array, string given in %s on line %d NULL --heredoc-- -Warning: array_diff_key(): Argument #2 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 2 to be an array, string given in %s on line %d NULL -Warning: array_diff_key(): Argument #2 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 2 to be an array, string given in %s on line %d NULL --instance of classWithToString-- -Warning: array_diff_key(): Argument #2 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 2 to be an array, object given in %s on line %d NULL -Warning: array_diff_key(): Argument #2 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 2 to be an array, object given in %s on line %d NULL --instance of classWithoutToString-- -Warning: array_diff_key(): Argument #2 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 2 to be an array, object given in %s on line %d NULL -Warning: array_diff_key(): Argument #2 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 2 to be an array, object given in %s on line %d NULL --undefined var-- -Warning: array_diff_key(): Argument #2 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 2 to be an array, null given in %s on line %d NULL -Warning: array_diff_key(): Argument #2 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 2 to be an array, null given in %s on line %d NULL --unset var-- -Warning: array_diff_key(): Argument #2 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 2 to be an array, null given in %s on line %d NULL -Warning: array_diff_key(): Argument #2 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 2 to be an array, null given in %s on line %d NULL --resource-- -Warning: array_diff_key(): Argument #2 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 2 to be an array, resource given in %s on line %d NULL -Warning: array_diff_key(): Argument #2 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 2 to be an array, resource given in %s on line %d NULL ===DONE=== diff --git a/ext/standard/tests/array/array_diff_key_variation3.phpt b/ext/standard/tests/array/array_diff_key_variation3.phpt index e313624582..36741dba33 100644 --- a/ext/standard/tests/array/array_diff_key_variation3.phpt +++ b/ext/standard/tests/array/array_diff_key_variation3.phpt @@ -102,131 +102,131 @@ fclose($fp); --int 0-- -Warning: array_diff_key(): Argument #3 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 3 to be an array, int given in %s on line %d NULL --int 1-- -Warning: array_diff_key(): Argument #3 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 3 to be an array, int given in %s on line %d NULL --int 12345-- -Warning: array_diff_key(): Argument #3 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 3 to be an array, int given in %s on line %d NULL --int -12345-- -Warning: array_diff_key(): Argument #3 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 3 to be an array, int given in %s on line %d NULL --float 10.5-- -Warning: array_diff_key(): Argument #3 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 3 to be an array, float given in %s on line %d NULL --float -10.5-- -Warning: array_diff_key(): Argument #3 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 3 to be an array, float given in %s on line %d NULL --float 12.3456789000e10-- -Warning: array_diff_key(): Argument #3 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 3 to be an array, float given in %s on line %d NULL --float -12.3456789000e10-- -Warning: array_diff_key(): Argument #3 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 3 to be an array, float given in %s on line %d NULL --float .5-- -Warning: array_diff_key(): Argument #3 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 3 to be an array, float given in %s on line %d NULL --uppercase NULL-- -Warning: array_diff_key(): Argument #3 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 3 to be an array, null given in %s on line %d NULL --lowercase null-- -Warning: array_diff_key(): Argument #3 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 3 to be an array, null given in %s on line %d NULL --lowercase true-- -Warning: array_diff_key(): Argument #3 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 3 to be an array, bool given in %s on line %d NULL --lowercase false-- -Warning: array_diff_key(): Argument #3 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 3 to be an array, bool given in %s on line %d NULL --uppercase TRUE-- -Warning: array_diff_key(): Argument #3 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 3 to be an array, bool given in %s on line %d NULL --uppercase FALSE-- -Warning: array_diff_key(): Argument #3 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 3 to be an array, bool given in %s on line %d NULL --empty string DQ-- -Warning: array_diff_key(): Argument #3 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 3 to be an array, string given in %s on line %d NULL --empty string SQ-- -Warning: array_diff_key(): Argument #3 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 3 to be an array, string given in %s on line %d NULL --string DQ-- -Warning: array_diff_key(): Argument #3 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 3 to be an array, string given in %s on line %d NULL --string SQ-- -Warning: array_diff_key(): Argument #3 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 3 to be an array, string given in %s on line %d NULL --mixed case string-- -Warning: array_diff_key(): Argument #3 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 3 to be an array, string given in %s on line %d NULL --heredoc-- -Warning: array_diff_key(): Argument #3 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 3 to be an array, string given in %s on line %d NULL --instance of classWithToString-- -Warning: array_diff_key(): Argument #3 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 3 to be an array, object given in %s on line %d NULL --instance of classWithoutToString-- -Warning: array_diff_key(): Argument #3 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 3 to be an array, object given in %s on line %d NULL --undefined var-- -Warning: array_diff_key(): Argument #3 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 3 to be an array, null given in %s on line %d NULL --unset var-- -Warning: array_diff_key(): Argument #3 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 3 to be an array, null given in %s on line %d NULL --resource-- -Warning: array_diff_key(): Argument #3 is not an array in %s on line %d +Warning: array_diff_key(): Expected parameter 3 to be an array, resource given in %s on line %d NULL ===DONE=== diff --git a/ext/standard/tests/array/array_diff_key_variation4.phpt b/ext/standard/tests/array/array_diff_key_variation4.phpt index c3f5f049c3..c7171dc440 100644 --- a/ext/standard/tests/array/array_diff_key_variation4.phpt +++ b/ext/standard/tests/array/array_diff_key_variation4.phpt @@ -26,7 +26,7 @@ foreach($input_arrays as $key =>$value) { } ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_diff_key() : usage variation *** --decimal indexed-- diff --git a/ext/standard/tests/array/array_diff_key_variation5.phpt b/ext/standard/tests/array/array_diff_key_variation5.phpt index bccd1eb965..f5017ba63b 100644 --- a/ext/standard/tests/array/array_diff_key_variation5.phpt +++ b/ext/standard/tests/array/array_diff_key_variation5.phpt @@ -19,7 +19,7 @@ var_dump( array_diff_key($input_array, $float_indx_array) ); var_dump( array_diff_key($float_indx_array, $input_array) ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_diff_key() : usage variation *** -- Testing array_diff_key() function with float indexed array -- diff --git a/ext/standard/tests/array/array_diff_key_variation6.phpt b/ext/standard/tests/array/array_diff_key_variation6.phpt index 44a6072ef3..7f00c4b3ab 100644 --- a/ext/standard/tests/array/array_diff_key_variation6.phpt +++ b/ext/standard/tests/array/array_diff_key_variation6.phpt @@ -19,7 +19,7 @@ var_dump( array_diff_key($input_array, $boolean_indx_array) ); var_dump( array_diff_key($boolean_indx_array, $input_array) ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_diff_key() : usage variation *** -- Testing array_diff_key() function with boolean indexed array -- diff --git a/ext/standard/tests/array/array_diff_key_variation7.phpt b/ext/standard/tests/array/array_diff_key_variation7.phpt index ec753e0ab5..02cf2c9e67 100644 --- a/ext/standard/tests/array/array_diff_key_variation7.phpt +++ b/ext/standard/tests/array/array_diff_key_variation7.phpt @@ -30,7 +30,7 @@ foreach($input_arrays as $key =>$value) { } ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_diff_key() : usage variation *** --null indexed-- diff --git a/ext/standard/tests/array/array_diff_key_variation8.phpt b/ext/standard/tests/array/array_diff_key_variation8.phpt index ba452621b5..349ebbbc6e 100644 --- a/ext/standard/tests/array/array_diff_key_variation8.phpt +++ b/ext/standard/tests/array/array_diff_key_variation8.phpt @@ -33,7 +33,7 @@ var_dump( array_diff_key($array1, $array2) ); var_dump( array_diff_key($array2, $array1) ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_diff_key() : usage variation *** -- Testing array_diff_key() function with multi dimensional array -- diff --git a/ext/standard/tests/array/array_diff_uassoc_variation1.phpt b/ext/standard/tests/array/array_diff_uassoc_variation1.phpt index 95da2ecb3c..aad42705db 100644 --- a/ext/standard/tests/array/array_diff_uassoc_variation1.phpt +++ b/ext/standard/tests/array/array_diff_uassoc_variation1.phpt @@ -114,131 +114,131 @@ fclose($fp); --int 0-- -Warning: array_diff_uassoc(): Argument #1 is not an array in %s on line %d +Warning: array_diff_uassoc(): Expected parameter 1 to be an array, int given in %s on line %d NULL --int 1-- -Warning: array_diff_uassoc(): Argument #1 is not an array in %s on line %d +Warning: array_diff_uassoc(): Expected parameter 1 to be an array, int given in %s on line %d NULL --int 12345-- -Warning: array_diff_uassoc(): Argument #1 is not an array in %s on line %d +Warning: array_diff_uassoc(): Expected parameter 1 to be an array, int given in %s on line %d NULL --int -12345-- -Warning: array_diff_uassoc(): Argument #1 is not an array in %s on line %d +Warning: array_diff_uassoc(): Expected parameter 1 to be an array, int given in %s on line %d NULL --float 10.5-- -Warning: array_diff_uassoc(): Argument #1 is not an array in %s on line %d +Warning: array_diff_uassoc(): Expected parameter 1 to be an array, float given in %s on line %d NULL --float -10.5-- -Warning: array_diff_uassoc(): Argument #1 is not an array in %s on line %d +Warning: array_diff_uassoc(): Expected parameter 1 to be an array, float given in %s on line %d NULL --float 12.3456789000e10-- -Warning: array_diff_uassoc(): Argument #1 is not an array in %s on line %d +Warning: array_diff_uassoc(): Expected parameter 1 to be an array, float given in %s on line %d NULL --float -12.3456789000e10-- -Warning: array_diff_uassoc(): Argument #1 is not an array in %s on line %d +Warning: array_diff_uassoc(): Expected parameter 1 to be an array, float given in %s on line %d NULL --float .5-- -Warning: array_diff_uassoc(): Argument #1 is not an array in %s on line %d +Warning: array_diff_uassoc(): Expected parameter 1 to be an array, float given in %s on line %d NULL --uppercase NULL-- -Warning: array_diff_uassoc(): Argument #1 is not an array in %s on line %d +Warning: array_diff_uassoc(): Expected parameter 1 to be an array, null given in %s on line %d NULL --lowercase null-- -Warning: array_diff_uassoc(): Argument #1 is not an array in %s on line %d +Warning: array_diff_uassoc(): Expected parameter 1 to be an array, null given in %s on line %d NULL --lowercase true-- -Warning: array_diff_uassoc(): Argument #1 is not an array in %s on line %d +Warning: array_diff_uassoc(): Expected parameter 1 to be an array, bool given in %s on line %d NULL --lowercase false-- -Warning: array_diff_uassoc(): Argument #1 is not an array in %s on line %d +Warning: array_diff_uassoc(): Expected parameter 1 to be an array, bool given in %s on line %d NULL --uppercase TRUE-- -Warning: array_diff_uassoc(): Argument #1 is not an array in %s on line %d +Warning: array_diff_uassoc(): Expected parameter 1 to be an array, bool given in %s on line %d NULL --uppercase FALSE-- -Warning: array_diff_uassoc(): Argument #1 is not an array in %s on line %d +Warning: array_diff_uassoc(): Expected parameter 1 to be an array, bool given in %s on line %d NULL --empty string DQ-- -Warning: array_diff_uassoc(): Argument #1 is not an array in %s on line %d +Warning: array_diff_uassoc(): Expected parameter 1 to be an array, string given in %s on line %d NULL --empty string SQ-- -Warning: array_diff_uassoc(): Argument #1 is not an array in %s on line %d +Warning: array_diff_uassoc(): Expected parameter 1 to be an array, string given in %s on line %d NULL --string DQ-- -Warning: array_diff_uassoc(): Argument #1 is not an array in %s on line %d +Warning: array_diff_uassoc(): Expected parameter 1 to be an array, string given in %s on line %d NULL --string SQ-- -Warning: array_diff_uassoc(): Argument #1 is not an array in %s on line %d +Warning: array_diff_uassoc(): Expected parameter 1 to be an array, string given in %s on line %d NULL --mixed case string-- -Warning: array_diff_uassoc(): Argument #1 is not an array in %s on line %d +Warning: array_diff_uassoc(): Expected parameter 1 to be an array, string given in %s on line %d NULL --heredoc-- -Warning: array_diff_uassoc(): Argument #1 is not an array in %s on line %d +Warning: array_diff_uassoc(): Expected parameter 1 to be an array, string given in %s on line %d NULL --instance of classWithToString-- -Warning: array_diff_uassoc(): Argument #1 is not an array in %s on line %d +Warning: array_diff_uassoc(): Expected parameter 1 to be an array, object given in %s on line %d NULL --instance of classWithoutToString-- -Warning: array_diff_uassoc(): Argument #1 is not an array in %s on line %d +Warning: array_diff_uassoc(): Expected parameter 1 to be an array, object given in %s on line %d NULL --undefined var-- -Warning: array_diff_uassoc(): Argument #1 is not an array in %s on line %d +Warning: array_diff_uassoc(): Expected parameter 1 to be an array, null given in %s on line %d NULL --unset var-- -Warning: array_diff_uassoc(): Argument #1 is not an array in %s on line %d +Warning: array_diff_uassoc(): Expected parameter 1 to be an array, null given in %s on line %d NULL --resource-- -Warning: array_diff_uassoc(): Argument #1 is not an array in %s on line %d +Warning: array_diff_uassoc(): Expected parameter 1 to be an array, resource given in %s on line %d NULL ===DONE=== diff --git a/ext/standard/tests/array/array_diff_uassoc_variation10.phpt b/ext/standard/tests/array/array_diff_uassoc_variation10.phpt index 018973da52..a32d566062 100644 --- a/ext/standard/tests/array/array_diff_uassoc_variation10.phpt +++ b/ext/standard/tests/array/array_diff_uassoc_variation10.phpt @@ -20,7 +20,7 @@ var_dump( array_diff_uassoc($float_indx_array, $input_array, "strcasecmp") ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_diff_uassoc() : usage variation *** -- Testing array_diff_key() function with float indexed array -- diff --git a/ext/standard/tests/array/array_diff_uassoc_variation11.phpt b/ext/standard/tests/array/array_diff_uassoc_variation11.phpt index 3d984899e0..d317bfcde0 100644 --- a/ext/standard/tests/array/array_diff_uassoc_variation11.phpt +++ b/ext/standard/tests/array/array_diff_uassoc_variation11.phpt @@ -20,7 +20,7 @@ var_dump( array_diff_uassoc($boolean_indx_array, $input_array, "strcasecmp") ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_diff_uassoc() : usage variation *** -- Testing array_diff_key() function with float indexed array -- diff --git a/ext/standard/tests/array/array_diff_uassoc_variation12.phpt b/ext/standard/tests/array/array_diff_uassoc_variation12.phpt index 6106bfd3c0..c0f88f5051 100644 --- a/ext/standard/tests/array/array_diff_uassoc_variation12.phpt +++ b/ext/standard/tests/array/array_diff_uassoc_variation12.phpt @@ -31,7 +31,7 @@ foreach($input_arrays as $key =>$value) { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_diff_uassoc() : usage variation *** --null indexed-- diff --git a/ext/standard/tests/array/array_diff_uassoc_variation13.phpt b/ext/standard/tests/array/array_diff_uassoc_variation13.phpt index f817452be2..53a45ee278 100644 --- a/ext/standard/tests/array/array_diff_uassoc_variation13.phpt +++ b/ext/standard/tests/array/array_diff_uassoc_variation13.phpt @@ -33,7 +33,7 @@ var_dump( array_diff_uassoc($array2, $array1, "strcasecmp") ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_diff_uassoc() : usage variation *** -- Testing array_diff_uassoc() function with referenced variable $ref_var has value 'a' -- diff --git a/ext/standard/tests/array/array_diff_uassoc_variation2.phpt b/ext/standard/tests/array/array_diff_uassoc_variation2.phpt index 073602c48a..ae664f9812 100644 --- a/ext/standard/tests/array/array_diff_uassoc_variation2.phpt +++ b/ext/standard/tests/array/array_diff_uassoc_variation2.phpt @@ -114,131 +114,131 @@ fclose($fp); --int 0-- -Warning: array_diff_uassoc(): Argument #2 is not an array in %s on line %d +Warning: array_diff_uassoc(): Expected parameter 2 to be an array, int given in %s on line %d NULL --int 1-- -Warning: array_diff_uassoc(): Argument #2 is not an array in %s on line %d +Warning: array_diff_uassoc(): Expected parameter 2 to be an array, int given in %s on line %d NULL --int 12345-- -Warning: array_diff_uassoc(): Argument #2 is not an array in %s on line %d +Warning: array_diff_uassoc(): Expected parameter 2 to be an array, int given in %s on line %d NULL --int -12345-- -Warning: array_diff_uassoc(): Argument #2 is not an array in %s on line %d +Warning: array_diff_uassoc(): Expected parameter 2 to be an array, int given in %s on line %d NULL --float 10.5-- -Warning: array_diff_uassoc(): Argument #2 is not an array in %s on line %d +Warning: array_diff_uassoc(): Expected parameter 2 to be an array, float given in %s on line %d NULL --float -10.5-- -Warning: array_diff_uassoc(): Argument #2 is not an array in %s on line %d +Warning: array_diff_uassoc(): Expected parameter 2 to be an array, float given in %s on line %d NULL --float 12.3456789000e10-- -Warning: array_diff_uassoc(): Argument #2 is not an array in %s on line %d +Warning: array_diff_uassoc(): Expected parameter 2 to be an array, float given in %s on line %d NULL --float -12.3456789000e10-- -Warning: array_diff_uassoc(): Argument #2 is not an array in %s on line %d +Warning: array_diff_uassoc(): Expected parameter 2 to be an array, float given in %s on line %d NULL --float .5-- -Warning: array_diff_uassoc(): Argument #2 is not an array in %s on line %d +Warning: array_diff_uassoc(): Expected parameter 2 to be an array, float given in %s on line %d NULL --uppercase NULL-- -Warning: array_diff_uassoc(): Argument #2 is not an array in %s on line %d +Warning: array_diff_uassoc(): Expected parameter 2 to be an array, null given in %s on line %d NULL --lowercase null-- -Warning: array_diff_uassoc(): Argument #2 is not an array in %s on line %d +Warning: array_diff_uassoc(): Expected parameter 2 to be an array, null given in %s on line %d NULL --lowercase true-- -Warning: array_diff_uassoc(): Argument #2 is not an array in %s on line %d +Warning: array_diff_uassoc(): Expected parameter 2 to be an array, bool given in %s on line %d NULL --lowercase false-- -Warning: array_diff_uassoc(): Argument #2 is not an array in %s on line %d +Warning: array_diff_uassoc(): Expected parameter 2 to be an array, bool given in %s on line %d NULL --uppercase TRUE-- -Warning: array_diff_uassoc(): Argument #2 is not an array in %s on line %d +Warning: array_diff_uassoc(): Expected parameter 2 to be an array, bool given in %s on line %d NULL --uppercase FALSE-- -Warning: array_diff_uassoc(): Argument #2 is not an array in %s on line %d +Warning: array_diff_uassoc(): Expected parameter 2 to be an array, bool given in %s on line %d NULL --empty string DQ-- -Warning: array_diff_uassoc(): Argument #2 is not an array in %s on line %d +Warning: array_diff_uassoc(): Expected parameter 2 to be an array, string given in %s on line %d NULL --empty string SQ-- -Warning: array_diff_uassoc(): Argument #2 is not an array in %s on line %d +Warning: array_diff_uassoc(): Expected parameter 2 to be an array, string given in %s on line %d NULL --string DQ-- -Warning: array_diff_uassoc(): Argument #2 is not an array in %s on line %d +Warning: array_diff_uassoc(): Expected parameter 2 to be an array, string given in %s on line %d NULL --string SQ-- -Warning: array_diff_uassoc(): Argument #2 is not an array in %s on line %d +Warning: array_diff_uassoc(): Expected parameter 2 to be an array, string given in %s on line %d NULL --mixed case string-- -Warning: array_diff_uassoc(): Argument #2 is not an array in %s on line %d +Warning: array_diff_uassoc(): Expected parameter 2 to be an array, string given in %s on line %d NULL --heredoc-- -Warning: array_diff_uassoc(): Argument #2 is not an array in %s on line %d +Warning: array_diff_uassoc(): Expected parameter 2 to be an array, string given in %s on line %d NULL --instance of classWithToString-- -Warning: array_diff_uassoc(): Argument #2 is not an array in %s on line %d +Warning: array_diff_uassoc(): Expected parameter 2 to be an array, object given in %s on line %d NULL --instance of classWithoutToString-- -Warning: array_diff_uassoc(): Argument #2 is not an array in %s on line %d +Warning: array_diff_uassoc(): Expected parameter 2 to be an array, object given in %s on line %d NULL --undefined var-- -Warning: array_diff_uassoc(): Argument #2 is not an array in %s on line %d +Warning: array_diff_uassoc(): Expected parameter 2 to be an array, null given in %s on line %d NULL --unset var-- -Warning: array_diff_uassoc(): Argument #2 is not an array in %s on line %d +Warning: array_diff_uassoc(): Expected parameter 2 to be an array, null given in %s on line %d NULL --resource-- -Warning: array_diff_uassoc(): Argument #2 is not an array in %s on line %d +Warning: array_diff_uassoc(): Expected parameter 2 to be an array, resource given in %s on line %d NULL ===DONE=== diff --git a/ext/standard/tests/array/array_diff_uassoc_variation4.phpt b/ext/standard/tests/array/array_diff_uassoc_variation4.phpt index 0943a42e6a..8ea51a4103 100644 --- a/ext/standard/tests/array/array_diff_uassoc_variation4.phpt +++ b/ext/standard/tests/array/array_diff_uassoc_variation4.phpt @@ -116,131 +116,131 @@ fclose($fp); --int 0-- -Warning: array_diff_uassoc(): Argument #3 is not an array in %s on line %d +Warning: array_diff_uassoc(): Expected parameter 3 to be an array, int given in %s on line %d NULL --int 1-- -Warning: array_diff_uassoc(): Argument #3 is not an array in %s on line %d +Warning: array_diff_uassoc(): Expected parameter 3 to be an array, int given in %s on line %d NULL --int 12345-- -Warning: array_diff_uassoc(): Argument #3 is not an array in %s on line %d +Warning: array_diff_uassoc(): Expected parameter 3 to be an array, int given in %s on line %d NULL --int -12345-- -Warning: array_diff_uassoc(): Argument #3 is not an array in %s on line %d +Warning: array_diff_uassoc(): Expected parameter 3 to be an array, int given in %s on line %d NULL --float 10.5-- -Warning: array_diff_uassoc(): Argument #3 is not an array in %s on line %d +Warning: array_diff_uassoc(): Expected parameter 3 to be an array, float given in %s on line %d NULL --float -10.5-- -Warning: array_diff_uassoc(): Argument #3 is not an array in %s on line %d +Warning: array_diff_uassoc(): Expected parameter 3 to be an array, float given in %s on line %d NULL --float 12.3456789000e10-- -Warning: array_diff_uassoc(): Argument #3 is not an array in %s on line %d +Warning: array_diff_uassoc(): Expected parameter 3 to be an array, float given in %s on line %d NULL --float -12.3456789000e10-- -Warning: array_diff_uassoc(): Argument #3 is not an array in %s on line %d +Warning: array_diff_uassoc(): Expected parameter 3 to be an array, float given in %s on line %d NULL --float .5-- -Warning: array_diff_uassoc(): Argument #3 is not an array in %s on line %d +Warning: array_diff_uassoc(): Expected parameter 3 to be an array, float given in %s on line %d NULL --uppercase NULL-- -Warning: array_diff_uassoc(): Argument #3 is not an array in %s on line %d +Warning: array_diff_uassoc(): Expected parameter 3 to be an array, null given in %s on line %d NULL --lowercase null-- -Warning: array_diff_uassoc(): Argument #3 is not an array in %s on line %d +Warning: array_diff_uassoc(): Expected parameter 3 to be an array, null given in %s on line %d NULL --lowercase true-- -Warning: array_diff_uassoc(): Argument #3 is not an array in %s on line %d +Warning: array_diff_uassoc(): Expected parameter 3 to be an array, bool given in %s on line %d NULL --lowercase false-- -Warning: array_diff_uassoc(): Argument #3 is not an array in %s on line %d +Warning: array_diff_uassoc(): Expected parameter 3 to be an array, bool given in %s on line %d NULL --uppercase TRUE-- -Warning: array_diff_uassoc(): Argument #3 is not an array in %s on line %d +Warning: array_diff_uassoc(): Expected parameter 3 to be an array, bool given in %s on line %d NULL --uppercase FALSE-- -Warning: array_diff_uassoc(): Argument #3 is not an array in %s on line %d +Warning: array_diff_uassoc(): Expected parameter 3 to be an array, bool given in %s on line %d NULL --empty string DQ-- -Warning: array_diff_uassoc(): Argument #3 is not an array in %s on line %d +Warning: array_diff_uassoc(): Expected parameter 3 to be an array, string given in %s on line %d NULL --empty string SQ-- -Warning: array_diff_uassoc(): Argument #3 is not an array in %s on line %d +Warning: array_diff_uassoc(): Expected parameter 3 to be an array, string given in %s on line %d NULL --string DQ-- -Warning: array_diff_uassoc(): Argument #3 is not an array in %s on line %d +Warning: array_diff_uassoc(): Expected parameter 3 to be an array, string given in %s on line %d NULL --string SQ-- -Warning: array_diff_uassoc(): Argument #3 is not an array in %s on line %d +Warning: array_diff_uassoc(): Expected parameter 3 to be an array, string given in %s on line %d NULL --mixed case string-- -Warning: array_diff_uassoc(): Argument #3 is not an array in %s on line %d +Warning: array_diff_uassoc(): Expected parameter 3 to be an array, string given in %s on line %d NULL --heredoc-- -Warning: array_diff_uassoc(): Argument #3 is not an array in %s on line %d +Warning: array_diff_uassoc(): Expected parameter 3 to be an array, string given in %s on line %d NULL --instance of classWithToString-- -Warning: array_diff_uassoc(): Argument #3 is not an array in %s on line %d +Warning: array_diff_uassoc(): Expected parameter 3 to be an array, object given in %s on line %d NULL --instance of classWithoutToString-- -Warning: array_diff_uassoc(): Argument #3 is not an array in %s on line %d +Warning: array_diff_uassoc(): Expected parameter 3 to be an array, object given in %s on line %d NULL --undefined var-- -Warning: array_diff_uassoc(): Argument #3 is not an array in %s on line %d +Warning: array_diff_uassoc(): Expected parameter 3 to be an array, null given in %s on line %d NULL --unset var-- -Warning: array_diff_uassoc(): Argument #3 is not an array in %s on line %d +Warning: array_diff_uassoc(): Expected parameter 3 to be an array, null given in %s on line %d NULL --resource-- -Warning: array_diff_uassoc(): Argument #3 is not an array in %s on line %d +Warning: array_diff_uassoc(): Expected parameter 3 to be an array, resource given in %s on line %d NULL ===DONE=== diff --git a/ext/standard/tests/array/array_diff_uassoc_variation5.phpt b/ext/standard/tests/array/array_diff_uassoc_variation5.phpt index 5961b95925..9cd44cf1d8 100644 --- a/ext/standard/tests/array/array_diff_uassoc_variation5.phpt +++ b/ext/standard/tests/array/array_diff_uassoc_variation5.phpt @@ -29,7 +29,7 @@ var_dump( array_diff_uassoc($arr_float, $arr_default_int, "key_compare_func") ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_diff_uassoc() : usage variation *** -- Result of comparing integers and floating point numbers -- diff --git a/ext/standard/tests/array/array_diff_uassoc_variation6.phpt b/ext/standard/tests/array/array_diff_uassoc_variation6.phpt index 12285bc390..463ca80d5c 100644 --- a/ext/standard/tests/array/array_diff_uassoc_variation6.phpt +++ b/ext/standard/tests/array/array_diff_uassoc_variation6.phpt @@ -33,7 +33,7 @@ var_dump( array_diff_uassoc($arr_string_float, $arr_float, "key_compare_func") ) ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_diff_uassoc() : usage variation *** -- Result of comparing floating points and strings containing integers -- diff --git a/ext/standard/tests/array/array_diff_uassoc_variation7.phpt b/ext/standard/tests/array/array_diff_uassoc_variation7.phpt index fde67266c4..4312688c59 100644 --- a/ext/standard/tests/array/array_diff_uassoc_variation7.phpt +++ b/ext/standard/tests/array/array_diff_uassoc_variation7.phpt @@ -28,7 +28,7 @@ var_dump( array_diff_uassoc($arr_string_float, $arr_string_int, "key_compare_fun ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_diff_uassoc() : usage variation *** -- Result of comparing strings containing integers and strings containing floating points -- diff --git a/ext/standard/tests/array/array_diff_uassoc_variation8.phpt b/ext/standard/tests/array/array_diff_uassoc_variation8.phpt index 21b671131c..7bbe12212b 100644 --- a/ext/standard/tests/array/array_diff_uassoc_variation8.phpt +++ b/ext/standard/tests/array/array_diff_uassoc_variation8.phpt @@ -33,7 +33,7 @@ var_dump( array_diff_uassoc($arr_string_float, $arr_default_int, "key_compare_fu ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_diff_uassoc() : usage variation *** -- Result of comparing integers and strings containing an integers -- diff --git a/ext/standard/tests/array/array_diff_uassoc_variation9.phpt b/ext/standard/tests/array/array_diff_uassoc_variation9.phpt index 09450ff47c..fa36ea3ac2 100644 --- a/ext/standard/tests/array/array_diff_uassoc_variation9.phpt +++ b/ext/standard/tests/array/array_diff_uassoc_variation9.phpt @@ -27,7 +27,7 @@ foreach($input_arrays as $key =>$value) { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_diff_uassoc() : usage variation *** --decimal indexed-- diff --git a/ext/standard/tests/array/array_diff_ukey_variation1.phpt b/ext/standard/tests/array/array_diff_ukey_variation1.phpt index e2234595ad..bbf349c4fd 100644 --- a/ext/standard/tests/array/array_diff_ukey_variation1.phpt +++ b/ext/standard/tests/array/array_diff_ukey_variation1.phpt @@ -110,209 +110,209 @@ fclose($fp); --int 0-- -Warning: array_diff_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 1 to be an array, int given in %s on line %d NULL -Warning: array_diff_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 1 to be an array, int given in %s on line %d NULL --int 1-- -Warning: array_diff_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 1 to be an array, int given in %s on line %d NULL -Warning: array_diff_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 1 to be an array, int given in %s on line %d NULL --int 12345-- -Warning: array_diff_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 1 to be an array, int given in %s on line %d NULL -Warning: array_diff_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 1 to be an array, int given in %s on line %d NULL --int -12345-- -Warning: array_diff_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 1 to be an array, int given in %s on line %d NULL -Warning: array_diff_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 1 to be an array, int given in %s on line %d NULL --float 10.5-- -Warning: array_diff_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 1 to be an array, float given in %s on line %d NULL -Warning: array_diff_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 1 to be an array, float given in %s on line %d NULL --float -10.5-- -Warning: array_diff_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 1 to be an array, float given in %s on line %d NULL -Warning: array_diff_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 1 to be an array, float given in %s on line %d NULL --float 12.3456789000e10-- -Warning: array_diff_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 1 to be an array, float given in %s on line %d NULL -Warning: array_diff_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 1 to be an array, float given in %s on line %d NULL --float -12.3456789000e10-- -Warning: array_diff_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 1 to be an array, float given in %s on line %d NULL -Warning: array_diff_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 1 to be an array, float given in %s on line %d NULL --float .5-- -Warning: array_diff_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 1 to be an array, float given in %s on line %d NULL -Warning: array_diff_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 1 to be an array, float given in %s on line %d NULL --uppercase NULL-- -Warning: array_diff_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 1 to be an array, null given in %s on line %d NULL -Warning: array_diff_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 1 to be an array, null given in %s on line %d NULL --lowercase null-- -Warning: array_diff_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 1 to be an array, null given in %s on line %d NULL -Warning: array_diff_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 1 to be an array, null given in %s on line %d NULL --lowercase true-- -Warning: array_diff_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 1 to be an array, bool given in %s on line %d NULL -Warning: array_diff_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 1 to be an array, bool given in %s on line %d NULL --lowercase false-- -Warning: array_diff_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 1 to be an array, bool given in %s on line %d NULL -Warning: array_diff_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 1 to be an array, bool given in %s on line %d NULL --uppercase TRUE-- -Warning: array_diff_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 1 to be an array, bool given in %s on line %d NULL -Warning: array_diff_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 1 to be an array, bool given in %s on line %d NULL --uppercase FALSE-- -Warning: array_diff_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 1 to be an array, bool given in %s on line %d NULL -Warning: array_diff_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 1 to be an array, bool given in %s on line %d NULL --empty string DQ-- -Warning: array_diff_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 1 to be an array, string given in %s on line %d NULL -Warning: array_diff_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 1 to be an array, string given in %s on line %d NULL --empty string SQ-- -Warning: array_diff_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 1 to be an array, string given in %s on line %d NULL -Warning: array_diff_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 1 to be an array, string given in %s on line %d NULL --string DQ-- -Warning: array_diff_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 1 to be an array, string given in %s on line %d NULL -Warning: array_diff_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 1 to be an array, string given in %s on line %d NULL --string SQ-- -Warning: array_diff_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 1 to be an array, string given in %s on line %d NULL -Warning: array_diff_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 1 to be an array, string given in %s on line %d NULL --mixed case string-- -Warning: array_diff_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 1 to be an array, string given in %s on line %d NULL -Warning: array_diff_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 1 to be an array, string given in %s on line %d NULL --heredoc-- -Warning: array_diff_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 1 to be an array, string given in %s on line %d NULL -Warning: array_diff_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 1 to be an array, string given in %s on line %d NULL --instance of classWithToString-- -Warning: array_diff_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 1 to be an array, object given in %s on line %d NULL -Warning: array_diff_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 1 to be an array, object given in %s on line %d NULL --instance of classWithoutToString-- -Warning: array_diff_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 1 to be an array, object given in %s on line %d NULL -Warning: array_diff_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 1 to be an array, object given in %s on line %d NULL --undefined var-- -Warning: array_diff_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 1 to be an array, null given in %s on line %d NULL -Warning: array_diff_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 1 to be an array, null given in %s on line %d NULL --unset var-- -Warning: array_diff_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 1 to be an array, null given in %s on line %d NULL -Warning: array_diff_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 1 to be an array, null given in %s on line %d NULL --resource-- -Warning: array_diff_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 1 to be an array, resource given in %s on line %d NULL -Warning: array_diff_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 1 to be an array, resource given in %s on line %d NULL ===DONE=== diff --git a/ext/standard/tests/array/array_diff_ukey_variation2.phpt b/ext/standard/tests/array/array_diff_ukey_variation2.phpt index 6831ba12a7..38141a430c 100644 --- a/ext/standard/tests/array/array_diff_ukey_variation2.phpt +++ b/ext/standard/tests/array/array_diff_ukey_variation2.phpt @@ -114,209 +114,209 @@ fclose($fp); --int 0-- -Warning: array_diff_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 2 to be an array, int given in %s on line %d NULL -Warning: array_diff_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 2 to be an array, int given in %s on line %d NULL --int 1-- -Warning: array_diff_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 2 to be an array, int given in %s on line %d NULL -Warning: array_diff_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 2 to be an array, int given in %s on line %d NULL --int 12345-- -Warning: array_diff_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 2 to be an array, int given in %s on line %d NULL -Warning: array_diff_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 2 to be an array, int given in %s on line %d NULL --int -12345-- -Warning: array_diff_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 2 to be an array, int given in %s on line %d NULL -Warning: array_diff_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 2 to be an array, int given in %s on line %d NULL --float 10.5-- -Warning: array_diff_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 2 to be an array, float given in %s on line %d NULL -Warning: array_diff_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 2 to be an array, float given in %s on line %d NULL --float -10.5-- -Warning: array_diff_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 2 to be an array, float given in %s on line %d NULL -Warning: array_diff_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 2 to be an array, float given in %s on line %d NULL --float 12.3456789000e10-- -Warning: array_diff_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 2 to be an array, float given in %s on line %d NULL -Warning: array_diff_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 2 to be an array, float given in %s on line %d NULL --float -12.3456789000e10-- -Warning: array_diff_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 2 to be an array, float given in %s on line %d NULL -Warning: array_diff_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 2 to be an array, float given in %s on line %d NULL --float .5-- -Warning: array_diff_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 2 to be an array, float given in %s on line %d NULL -Warning: array_diff_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 2 to be an array, float given in %s on line %d NULL --uppercase NULL-- -Warning: array_diff_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 2 to be an array, null given in %s on line %d NULL -Warning: array_diff_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 2 to be an array, null given in %s on line %d NULL --lowercase null-- -Warning: array_diff_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 2 to be an array, null given in %s on line %d NULL -Warning: array_diff_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 2 to be an array, null given in %s on line %d NULL --lowercase true-- -Warning: array_diff_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 2 to be an array, bool given in %s on line %d NULL -Warning: array_diff_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 2 to be an array, bool given in %s on line %d NULL --lowercase false-- -Warning: array_diff_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 2 to be an array, bool given in %s on line %d NULL -Warning: array_diff_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 2 to be an array, bool given in %s on line %d NULL --uppercase TRUE-- -Warning: array_diff_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 2 to be an array, bool given in %s on line %d NULL -Warning: array_diff_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 2 to be an array, bool given in %s on line %d NULL --uppercase FALSE-- -Warning: array_diff_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 2 to be an array, bool given in %s on line %d NULL -Warning: array_diff_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 2 to be an array, bool given in %s on line %d NULL --empty string DQ-- -Warning: array_diff_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 2 to be an array, string given in %s on line %d NULL -Warning: array_diff_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 2 to be an array, string given in %s on line %d NULL --empty string SQ-- -Warning: array_diff_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 2 to be an array, string given in %s on line %d NULL -Warning: array_diff_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 2 to be an array, string given in %s on line %d NULL --string DQ-- -Warning: array_diff_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 2 to be an array, string given in %s on line %d NULL -Warning: array_diff_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 2 to be an array, string given in %s on line %d NULL --string SQ-- -Warning: array_diff_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 2 to be an array, string given in %s on line %d NULL -Warning: array_diff_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 2 to be an array, string given in %s on line %d NULL --mixed case string-- -Warning: array_diff_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 2 to be an array, string given in %s on line %d NULL -Warning: array_diff_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 2 to be an array, string given in %s on line %d NULL --heredoc-- -Warning: array_diff_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 2 to be an array, string given in %s on line %d NULL -Warning: array_diff_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 2 to be an array, string given in %s on line %d NULL --instance of classWithToString-- -Warning: array_diff_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 2 to be an array, object given in %s on line %d NULL -Warning: array_diff_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 2 to be an array, object given in %s on line %d NULL --instance of classWithoutToString-- -Warning: array_diff_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 2 to be an array, object given in %s on line %d NULL -Warning: array_diff_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 2 to be an array, object given in %s on line %d NULL --undefined var-- -Warning: array_diff_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 2 to be an array, null given in %s on line %d NULL -Warning: array_diff_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 2 to be an array, null given in %s on line %d NULL --unset var-- -Warning: array_diff_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 2 to be an array, null given in %s on line %d NULL -Warning: array_diff_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 2 to be an array, null given in %s on line %d NULL --resource-- -Warning: array_diff_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 2 to be an array, resource given in %s on line %d NULL -Warning: array_diff_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 2 to be an array, resource given in %s on line %d NULL ===DONE=== diff --git a/ext/standard/tests/array/array_diff_ukey_variation3.phpt b/ext/standard/tests/array/array_diff_ukey_variation3.phpt index 309dae45a4..572061d697 100644 --- a/ext/standard/tests/array/array_diff_ukey_variation3.phpt +++ b/ext/standard/tests/array/array_diff_ukey_variation3.phpt @@ -110,131 +110,131 @@ fclose($fp); --int 0-- -Warning: array_diff_ukey(): Argument #3 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 3 to be an array, int given in %s on line %d NULL --int 1-- -Warning: array_diff_ukey(): Argument #3 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 3 to be an array, int given in %s on line %d NULL --int 12345-- -Warning: array_diff_ukey(): Argument #3 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 3 to be an array, int given in %s on line %d NULL --int -12345-- -Warning: array_diff_ukey(): Argument #3 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 3 to be an array, int given in %s on line %d NULL --float 10.5-- -Warning: array_diff_ukey(): Argument #3 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 3 to be an array, float given in %s on line %d NULL --float -10.5-- -Warning: array_diff_ukey(): Argument #3 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 3 to be an array, float given in %s on line %d NULL --float 12.3456789000e10-- -Warning: array_diff_ukey(): Argument #3 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 3 to be an array, float given in %s on line %d NULL --float -12.3456789000e10-- -Warning: array_diff_ukey(): Argument #3 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 3 to be an array, float given in %s on line %d NULL --float .5-- -Warning: array_diff_ukey(): Argument #3 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 3 to be an array, float given in %s on line %d NULL --uppercase NULL-- -Warning: array_diff_ukey(): Argument #3 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 3 to be an array, null given in %s on line %d NULL --lowercase null-- -Warning: array_diff_ukey(): Argument #3 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 3 to be an array, null given in %s on line %d NULL --lowercase true-- -Warning: array_diff_ukey(): Argument #3 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 3 to be an array, bool given in %s on line %d NULL --lowercase false-- -Warning: array_diff_ukey(): Argument #3 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 3 to be an array, bool given in %s on line %d NULL --uppercase TRUE-- -Warning: array_diff_ukey(): Argument #3 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 3 to be an array, bool given in %s on line %d NULL --uppercase FALSE-- -Warning: array_diff_ukey(): Argument #3 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 3 to be an array, bool given in %s on line %d NULL --empty string DQ-- -Warning: array_diff_ukey(): Argument #3 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 3 to be an array, string given in %s on line %d NULL --empty string SQ-- -Warning: array_diff_ukey(): Argument #3 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 3 to be an array, string given in %s on line %d NULL --string DQ-- -Warning: array_diff_ukey(): Argument #3 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 3 to be an array, string given in %s on line %d NULL --string SQ-- -Warning: array_diff_ukey(): Argument #3 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 3 to be an array, string given in %s on line %d NULL --mixed case string-- -Warning: array_diff_ukey(): Argument #3 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 3 to be an array, string given in %s on line %d NULL --heredoc-- -Warning: array_diff_ukey(): Argument #3 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 3 to be an array, string given in %s on line %d NULL --instance of classWithToString-- -Warning: array_diff_ukey(): Argument #3 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 3 to be an array, object given in %s on line %d NULL --instance of classWithoutToString-- -Warning: array_diff_ukey(): Argument #3 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 3 to be an array, object given in %s on line %d NULL --undefined var-- -Warning: array_diff_ukey(): Argument #3 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 3 to be an array, null given in %s on line %d NULL --unset var-- -Warning: array_diff_ukey(): Argument #3 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 3 to be an array, null given in %s on line %d NULL --resource-- -Warning: array_diff_ukey(): Argument #3 is not an array in %s on line %d +Warning: array_diff_ukey(): Expected parameter 3 to be an array, resource given in %s on line %d NULL ===DONE=== diff --git a/ext/standard/tests/array/array_diff_ukey_variation5.phpt b/ext/standard/tests/array/array_diff_ukey_variation5.phpt index 8f96ad6f40..7606212023 100644 --- a/ext/standard/tests/array/array_diff_ukey_variation5.phpt +++ b/ext/standard/tests/array/array_diff_ukey_variation5.phpt @@ -33,7 +33,7 @@ var_dump( array_diff_ukey($array1, $array2, 'strcasecmp') ); var_dump( array_diff_ukey($array2, $array1, 'strcasecmp') ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_diff_ukey() : usage variation *** -- Testing array_diff_ukey() function with multi dimensional array -- diff --git a/ext/standard/tests/array/array_diff_ukey_variation6.phpt b/ext/standard/tests/array/array_diff_ukey_variation6.phpt index c6bb1ccbc6..1131922fc8 100644 --- a/ext/standard/tests/array/array_diff_ukey_variation6.phpt +++ b/ext/standard/tests/array/array_diff_ukey_variation6.phpt @@ -30,7 +30,7 @@ foreach($input_arrays as $key =>$value) { } ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_diff_ukey() : usage variation *** --decimal indexed-- diff --git a/ext/standard/tests/array/array_diff_ukey_variation7.phpt b/ext/standard/tests/array/array_diff_ukey_variation7.phpt index 03f18ee967..16ba89e9f1 100644 --- a/ext/standard/tests/array/array_diff_ukey_variation7.phpt +++ b/ext/standard/tests/array/array_diff_ukey_variation7.phpt @@ -25,7 +25,7 @@ var_dump( array_diff_ukey($input_array, $float_indx_array, 'key_compare_func') ) ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_diff_ukey() : usage variation *** -- Testing array_diff_ukey() function with float indexed array -- diff --git a/ext/standard/tests/array/array_diff_ukey_variation8.phpt b/ext/standard/tests/array/array_diff_ukey_variation8.phpt index 26830f3f4e..0048bbb3fa 100644 --- a/ext/standard/tests/array/array_diff_ukey_variation8.phpt +++ b/ext/standard/tests/array/array_diff_ukey_variation8.phpt @@ -25,7 +25,7 @@ var_dump( array_diff_ukey($input_array, $boolean_indx_array, 'key_compare_func') ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_diff_ukey() : usage variation *** -- Testing array_diff_ukey() function with boolean indexed array -- diff --git a/ext/standard/tests/array/array_diff_ukey_variation9.phpt b/ext/standard/tests/array/array_diff_ukey_variation9.phpt index 1bfbddad15..5fdb0d4e24 100644 --- a/ext/standard/tests/array/array_diff_ukey_variation9.phpt +++ b/ext/standard/tests/array/array_diff_ukey_variation9.phpt @@ -30,7 +30,7 @@ foreach($input_arrays as $key =>$value) { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_diff_ukey() : usage variation *** --null indexed-- diff --git a/ext/standard/tests/array/array_diff_variation1.phpt b/ext/standard/tests/array/array_diff_variation1.phpt index fc6418e06b..e162c523d6 100644 --- a/ext/standard/tests/array/array_diff_variation1.phpt +++ b/ext/standard/tests/array/array_diff_variation1.phpt @@ -103,106 +103,106 @@ echo "Done"; *** Testing array_diff() : usage variations *** -- Iteration 1 -- -Warning: array_diff(): Argument #1 is not an array in %s on line %d +Warning: array_diff(): Expected parameter 1 to be an array, int given in %s on line %d NULL -- Iteration 2 -- -Warning: array_diff(): Argument #1 is not an array in %s on line %d +Warning: array_diff(): Expected parameter 1 to be an array, int given in %s on line %d NULL -- Iteration 3 -- -Warning: array_diff(): Argument #1 is not an array in %s on line %d +Warning: array_diff(): Expected parameter 1 to be an array, int given in %s on line %d NULL -- Iteration 4 -- -Warning: array_diff(): Argument #1 is not an array in %s on line %d +Warning: array_diff(): Expected parameter 1 to be an array, int given in %s on line %d NULL -- Iteration 5 -- -Warning: array_diff(): Argument #1 is not an array in %s on line %d +Warning: array_diff(): Expected parameter 1 to be an array, float given in %s on line %d NULL -- Iteration 6 -- -Warning: array_diff(): Argument #1 is not an array in %s on line %d +Warning: array_diff(): Expected parameter 1 to be an array, float given in %s on line %d NULL -- Iteration 7 -- -Warning: array_diff(): Argument #1 is not an array in %s on line %d +Warning: array_diff(): Expected parameter 1 to be an array, float given in %s on line %d NULL -- Iteration 8 -- -Warning: array_diff(): Argument #1 is not an array in %s on line %d +Warning: array_diff(): Expected parameter 1 to be an array, float given in %s on line %d NULL -- Iteration 9 -- -Warning: array_diff(): Argument #1 is not an array in %s on line %d +Warning: array_diff(): Expected parameter 1 to be an array, float given in %s on line %d NULL -- Iteration 10 -- -Warning: array_diff(): Argument #1 is not an array in %s on line %d +Warning: array_diff(): Expected parameter 1 to be an array, null given in %s on line %d NULL -- Iteration 11 -- -Warning: array_diff(): Argument #1 is not an array in %s on line %d +Warning: array_diff(): Expected parameter 1 to be an array, null given in %s on line %d NULL -- Iteration 12 -- -Warning: array_diff(): Argument #1 is not an array in %s on line %d +Warning: array_diff(): Expected parameter 1 to be an array, bool given in %s on line %d NULL -- Iteration 13 -- -Warning: array_diff(): Argument #1 is not an array in %s on line %d +Warning: array_diff(): Expected parameter 1 to be an array, bool given in %s on line %d NULL -- Iteration 14 -- -Warning: array_diff(): Argument #1 is not an array in %s on line %d +Warning: array_diff(): Expected parameter 1 to be an array, bool given in %s on line %d NULL -- Iteration 15 -- -Warning: array_diff(): Argument #1 is not an array in %s on line %d +Warning: array_diff(): Expected parameter 1 to be an array, bool given in %s on line %d NULL -- Iteration 16 -- -Warning: array_diff(): Argument #1 is not an array in %s on line %d +Warning: array_diff(): Expected parameter 1 to be an array, string given in %s on line %d NULL -- Iteration 17 -- -Warning: array_diff(): Argument #1 is not an array in %s on line %d +Warning: array_diff(): Expected parameter 1 to be an array, string given in %s on line %d NULL -- Iteration 18 -- -Warning: array_diff(): Argument #1 is not an array in %s on line %d +Warning: array_diff(): Expected parameter 1 to be an array, string given in %s on line %d NULL -- Iteration 19 -- -Warning: array_diff(): Argument #1 is not an array in %s on line %d +Warning: array_diff(): Expected parameter 1 to be an array, string given in %s on line %d NULL -- Iteration 20 -- -Warning: array_diff(): Argument #1 is not an array in %s on line %d +Warning: array_diff(): Expected parameter 1 to be an array, string given in %s on line %d NULL -- Iteration 21 -- -Warning: array_diff(): Argument #1 is not an array in %s on line %d +Warning: array_diff(): Expected parameter 1 to be an array, string given in %s on line %d NULL -- Iteration 22 -- -Warning: array_diff(): Argument #1 is not an array in %s on line %d +Warning: array_diff(): Expected parameter 1 to be an array, string given in %s on line %d NULL -- Iteration 23 -- -Warning: array_diff(): Argument #1 is not an array in %s on line %d +Warning: array_diff(): Expected parameter 1 to be an array, object given in %s on line %d NULL -- Iteration 24 -- -Warning: array_diff(): Argument #1 is not an array in %s on line %d +Warning: array_diff(): Expected parameter 1 to be an array, null given in %s on line %d NULL -- Iteration 25 -- -Warning: array_diff(): Argument #1 is not an array in %s on line %d +Warning: array_diff(): Expected parameter 1 to be an array, null given in %s on line %d NULL -- Iteration 26 -- -Warning: array_diff(): Argument #1 is not an array in %s on line %d +Warning: array_diff(): Expected parameter 1 to be an array, resource given in %s on line %d NULL Done diff --git a/ext/standard/tests/array/array_diff_variation10.phpt b/ext/standard/tests/array/array_diff_variation10.phpt index f93a1f5353..239326821f 100644 --- a/ext/standard/tests/array/array_diff_variation10.phpt +++ b/ext/standard/tests/array/array_diff_variation10.phpt @@ -31,7 +31,7 @@ var_dump(array_diff($array2, $array1)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_diff() : usage variations *** array(1) { [0]=> diff --git a/ext/standard/tests/array/array_diff_variation2.phpt b/ext/standard/tests/array/array_diff_variation2.phpt index dfa070e55d..5f8183b88d 100644 --- a/ext/standard/tests/array/array_diff_variation2.phpt +++ b/ext/standard/tests/array/array_diff_variation2.phpt @@ -102,106 +102,106 @@ echo "Done"; *** Testing array_diff() : usage variations *** -- Iteration 1 -- -Warning: array_diff(): Argument #2 is not an array in %s on line %d +Warning: array_diff(): Expected parameter 2 to be an array, int given in %s on line %d NULL -- Iteration 2 -- -Warning: array_diff(): Argument #2 is not an array in %s on line %d +Warning: array_diff(): Expected parameter 2 to be an array, int given in %s on line %d NULL -- Iteration 3 -- -Warning: array_diff(): Argument #2 is not an array in %s on line %d +Warning: array_diff(): Expected parameter 2 to be an array, int given in %s on line %d NULL -- Iteration 4 -- -Warning: array_diff(): Argument #2 is not an array in %s on line %d +Warning: array_diff(): Expected parameter 2 to be an array, int given in %s on line %d NULL -- Iteration 5 -- -Warning: array_diff(): Argument #2 is not an array in %s on line %d +Warning: array_diff(): Expected parameter 2 to be an array, float given in %s on line %d NULL -- Iteration 6 -- -Warning: array_diff(): Argument #2 is not an array in %s on line %d +Warning: array_diff(): Expected parameter 2 to be an array, float given in %s on line %d NULL -- Iteration 7 -- -Warning: array_diff(): Argument #2 is not an array in %s on line %d +Warning: array_diff(): Expected parameter 2 to be an array, float given in %s on line %d NULL -- Iteration 8 -- -Warning: array_diff(): Argument #2 is not an array in %s on line %d +Warning: array_diff(): Expected parameter 2 to be an array, float given in %s on line %d NULL -- Iteration 9 -- -Warning: array_diff(): Argument #2 is not an array in %s on line %d +Warning: array_diff(): Expected parameter 2 to be an array, float given in %s on line %d NULL -- Iteration 10 -- -Warning: array_diff(): Argument #2 is not an array in %s on line %d +Warning: array_diff(): Expected parameter 2 to be an array, null given in %s on line %d NULL -- Iteration 11 -- -Warning: array_diff(): Argument #2 is not an array in %s on line %d +Warning: array_diff(): Expected parameter 2 to be an array, null given in %s on line %d NULL -- Iteration 12 -- -Warning: array_diff(): Argument #2 is not an array in %s on line %d +Warning: array_diff(): Expected parameter 2 to be an array, bool given in %s on line %d NULL -- Iteration 13 -- -Warning: array_diff(): Argument #2 is not an array in %s on line %d +Warning: array_diff(): Expected parameter 2 to be an array, bool given in %s on line %d NULL -- Iteration 14 -- -Warning: array_diff(): Argument #2 is not an array in %s on line %d +Warning: array_diff(): Expected parameter 2 to be an array, bool given in %s on line %d NULL -- Iteration 15 -- -Warning: array_diff(): Argument #2 is not an array in %s on line %d +Warning: array_diff(): Expected parameter 2 to be an array, bool given in %s on line %d NULL -- Iteration 16 -- -Warning: array_diff(): Argument #2 is not an array in %s on line %d +Warning: array_diff(): Expected parameter 2 to be an array, string given in %s on line %d NULL -- Iteration 17 -- -Warning: array_diff(): Argument #2 is not an array in %s on line %d +Warning: array_diff(): Expected parameter 2 to be an array, string given in %s on line %d NULL -- Iteration 18 -- -Warning: array_diff(): Argument #2 is not an array in %s on line %d +Warning: array_diff(): Expected parameter 2 to be an array, string given in %s on line %d NULL -- Iteration 19 -- -Warning: array_diff(): Argument #2 is not an array in %s on line %d +Warning: array_diff(): Expected parameter 2 to be an array, string given in %s on line %d NULL -- Iteration 20 -- -Warning: array_diff(): Argument #2 is not an array in %s on line %d +Warning: array_diff(): Expected parameter 2 to be an array, string given in %s on line %d NULL -- Iteration 21 -- -Warning: array_diff(): Argument #2 is not an array in %s on line %d +Warning: array_diff(): Expected parameter 2 to be an array, string given in %s on line %d NULL -- Iteration 22 -- -Warning: array_diff(): Argument #2 is not an array in %s on line %d +Warning: array_diff(): Expected parameter 2 to be an array, string given in %s on line %d NULL -- Iteration 23 -- -Warning: array_diff(): Argument #2 is not an array in %s on line %d +Warning: array_diff(): Expected parameter 2 to be an array, object given in %s on line %d NULL -- Iteration 24 -- -Warning: array_diff(): Argument #2 is not an array in %s on line %d +Warning: array_diff(): Expected parameter 2 to be an array, null given in %s on line %d NULL -- Iteration 25 -- -Warning: array_diff(): Argument #2 is not an array in %s on line %d +Warning: array_diff(): Expected parameter 2 to be an array, null given in %s on line %d NULL -- Iteration 26 -- -Warning: array_diff(): Argument #2 is not an array in %s on line %d +Warning: array_diff(): Expected parameter 2 to be an array, resource given in %s on line %d NULL Done diff --git a/ext/standard/tests/array/array_diff_variation3.phpt b/ext/standard/tests/array/array_diff_variation3.phpt index 0fc9af9f5f..b7c842f21b 100644 --- a/ext/standard/tests/array/array_diff_variation3.phpt +++ b/ext/standard/tests/array/array_diff_variation3.phpt @@ -103,7 +103,7 @@ foreach($values as $value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_diff() : usage variations *** Iteration: 1 diff --git a/ext/standard/tests/array/array_diff_variation4.phpt b/ext/standard/tests/array/array_diff_variation4.phpt index bdd1ffd398..3b02c21b36 100644 --- a/ext/standard/tests/array/array_diff_variation4.phpt +++ b/ext/standard/tests/array/array_diff_variation4.phpt @@ -103,7 +103,7 @@ foreach($values as $value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_diff() : usage variations *** Iteration: 1 diff --git a/ext/standard/tests/array/array_diff_variation5.phpt b/ext/standard/tests/array/array_diff_variation5.phpt index 7b428d2b82..8737e7c660 100644 --- a/ext/standard/tests/array/array_diff_variation5.phpt +++ b/ext/standard/tests/array/array_diff_variation5.phpt @@ -48,7 +48,7 @@ var_dump(array_diff($arr_float_str, $arr_int_str)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_diff() : usage variations *** -- Compare integers and floats: -- array(0) { diff --git a/ext/standard/tests/array/array_diff_variation6.phpt b/ext/standard/tests/array/array_diff_variation6.phpt index 86f22f06dd..3c141216c7 100644 --- a/ext/standard/tests/array/array_diff_variation6.phpt +++ b/ext/standard/tests/array/array_diff_variation6.phpt @@ -29,7 +29,7 @@ var_dump(array_diff($array_assoc, $array_index)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_diff() : usage variations *** array(1) { [0]=> diff --git a/ext/standard/tests/array/array_diff_variation7.phpt b/ext/standard/tests/array/array_diff_variation7.phpt index b3c065ef7d..f4368ade6c 100644 --- a/ext/standard/tests/array/array_diff_variation7.phpt +++ b/ext/standard/tests/array/array_diff_variation7.phpt @@ -44,7 +44,7 @@ var_dump(array_diff($arr2, $arr1)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_diff() : usage variations *** -- Basic Comparison -- array(3) { diff --git a/ext/standard/tests/array/array_fill.phpt b/ext/standard/tests/array/array_fill.phpt index c6c7e1e457..230fe61652 100644 --- a/ext/standard/tests/array/array_fill.phpt +++ b/ext/standard/tests/array/array_fill.phpt @@ -20,7 +20,7 @@ foreach($array1 as $start) echo '== Done =='; ?> ===============Done==================== ---EXPECTF-- +--EXPECT-- =========================== start: 0 num: 0 value: 1 array(0) { diff --git a/ext/standard/tests/array/array_fill_basic.phpt b/ext/standard/tests/array/array_fill_basic.phpt index a6ef4c4a68..5575cee6d6 100644 --- a/ext/standard/tests/array/array_fill_basic.phpt +++ b/ext/standard/tests/array/array_fill_basic.phpt @@ -42,7 +42,7 @@ for($i = 0; $i < count($values); $i ++) echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_fill() : basic functionality *** -- Iteration 1 -- array(2) { diff --git a/ext/standard/tests/array/array_fill_keys_variation2.phpt b/ext/standard/tests/array/array_fill_keys_variation2.phpt index 0b661f0525..4a7aef39d2 100644 --- a/ext/standard/tests/array/array_fill_keys_variation2.phpt +++ b/ext/standard/tests/array/array_fill_keys_variation2.phpt @@ -46,7 +46,7 @@ var_dump(array_fill_keys($refArray, $simpleStr)); fclose($fp); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_fill_keys() : parameter variations *** -- Testing array_fill_keys() function with reference value -- diff --git a/ext/standard/tests/array/array_fill_keys_variation3.phpt b/ext/standard/tests/array/array_fill_keys_variation3.phpt index e468c6f1e8..84cc928cbc 100644 --- a/ext/standard/tests/array/array_fill_keys_variation3.phpt +++ b/ext/standard/tests/array/array_fill_keys_variation3.phpt @@ -36,7 +36,7 @@ echo "Done"; -- Testing array_fill_keys() function with both wrong arguments -- -Warning: array_fill_keys() expects parameter 1 to be array, boolean given in %sarray_fill_keys_variation3.php on line %d +Warning: array_fill_keys() expects parameter 1 to be array, bool given in %sarray_fill_keys_variation3.php on line %d NULL -- Testing array_fill_keys() function with unusual second arguments -- diff --git a/ext/standard/tests/array/array_fill_variation1.phpt b/ext/standard/tests/array/array_fill_variation1.phpt index 1d779840cd..f3bdef1b61 100644 --- a/ext/standard/tests/array/array_fill_variation1.phpt +++ b/ext/standard/tests/array/array_fill_variation1.phpt @@ -125,7 +125,7 @@ array(2) { } -- Iteration 3 -- -Warning: array_fill() expects parameter 1 to be integer, float given in %s%eext%estandard%etests%earray%earray_fill_variation1.php on line 92 +Warning: array_fill() expects parameter 1 to be int, float given in %s%eext%estandard%etests%earray%earray_fill_variation1.php on line 92 NULL -- Iteration 4 -- array(2) { @@ -143,23 +143,23 @@ array(2) { } -- Iteration 6 -- -Warning: array_fill() expects parameter 1 to be integer, array given in %sarray_fill_variation1.php on line %d +Warning: array_fill() expects parameter 1 to be int, array given in %sarray_fill_variation1.php on line %d NULL -- Iteration 7 -- -Warning: array_fill() expects parameter 1 to be integer, array given in %sarray_fill_variation1.php on line %d +Warning: array_fill() expects parameter 1 to be int, array given in %sarray_fill_variation1.php on line %d NULL -- Iteration 8 -- -Warning: array_fill() expects parameter 1 to be integer, array given in %sarray_fill_variation1.php on line %d +Warning: array_fill() expects parameter 1 to be int, array given in %sarray_fill_variation1.php on line %d NULL -- Iteration 9 -- -Warning: array_fill() expects parameter 1 to be integer, array given in %sarray_fill_variation1.php on line %d +Warning: array_fill() expects parameter 1 to be int, array given in %sarray_fill_variation1.php on line %d NULL -- Iteration 10 -- -Warning: array_fill() expects parameter 1 to be integer, array given in %sarray_fill_variation1.php on line %d +Warning: array_fill() expects parameter 1 to be int, array given in %sarray_fill_variation1.php on line %d NULL -- Iteration 11 -- array(2) { @@ -205,23 +205,23 @@ array(2) { } -- Iteration 17 -- -Warning: array_fill() expects parameter 1 to be integer, string given in %sarray_fill_variation1.php on line %d +Warning: array_fill() expects parameter 1 to be int, string given in %sarray_fill_variation1.php on line %d NULL -- Iteration 18 -- -Warning: array_fill() expects parameter 1 to be integer, string given in %sarray_fill_variation1.php on line %d +Warning: array_fill() expects parameter 1 to be int, string given in %sarray_fill_variation1.php on line %d NULL -- Iteration 19 -- -Warning: array_fill() expects parameter 1 to be integer, string given in %sarray_fill_variation1.php on line %d +Warning: array_fill() expects parameter 1 to be int, string given in %sarray_fill_variation1.php on line %d NULL -- Iteration 20 -- -Warning: array_fill() expects parameter 1 to be integer, string given in %sarray_fill_variation1.php on line %d +Warning: array_fill() expects parameter 1 to be int, string given in %sarray_fill_variation1.php on line %d NULL -- Iteration 21 -- -Warning: array_fill() expects parameter 1 to be integer, object given in %sarray_fill_variation1.php on line %d +Warning: array_fill() expects parameter 1 to be int, object given in %sarray_fill_variation1.php on line %d NULL -- Iteration 22 -- array(2) { @@ -239,6 +239,6 @@ array(2) { } -- Iteration 24 -- -Warning: array_fill() expects parameter 1 to be integer, resource given in %sarray_fill_variation1.php on line %d +Warning: array_fill() expects parameter 1 to be int, resource given in %sarray_fill_variation1.php on line %d NULL Done diff --git a/ext/standard/tests/array/array_fill_variation1_64bit.phpt b/ext/standard/tests/array/array_fill_variation1_64bit.phpt index 53a2eaee0d..ba3a70c482 100644 --- a/ext/standard/tests/array/array_fill_variation1_64bit.phpt +++ b/ext/standard/tests/array/array_fill_variation1_64bit.phpt @@ -146,23 +146,23 @@ array(2) { } -- Iteration 6 -- -Warning: array_fill() expects parameter 1 to be integer, array given in %s on line %d +Warning: array_fill() expects parameter 1 to be int, array given in %s on line %d NULL -- Iteration 7 -- -Warning: array_fill() expects parameter 1 to be integer, array given in %s on line %d +Warning: array_fill() expects parameter 1 to be int, array given in %s on line %d NULL -- Iteration 8 -- -Warning: array_fill() expects parameter 1 to be integer, array given in %s on line %d +Warning: array_fill() expects parameter 1 to be int, array given in %s on line %d NULL -- Iteration 9 -- -Warning: array_fill() expects parameter 1 to be integer, array given in %s on line %d +Warning: array_fill() expects parameter 1 to be int, array given in %s on line %d NULL -- Iteration 10 -- -Warning: array_fill() expects parameter 1 to be integer, array given in %s on line %d +Warning: array_fill() expects parameter 1 to be int, array given in %s on line %d NULL -- Iteration 11 -- array(2) { @@ -208,23 +208,23 @@ array(2) { } -- Iteration 17 -- -Warning: array_fill() expects parameter 1 to be integer, string given in %s on line %d +Warning: array_fill() expects parameter 1 to be int, string given in %s on line %d NULL -- Iteration 18 -- -Warning: array_fill() expects parameter 1 to be integer, string given in %s on line %d +Warning: array_fill() expects parameter 1 to be int, string given in %s on line %d NULL -- Iteration 19 -- -Warning: array_fill() expects parameter 1 to be integer, string given in %s on line %d +Warning: array_fill() expects parameter 1 to be int, string given in %s on line %d NULL -- Iteration 20 -- -Warning: array_fill() expects parameter 1 to be integer, string given in %s on line %d +Warning: array_fill() expects parameter 1 to be int, string given in %s on line %d NULL -- Iteration 21 -- -Warning: array_fill() expects parameter 1 to be integer, object given in %s on line %d +Warning: array_fill() expects parameter 1 to be int, object given in %s on line %d NULL -- Iteration 22 -- array(2) { @@ -242,6 +242,6 @@ array(2) { } -- Iteration 24 -- -Warning: array_fill() expects parameter 1 to be integer, resource given in %s on line %d +Warning: array_fill() expects parameter 1 to be int, resource given in %s on line %d NULL Done diff --git a/ext/standard/tests/array/array_fill_variation2.phpt b/ext/standard/tests/array/array_fill_variation2.phpt index d9ecd139a6..1209aea44d 100644 --- a/ext/standard/tests/array/array_fill_variation2.phpt +++ b/ext/standard/tests/array/array_fill_variation2.phpt @@ -129,23 +129,23 @@ array(0) { } -- Iteration 6 -- -Warning: array_fill() expects parameter 2 to be integer, array given in %s on line %d +Warning: array_fill() expects parameter 2 to be int, array given in %s on line %d NULL -- Iteration 7 -- -Warning: array_fill() expects parameter 2 to be integer, array given in %s on line %d +Warning: array_fill() expects parameter 2 to be int, array given in %s on line %d NULL -- Iteration 8 -- -Warning: array_fill() expects parameter 2 to be integer, array given in %s on line %d +Warning: array_fill() expects parameter 2 to be int, array given in %s on line %d NULL -- Iteration 9 -- -Warning: array_fill() expects parameter 2 to be integer, array given in %s on line %d +Warning: array_fill() expects parameter 2 to be int, array given in %s on line %d NULL -- Iteration 10 -- -Warning: array_fill() expects parameter 2 to be integer, array given in %s on line %d +Warning: array_fill() expects parameter 2 to be int, array given in %s on line %d NULL -- Iteration 11 -- array(0) { @@ -171,23 +171,23 @@ array(0) { } -- Iteration 17 -- -Warning: array_fill() expects parameter 2 to be integer, string given in %s on line %d +Warning: array_fill() expects parameter 2 to be int, string given in %s on line %d NULL -- Iteration 18 -- -Warning: array_fill() expects parameter 2 to be integer, string given in %s on line %d +Warning: array_fill() expects parameter 2 to be int, string given in %s on line %d NULL -- Iteration 19 -- -Warning: array_fill() expects parameter 2 to be integer, string given in %s on line %d +Warning: array_fill() expects parameter 2 to be int, string given in %s on line %d NULL -- Iteration 20 -- -Warning: array_fill() expects parameter 2 to be integer, string given in %s on line %d +Warning: array_fill() expects parameter 2 to be int, string given in %s on line %d NULL -- Iteration 21 -- -Warning: array_fill() expects parameter 2 to be integer, object given in %s on line %d +Warning: array_fill() expects parameter 2 to be int, object given in %s on line %d NULL -- Iteration 22 -- array(0) { diff --git a/ext/standard/tests/array/array_fill_variation4.phpt b/ext/standard/tests/array/array_fill_variation4.phpt index b750677e65..e0b1b5f0cd 100644 --- a/ext/standard/tests/array/array_fill_variation4.phpt +++ b/ext/standard/tests/array/array_fill_variation4.phpt @@ -43,7 +43,7 @@ for($i =0; $i < count($values); $i ++) echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_fill() : variation *** *** Filling 2 dimensional array with all basic valid values *** -- Iteration 1 -- diff --git a/ext/standard/tests/array/array_fill_variation5.phpt b/ext/standard/tests/array/array_fill_variation5.phpt index c8b67a7def..53e0fb5bec 100644 --- a/ext/standard/tests/array/array_fill_variation5.phpt +++ b/ext/standard/tests/array/array_fill_variation5.phpt @@ -52,7 +52,7 @@ for($i = 0; $i < count($values); $i++) echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_fill() : usage variations *** --- Testing array_fill() with different types of array values for 'val' argument --- -- Iteration 1 -- diff --git a/ext/standard/tests/array/array_filter_basic.phpt b/ext/standard/tests/array/array_filter_basic.phpt index 0b59c1cb75..b2a51ab2c6 100644 --- a/ext/standard/tests/array/array_filter_basic.phpt +++ b/ext/standard/tests/array/array_filter_basic.phpt @@ -34,7 +34,7 @@ var_dump( array_filter($input) ); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing array_filter() : basic functionality *** array(2) { [1]=> diff --git a/ext/standard/tests/array/array_filter_variation1.phpt b/ext/standard/tests/array/array_filter_variation1.phpt index e257844f26..f75b03cbed 100644 --- a/ext/standard/tests/array/array_filter_variation1.phpt +++ b/ext/standard/tests/array/array_filter_variation1.phpt @@ -102,19 +102,19 @@ echo "Done" *** Testing array_filter() : usage variations - unexpected values for 'input'*** -- Iteration 1 -- -Warning: array_filter() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_filter() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 2 -- -Warning: array_filter() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_filter() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 3 -- -Warning: array_filter() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_filter() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 4 -- -Warning: array_filter() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_filter() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 5 -- @@ -146,19 +146,19 @@ Warning: array_filter() expects parameter 1 to be array, null given in %s on lin NULL -- Iteration 12 -- -Warning: array_filter() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_filter() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 13 -- -Warning: array_filter() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_filter() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 14 -- -Warning: array_filter() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_filter() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 15 -- -Warning: array_filter() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_filter() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 16 -- diff --git a/ext/standard/tests/array/array_filter_variation3.phpt b/ext/standard/tests/array/array_filter_variation3.phpt index 70ad689f4d..be00f25d8d 100644 --- a/ext/standard/tests/array/array_filter_variation3.phpt +++ b/ext/standard/tests/array/array_filter_variation3.phpt @@ -49,7 +49,7 @@ for($count = 0; $count < count($input_values); $count++) echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing array_filter() : usage variations - different types of array for 'input' argument*** -- Iteration 1 -- array(5) { diff --git a/ext/standard/tests/array/array_filter_variation4.phpt b/ext/standard/tests/array/array_filter_variation4.phpt index 9dee494be4..f8b71dc10b 100644 --- a/ext/standard/tests/array/array_filter_variation4.phpt +++ b/ext/standard/tests/array/array_filter_variation4.phpt @@ -58,7 +58,7 @@ var_dump( array_filter($input, "callback4") ); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing array_filter() : usage variation - different 'callback' functions*** -- Callback function without parameter and with return -- array(8) { diff --git a/ext/standard/tests/array/array_filter_variation5.phpt b/ext/standard/tests/array/array_filter_variation5.phpt index 1f267908ea..81d9929c15 100644 --- a/ext/standard/tests/array/array_filter_variation5.phpt +++ b/ext/standard/tests/array/array_filter_variation5.phpt @@ -65,7 +65,7 @@ var_dump( array_filter($input, 'always_false') ); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing array_filter() : usage variations - different false elements in 'input' *** array(0) { } diff --git a/ext/standard/tests/array/array_filter_variation6.phpt b/ext/standard/tests/array/array_filter_variation6.phpt index df13dc2d12..665481a6c8 100644 --- a/ext/standard/tests/array/array_filter_variation6.phpt +++ b/ext/standard/tests/array/array_filter_variation6.phpt @@ -43,7 +43,7 @@ var_dump( array_filter($input) ); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing array_filter() : usage variations - 'input' containing references *** array(3) { [0]=> diff --git a/ext/standard/tests/array/array_filter_variation7.phpt b/ext/standard/tests/array/array_filter_variation7.phpt index 1e46800c5d..efbe141fe5 100644 --- a/ext/standard/tests/array/array_filter_variation7.phpt +++ b/ext/standard/tests/array/array_filter_variation7.phpt @@ -33,7 +33,7 @@ var_dump( array_filter($input, function($input) { }) ); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing array_filter() : usage variations - Anonymous callback functions *** Anonymous callback function with regular parameter and statement array(3) { diff --git a/ext/standard/tests/array/array_filter_variation8.phpt b/ext/standard/tests/array/array_filter_variation8.phpt index 7fc1fd798d..8fa91d824a 100644 --- a/ext/standard/tests/array/array_filter_variation8.phpt +++ b/ext/standard/tests/array/array_filter_variation8.phpt @@ -59,7 +59,7 @@ var_dump( array_filter($input, 'callback5') ); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing array_filter() : usage variations - callback function with different return values*** callback function with int return value array(9) { diff --git a/ext/standard/tests/array/array_flip_basic.phpt b/ext/standard/tests/array/array_flip_basic.phpt index c704b295fe..3912162dd8 100644 --- a/ext/standard/tests/array/array_flip_basic.phpt +++ b/ext/standard/tests/array/array_flip_basic.phpt @@ -30,7 +30,7 @@ $input = array(1 => 'one','two', 3 => 'three', 4, "five" => 5); var_dump( array_flip($input) ); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing array_flip() : basic functionality *** array(2) { [1]=> diff --git a/ext/standard/tests/array/array_flip_variation1.phpt b/ext/standard/tests/array/array_flip_variation1.phpt index 5dd84e600b..98aa459362 100644 --- a/ext/standard/tests/array/array_flip_variation1.phpt +++ b/ext/standard/tests/array/array_flip_variation1.phpt @@ -86,19 +86,19 @@ echo "Done" *** Testing array_flip() : usage variations - unexpected values for 'input' *** -- Iteration 1 -- -Warning: array_flip() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_flip() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 2 -- -Warning: array_flip() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_flip() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 3 -- -Warning: array_flip() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_flip() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 4 -- -Warning: array_flip() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_flip() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 5 -- @@ -130,19 +130,19 @@ Warning: array_flip() expects parameter 1 to be array, null given in %s on line NULL -- Iteration 12 -- -Warning: array_flip() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_flip() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 13 -- -Warning: array_flip() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_flip() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 14 -- -Warning: array_flip() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_flip() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 15 -- -Warning: array_flip() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_flip() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 16 -- diff --git a/ext/standard/tests/array/array_flip_variation3.phpt b/ext/standard/tests/array/array_flip_variation3.phpt Binary files differindex b1159d4382..1f6fb5804c 100644 --- a/ext/standard/tests/array/array_flip_variation3.phpt +++ b/ext/standard/tests/array/array_flip_variation3.phpt diff --git a/ext/standard/tests/array/array_flip_variation5.phpt b/ext/standard/tests/array/array_flip_variation5.phpt index f39a49069a..3ba0cf1aa4 100644 --- a/ext/standard/tests/array/array_flip_variation5.phpt +++ b/ext/standard/tests/array/array_flip_variation5.phpt @@ -39,7 +39,7 @@ var_dump( array_flip($input) ); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing array_flip() : 'input' array with repeatitive keys/values *** array(3) { ["VaLuE"]=> diff --git a/ext/standard/tests/array/array_intersect_assoc_basic.phpt b/ext/standard/tests/array/array_intersect_assoc_basic.phpt index 00c1cf8518..17e48b4ba0 100644 --- a/ext/standard/tests/array/array_intersect_assoc_basic.phpt +++ b/ext/standard/tests/array/array_intersect_assoc_basic.phpt @@ -40,7 +40,7 @@ var_dump( array_intersect_assoc($arr_associative, $arr_default_keys, $arr3, $arr echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_intersect_assoc() : basic functionality *** array(4) { [0]=> diff --git a/ext/standard/tests/array/array_intersect_assoc_variation1.phpt b/ext/standard/tests/array/array_intersect_assoc_variation1.phpt index 9c372c9522..ca11b7cc9b 100644 --- a/ext/standard/tests/array/array_intersect_assoc_variation1.phpt +++ b/ext/standard/tests/array/array_intersect_assoc_variation1.phpt @@ -112,170 +112,170 @@ echo "Done"; *** Testing array_intersect_assoc() : Passing non-array values to $arr1 argument *** -- Iteration 1 -- -Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 1 to be an array, int given in %s on line %d NULL -Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 1 to be an array, int given in %s on line %d NULL -- Iteration 2 -- -Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 1 to be an array, int given in %s on line %d NULL -Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 1 to be an array, int given in %s on line %d NULL -- Iteration 3 -- -Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 1 to be an array, int given in %s on line %d NULL -Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 1 to be an array, int given in %s on line %d NULL -- Iteration 4 -- -Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 1 to be an array, int given in %s on line %d NULL -Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 1 to be an array, int given in %s on line %d NULL -- Iteration 5 -- -Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 1 to be an array, float given in %s on line %d NULL -Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 1 to be an array, float given in %s on line %d NULL -- Iteration 6 -- -Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 1 to be an array, float given in %s on line %d NULL -Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 1 to be an array, float given in %s on line %d NULL -- Iteration 7 -- -Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 1 to be an array, float given in %s on line %d NULL -Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 1 to be an array, float given in %s on line %d NULL -- Iteration 8 -- -Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 1 to be an array, float given in %s on line %d NULL -Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 1 to be an array, float given in %s on line %d NULL -- Iteration 9 -- -Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 1 to be an array, float given in %s on line %d NULL -Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 1 to be an array, float given in %s on line %d NULL -- Iteration 10 -- -Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 1 to be an array, null given in %s on line %d NULL -Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 1 to be an array, null given in %s on line %d NULL -- Iteration 11 -- -Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 1 to be an array, null given in %s on line %d NULL -Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 1 to be an array, null given in %s on line %d NULL -- Iteration 12 -- -Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 1 to be an array, bool given in %s on line %d NULL -Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 1 to be an array, bool given in %s on line %d NULL -- Iteration 13 -- -Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 1 to be an array, bool given in %s on line %d NULL -Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 1 to be an array, bool given in %s on line %d NULL -- Iteration 14 -- -Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 1 to be an array, bool given in %s on line %d NULL -Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 1 to be an array, bool given in %s on line %d NULL -- Iteration 15 -- -Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 1 to be an array, bool given in %s on line %d NULL -Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 1 to be an array, bool given in %s on line %d NULL -- Iteration 16 -- -Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 1 to be an array, string given in %s on line %d NULL -Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 1 to be an array, string given in %s on line %d NULL -- Iteration 17 -- -Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 1 to be an array, string given in %s on line %d NULL -Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 1 to be an array, string given in %s on line %d NULL -- Iteration 18 -- -Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 1 to be an array, string given in %s on line %d NULL -Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 1 to be an array, string given in %s on line %d NULL -- Iteration 19 -- -Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 1 to be an array, string given in %s on line %d NULL -Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 1 to be an array, string given in %s on line %d NULL -- Iteration 20 -- -Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 1 to be an array, string given in %s on line %d NULL -Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 1 to be an array, string given in %s on line %d NULL -- Iteration 21 -- -Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 1 to be an array, object given in %s on line %d NULL -Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 1 to be an array, object given in %s on line %d NULL -- Iteration 22 -- -Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 1 to be an array, null given in %s on line %d NULL -Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 1 to be an array, null given in %s on line %d NULL -- Iteration 23 -- -Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 1 to be an array, null given in %s on line %d NULL -Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 1 to be an array, null given in %s on line %d NULL -- Iteration 24 -- -Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 1 to be an array, resource given in %s on line %d NULL -Warning: array_intersect_assoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 1 to be an array, resource given in %s on line %d NULL Done diff --git a/ext/standard/tests/array/array_intersect_assoc_variation10.phpt b/ext/standard/tests/array/array_intersect_assoc_variation10.phpt index a11b378e88..5e6137d089 100644 --- a/ext/standard/tests/array/array_intersect_assoc_variation10.phpt +++ b/ext/standard/tests/array/array_intersect_assoc_variation10.phpt @@ -31,7 +31,7 @@ var_dump( array_intersect_assoc($arr_binary, $arr_binary) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_intersect_assoc() : binary safe checking *** array(2) { [0]=> diff --git a/ext/standard/tests/array/array_intersect_assoc_variation2.phpt b/ext/standard/tests/array/array_intersect_assoc_variation2.phpt index 0659721686..274da6f7b2 100644 --- a/ext/standard/tests/array/array_intersect_assoc_variation2.phpt +++ b/ext/standard/tests/array/array_intersect_assoc_variation2.phpt @@ -113,170 +113,170 @@ echo "Done"; *** Testing array_intersect_assoc() : Passing non-array values to $arr2 argument *** -- Iteration 1 -- -Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 2 to be an array, int given in %s on line %d NULL -Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 2 to be an array, int given in %s on line %d NULL -- Iteration 2 -- -Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 2 to be an array, int given in %s on line %d NULL -Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 2 to be an array, int given in %s on line %d NULL -- Iteration 3 -- -Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 2 to be an array, int given in %s on line %d NULL -Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 2 to be an array, int given in %s on line %d NULL -- Iteration 4 -- -Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 2 to be an array, int given in %s on line %d NULL -Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 2 to be an array, int given in %s on line %d NULL -- Iteration 5 -- -Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 2 to be an array, float given in %s on line %d NULL -Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 2 to be an array, float given in %s on line %d NULL -- Iteration 6 -- -Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 2 to be an array, float given in %s on line %d NULL -Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 2 to be an array, float given in %s on line %d NULL -- Iteration 7 -- -Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 2 to be an array, float given in %s on line %d NULL -Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 2 to be an array, float given in %s on line %d NULL -- Iteration 8 -- -Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 2 to be an array, float given in %s on line %d NULL -Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 2 to be an array, float given in %s on line %d NULL -- Iteration 9 -- -Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 2 to be an array, float given in %s on line %d NULL -Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 2 to be an array, float given in %s on line %d NULL -- Iteration 10 -- -Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 2 to be an array, null given in %s on line %d NULL -Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 2 to be an array, null given in %s on line %d NULL -- Iteration 11 -- -Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 2 to be an array, null given in %s on line %d NULL -Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 2 to be an array, null given in %s on line %d NULL -- Iteration 12 -- -Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 2 to be an array, bool given in %s on line %d NULL -Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 2 to be an array, bool given in %s on line %d NULL -- Iteration 13 -- -Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 2 to be an array, bool given in %s on line %d NULL -Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 2 to be an array, bool given in %s on line %d NULL -- Iteration 14 -- -Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 2 to be an array, bool given in %s on line %d NULL -Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 2 to be an array, bool given in %s on line %d NULL -- Iteration 15 -- -Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 2 to be an array, bool given in %s on line %d NULL -Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 2 to be an array, bool given in %s on line %d NULL -- Iteration 16 -- -Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 2 to be an array, string given in %s on line %d NULL -Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 2 to be an array, string given in %s on line %d NULL -- Iteration 17 -- -Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 2 to be an array, string given in %s on line %d NULL -Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 2 to be an array, string given in %s on line %d NULL -- Iteration 18 -- -Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 2 to be an array, string given in %s on line %d NULL -Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 2 to be an array, string given in %s on line %d NULL -- Iteration 19 -- -Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 2 to be an array, string given in %s on line %d NULL -Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 2 to be an array, string given in %s on line %d NULL -- Iteration 20 -- -Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 2 to be an array, string given in %s on line %d NULL -Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 2 to be an array, string given in %s on line %d NULL -- Iteration 21 -- -Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 2 to be an array, object given in %s on line %d NULL -Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 2 to be an array, object given in %s on line %d NULL -- Iteration 22 -- -Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 2 to be an array, null given in %s on line %d NULL -Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 2 to be an array, null given in %s on line %d NULL -- Iteration 23 -- -Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 2 to be an array, null given in %s on line %d NULL -Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 2 to be an array, null given in %s on line %d NULL -- Iteration 24 -- -Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 2 to be an array, resource given in %s on line %d NULL -Warning: array_intersect_assoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_assoc(): Expected parameter 2 to be an array, resource given in %s on line %d NULL Done diff --git a/ext/standard/tests/array/array_intersect_assoc_variation3.phpt b/ext/standard/tests/array/array_intersect_assoc_variation3.phpt index 06cafe629c..44eaf4d410 100644 --- a/ext/standard/tests/array/array_intersect_assoc_variation3.phpt +++ b/ext/standard/tests/array/array_intersect_assoc_variation3.phpt @@ -101,7 +101,7 @@ foreach($arrays as $arr1) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_intersect_assoc() : Passing different types of arrays to $arr1 argument *** -- Iteration 1 -- array(1) { diff --git a/ext/standard/tests/array/array_intersect_assoc_variation4.phpt b/ext/standard/tests/array/array_intersect_assoc_variation4.phpt index 9b2cc441e0..df3cbfbcd7 100644 --- a/ext/standard/tests/array/array_intersect_assoc_variation4.phpt +++ b/ext/standard/tests/array/array_intersect_assoc_variation4.phpt @@ -100,7 +100,7 @@ foreach($arrays as $arr2) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_intersect_assoc() : Passing different types of arrays to $arr2 argument *** -- Iteration 1 -- array(1) { diff --git a/ext/standard/tests/array/array_intersect_assoc_variation5.phpt b/ext/standard/tests/array/array_intersect_assoc_variation5.phpt index b4fe47ea5e..3a86aa9466 100644 --- a/ext/standard/tests/array/array_intersect_assoc_variation5.phpt +++ b/ext/standard/tests/array/array_intersect_assoc_variation5.phpt @@ -79,7 +79,7 @@ foreach($arrays as $arr1) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_intersect_assoc() : assoc array with diff keys to $arr1 argument *** -- Iteration 1 -- array(0) { diff --git a/ext/standard/tests/array/array_intersect_assoc_variation6.phpt b/ext/standard/tests/array/array_intersect_assoc_variation6.phpt index 0c49a2cc46..e40f56bed0 100644 --- a/ext/standard/tests/array/array_intersect_assoc_variation6.phpt +++ b/ext/standard/tests/array/array_intersect_assoc_variation6.phpt @@ -79,7 +79,7 @@ foreach($arrays as $arr2) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_intersect_assoc() : assoc array with diff keys to $arr2 argument *** -- Iteration 1 -- array(0) { diff --git a/ext/standard/tests/array/array_intersect_basic.phpt b/ext/standard/tests/array/array_intersect_basic.phpt index 702260b49f..6c826c4045 100644 --- a/ext/standard/tests/array/array_intersect_basic.phpt +++ b/ext/standard/tests/array/array_intersect_basic.phpt @@ -39,7 +39,7 @@ var_dump( array_intersect($arr_associative, $arr_default_keys, $arr3, $arr_assoc echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_intersect() : basic functionality *** array(4) { [0]=> diff --git a/ext/standard/tests/array/array_intersect_key.phpt b/ext/standard/tests/array/array_intersect_key.phpt index 6d27839404..52a0ee5e97 100644 --- a/ext/standard/tests/array/array_intersect_key.phpt +++ b/ext/standard/tests/array/array_intersect_key.phpt @@ -59,7 +59,7 @@ function comp_func($a, $b) { } ?> ---EXPECTF-- +--EXPECT-- array(3) { [2]=> int(4) diff --git a/ext/standard/tests/array/array_intersect_key_variation1.phpt b/ext/standard/tests/array/array_intersect_key_variation1.phpt index 026d203b53..fb9dd2c7aa 100644 --- a/ext/standard/tests/array/array_intersect_key_variation1.phpt +++ b/ext/standard/tests/array/array_intersect_key_variation1.phpt @@ -106,209 +106,209 @@ fclose($fp); --int 0-- -Warning: array_intersect_key(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 1 to be an array, int given in %s on line %d NULL -Warning: array_intersect_key(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 1 to be an array, int given in %s on line %d NULL --int 1-- -Warning: array_intersect_key(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 1 to be an array, int given in %s on line %d NULL -Warning: array_intersect_key(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 1 to be an array, int given in %s on line %d NULL --int 12345-- -Warning: array_intersect_key(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 1 to be an array, int given in %s on line %d NULL -Warning: array_intersect_key(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 1 to be an array, int given in %s on line %d NULL --int -12345-- -Warning: array_intersect_key(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 1 to be an array, int given in %s on line %d NULL -Warning: array_intersect_key(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 1 to be an array, int given in %s on line %d NULL --float 10.5-- -Warning: array_intersect_key(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 1 to be an array, float given in %s on line %d NULL -Warning: array_intersect_key(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 1 to be an array, float given in %s on line %d NULL --float -10.5-- -Warning: array_intersect_key(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 1 to be an array, float given in %s on line %d NULL -Warning: array_intersect_key(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 1 to be an array, float given in %s on line %d NULL --float 12.3456789000e10-- -Warning: array_intersect_key(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 1 to be an array, float given in %s on line %d NULL -Warning: array_intersect_key(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 1 to be an array, float given in %s on line %d NULL --float -12.3456789000e10-- -Warning: array_intersect_key(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 1 to be an array, float given in %s on line %d NULL -Warning: array_intersect_key(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 1 to be an array, float given in %s on line %d NULL --float .5-- -Warning: array_intersect_key(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 1 to be an array, float given in %s on line %d NULL -Warning: array_intersect_key(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 1 to be an array, float given in %s on line %d NULL --uppercase NULL-- -Warning: array_intersect_key(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 1 to be an array, null given in %s on line %d NULL -Warning: array_intersect_key(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 1 to be an array, null given in %s on line %d NULL --lowercase null-- -Warning: array_intersect_key(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 1 to be an array, null given in %s on line %d NULL -Warning: array_intersect_key(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 1 to be an array, null given in %s on line %d NULL --lowercase true-- -Warning: array_intersect_key(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 1 to be an array, bool given in %s on line %d NULL -Warning: array_intersect_key(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 1 to be an array, bool given in %s on line %d NULL --lowercase false-- -Warning: array_intersect_key(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 1 to be an array, bool given in %s on line %d NULL -Warning: array_intersect_key(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 1 to be an array, bool given in %s on line %d NULL --uppercase TRUE-- -Warning: array_intersect_key(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 1 to be an array, bool given in %s on line %d NULL -Warning: array_intersect_key(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 1 to be an array, bool given in %s on line %d NULL --uppercase FALSE-- -Warning: array_intersect_key(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 1 to be an array, bool given in %s on line %d NULL -Warning: array_intersect_key(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 1 to be an array, bool given in %s on line %d NULL --empty string DQ-- -Warning: array_intersect_key(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 1 to be an array, string given in %s on line %d NULL -Warning: array_intersect_key(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 1 to be an array, string given in %s on line %d NULL --empty string SQ-- -Warning: array_intersect_key(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 1 to be an array, string given in %s on line %d NULL -Warning: array_intersect_key(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 1 to be an array, string given in %s on line %d NULL --string DQ-- -Warning: array_intersect_key(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 1 to be an array, string given in %s on line %d NULL -Warning: array_intersect_key(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 1 to be an array, string given in %s on line %d NULL --string SQ-- -Warning: array_intersect_key(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 1 to be an array, string given in %s on line %d NULL -Warning: array_intersect_key(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 1 to be an array, string given in %s on line %d NULL --mixed case string-- -Warning: array_intersect_key(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 1 to be an array, string given in %s on line %d NULL -Warning: array_intersect_key(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 1 to be an array, string given in %s on line %d NULL --heredoc-- -Warning: array_intersect_key(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 1 to be an array, string given in %s on line %d NULL -Warning: array_intersect_key(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 1 to be an array, string given in %s on line %d NULL --instance of classWithToString-- -Warning: array_intersect_key(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 1 to be an array, object given in %s on line %d NULL -Warning: array_intersect_key(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 1 to be an array, object given in %s on line %d NULL --instance of classWithoutToString-- -Warning: array_intersect_key(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 1 to be an array, object given in %s on line %d NULL -Warning: array_intersect_key(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 1 to be an array, object given in %s on line %d NULL --undefined var-- -Warning: array_intersect_key(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 1 to be an array, null given in %s on line %d NULL -Warning: array_intersect_key(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 1 to be an array, null given in %s on line %d NULL --unset var-- -Warning: array_intersect_key(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 1 to be an array, null given in %s on line %d NULL -Warning: array_intersect_key(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 1 to be an array, null given in %s on line %d NULL --resource var-- -Warning: array_intersect_key(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 1 to be an array, resource given in %s on line %d NULL -Warning: array_intersect_key(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 1 to be an array, resource given in %s on line %d NULL ===DONE=== diff --git a/ext/standard/tests/array/array_intersect_key_variation2.phpt b/ext/standard/tests/array/array_intersect_key_variation2.phpt index fa3458b6a8..5d2147b99f 100644 --- a/ext/standard/tests/array/array_intersect_key_variation2.phpt +++ b/ext/standard/tests/array/array_intersect_key_variation2.phpt @@ -107,209 +107,209 @@ fclose($fp); --int 0-- -Warning: array_intersect_key(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 2 to be an array, int given in %s on line %d NULL -Warning: array_intersect_key(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 2 to be an array, int given in %s on line %d NULL --int 1-- -Warning: array_intersect_key(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 2 to be an array, int given in %s on line %d NULL -Warning: array_intersect_key(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 2 to be an array, int given in %s on line %d NULL --int 12345-- -Warning: array_intersect_key(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 2 to be an array, int given in %s on line %d NULL -Warning: array_intersect_key(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 2 to be an array, int given in %s on line %d NULL --int -12345-- -Warning: array_intersect_key(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 2 to be an array, int given in %s on line %d NULL -Warning: array_intersect_key(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 2 to be an array, int given in %s on line %d NULL --float 10.5-- -Warning: array_intersect_key(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 2 to be an array, float given in %s on line %d NULL -Warning: array_intersect_key(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 2 to be an array, float given in %s on line %d NULL --float -10.5-- -Warning: array_intersect_key(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 2 to be an array, float given in %s on line %d NULL -Warning: array_intersect_key(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 2 to be an array, float given in %s on line %d NULL --float 12.3456789000e10-- -Warning: array_intersect_key(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 2 to be an array, float given in %s on line %d NULL -Warning: array_intersect_key(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 2 to be an array, float given in %s on line %d NULL --float -12.3456789000e10-- -Warning: array_intersect_key(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 2 to be an array, float given in %s on line %d NULL -Warning: array_intersect_key(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 2 to be an array, float given in %s on line %d NULL --float .5-- -Warning: array_intersect_key(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 2 to be an array, float given in %s on line %d NULL -Warning: array_intersect_key(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 2 to be an array, float given in %s on line %d NULL --uppercase NULL-- -Warning: array_intersect_key(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 2 to be an array, null given in %s on line %d NULL -Warning: array_intersect_key(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 2 to be an array, null given in %s on line %d NULL --lowercase null-- -Warning: array_intersect_key(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 2 to be an array, null given in %s on line %d NULL -Warning: array_intersect_key(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 2 to be an array, null given in %s on line %d NULL --lowercase true-- -Warning: array_intersect_key(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 2 to be an array, bool given in %s on line %d NULL -Warning: array_intersect_key(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 2 to be an array, bool given in %s on line %d NULL --lowercase false-- -Warning: array_intersect_key(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 2 to be an array, bool given in %s on line %d NULL -Warning: array_intersect_key(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 2 to be an array, bool given in %s on line %d NULL --uppercase TRUE-- -Warning: array_intersect_key(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 2 to be an array, bool given in %s on line %d NULL -Warning: array_intersect_key(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 2 to be an array, bool given in %s on line %d NULL --uppercase FALSE-- -Warning: array_intersect_key(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 2 to be an array, bool given in %s on line %d NULL -Warning: array_intersect_key(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 2 to be an array, bool given in %s on line %d NULL --empty string DQ-- -Warning: array_intersect_key(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 2 to be an array, string given in %s on line %d NULL -Warning: array_intersect_key(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 2 to be an array, string given in %s on line %d NULL --empty string SQ-- -Warning: array_intersect_key(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 2 to be an array, string given in %s on line %d NULL -Warning: array_intersect_key(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 2 to be an array, string given in %s on line %d NULL --string DQ-- -Warning: array_intersect_key(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 2 to be an array, string given in %s on line %d NULL -Warning: array_intersect_key(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 2 to be an array, string given in %s on line %d NULL --string SQ-- -Warning: array_intersect_key(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 2 to be an array, string given in %s on line %d NULL -Warning: array_intersect_key(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 2 to be an array, string given in %s on line %d NULL --mixed case string-- -Warning: array_intersect_key(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 2 to be an array, string given in %s on line %d NULL -Warning: array_intersect_key(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 2 to be an array, string given in %s on line %d NULL --heredoc-- -Warning: array_intersect_key(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 2 to be an array, string given in %s on line %d NULL -Warning: array_intersect_key(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 2 to be an array, string given in %s on line %d NULL --instance of classWithToString-- -Warning: array_intersect_key(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 2 to be an array, object given in %s on line %d NULL -Warning: array_intersect_key(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 2 to be an array, object given in %s on line %d NULL --instance of classWithoutToString-- -Warning: array_intersect_key(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 2 to be an array, object given in %s on line %d NULL -Warning: array_intersect_key(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 2 to be an array, object given in %s on line %d NULL --undefined var-- -Warning: array_intersect_key(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 2 to be an array, null given in %s on line %d NULL -Warning: array_intersect_key(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 2 to be an array, null given in %s on line %d NULL --unset var-- -Warning: array_intersect_key(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 2 to be an array, null given in %s on line %d NULL -Warning: array_intersect_key(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 2 to be an array, null given in %s on line %d NULL --resource var-- -Warning: array_intersect_key(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 2 to be an array, resource given in %s on line %d NULL -Warning: array_intersect_key(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 2 to be an array, resource given in %s on line %d NULL ===DONE=== diff --git a/ext/standard/tests/array/array_intersect_key_variation3.phpt b/ext/standard/tests/array/array_intersect_key_variation3.phpt index 3c0e697e96..dca52bafc2 100644 --- a/ext/standard/tests/array/array_intersect_key_variation3.phpt +++ b/ext/standard/tests/array/array_intersect_key_variation3.phpt @@ -105,131 +105,131 @@ fclose($fp); --int 0-- -Warning: array_intersect_key(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 3 to be an array, int given in %s on line %d NULL --int 1-- -Warning: array_intersect_key(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 3 to be an array, int given in %s on line %d NULL --int 12345-- -Warning: array_intersect_key(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 3 to be an array, int given in %s on line %d NULL --int -12345-- -Warning: array_intersect_key(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 3 to be an array, int given in %s on line %d NULL --float 10.5-- -Warning: array_intersect_key(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 3 to be an array, float given in %s on line %d NULL --float -10.5-- -Warning: array_intersect_key(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 3 to be an array, float given in %s on line %d NULL --float 12.3456789000e10-- -Warning: array_intersect_key(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 3 to be an array, float given in %s on line %d NULL --float -12.3456789000e10-- -Warning: array_intersect_key(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 3 to be an array, float given in %s on line %d NULL --float .5-- -Warning: array_intersect_key(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 3 to be an array, float given in %s on line %d NULL --uppercase NULL-- -Warning: array_intersect_key(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 3 to be an array, null given in %s on line %d NULL --lowercase null-- -Warning: array_intersect_key(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 3 to be an array, null given in %s on line %d NULL --lowercase true-- -Warning: array_intersect_key(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 3 to be an array, bool given in %s on line %d NULL --lowercase false-- -Warning: array_intersect_key(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 3 to be an array, bool given in %s on line %d NULL --uppercase TRUE-- -Warning: array_intersect_key(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 3 to be an array, bool given in %s on line %d NULL --uppercase FALSE-- -Warning: array_intersect_key(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 3 to be an array, bool given in %s on line %d NULL --empty string DQ-- -Warning: array_intersect_key(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 3 to be an array, string given in %s on line %d NULL --empty string SQ-- -Warning: array_intersect_key(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 3 to be an array, string given in %s on line %d NULL --string DQ-- -Warning: array_intersect_key(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 3 to be an array, string given in %s on line %d NULL --string SQ-- -Warning: array_intersect_key(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 3 to be an array, string given in %s on line %d NULL --mixed case string-- -Warning: array_intersect_key(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 3 to be an array, string given in %s on line %d NULL --heredoc-- -Warning: array_intersect_key(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 3 to be an array, string given in %s on line %d NULL --instance of classWithToString-- -Warning: array_intersect_key(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 3 to be an array, object given in %s on line %d NULL --instance of classWithoutToString-- -Warning: array_intersect_key(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 3 to be an array, object given in %s on line %d NULL --undefined var-- -Warning: array_intersect_key(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 3 to be an array, null given in %s on line %d NULL --unset var-- -Warning: array_intersect_key(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 3 to be an array, null given in %s on line %d NULL --resource var-- -Warning: array_intersect_key(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_key(): Expected parameter 3 to be an array, resource given in %s on line %d NULL ===DONE=== diff --git a/ext/standard/tests/array/array_intersect_key_variation4.phpt b/ext/standard/tests/array/array_intersect_key_variation4.phpt index 27ee1069dd..8b49ba8db1 100644 --- a/ext/standard/tests/array/array_intersect_key_variation4.phpt +++ b/ext/standard/tests/array/array_intersect_key_variation4.phpt @@ -25,7 +25,7 @@ foreach($input_arrays as $key =>$value) { } ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_intersect_key() : usage variation *** --decimal indexed-- diff --git a/ext/standard/tests/array/array_intersect_key_variation5.phpt b/ext/standard/tests/array/array_intersect_key_variation5.phpt index 461a1e8590..fb01bb9207 100644 --- a/ext/standard/tests/array/array_intersect_key_variation5.phpt +++ b/ext/standard/tests/array/array_intersect_key_variation5.phpt @@ -18,7 +18,7 @@ var_dump( array_intersect_key($input_array, $float_indx_array) ); var_dump( array_intersect_key($float_indx_array,$input_array ) ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_intersect_key() : usage variation *** -- Testing array_intersect_key() function with float indexed array -- diff --git a/ext/standard/tests/array/array_intersect_key_variation6.phpt b/ext/standard/tests/array/array_intersect_key_variation6.phpt index 344cb7bf6f..da0115e368 100644 --- a/ext/standard/tests/array/array_intersect_key_variation6.phpt +++ b/ext/standard/tests/array/array_intersect_key_variation6.phpt @@ -18,7 +18,7 @@ var_dump( array_intersect_key($input_array, $boolean_indx_array) ); var_dump( array_intersect_key($boolean_indx_array,$input_array ) ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_intersect_key() : usage variation *** -- Testing array_intersect_key() function with boolean indexed array -- diff --git a/ext/standard/tests/array/array_intersect_key_variation7.phpt b/ext/standard/tests/array/array_intersect_key_variation7.phpt index 2deb99b4d4..589893db5a 100644 --- a/ext/standard/tests/array/array_intersect_key_variation7.phpt +++ b/ext/standard/tests/array/array_intersect_key_variation7.phpt @@ -28,7 +28,7 @@ foreach($input_arrays as $key =>$value) { } ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_intersect_key() : usage variation *** --null indexed-- diff --git a/ext/standard/tests/array/array_intersect_key_variation8.phpt b/ext/standard/tests/array/array_intersect_key_variation8.phpt index e3d8898c83..9a84b2aead 100644 --- a/ext/standard/tests/array/array_intersect_key_variation8.phpt +++ b/ext/standard/tests/array/array_intersect_key_variation8.phpt @@ -31,7 +31,7 @@ var_dump( array_intersect_key($array1, $array2) ); var_dump( array_intersect_key($array2,$array1 ) ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_intersect_key() : usage variation *** array(2) { ["first"]=> diff --git a/ext/standard/tests/array/array_intersect_uassoc_variation1.phpt b/ext/standard/tests/array/array_intersect_uassoc_variation1.phpt index 717bdf02c0..887ad12d9a 100644 --- a/ext/standard/tests/array/array_intersect_uassoc_variation1.phpt +++ b/ext/standard/tests/array/array_intersect_uassoc_variation1.phpt @@ -114,209 +114,209 @@ fclose($fp); --int 0-- -Warning: array_intersect_uassoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, int given in %s on line %d NULL -Warning: array_intersect_uassoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, int given in %s on line %d NULL --int 1-- -Warning: array_intersect_uassoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, int given in %s on line %d NULL -Warning: array_intersect_uassoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, int given in %s on line %d NULL --int 12345-- -Warning: array_intersect_uassoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, int given in %s on line %d NULL -Warning: array_intersect_uassoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, int given in %s on line %d NULL --int -12345-- -Warning: array_intersect_uassoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, int given in %s on line %d NULL -Warning: array_intersect_uassoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, int given in %s on line %d NULL --float 10.5-- -Warning: array_intersect_uassoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, float given in %s on line %d NULL -Warning: array_intersect_uassoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, float given in %s on line %d NULL --float -10.5-- -Warning: array_intersect_uassoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, float given in %s on line %d NULL -Warning: array_intersect_uassoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, float given in %s on line %d NULL --float 12.3456789000e10-- -Warning: array_intersect_uassoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, float given in %s on line %d NULL -Warning: array_intersect_uassoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, float given in %s on line %d NULL --float -12.3456789000e10-- -Warning: array_intersect_uassoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, float given in %s on line %d NULL -Warning: array_intersect_uassoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, float given in %s on line %d NULL --float .5-- -Warning: array_intersect_uassoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, float given in %s on line %d NULL -Warning: array_intersect_uassoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, float given in %s on line %d NULL --uppercase NULL-- -Warning: array_intersect_uassoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, null given in %s on line %d NULL -Warning: array_intersect_uassoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, null given in %s on line %d NULL --lowercase null-- -Warning: array_intersect_uassoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, null given in %s on line %d NULL -Warning: array_intersect_uassoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, null given in %s on line %d NULL --lowercase true-- -Warning: array_intersect_uassoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, bool given in %s on line %d NULL -Warning: array_intersect_uassoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, bool given in %s on line %d NULL --lowercase false-- -Warning: array_intersect_uassoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, bool given in %s on line %d NULL -Warning: array_intersect_uassoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, bool given in %s on line %d NULL --uppercase TRUE-- -Warning: array_intersect_uassoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, bool given in %s on line %d NULL -Warning: array_intersect_uassoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, bool given in %s on line %d NULL --uppercase FALSE-- -Warning: array_intersect_uassoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, bool given in %s on line %d NULL -Warning: array_intersect_uassoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, bool given in %s on line %d NULL --empty string DQ-- -Warning: array_intersect_uassoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, string given in %s on line %d NULL -Warning: array_intersect_uassoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, string given in %s on line %d NULL --empty string SQ-- -Warning: array_intersect_uassoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, string given in %s on line %d NULL -Warning: array_intersect_uassoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, string given in %s on line %d NULL --string DQ-- -Warning: array_intersect_uassoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, string given in %s on line %d NULL -Warning: array_intersect_uassoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, string given in %s on line %d NULL --string SQ-- -Warning: array_intersect_uassoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, string given in %s on line %d NULL -Warning: array_intersect_uassoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, string given in %s on line %d NULL --mixed case string-- -Warning: array_intersect_uassoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, string given in %s on line %d NULL -Warning: array_intersect_uassoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, string given in %s on line %d NULL --heredoc-- -Warning: array_intersect_uassoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, string given in %s on line %d NULL -Warning: array_intersect_uassoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, string given in %s on line %d NULL --instance of classWithToString-- -Warning: array_intersect_uassoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, object given in %s on line %d NULL -Warning: array_intersect_uassoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, object given in %s on line %d NULL --instance of classWithoutToString-- -Warning: array_intersect_uassoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, object given in %s on line %d NULL -Warning: array_intersect_uassoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, object given in %s on line %d NULL --undefined var-- -Warning: array_intersect_uassoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, null given in %s on line %d NULL -Warning: array_intersect_uassoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, null given in %s on line %d NULL --unset var-- -Warning: array_intersect_uassoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, null given in %s on line %d NULL -Warning: array_intersect_uassoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, null given in %s on line %d NULL --resource-- -Warning: array_intersect_uassoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, resource given in %s on line %d NULL -Warning: array_intersect_uassoc(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 1 to be an array, resource given in %s on line %d NULL ===DONE=== diff --git a/ext/standard/tests/array/array_intersect_uassoc_variation10.phpt b/ext/standard/tests/array/array_intersect_uassoc_variation10.phpt index 09759a607d..8f0bfd4753 100644 --- a/ext/standard/tests/array/array_intersect_uassoc_variation10.phpt +++ b/ext/standard/tests/array/array_intersect_uassoc_variation10.phpt @@ -34,7 +34,7 @@ $obj = new MyClass(); var_dump( array_intersect_uassoc($array1, $array2, array($obj,'class_compare_func')) ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_intersect_uassoc() : usage variation *** -- Testing array_intersect_uassoc() function using class with static method as callback -- diff --git a/ext/standard/tests/array/array_intersect_uassoc_variation2.phpt b/ext/standard/tests/array/array_intersect_uassoc_variation2.phpt index c9d7e75cf2..d482e9ffcc 100644 --- a/ext/standard/tests/array/array_intersect_uassoc_variation2.phpt +++ b/ext/standard/tests/array/array_intersect_uassoc_variation2.phpt @@ -114,209 +114,209 @@ fclose($fp); --int 0-- -Warning: array_intersect_uassoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, int given in %s on line %d NULL -Warning: array_intersect_uassoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, int given in %s on line %d NULL --int 1-- -Warning: array_intersect_uassoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, int given in %s on line %d NULL -Warning: array_intersect_uassoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, int given in %s on line %d NULL --int 12345-- -Warning: array_intersect_uassoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, int given in %s on line %d NULL -Warning: array_intersect_uassoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, int given in %s on line %d NULL --int -12345-- -Warning: array_intersect_uassoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, int given in %s on line %d NULL -Warning: array_intersect_uassoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, int given in %s on line %d NULL --float 10.5-- -Warning: array_intersect_uassoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, float given in %s on line %d NULL -Warning: array_intersect_uassoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, float given in %s on line %d NULL --float -10.5-- -Warning: array_intersect_uassoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, float given in %s on line %d NULL -Warning: array_intersect_uassoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, float given in %s on line %d NULL --float 12.3456789000e10-- -Warning: array_intersect_uassoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, float given in %s on line %d NULL -Warning: array_intersect_uassoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, float given in %s on line %d NULL --float -12.3456789000e10-- -Warning: array_intersect_uassoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, float given in %s on line %d NULL -Warning: array_intersect_uassoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, float given in %s on line %d NULL --float .5-- -Warning: array_intersect_uassoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, float given in %s on line %d NULL -Warning: array_intersect_uassoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, float given in %s on line %d NULL --uppercase NULL-- -Warning: array_intersect_uassoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, null given in %s on line %d NULL -Warning: array_intersect_uassoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, null given in %s on line %d NULL --lowercase null-- -Warning: array_intersect_uassoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, null given in %s on line %d NULL -Warning: array_intersect_uassoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, null given in %s on line %d NULL --lowercase true-- -Warning: array_intersect_uassoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, bool given in %s on line %d NULL -Warning: array_intersect_uassoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, bool given in %s on line %d NULL --lowercase false-- -Warning: array_intersect_uassoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, bool given in %s on line %d NULL -Warning: array_intersect_uassoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, bool given in %s on line %d NULL --uppercase TRUE-- -Warning: array_intersect_uassoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, bool given in %s on line %d NULL -Warning: array_intersect_uassoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, bool given in %s on line %d NULL --uppercase FALSE-- -Warning: array_intersect_uassoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, bool given in %s on line %d NULL -Warning: array_intersect_uassoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, bool given in %s on line %d NULL --empty string DQ-- -Warning: array_intersect_uassoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, string given in %s on line %d NULL -Warning: array_intersect_uassoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, string given in %s on line %d NULL --empty string SQ-- -Warning: array_intersect_uassoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, string given in %s on line %d NULL -Warning: array_intersect_uassoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, string given in %s on line %d NULL --string DQ-- -Warning: array_intersect_uassoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, string given in %s on line %d NULL -Warning: array_intersect_uassoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, string given in %s on line %d NULL --string SQ-- -Warning: array_intersect_uassoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, string given in %s on line %d NULL -Warning: array_intersect_uassoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, string given in %s on line %d NULL --mixed case string-- -Warning: array_intersect_uassoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, string given in %s on line %d NULL -Warning: array_intersect_uassoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, string given in %s on line %d NULL --heredoc-- -Warning: array_intersect_uassoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, string given in %s on line %d NULL -Warning: array_intersect_uassoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, string given in %s on line %d NULL --instance of classWithToString-- -Warning: array_intersect_uassoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, object given in %s on line %d NULL -Warning: array_intersect_uassoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, object given in %s on line %d NULL --instance of classWithoutToString-- -Warning: array_intersect_uassoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, object given in %s on line %d NULL -Warning: array_intersect_uassoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, object given in %s on line %d NULL --undefined var-- -Warning: array_intersect_uassoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, null given in %s on line %d NULL -Warning: array_intersect_uassoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, null given in %s on line %d NULL --unset var-- -Warning: array_intersect_uassoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, null given in %s on line %d NULL -Warning: array_intersect_uassoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, null given in %s on line %d NULL --resource-- -Warning: array_intersect_uassoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, resource given in %s on line %d NULL -Warning: array_intersect_uassoc(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 2 to be an array, resource given in %s on line %d NULL ===DONE=== diff --git a/ext/standard/tests/array/array_intersect_uassoc_variation3.phpt b/ext/standard/tests/array/array_intersect_uassoc_variation3.phpt index b6d29dda9f..42e53101dc 100644 --- a/ext/standard/tests/array/array_intersect_uassoc_variation3.phpt +++ b/ext/standard/tests/array/array_intersect_uassoc_variation3.phpt @@ -113,131 +113,131 @@ fclose($fp); --int 0-- -Warning: array_intersect_uassoc(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 3 to be an array, int given in %s on line %d NULL --int 1-- -Warning: array_intersect_uassoc(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 3 to be an array, int given in %s on line %d NULL --int 12345-- -Warning: array_intersect_uassoc(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 3 to be an array, int given in %s on line %d NULL --int -12345-- -Warning: array_intersect_uassoc(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 3 to be an array, int given in %s on line %d NULL --float 10.5-- -Warning: array_intersect_uassoc(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 3 to be an array, float given in %s on line %d NULL --float -10.5-- -Warning: array_intersect_uassoc(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 3 to be an array, float given in %s on line %d NULL --float 12.3456789000e10-- -Warning: array_intersect_uassoc(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 3 to be an array, float given in %s on line %d NULL --float -12.3456789000e10-- -Warning: array_intersect_uassoc(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 3 to be an array, float given in %s on line %d NULL --float .5-- -Warning: array_intersect_uassoc(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 3 to be an array, float given in %s on line %d NULL --uppercase NULL-- -Warning: array_intersect_uassoc(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 3 to be an array, null given in %s on line %d NULL --lowercase null-- -Warning: array_intersect_uassoc(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 3 to be an array, null given in %s on line %d NULL --lowercase true-- -Warning: array_intersect_uassoc(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 3 to be an array, bool given in %s on line %d NULL --lowercase false-- -Warning: array_intersect_uassoc(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 3 to be an array, bool given in %s on line %d NULL --uppercase TRUE-- -Warning: array_intersect_uassoc(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 3 to be an array, bool given in %s on line %d NULL --uppercase FALSE-- -Warning: array_intersect_uassoc(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 3 to be an array, bool given in %s on line %d NULL --empty string DQ-- -Warning: array_intersect_uassoc(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 3 to be an array, string given in %s on line %d NULL --empty string SQ-- -Warning: array_intersect_uassoc(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 3 to be an array, string given in %s on line %d NULL --string DQ-- -Warning: array_intersect_uassoc(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 3 to be an array, string given in %s on line %d NULL --string SQ-- -Warning: array_intersect_uassoc(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 3 to be an array, string given in %s on line %d NULL --mixed case string-- -Warning: array_intersect_uassoc(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 3 to be an array, string given in %s on line %d NULL --heredoc-- -Warning: array_intersect_uassoc(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 3 to be an array, string given in %s on line %d NULL --instance of classWithToString-- -Warning: array_intersect_uassoc(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 3 to be an array, object given in %s on line %d NULL --instance of classWithoutToString-- -Warning: array_intersect_uassoc(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 3 to be an array, object given in %s on line %d NULL --undefined var-- -Warning: array_intersect_uassoc(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 3 to be an array, null given in %s on line %d NULL --unset var-- -Warning: array_intersect_uassoc(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 3 to be an array, null given in %s on line %d NULL --resource-- -Warning: array_intersect_uassoc(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_uassoc(): Expected parameter 3 to be an array, resource given in %s on line %d NULL ===DONE=== diff --git a/ext/standard/tests/array/array_intersect_uassoc_variation5.phpt b/ext/standard/tests/array/array_intersect_uassoc_variation5.phpt index ec7ee81969..10835a1871 100644 --- a/ext/standard/tests/array/array_intersect_uassoc_variation5.phpt +++ b/ext/standard/tests/array/array_intersect_uassoc_variation5.phpt @@ -33,7 +33,7 @@ echo "\n-- Result of integers and strings containing floating points intersectio var_dump( array_intersect_uassoc($arr_default_int, $arr_string_float, "key_compare_func") ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_intersect_uassoc() : usage variation *** -- Result of integers and floating point intersection -- diff --git a/ext/standard/tests/array/array_intersect_uassoc_variation6.phpt b/ext/standard/tests/array/array_intersect_uassoc_variation6.phpt index 55dd46d48e..b29a9684d5 100644 --- a/ext/standard/tests/array/array_intersect_uassoc_variation6.phpt +++ b/ext/standard/tests/array/array_intersect_uassoc_variation6.phpt @@ -29,7 +29,7 @@ echo "\n-- Result of floating points and strings containing floating point inter var_dump( array_intersect_uassoc($arr_float, $arr_string_float, "key_compare_func") ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_intersect_uassoc() : usage variation *** -- Result of floating points and strings containing integers intersection -- diff --git a/ext/standard/tests/array/array_intersect_uassoc_variation7.phpt b/ext/standard/tests/array/array_intersect_uassoc_variation7.phpt index 7fa053a91a..4be5ebf5d7 100644 --- a/ext/standard/tests/array/array_intersect_uassoc_variation7.phpt +++ b/ext/standard/tests/array/array_intersect_uassoc_variation7.phpt @@ -33,7 +33,7 @@ echo "\n-- Result of strings containing integers and strings containing floating var_dump( array_intersect_uassoc($arr1_string_int, $arr2_string_float, "key_compare_func") ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_intersect_uassoc() : usage variation *** -- Result of strings containing integers intersection -- diff --git a/ext/standard/tests/array/array_intersect_uassoc_variation8.phpt b/ext/standard/tests/array/array_intersect_uassoc_variation8.phpt index 7b218f7faa..256b883d28 100644 --- a/ext/standard/tests/array/array_intersect_uassoc_variation8.phpt +++ b/ext/standard/tests/array/array_intersect_uassoc_variation8.phpt @@ -28,7 +28,7 @@ echo "\n-- Testing array_intersect_uassoc() function when \$array2 is referencd var_dump( array_intersect_uassoc($array1, $array2, "strcasecmp") ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_intersect_uassoc() : usage variation *** -- Testing array_intersect_uassoc() function with referenced variable $ref_var has value 'a' -- diff --git a/ext/standard/tests/array/array_intersect_ukey_variation1.phpt b/ext/standard/tests/array/array_intersect_ukey_variation1.phpt index baefaa8620..86850094b8 100644 --- a/ext/standard/tests/array/array_intersect_ukey_variation1.phpt +++ b/ext/standard/tests/array/array_intersect_ukey_variation1.phpt @@ -112,209 +112,209 @@ fclose($fp); --int 0-- -Warning: array_intersect_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 1 to be an array, int given in %s on line %d NULL -Warning: array_intersect_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 1 to be an array, int given in %s on line %d NULL --int 1-- -Warning: array_intersect_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 1 to be an array, int given in %s on line %d NULL -Warning: array_intersect_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 1 to be an array, int given in %s on line %d NULL --int 12345-- -Warning: array_intersect_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 1 to be an array, int given in %s on line %d NULL -Warning: array_intersect_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 1 to be an array, int given in %s on line %d NULL --int -12345-- -Warning: array_intersect_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 1 to be an array, int given in %s on line %d NULL -Warning: array_intersect_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 1 to be an array, int given in %s on line %d NULL --float 10.5-- -Warning: array_intersect_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 1 to be an array, float given in %s on line %d NULL -Warning: array_intersect_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 1 to be an array, float given in %s on line %d NULL --float -10.5-- -Warning: array_intersect_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 1 to be an array, float given in %s on line %d NULL -Warning: array_intersect_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 1 to be an array, float given in %s on line %d NULL --float 12.3456789000e10-- -Warning: array_intersect_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 1 to be an array, float given in %s on line %d NULL -Warning: array_intersect_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 1 to be an array, float given in %s on line %d NULL --float -12.3456789000e10-- -Warning: array_intersect_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 1 to be an array, float given in %s on line %d NULL -Warning: array_intersect_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 1 to be an array, float given in %s on line %d NULL --float .5-- -Warning: array_intersect_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 1 to be an array, float given in %s on line %d NULL -Warning: array_intersect_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 1 to be an array, float given in %s on line %d NULL --uppercase NULL-- -Warning: array_intersect_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 1 to be an array, null given in %s on line %d NULL -Warning: array_intersect_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 1 to be an array, null given in %s on line %d NULL --lowercase null-- -Warning: array_intersect_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 1 to be an array, null given in %s on line %d NULL -Warning: array_intersect_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 1 to be an array, null given in %s on line %d NULL --lowercase true-- -Warning: array_intersect_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 1 to be an array, bool given in %s on line %d NULL -Warning: array_intersect_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 1 to be an array, bool given in %s on line %d NULL --lowercase false-- -Warning: array_intersect_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 1 to be an array, bool given in %s on line %d NULL -Warning: array_intersect_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 1 to be an array, bool given in %s on line %d NULL --uppercase TRUE-- -Warning: array_intersect_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 1 to be an array, bool given in %s on line %d NULL -Warning: array_intersect_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 1 to be an array, bool given in %s on line %d NULL --uppercase FALSE-- -Warning: array_intersect_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 1 to be an array, bool given in %s on line %d NULL -Warning: array_intersect_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 1 to be an array, bool given in %s on line %d NULL --empty string DQ-- -Warning: array_intersect_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 1 to be an array, string given in %s on line %d NULL -Warning: array_intersect_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 1 to be an array, string given in %s on line %d NULL --empty string SQ-- -Warning: array_intersect_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 1 to be an array, string given in %s on line %d NULL -Warning: array_intersect_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 1 to be an array, string given in %s on line %d NULL --string DQ-- -Warning: array_intersect_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 1 to be an array, string given in %s on line %d NULL -Warning: array_intersect_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 1 to be an array, string given in %s on line %d NULL --string SQ-- -Warning: array_intersect_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 1 to be an array, string given in %s on line %d NULL -Warning: array_intersect_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 1 to be an array, string given in %s on line %d NULL --mixed case string-- -Warning: array_intersect_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 1 to be an array, string given in %s on line %d NULL -Warning: array_intersect_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 1 to be an array, string given in %s on line %d NULL --heredoc-- -Warning: array_intersect_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 1 to be an array, string given in %s on line %d NULL -Warning: array_intersect_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 1 to be an array, string given in %s on line %d NULL --instance of classWithToString-- -Warning: array_intersect_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 1 to be an array, object given in %s on line %d NULL -Warning: array_intersect_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 1 to be an array, object given in %s on line %d NULL --instance of classWithoutToString-- -Warning: array_intersect_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 1 to be an array, object given in %s on line %d NULL -Warning: array_intersect_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 1 to be an array, object given in %s on line %d NULL --undefined var-- -Warning: array_intersect_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 1 to be an array, null given in %s on line %d NULL -Warning: array_intersect_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 1 to be an array, null given in %s on line %d NULL --unset var-- -Warning: array_intersect_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 1 to be an array, null given in %s on line %d NULL -Warning: array_intersect_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 1 to be an array, null given in %s on line %d NULL --resource var-- -Warning: array_intersect_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 1 to be an array, resource given in %s on line %d NULL -Warning: array_intersect_ukey(): Argument #1 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 1 to be an array, resource given in %s on line %d NULL ===DONE=== diff --git a/ext/standard/tests/array/array_intersect_ukey_variation2.phpt b/ext/standard/tests/array/array_intersect_ukey_variation2.phpt index 3638c9ceb7..82b43628e3 100644 --- a/ext/standard/tests/array/array_intersect_ukey_variation2.phpt +++ b/ext/standard/tests/array/array_intersect_ukey_variation2.phpt @@ -112,209 +112,209 @@ fclose($fp); --int 0-- -Warning: array_intersect_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 2 to be an array, int given in %s on line %d NULL -Warning: array_intersect_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 2 to be an array, int given in %s on line %d NULL --int 1-- -Warning: array_intersect_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 2 to be an array, int given in %s on line %d NULL -Warning: array_intersect_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 2 to be an array, int given in %s on line %d NULL --int 12345-- -Warning: array_intersect_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 2 to be an array, int given in %s on line %d NULL -Warning: array_intersect_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 2 to be an array, int given in %s on line %d NULL --int -12345-- -Warning: array_intersect_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 2 to be an array, int given in %s on line %d NULL -Warning: array_intersect_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 2 to be an array, int given in %s on line %d NULL --float 10.5-- -Warning: array_intersect_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 2 to be an array, float given in %s on line %d NULL -Warning: array_intersect_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 2 to be an array, float given in %s on line %d NULL --float -10.5-- -Warning: array_intersect_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 2 to be an array, float given in %s on line %d NULL -Warning: array_intersect_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 2 to be an array, float given in %s on line %d NULL --float 12.3456789000e10-- -Warning: array_intersect_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 2 to be an array, float given in %s on line %d NULL -Warning: array_intersect_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 2 to be an array, float given in %s on line %d NULL --float -12.3456789000e10-- -Warning: array_intersect_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 2 to be an array, float given in %s on line %d NULL -Warning: array_intersect_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 2 to be an array, float given in %s on line %d NULL --float .5-- -Warning: array_intersect_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 2 to be an array, float given in %s on line %d NULL -Warning: array_intersect_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 2 to be an array, float given in %s on line %d NULL --uppercase NULL-- -Warning: array_intersect_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 2 to be an array, null given in %s on line %d NULL -Warning: array_intersect_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 2 to be an array, null given in %s on line %d NULL --lowercase null-- -Warning: array_intersect_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 2 to be an array, null given in %s on line %d NULL -Warning: array_intersect_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 2 to be an array, null given in %s on line %d NULL --lowercase true-- -Warning: array_intersect_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 2 to be an array, bool given in %s on line %d NULL -Warning: array_intersect_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 2 to be an array, bool given in %s on line %d NULL --lowercase false-- -Warning: array_intersect_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 2 to be an array, bool given in %s on line %d NULL -Warning: array_intersect_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 2 to be an array, bool given in %s on line %d NULL --uppercase TRUE-- -Warning: array_intersect_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 2 to be an array, bool given in %s on line %d NULL -Warning: array_intersect_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 2 to be an array, bool given in %s on line %d NULL --uppercase FALSE-- -Warning: array_intersect_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 2 to be an array, bool given in %s on line %d NULL -Warning: array_intersect_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 2 to be an array, bool given in %s on line %d NULL --empty string DQ-- -Warning: array_intersect_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 2 to be an array, string given in %s on line %d NULL -Warning: array_intersect_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 2 to be an array, string given in %s on line %d NULL --empty string SQ-- -Warning: array_intersect_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 2 to be an array, string given in %s on line %d NULL -Warning: array_intersect_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 2 to be an array, string given in %s on line %d NULL --string DQ-- -Warning: array_intersect_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 2 to be an array, string given in %s on line %d NULL -Warning: array_intersect_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 2 to be an array, string given in %s on line %d NULL --string SQ-- -Warning: array_intersect_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 2 to be an array, string given in %s on line %d NULL -Warning: array_intersect_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 2 to be an array, string given in %s on line %d NULL --mixed case string-- -Warning: array_intersect_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 2 to be an array, string given in %s on line %d NULL -Warning: array_intersect_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 2 to be an array, string given in %s on line %d NULL --heredoc-- -Warning: array_intersect_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 2 to be an array, string given in %s on line %d NULL -Warning: array_intersect_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 2 to be an array, string given in %s on line %d NULL --instance of classWithToString-- -Warning: array_intersect_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 2 to be an array, object given in %s on line %d NULL -Warning: array_intersect_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 2 to be an array, object given in %s on line %d NULL --instance of classWithoutToString-- -Warning: array_intersect_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 2 to be an array, object given in %s on line %d NULL -Warning: array_intersect_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 2 to be an array, object given in %s on line %d NULL --undefined var-- -Warning: array_intersect_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 2 to be an array, null given in %s on line %d NULL -Warning: array_intersect_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 2 to be an array, null given in %s on line %d NULL --unset var-- -Warning: array_intersect_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 2 to be an array, null given in %s on line %d NULL -Warning: array_intersect_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 2 to be an array, null given in %s on line %d NULL --resource var-- -Warning: array_intersect_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 2 to be an array, resource given in %s on line %d NULL -Warning: array_intersect_ukey(): Argument #2 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 2 to be an array, resource given in %s on line %d NULL ===DONE=== diff --git a/ext/standard/tests/array/array_intersect_ukey_variation4.phpt b/ext/standard/tests/array/array_intersect_ukey_variation4.phpt index 085a5d9477..35c0d4a2e6 100644 --- a/ext/standard/tests/array/array_intersect_ukey_variation4.phpt +++ b/ext/standard/tests/array/array_intersect_ukey_variation4.phpt @@ -113,209 +113,209 @@ fclose($fp); --int 0-- -Warning: array_intersect_ukey(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 3 to be an array, int given in %s on line %d NULL -Warning: array_intersect_ukey(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 3 to be an array, int given in %s on line %d NULL --int 1-- -Warning: array_intersect_ukey(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 3 to be an array, int given in %s on line %d NULL -Warning: array_intersect_ukey(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 3 to be an array, int given in %s on line %d NULL --int 12345-- -Warning: array_intersect_ukey(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 3 to be an array, int given in %s on line %d NULL -Warning: array_intersect_ukey(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 3 to be an array, int given in %s on line %d NULL --int -12345-- -Warning: array_intersect_ukey(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 3 to be an array, int given in %s on line %d NULL -Warning: array_intersect_ukey(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 3 to be an array, int given in %s on line %d NULL --float 10.5-- -Warning: array_intersect_ukey(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 3 to be an array, float given in %s on line %d NULL -Warning: array_intersect_ukey(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 3 to be an array, float given in %s on line %d NULL --float -10.5-- -Warning: array_intersect_ukey(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 3 to be an array, float given in %s on line %d NULL -Warning: array_intersect_ukey(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 3 to be an array, float given in %s on line %d NULL --float 12.3456789000e10-- -Warning: array_intersect_ukey(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 3 to be an array, float given in %s on line %d NULL -Warning: array_intersect_ukey(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 3 to be an array, float given in %s on line %d NULL --float -12.3456789000e10-- -Warning: array_intersect_ukey(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 3 to be an array, float given in %s on line %d NULL -Warning: array_intersect_ukey(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 3 to be an array, float given in %s on line %d NULL --float .5-- -Warning: array_intersect_ukey(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 3 to be an array, float given in %s on line %d NULL -Warning: array_intersect_ukey(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 3 to be an array, float given in %s on line %d NULL --uppercase NULL-- -Warning: array_intersect_ukey(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 3 to be an array, null given in %s on line %d NULL -Warning: array_intersect_ukey(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 3 to be an array, null given in %s on line %d NULL --lowercase null-- -Warning: array_intersect_ukey(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 3 to be an array, null given in %s on line %d NULL -Warning: array_intersect_ukey(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 3 to be an array, null given in %s on line %d NULL --lowercase true-- -Warning: array_intersect_ukey(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 3 to be an array, bool given in %s on line %d NULL -Warning: array_intersect_ukey(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 3 to be an array, bool given in %s on line %d NULL --lowercase false-- -Warning: array_intersect_ukey(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 3 to be an array, bool given in %s on line %d NULL -Warning: array_intersect_ukey(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 3 to be an array, bool given in %s on line %d NULL --uppercase TRUE-- -Warning: array_intersect_ukey(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 3 to be an array, bool given in %s on line %d NULL -Warning: array_intersect_ukey(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 3 to be an array, bool given in %s on line %d NULL --uppercase FALSE-- -Warning: array_intersect_ukey(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 3 to be an array, bool given in %s on line %d NULL -Warning: array_intersect_ukey(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 3 to be an array, bool given in %s on line %d NULL --empty string DQ-- -Warning: array_intersect_ukey(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 3 to be an array, string given in %s on line %d NULL -Warning: array_intersect_ukey(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 3 to be an array, string given in %s on line %d NULL --empty string SQ-- -Warning: array_intersect_ukey(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 3 to be an array, string given in %s on line %d NULL -Warning: array_intersect_ukey(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 3 to be an array, string given in %s on line %d NULL --string DQ-- -Warning: array_intersect_ukey(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 3 to be an array, string given in %s on line %d NULL -Warning: array_intersect_ukey(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 3 to be an array, string given in %s on line %d NULL --string SQ-- -Warning: array_intersect_ukey(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 3 to be an array, string given in %s on line %d NULL -Warning: array_intersect_ukey(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 3 to be an array, string given in %s on line %d NULL --mixed case string-- -Warning: array_intersect_ukey(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 3 to be an array, string given in %s on line %d NULL -Warning: array_intersect_ukey(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 3 to be an array, string given in %s on line %d NULL --heredoc-- -Warning: array_intersect_ukey(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 3 to be an array, string given in %s on line %d NULL -Warning: array_intersect_ukey(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 3 to be an array, string given in %s on line %d NULL --instance of classWithToString-- -Warning: array_intersect_ukey(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 3 to be an array, object given in %s on line %d NULL -Warning: array_intersect_ukey(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 3 to be an array, object given in %s on line %d NULL --instance of classWithoutToString-- -Warning: array_intersect_ukey(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 3 to be an array, object given in %s on line %d NULL -Warning: array_intersect_ukey(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 3 to be an array, object given in %s on line %d NULL --undefined var-- -Warning: array_intersect_ukey(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 3 to be an array, null given in %s on line %d NULL -Warning: array_intersect_ukey(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 3 to be an array, null given in %s on line %d NULL --unset var-- -Warning: array_intersect_ukey(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 3 to be an array, null given in %s on line %d NULL -Warning: array_intersect_ukey(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 3 to be an array, null given in %s on line %d NULL --resource var-- -Warning: array_intersect_ukey(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 3 to be an array, resource given in %s on line %d NULL -Warning: array_intersect_ukey(): Argument #3 is not an array in %s on line %d +Warning: array_intersect_ukey(): Expected parameter 3 to be an array, resource given in %s on line %d NULL ===DONE=== diff --git a/ext/standard/tests/array/array_intersect_ukey_variation5.phpt b/ext/standard/tests/array/array_intersect_ukey_variation5.phpt index 26fa0baa7d..e56d6195d0 100644 --- a/ext/standard/tests/array/array_intersect_ukey_variation5.phpt +++ b/ext/standard/tests/array/array_intersect_ukey_variation5.phpt @@ -34,7 +34,7 @@ echo "\n-- Result of integers and strings containing floating points intersectio var_dump( array_intersect_ukey($arr_default_int, $arr_string_float, "key_compare_func") ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_intersect_ukey() : usage variation *** -- Result of integers and floating point intersection -- diff --git a/ext/standard/tests/array/array_intersect_ukey_variation6.phpt b/ext/standard/tests/array/array_intersect_ukey_variation6.phpt index 9918a6d17b..9384c48a46 100644 --- a/ext/standard/tests/array/array_intersect_ukey_variation6.phpt +++ b/ext/standard/tests/array/array_intersect_ukey_variation6.phpt @@ -30,7 +30,7 @@ echo "\n-- Result of floating points and strings containing floating point inter var_dump( array_intersect_ukey($arr_float, $arr_string_float, 'key_compare_func') ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_intersect_ukey() : usage variation *** -- Result of floating points and strings containing integers intersection -- diff --git a/ext/standard/tests/array/array_intersect_ukey_variation7.phpt b/ext/standard/tests/array/array_intersect_ukey_variation7.phpt index 93ef64ad4f..4f069c0ae8 100644 --- a/ext/standard/tests/array/array_intersect_ukey_variation7.phpt +++ b/ext/standard/tests/array/array_intersect_ukey_variation7.phpt @@ -34,7 +34,7 @@ echo "\n-- Result of strings containing integers and strings containing floating var_dump( array_intersect_ukey($arr1_string_int, $arr2_string_float, 'key_compare_func') ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_intersect_ukey() : usage variation *** -- Result of strings containing integers intersection -- diff --git a/ext/standard/tests/array/array_intersect_ukey_variation9.phpt b/ext/standard/tests/array/array_intersect_ukey_variation9.phpt index 829ccc7b7c..f6dddb9e83 100644 --- a/ext/standard/tests/array/array_intersect_ukey_variation9.phpt +++ b/ext/standard/tests/array/array_intersect_ukey_variation9.phpt @@ -34,7 +34,7 @@ $obj = new MyClass(); var_dump( array_intersect_ukey($array1, $array2, array($obj,'class_compare_func')) ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_intersect_ukey() : usage variation *** -- Testing array_intersect_ukey() function using class with static method as callback -- diff --git a/ext/standard/tests/array/array_intersect_variation1.phpt b/ext/standard/tests/array/array_intersect_variation1.phpt index 7e737b0512..9536dd8c2a 100644 --- a/ext/standard/tests/array/array_intersect_variation1.phpt +++ b/ext/standard/tests/array/array_intersect_variation1.phpt @@ -111,170 +111,170 @@ echo "Done"; *** Testing array_intersect() : Passing non-array values to $arr1 argument *** -- Iterator 1 -- -Warning: array_intersect(): Argument #1 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 1 to be an array, int given in %s on line %d NULL -Warning: array_intersect(): Argument #1 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 1 to be an array, int given in %s on line %d NULL -- Iterator 2 -- -Warning: array_intersect(): Argument #1 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 1 to be an array, int given in %s on line %d NULL -Warning: array_intersect(): Argument #1 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 1 to be an array, int given in %s on line %d NULL -- Iterator 3 -- -Warning: array_intersect(): Argument #1 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 1 to be an array, int given in %s on line %d NULL -Warning: array_intersect(): Argument #1 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 1 to be an array, int given in %s on line %d NULL -- Iterator 4 -- -Warning: array_intersect(): Argument #1 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 1 to be an array, int given in %s on line %d NULL -Warning: array_intersect(): Argument #1 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 1 to be an array, int given in %s on line %d NULL -- Iterator 5 -- -Warning: array_intersect(): Argument #1 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 1 to be an array, float given in %s on line %d NULL -Warning: array_intersect(): Argument #1 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 1 to be an array, float given in %s on line %d NULL -- Iterator 6 -- -Warning: array_intersect(): Argument #1 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 1 to be an array, float given in %s on line %d NULL -Warning: array_intersect(): Argument #1 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 1 to be an array, float given in %s on line %d NULL -- Iterator 7 -- -Warning: array_intersect(): Argument #1 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 1 to be an array, float given in %s on line %d NULL -Warning: array_intersect(): Argument #1 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 1 to be an array, float given in %s on line %d NULL -- Iterator 8 -- -Warning: array_intersect(): Argument #1 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 1 to be an array, float given in %s on line %d NULL -Warning: array_intersect(): Argument #1 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 1 to be an array, float given in %s on line %d NULL -- Iterator 9 -- -Warning: array_intersect(): Argument #1 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 1 to be an array, float given in %s on line %d NULL -Warning: array_intersect(): Argument #1 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 1 to be an array, float given in %s on line %d NULL -- Iterator 10 -- -Warning: array_intersect(): Argument #1 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 1 to be an array, null given in %s on line %d NULL -Warning: array_intersect(): Argument #1 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 1 to be an array, null given in %s on line %d NULL -- Iterator 11 -- -Warning: array_intersect(): Argument #1 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 1 to be an array, null given in %s on line %d NULL -Warning: array_intersect(): Argument #1 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 1 to be an array, null given in %s on line %d NULL -- Iterator 12 -- -Warning: array_intersect(): Argument #1 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 1 to be an array, bool given in %s on line %d NULL -Warning: array_intersect(): Argument #1 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 1 to be an array, bool given in %s on line %d NULL -- Iterator 13 -- -Warning: array_intersect(): Argument #1 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 1 to be an array, bool given in %s on line %d NULL -Warning: array_intersect(): Argument #1 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 1 to be an array, bool given in %s on line %d NULL -- Iterator 14 -- -Warning: array_intersect(): Argument #1 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 1 to be an array, bool given in %s on line %d NULL -Warning: array_intersect(): Argument #1 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 1 to be an array, bool given in %s on line %d NULL -- Iterator 15 -- -Warning: array_intersect(): Argument #1 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 1 to be an array, bool given in %s on line %d NULL -Warning: array_intersect(): Argument #1 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 1 to be an array, bool given in %s on line %d NULL -- Iterator 16 -- -Warning: array_intersect(): Argument #1 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 1 to be an array, string given in %s on line %d NULL -Warning: array_intersect(): Argument #1 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 1 to be an array, string given in %s on line %d NULL -- Iterator 17 -- -Warning: array_intersect(): Argument #1 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 1 to be an array, string given in %s on line %d NULL -Warning: array_intersect(): Argument #1 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 1 to be an array, string given in %s on line %d NULL -- Iterator 18 -- -Warning: array_intersect(): Argument #1 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 1 to be an array, string given in %s on line %d NULL -Warning: array_intersect(): Argument #1 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 1 to be an array, string given in %s on line %d NULL -- Iterator 19 -- -Warning: array_intersect(): Argument #1 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 1 to be an array, string given in %s on line %d NULL -Warning: array_intersect(): Argument #1 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 1 to be an array, string given in %s on line %d NULL -- Iterator 20 -- -Warning: array_intersect(): Argument #1 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 1 to be an array, string given in %s on line %d NULL -Warning: array_intersect(): Argument #1 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 1 to be an array, string given in %s on line %d NULL -- Iterator 21 -- -Warning: array_intersect(): Argument #1 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 1 to be an array, object given in %s on line %d NULL -Warning: array_intersect(): Argument #1 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 1 to be an array, object given in %s on line %d NULL -- Iterator 22 -- -Warning: array_intersect(): Argument #1 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 1 to be an array, null given in %s on line %d NULL -Warning: array_intersect(): Argument #1 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 1 to be an array, null given in %s on line %d NULL -- Iterator 23 -- -Warning: array_intersect(): Argument #1 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 1 to be an array, null given in %s on line %d NULL -Warning: array_intersect(): Argument #1 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 1 to be an array, null given in %s on line %d NULL -- Iterator 24 -- -Warning: array_intersect(): Argument #1 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 1 to be an array, resource given in %s on line %d NULL -Warning: array_intersect(): Argument #1 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 1 to be an array, resource given in %s on line %d NULL Done diff --git a/ext/standard/tests/array/array_intersect_variation10.phpt b/ext/standard/tests/array/array_intersect_variation10.phpt index df395b053c..b45e0da74f 100644 --- a/ext/standard/tests/array/array_intersect_variation10.phpt +++ b/ext/standard/tests/array/array_intersect_variation10.phpt @@ -30,7 +30,7 @@ var_dump( array_intersect($arr_binary, $arr_binary) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_intersect() : binary safe checking *** array(2) { [0]=> diff --git a/ext/standard/tests/array/array_intersect_variation2.phpt b/ext/standard/tests/array/array_intersect_variation2.phpt index e973a5d93a..1db37b8467 100644 --- a/ext/standard/tests/array/array_intersect_variation2.phpt +++ b/ext/standard/tests/array/array_intersect_variation2.phpt @@ -112,170 +112,170 @@ echo "Done"; *** Testing array_intersect() : Passing non-array values to $arr2 argument *** -- Iterator 1 -- -Warning: array_intersect(): Argument #2 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 2 to be an array, int given in %s on line %d NULL -Warning: array_intersect(): Argument #2 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 2 to be an array, int given in %s on line %d NULL -- Iterator 2 -- -Warning: array_intersect(): Argument #2 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 2 to be an array, int given in %s on line %d NULL -Warning: array_intersect(): Argument #2 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 2 to be an array, int given in %s on line %d NULL -- Iterator 3 -- -Warning: array_intersect(): Argument #2 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 2 to be an array, int given in %s on line %d NULL -Warning: array_intersect(): Argument #2 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 2 to be an array, int given in %s on line %d NULL -- Iterator 4 -- -Warning: array_intersect(): Argument #2 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 2 to be an array, int given in %s on line %d NULL -Warning: array_intersect(): Argument #2 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 2 to be an array, int given in %s on line %d NULL -- Iterator 5 -- -Warning: array_intersect(): Argument #2 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 2 to be an array, float given in %s on line %d NULL -Warning: array_intersect(): Argument #2 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 2 to be an array, float given in %s on line %d NULL -- Iterator 6 -- -Warning: array_intersect(): Argument #2 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 2 to be an array, float given in %s on line %d NULL -Warning: array_intersect(): Argument #2 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 2 to be an array, float given in %s on line %d NULL -- Iterator 7 -- -Warning: array_intersect(): Argument #2 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 2 to be an array, float given in %s on line %d NULL -Warning: array_intersect(): Argument #2 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 2 to be an array, float given in %s on line %d NULL -- Iterator 8 -- -Warning: array_intersect(): Argument #2 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 2 to be an array, float given in %s on line %d NULL -Warning: array_intersect(): Argument #2 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 2 to be an array, float given in %s on line %d NULL -- Iterator 9 -- -Warning: array_intersect(): Argument #2 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 2 to be an array, float given in %s on line %d NULL -Warning: array_intersect(): Argument #2 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 2 to be an array, float given in %s on line %d NULL -- Iterator 10 -- -Warning: array_intersect(): Argument #2 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 2 to be an array, null given in %s on line %d NULL -Warning: array_intersect(): Argument #2 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 2 to be an array, null given in %s on line %d NULL -- Iterator 11 -- -Warning: array_intersect(): Argument #2 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 2 to be an array, null given in %s on line %d NULL -Warning: array_intersect(): Argument #2 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 2 to be an array, null given in %s on line %d NULL -- Iterator 12 -- -Warning: array_intersect(): Argument #2 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 2 to be an array, bool given in %s on line %d NULL -Warning: array_intersect(): Argument #2 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 2 to be an array, bool given in %s on line %d NULL -- Iterator 13 -- -Warning: array_intersect(): Argument #2 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 2 to be an array, bool given in %s on line %d NULL -Warning: array_intersect(): Argument #2 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 2 to be an array, bool given in %s on line %d NULL -- Iterator 14 -- -Warning: array_intersect(): Argument #2 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 2 to be an array, bool given in %s on line %d NULL -Warning: array_intersect(): Argument #2 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 2 to be an array, bool given in %s on line %d NULL -- Iterator 15 -- -Warning: array_intersect(): Argument #2 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 2 to be an array, bool given in %s on line %d NULL -Warning: array_intersect(): Argument #2 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 2 to be an array, bool given in %s on line %d NULL -- Iterator 16 -- -Warning: array_intersect(): Argument #2 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 2 to be an array, string given in %s on line %d NULL -Warning: array_intersect(): Argument #2 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 2 to be an array, string given in %s on line %d NULL -- Iterator 17 -- -Warning: array_intersect(): Argument #2 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 2 to be an array, string given in %s on line %d NULL -Warning: array_intersect(): Argument #2 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 2 to be an array, string given in %s on line %d NULL -- Iterator 18 -- -Warning: array_intersect(): Argument #2 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 2 to be an array, string given in %s on line %d NULL -Warning: array_intersect(): Argument #2 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 2 to be an array, string given in %s on line %d NULL -- Iterator 19 -- -Warning: array_intersect(): Argument #2 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 2 to be an array, string given in %s on line %d NULL -Warning: array_intersect(): Argument #2 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 2 to be an array, string given in %s on line %d NULL -- Iterator 20 -- -Warning: array_intersect(): Argument #2 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 2 to be an array, string given in %s on line %d NULL -Warning: array_intersect(): Argument #2 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 2 to be an array, string given in %s on line %d NULL -- Iterator 21 -- -Warning: array_intersect(): Argument #2 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 2 to be an array, object given in %s on line %d NULL -Warning: array_intersect(): Argument #2 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 2 to be an array, object given in %s on line %d NULL -- Iterator 22 -- -Warning: array_intersect(): Argument #2 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 2 to be an array, null given in %s on line %d NULL -Warning: array_intersect(): Argument #2 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 2 to be an array, null given in %s on line %d NULL -- Iterator 23 -- -Warning: array_intersect(): Argument #2 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 2 to be an array, null given in %s on line %d NULL -Warning: array_intersect(): Argument #2 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 2 to be an array, null given in %s on line %d NULL -- Iterator 24 -- -Warning: array_intersect(): Argument #2 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 2 to be an array, resource given in %s on line %d NULL -Warning: array_intersect(): Argument #2 is not an array in %s on line %d +Warning: array_intersect(): Expected parameter 2 to be an array, resource given in %s on line %d NULL Done diff --git a/ext/standard/tests/array/array_intersect_variation3.phpt b/ext/standard/tests/array/array_intersect_variation3.phpt index 451bda072c..e6d22405ba 100644 --- a/ext/standard/tests/array/array_intersect_variation3.phpt +++ b/ext/standard/tests/array/array_intersect_variation3.phpt @@ -100,7 +100,7 @@ foreach($arrays as $arr1) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_intersect() : Passing different types of arrays to $arr1 argument *** -- Iterator 1 -- array(2) { diff --git a/ext/standard/tests/array/array_intersect_variation4.phpt b/ext/standard/tests/array/array_intersect_variation4.phpt index 4fbd478ccf..e019e4ef3e 100644 --- a/ext/standard/tests/array/array_intersect_variation4.phpt +++ b/ext/standard/tests/array/array_intersect_variation4.phpt @@ -99,7 +99,7 @@ foreach($arrays as $arr2) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_intersect() : Passing different types of arrays to $arr2 argument *** -- Iteration 1 -- array(3) { diff --git a/ext/standard/tests/array/array_intersect_variation5.phpt b/ext/standard/tests/array/array_intersect_variation5.phpt index c3caaa1630..6626c68de2 100644 --- a/ext/standard/tests/array/array_intersect_variation5.phpt +++ b/ext/standard/tests/array/array_intersect_variation5.phpt @@ -76,7 +76,7 @@ foreach($arrays as $arr1) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_intersect() : assoc array with diff keys to $arr1 argument *** -- Iterator 1 -- array(0) { diff --git a/ext/standard/tests/array/array_intersect_variation6.phpt b/ext/standard/tests/array/array_intersect_variation6.phpt index 3bb9a5388e..e605b86bd1 100644 --- a/ext/standard/tests/array/array_intersect_variation6.phpt +++ b/ext/standard/tests/array/array_intersect_variation6.phpt @@ -76,7 +76,7 @@ foreach($arrays as $arr2) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_intersect() : assoc array with diff keys to $arr2 argument *** -- Iterator 1 -- array(0) { diff --git a/ext/standard/tests/array/array_key_exists.phpt b/ext/standard/tests/array/array_key_exists.phpt index 63bcf82d93..61faf0158d 100644 --- a/ext/standard/tests/array/array_key_exists.phpt +++ b/ext/standard/tests/array/array_key_exists.phpt @@ -258,16 +258,16 @@ bool(false) Warning: array_key_exists() expects parameter 2 to be array, string given in %s on line %d NULL -Warning: array_key_exists() expects parameter 2 to be array, integer given in %s on line %d +Warning: array_key_exists() expects parameter 2 to be array, int given in %s on line %d NULL Warning: array_key_exists() expects parameter 2 to be array, null given in %s on line %d NULL -Warning: array_key_exists() expects parameter 2 to be array, boolean given in %s on line %d +Warning: array_key_exists() expects parameter 2 to be array, bool given in %s on line %d NULL -Warning: array_key_exists() expects parameter 2 to be array, boolean given in %s on line %d +Warning: array_key_exists() expects parameter 2 to be array, bool given in %s on line %d NULL Warning: array_key_exists() expects parameter 2 to be array, float given in %s on line %d diff --git a/ext/standard/tests/array/array_key_exists_basic.phpt b/ext/standard/tests/array/array_key_exists_basic.phpt index 01fc71919f..09df218c0f 100644 --- a/ext/standard/tests/array/array_key_exists_basic.phpt +++ b/ext/standard/tests/array/array_key_exists_basic.phpt @@ -22,7 +22,7 @@ var_dump(array_key_exists($key2, $search)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_key_exists() : basic functionality *** bool(true) bool(false) diff --git a/ext/standard/tests/array/array_key_exists_object1.phpt b/ext/standard/tests/array/array_key_exists_object1.phpt index e4e9499384..14453cd934 100644 --- a/ext/standard/tests/array/array_key_exists_object1.phpt +++ b/ext/standard/tests/array/array_key_exists_object1.phpt @@ -46,7 +46,7 @@ var_dump($class2); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_key_exists() : object functionality *** -- Do not assign a value to $class1->var3 -- diff --git a/ext/standard/tests/array/array_key_exists_object2.phpt b/ext/standard/tests/array/array_key_exists_object2.phpt index f7ae83f18d..c9c1633591 100644 --- a/ext/standard/tests/array/array_key_exists_object2.phpt +++ b/ext/standard/tests/array/array_key_exists_object2.phpt @@ -48,7 +48,7 @@ var_dump($class2); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_key_exists() : object functionality *** -- Do not assign a value to $class1->var3 -- diff --git a/ext/standard/tests/array/array_key_exists_variation2.phpt b/ext/standard/tests/array/array_key_exists_variation2.phpt index 4b839990bb..b1e3033002 100644 --- a/ext/standard/tests/array/array_key_exists_variation2.phpt +++ b/ext/standard/tests/array/array_key_exists_variation2.phpt @@ -103,22 +103,22 @@ echo "Done"; -- Iteration 1 -- -Warning: array_key_exists() expects parameter 2 to be array, integer given in %s on line %d +Warning: array_key_exists() expects parameter 2 to be array, int given in %s on line %d NULL -- Iteration 2 -- -Warning: array_key_exists() expects parameter 2 to be array, integer given in %s on line %d +Warning: array_key_exists() expects parameter 2 to be array, int given in %s on line %d NULL -- Iteration 3 -- -Warning: array_key_exists() expects parameter 2 to be array, integer given in %s on line %d +Warning: array_key_exists() expects parameter 2 to be array, int given in %s on line %d NULL -- Iteration 4 -- -Warning: array_key_exists() expects parameter 2 to be array, integer given in %s on line %d +Warning: array_key_exists() expects parameter 2 to be array, int given in %s on line %d NULL -- Iteration 5 -- @@ -158,22 +158,22 @@ NULL -- Iteration 12 -- -Warning: array_key_exists() expects parameter 2 to be array, boolean given in %s on line %d +Warning: array_key_exists() expects parameter 2 to be array, bool given in %s on line %d NULL -- Iteration 13 -- -Warning: array_key_exists() expects parameter 2 to be array, boolean given in %s on line %d +Warning: array_key_exists() expects parameter 2 to be array, bool given in %s on line %d NULL -- Iteration 14 -- -Warning: array_key_exists() expects parameter 2 to be array, boolean given in %s on line %d +Warning: array_key_exists() expects parameter 2 to be array, bool given in %s on line %d NULL -- Iteration 15 -- -Warning: array_key_exists() expects parameter 2 to be array, boolean given in %s on line %d +Warning: array_key_exists() expects parameter 2 to be array, bool given in %s on line %d NULL -- Iteration 16 -- diff --git a/ext/standard/tests/array/array_key_exists_variation4.phpt b/ext/standard/tests/array/array_key_exists_variation4.phpt index f542a1fa26..1f651a2c3a 100644 --- a/ext/standard/tests/array/array_key_exists_variation4.phpt +++ b/ext/standard/tests/array/array_key_exists_variation4.phpt @@ -22,7 +22,7 @@ var_dump(array_key_exists('one', $search)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_key_exists() : usage variations *** -- $search is a reference to $array -- diff --git a/ext/standard/tests/array/array_key_exists_variation5.phpt b/ext/standard/tests/array/array_key_exists_variation5.phpt index 6cd166257c..2e72ed7ed0 100644 --- a/ext/standard/tests/array/array_key_exists_variation5.phpt +++ b/ext/standard/tests/array/array_key_exists_variation5.phpt @@ -27,7 +27,7 @@ var_dump(array_key_exists(0, $multi_array['sub1'])); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_key_exists() : usage variations *** -- Attempt to match key in sub-array -- diff --git a/ext/standard/tests/array/array_key_exists_variation6.phpt b/ext/standard/tests/array/array_key_exists_variation6.phpt index 60a0e156e6..a801acdd34 100644 --- a/ext/standard/tests/array/array_key_exists_variation6.phpt +++ b/ext/standard/tests/array/array_key_exists_variation6.phpt @@ -42,7 +42,7 @@ foreach($array as $name => $input) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_key_exists() : usage variations *** -- Key in $search array is : null -- diff --git a/ext/standard/tests/array/array_key_exists_variation7.phpt b/ext/standard/tests/array/array_key_exists_variation7.phpt index ec935c68e8..09133f6e4d 100644 --- a/ext/standard/tests/array/array_key_exists_variation7.phpt +++ b/ext/standard/tests/array/array_key_exists_variation7.phpt @@ -24,7 +24,7 @@ echo key($input) . " => " . current ($input) . "\n"; echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_key_exists() : usage variations *** -- Call array_key_exists() -- diff --git a/ext/standard/tests/array/array_key_exists_variation8.phpt b/ext/standard/tests/array/array_key_exists_variation8.phpt index a07d291423..1d98b0eefb 100644 --- a/ext/standard/tests/array/array_key_exists_variation8.phpt +++ b/ext/standard/tests/array/array_key_exists_variation8.phpt @@ -109,7 +109,7 @@ foreach($inputs as $type => $input) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_key_exists() : usage variations *** -- Iteration 1: int data -- diff --git a/ext/standard/tests/array/array_key_first.phpt b/ext/standard/tests/array/array_key_first.phpt new file mode 100644 index 0000000000..6235386004 --- /dev/null +++ b/ext/standard/tests/array/array_key_first.phpt @@ -0,0 +1,234 @@ +--TEST-- +Test array_key_first() function +--FILE-- +<?php + +array_key_first($GLOBALS); + +/* Various combinations of arrays to be used for the test */ +$mixed_array = array( + array(), + array( 1,2,3,4,5,6,7,8,9 ), + array( "One", "_Two", "Three", "Four", "Five" ), + array( 6, "six", 7, "seven", 8, "eight", 9, "nine" ), + array( "a" => "aaa", "A" => "AAA", "c" => "ccc", "d" => "ddd", "e" => "eee" ), + array( "1" => "one", "2" => "two", "3" => "three", "4" => "four", "5" => "five" ), + array( 1 => "one", 2 => "two", 3 => 7, 4 => "four", 5 => "five" ), + array( "f" => "fff", "1" => "one", 4 => 6, "" => "blank", 2.4 => "float", "F" => "FFF", + "blank" => "", 3.7 => 3.7, 5.4 => 7, 6 => 8.6, '5' => "Five", "4name" => "jonny", "a" => NULL, NULL => 3 ), + array( 12, "name", 'age', '45' ), + array( array("oNe", "tWo", 4), array(10, 20, 30, 40, 50), array() ), + array( "one" => 1, "one" => 2, "three" => 3, 3, 4, 3 => 33, 4 => 44, 5, 6, + 5.4 => 54, 5.7 => 57, "5.4" => 554, "5.7" => 557 ), + array( "foo" ), + array( 1 => "42" ) +); + +/* Loop to test normal functionality with different arrays inputs */ +echo "\n*** Normal testing with various array inputs ***\n"; + +$counter = 1; +foreach( $mixed_array as $sub_array ) +{ + echo "\n-- Input Array for Iteration $counter is --\n"; + print_r( $sub_array ); + echo "\nFirst key is :\n"; + var_dump( array_key_first($sub_array) ); + $counter++; +} + +echo"\nDone"; +?> +--EXPECT-- +*** Normal testing with various array inputs *** + +-- Input Array for Iteration 1 is -- +Array +( +) + +First key is : +NULL + +-- Input Array for Iteration 2 is -- +Array +( + [0] => 1 + [1] => 2 + [2] => 3 + [3] => 4 + [4] => 5 + [5] => 6 + [6] => 7 + [7] => 8 + [8] => 9 +) + +First key is : +int(0) + +-- Input Array for Iteration 3 is -- +Array +( + [0] => One + [1] => _Two + [2] => Three + [3] => Four + [4] => Five +) + +First key is : +int(0) + +-- Input Array for Iteration 4 is -- +Array +( + [0] => 6 + [1] => six + [2] => 7 + [3] => seven + [4] => 8 + [5] => eight + [6] => 9 + [7] => nine +) + +First key is : +int(0) + +-- Input Array for Iteration 5 is -- +Array +( + [a] => aaa + [A] => AAA + [c] => ccc + [d] => ddd + [e] => eee +) + +First key is : +string(1) "a" + +-- Input Array for Iteration 6 is -- +Array +( + [1] => one + [2] => two + [3] => three + [4] => four + [5] => five +) + +First key is : +int(1) + +-- Input Array for Iteration 7 is -- +Array +( + [1] => one + [2] => two + [3] => 7 + [4] => four + [5] => five +) + +First key is : +int(1) + +-- Input Array for Iteration 8 is -- +Array +( + [f] => fff + [1] => one + [4] => 6 + [] => 3 + [2] => float + [F] => FFF + [blank] => + [3] => 3.7 + [5] => Five + [6] => 8.6 + [4name] => jonny + [a] => +) + +First key is : +string(1) "f" + +-- Input Array for Iteration 9 is -- +Array +( + [0] => 12 + [1] => name + [2] => age + [3] => 45 +) + +First key is : +int(0) + +-- Input Array for Iteration 10 is -- +Array +( + [0] => Array + ( + [0] => oNe + [1] => tWo + [2] => 4 + ) + + [1] => Array + ( + [0] => 10 + [1] => 20 + [2] => 30 + [3] => 40 + [4] => 50 + ) + + [2] => Array + ( + ) + +) + +First key is : +int(0) + +-- Input Array for Iteration 11 is -- +Array +( + [one] => 2 + [three] => 3 + [0] => 3 + [1] => 4 + [3] => 33 + [4] => 44 + [5] => 57 + [6] => 6 + [5.4] => 554 + [5.7] => 557 +) + +First key is : +string(3) "one" + +-- Input Array for Iteration 12 is -- +Array +( + [0] => foo +) + +First key is : +int(0) + +-- Input Array for Iteration 13 is -- +Array +( + [1] => 42 +) + +First key is : +int(1) + +Done diff --git a/ext/standard/tests/array/array_key_first_errors.phpt b/ext/standard/tests/array/array_key_first_errors.phpt new file mode 100644 index 0000000000..ad2c52b6a0 --- /dev/null +++ b/ext/standard/tests/array/array_key_first_errors.phpt @@ -0,0 +1,52 @@ +--TEST-- +Test array_key_first() function (errors) +--FILE-- +<?php + +$empty_array = array(); +$number = 5; +$str = "abc"; + +/* Various combinations of arrays to be used for the test */ +$mixed_array = array( + array( 1,2,3,4,5,6,7,8,9 ), + array( "One", "_Two", "Three", "Four", "Five" ) +); + +/* Testing Error Conditions */ +echo "\n*** Testing Error Conditions ***\n"; + +/* Zero argument */ +var_dump( array_key_first() ); + +/* Scalar argument */ +var_dump( array_key_first($number) ); + +/* String argument */ +var_dump( array_key_first($str) ); + +/* Invalid Number of arguments */ +var_dump( array_key_first($mixed_array[0],$mixed_array[1]) ); + +/* Empty Array as argument */ +var_dump( array_key_first($empty_array) ); + +echo"\nDone"; +?> +--EXPECTF-- +*** Testing Error Conditions *** + +Warning: array_key_first() expects exactly 1 parameter, 0 given in %s on line %d +NULL + +Warning: array_key_first() expects parameter 1 to be array, int given in %s on line %d +NULL + +Warning: array_key_first() expects parameter 1 to be array, string given in %s on line %d +NULL + +Warning: array_key_first() expects exactly 1 parameter, 2 given in %s on line %d +NULL +NULL + +Done diff --git a/ext/standard/tests/array/array_key_first_variation.phpt b/ext/standard/tests/array/array_key_first_variation.phpt new file mode 100644 index 0000000000..d619ed0122 --- /dev/null +++ b/ext/standard/tests/array/array_key_first_variation.phpt @@ -0,0 +1,36 @@ +--TEST-- +Test array_key_first() function (variation) +--FILE-- +<?php + +/* Various combinations of arrays to be used for the test */ +$array = array( 1,2,3,4,5,6,7,8,9 ); + +echo"\n*** Checking for internal array pointer not being changed by array_key_first ***\n"; + +echo "\nCurrent Element is : "; +var_dump( current($array) ); + +echo "\nNext Element is : "; +var_dump( next($array) ); + +echo "\nFirst key is : "; +var_dump( array_key_first($array) ); + +echo "\nCurrent Element after array_key_first operation is: "; +var_dump( current($array) ); + +echo"\nDone"; +?> +--EXPECT-- +*** Checking for internal array pointer not being changed by array_key_first *** + +Current Element is : int(1) + +Next Element is : int(2) + +First key is : int(0) + +Current Element after array_key_first operation is: int(2) + +Done diff --git a/ext/standard/tests/array/array_key_last.phpt b/ext/standard/tests/array/array_key_last.phpt new file mode 100644 index 0000000000..599d80eac4 --- /dev/null +++ b/ext/standard/tests/array/array_key_last.phpt @@ -0,0 +1,234 @@ +--TEST-- +Test array_key_last() function +--FILE-- +<?php + +array_key_last($GLOBALS); + +/* Various combinations of arrays to be used for the test */ +$mixed_array = array( + array(), + array( 1,2,3,4,5,6,7,8,9 ), + array( "One", "_Two", "Three", "Four", "Five" ), + array( 6, "six", 7, "seven", 8, "eight", 9, "nine" ), + array( "a" => "aaa", "A" => "AAA", "c" => "ccc", "d" => "ddd", "e" => "eee" ), + array( "1" => "one", "2" => "two", "3" => "three", "4" => "four", "5" => "five" ), + array( 1 => "one", 2 => "two", 3 => 7, 4 => "four", 5 => "five" ), + array( "f" => "fff", "1" => "one", 4 => 6, "" => "blank", 2.4 => "float", "F" => "FFF", + "blank" => "", 3.7 => 3.7, 5.4 => 7, 6 => 8.6, '5' => "Five", "4name" => "jonny", "a" => NULL, NULL => 3 ), + array( 12, "name", 'age', '45' ), + array( array("oNe", "tWo", 4), array(10, 20, 30, 40, 50), array() ), + array( "one" => 1, "one" => 2, "three" => 3, 3, 4, 3 => 33, 4 => 44, 5, 6, + 5.4 => 54, 5.7 => 57, "5.4" => 554, "5.7" => 557 ), + array( "foo" ), + array( 1 => "42" ) +); + +/* Loop to test normal functionality with different arrays inputs */ +echo "\n*** Normal testing with various array inputs ***\n"; + +$counter = 1; +foreach( $mixed_array as $sub_array ) +{ + echo "\n-- Input Array for Iteration $counter is --\n"; + print_r( $sub_array ); + echo "\nLast key is :\n"; + var_dump( array_key_last($sub_array) ); + $counter++; +} + +echo"\nDone"; +?> +--EXPECT-- +*** Normal testing with various array inputs *** + +-- Input Array for Iteration 1 is -- +Array +( +) + +Last key is : +NULL + +-- Input Array for Iteration 2 is -- +Array +( + [0] => 1 + [1] => 2 + [2] => 3 + [3] => 4 + [4] => 5 + [5] => 6 + [6] => 7 + [7] => 8 + [8] => 9 +) + +Last key is : +int(8) + +-- Input Array for Iteration 3 is -- +Array +( + [0] => One + [1] => _Two + [2] => Three + [3] => Four + [4] => Five +) + +Last key is : +int(4) + +-- Input Array for Iteration 4 is -- +Array +( + [0] => 6 + [1] => six + [2] => 7 + [3] => seven + [4] => 8 + [5] => eight + [6] => 9 + [7] => nine +) + +Last key is : +int(7) + +-- Input Array for Iteration 5 is -- +Array +( + [a] => aaa + [A] => AAA + [c] => ccc + [d] => ddd + [e] => eee +) + +Last key is : +string(1) "e" + +-- Input Array for Iteration 6 is -- +Array +( + [1] => one + [2] => two + [3] => three + [4] => four + [5] => five +) + +Last key is : +int(5) + +-- Input Array for Iteration 7 is -- +Array +( + [1] => one + [2] => two + [3] => 7 + [4] => four + [5] => five +) + +Last key is : +int(5) + +-- Input Array for Iteration 8 is -- +Array +( + [f] => fff + [1] => one + [4] => 6 + [] => 3 + [2] => float + [F] => FFF + [blank] => + [3] => 3.7 + [5] => Five + [6] => 8.6 + [4name] => jonny + [a] => +) + +Last key is : +string(1) "a" + +-- Input Array for Iteration 9 is -- +Array +( + [0] => 12 + [1] => name + [2] => age + [3] => 45 +) + +Last key is : +int(3) + +-- Input Array for Iteration 10 is -- +Array +( + [0] => Array + ( + [0] => oNe + [1] => tWo + [2] => 4 + ) + + [1] => Array + ( + [0] => 10 + [1] => 20 + [2] => 30 + [3] => 40 + [4] => 50 + ) + + [2] => Array + ( + ) + +) + +Last key is : +int(2) + +-- Input Array for Iteration 11 is -- +Array +( + [one] => 2 + [three] => 3 + [0] => 3 + [1] => 4 + [3] => 33 + [4] => 44 + [5] => 57 + [6] => 6 + [5.4] => 554 + [5.7] => 557 +) + +Last key is : +string(3) "5.7" + +-- Input Array for Iteration 12 is -- +Array +( + [0] => foo +) + +Last key is : +int(0) + +-- Input Array for Iteration 13 is -- +Array +( + [1] => 42 +) + +Last key is : +int(1) + +Done diff --git a/ext/standard/tests/array/array_key_last_errors.phpt b/ext/standard/tests/array/array_key_last_errors.phpt new file mode 100644 index 0000000000..88f8c9ffdd --- /dev/null +++ b/ext/standard/tests/array/array_key_last_errors.phpt @@ -0,0 +1,52 @@ +--TEST-- +Test array_key_last() function (errors) +--FILE-- +<?php + +$empty_array = array(); +$number = 5; +$str = "abc"; + +/* Various combinations of arrays to be used for the test */ +$mixed_array = array( + array( 1,2,3,4,5,6,7,8,9 ), + array( "One", "_Two", "Three", "Four", "Five" ) +); + +/* Testing Error Conditions */ +echo "\n*** Testing Error Conditions ***\n"; + +/* Zero argument */ +var_dump( array_key_last() ); + +/* Scalar argument */ +var_dump( array_key_last($number) ); + +/* String argument */ +var_dump( array_key_last($str) ); + +/* Invalid Number of arguments */ +var_dump( array_key_last($mixed_array[0],$mixed_array[1]) ); + +/* Empty Array as argument */ +var_dump( array_key_last($empty_array) ); + +echo"\nDone"; +?> +--EXPECTF-- +*** Testing Error Conditions *** + +Warning: array_key_last() expects exactly 1 parameter, 0 given in %s on line %d +NULL + +Warning: array_key_last() expects parameter 1 to be array, int given in %s on line %d +NULL + +Warning: array_key_last() expects parameter 1 to be array, string given in %s on line %d +NULL + +Warning: array_key_last() expects exactly 1 parameter, 2 given in %s on line %d +NULL +NULL + +Done diff --git a/ext/standard/tests/array/array_key_last_variation.phpt b/ext/standard/tests/array/array_key_last_variation.phpt new file mode 100644 index 0000000000..3b2a48673e --- /dev/null +++ b/ext/standard/tests/array/array_key_last_variation.phpt @@ -0,0 +1,36 @@ +--TEST-- +Test array_key_last() function (variation) +--FILE-- +<?php + +/* Various combinations of arrays to be used for the test */ +$array = array( 1,2,3,4,5,6,7,8,9 ); + +echo"\n*** Checking for internal array pointer not being changed by array_key_last ***\n"; + +echo "\nCurrent Element is : "; +var_dump( current($array) ); + +echo "\nNext Element is : "; +var_dump( next($array) ); + +echo "\nLast key is : "; +var_dump( array_key_last($array) ); + +echo "\nCurrent Element after array_key_last operation is: "; +var_dump( current($array) ); + +echo"\nDone"; +?> +--EXPECT-- +*** Checking for internal array pointer not being changed by array_key_last *** + +Current Element is : int(1) + +Next Element is : int(2) + +Last key is : int(8) + +Current Element after array_key_last operation is: int(2) + +Done diff --git a/ext/standard/tests/array/array_keys_basic.phpt b/ext/standard/tests/array/array_keys_basic.phpt index 80b624bb20..0aa84d984d 100644 --- a/ext/standard/tests/array/array_keys_basic.phpt +++ b/ext/standard/tests/array/array_keys_basic.phpt @@ -10,7 +10,7 @@ var_dump(array_keys($basic_arr)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_keys() on basic array operation *** array(5) { [0]=> diff --git a/ext/standard/tests/array/array_keys_error.phpt b/ext/standard/tests/array/array_keys_error.phpt index 685547f0ec..46a989b839 100644 --- a/ext/standard/tests/array/array_keys_error.phpt +++ b/ext/standard/tests/array/array_keys_error.phpt @@ -15,7 +15,7 @@ echo "Done\n"; ?> --EXPECTF-- *** Testing error conditions *** -Warning: array_keys() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_keys() expects parameter 1 to be array, int given in %s on line %d NULL Warning: array_keys() expects parameter 1 to be array, string given in %s on line %d diff --git a/ext/standard/tests/array/array_keys_variation_001.phpt b/ext/standard/tests/array/array_keys_variation_001.phpt index 3e2b13381a..e9944ed112 100644 --- a/ext/standard/tests/array/array_keys_variation_001.phpt +++ b/ext/standard/tests/array/array_keys_variation_001.phpt @@ -29,7 +29,7 @@ foreach ($arrays as $array) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_keys() on various arrays *** -- Iteration 0 -- array(0) { diff --git a/ext/standard/tests/array/array_keys_variation_002.phpt b/ext/standard/tests/array/array_keys_variation_002.phpt index 204f214ef9..8378cfbf0d 100644 --- a/ext/standard/tests/array/array_keys_variation_002.phpt +++ b/ext/standard/tests/array/array_keys_variation_002.phpt @@ -25,7 +25,7 @@ var_dump(array_keys(array())); // null array echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_keys() on range of values *** array(4) { [0]=> diff --git a/ext/standard/tests/array/array_keys_variation_002_64bit.phpt b/ext/standard/tests/array/array_keys_variation_002_64bit.phpt index 532c6d054a..dd35a77642 100644 --- a/ext/standard/tests/array/array_keys_variation_002_64bit.phpt +++ b/ext/standard/tests/array/array_keys_variation_002_64bit.phpt @@ -25,7 +25,7 @@ var_dump(array_keys(array())); // null array echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_keys() on range of values *** array(6) { [0]=> diff --git a/ext/standard/tests/array/array_keys_variation_003.phpt b/ext/standard/tests/array/array_keys_variation_003.phpt index f5e6f265e0..adb2baea66 100644 --- a/ext/standard/tests/array/array_keys_variation_003.phpt +++ b/ext/standard/tests/array/array_keys_variation_003.phpt @@ -26,7 +26,7 @@ foreach ($values as $value){ echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_keys() on all the types other than arrays *** bool(true) array(3) { diff --git a/ext/standard/tests/array/array_keys_variation_004.phpt b/ext/standard/tests/array/array_keys_variation_004.phpt index 47262e2848..8198a75e23 100644 --- a/ext/standard/tests/array/array_keys_variation_004.phpt +++ b/ext/standard/tests/array/array_keys_variation_004.phpt @@ -25,7 +25,7 @@ foreach ($values as $value){ echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_keys() on all the types other than arrays *** array(0) { } diff --git a/ext/standard/tests/array/array_keys_variation_005.phpt b/ext/standard/tests/array/array_keys_variation_005.phpt index ec6aff8d2c..e02e4095d8 100644 --- a/ext/standard/tests/array/array_keys_variation_005.phpt +++ b/ext/standard/tests/array/array_keys_variation_005.phpt @@ -20,7 +20,7 @@ fclose( $resource1 ); closedir( $resource2 ); ?> ---EXPECTF-- +--EXPECT-- *** Testing array_keys() with resource type *** array(1) { [0]=> diff --git a/ext/standard/tests/array/array_map_001.phpt b/ext/standard/tests/array/array_map_001.phpt index cd95e6c991..c5d78c257e 100644 --- a/ext/standard/tests/array/array_map_001.phpt +++ b/ext/standard/tests/array/array_map_001.phpt @@ -17,6 +17,6 @@ try { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(17) "exception caught!" Done diff --git a/ext/standard/tests/array/array_map_basic.phpt b/ext/standard/tests/array/array_map_basic.phpt index 53a7bb4e26..e67817e2ae 100644 --- a/ext/standard/tests/array/array_map_basic.phpt +++ b/ext/standard/tests/array/array_map_basic.phpt @@ -40,7 +40,7 @@ var_dump( array_map('concatenate', $arr1, $arr2) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_map() : basic functionality *** -- With two integer array -- array(3) { diff --git a/ext/standard/tests/array/array_map_variation10.phpt b/ext/standard/tests/array/array_map_variation10.phpt index 2eb0d115e0..5b80126966 100644 --- a/ext/standard/tests/array/array_map_variation10.phpt +++ b/ext/standard/tests/array/array_map_variation10.phpt @@ -85,6 +85,6 @@ array(3) { } -- passing NULL as 'arr1' -- -Warning: array_map(): Argument #2 should be an array in %s on line %d +Warning: array_map(): Expected parameter 2 to be an array, null given in %s on line %d NULL Done diff --git a/ext/standard/tests/array/array_map_variation11.phpt b/ext/standard/tests/array/array_map_variation11.phpt index 8ed879c45c..e169f591c8 100644 --- a/ext/standard/tests/array/array_map_variation11.phpt +++ b/ext/standard/tests/array/array_map_variation11.phpt @@ -26,7 +26,7 @@ var_dump( array_map('square_recur_single_array', $array1)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_map() : recursive callback function *** array(3) { [0]=> diff --git a/ext/standard/tests/array/array_map_variation13.phpt b/ext/standard/tests/array/array_map_variation13.phpt index 9f7173dfeb..059869326d 100644 --- a/ext/standard/tests/array/array_map_variation13.phpt +++ b/ext/standard/tests/array/array_map_variation13.phpt @@ -54,7 +54,7 @@ var_dump( array_map('callback_without_ret', $array1)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_map() : callback with diff return value *** -- with integer return value -- array(3) { diff --git a/ext/standard/tests/array/array_map_variation18.phpt b/ext/standard/tests/array/array_map_variation18.phpt index 8e1a862587..4c85d12e88 100644 --- a/ext/standard/tests/array/array_map_variation18.phpt +++ b/ext/standard/tests/array/array_map_variation18.phpt @@ -104,102 +104,102 @@ echo "Done"; *** Testing array_map() : unexpected values for 'arr1' *** -- Iteration 1 -- -Warning: array_map(): Argument #2 should be an array in %s on line %d%d +Warning: array_map(): Expected parameter 2 to be an array, int given in %s on line %d%d NULL -- Iteration 2 -- -Warning: array_map(): Argument #2 should be an array in %s on line %d%d +Warning: array_map(): Expected parameter 2 to be an array, int given in %s on line %d%d NULL -- Iteration 3 -- -Warning: array_map(): Argument #2 should be an array in %s on line %d%d +Warning: array_map(): Expected parameter 2 to be an array, int given in %s on line %d%d NULL -- Iteration 4 -- -Warning: array_map(): Argument #2 should be an array in %s on line %d%d +Warning: array_map(): Expected parameter 2 to be an array, int given in %s on line %d%d NULL -- Iteration 5 -- -Warning: array_map(): Argument #2 should be an array in %s on line %d%d +Warning: array_map(): Expected parameter 2 to be an array, float given in %s on line %d%d NULL -- Iteration 6 -- -Warning: array_map(): Argument #2 should be an array in %s on line %d%d +Warning: array_map(): Expected parameter 2 to be an array, float given in %s on line %d%d NULL -- Iteration 7 -- -Warning: array_map(): Argument #2 should be an array in %s on line %d%d +Warning: array_map(): Expected parameter 2 to be an array, float given in %s on line %d%d NULL -- Iteration 8 -- -Warning: array_map(): Argument #2 should be an array in %s on line %d%d +Warning: array_map(): Expected parameter 2 to be an array, float given in %s on line %d%d NULL -- Iteration 9 -- -Warning: array_map(): Argument #2 should be an array in %s on line %d%d +Warning: array_map(): Expected parameter 2 to be an array, float given in %s on line %d%d NULL -- Iteration 10 -- -Warning: array_map(): Argument #2 should be an array in %s on line %d%d +Warning: array_map(): Expected parameter 2 to be an array, null given in %s on line %d%d NULL -- Iteration 11 -- -Warning: array_map(): Argument #2 should be an array in %s on line %d%d +Warning: array_map(): Expected parameter 2 to be an array, null given in %s on line %d%d NULL -- Iteration 12 -- -Warning: array_map(): Argument #2 should be an array in %s on line %d%d +Warning: array_map(): Expected parameter 2 to be an array, bool given in %s on line %d%d NULL -- Iteration 13 -- -Warning: array_map(): Argument #2 should be an array in %s on line %d%d +Warning: array_map(): Expected parameter 2 to be an array, bool given in %s on line %d%d NULL -- Iteration 14 -- -Warning: array_map(): Argument #2 should be an array in %s on line %d%d +Warning: array_map(): Expected parameter 2 to be an array, bool given in %s on line %d%d NULL -- Iteration 15 -- -Warning: array_map(): Argument #2 should be an array in %s on line %d%d +Warning: array_map(): Expected parameter 2 to be an array, bool given in %s on line %d%d NULL -- Iteration 16 -- -Warning: array_map(): Argument #2 should be an array in %s on line %d%d +Warning: array_map(): Expected parameter 2 to be an array, string given in %s on line %d%d NULL -- Iteration 17 -- -Warning: array_map(): Argument #2 should be an array in %s on line %d%d +Warning: array_map(): Expected parameter 2 to be an array, string given in %s on line %d%d NULL -- Iteration 18 -- -Warning: array_map(): Argument #2 should be an array in %s on line %d%d +Warning: array_map(): Expected parameter 2 to be an array, string given in %s on line %d%d NULL -- Iteration 19 -- -Warning: array_map(): Argument #2 should be an array in %s on line %d%d +Warning: array_map(): Expected parameter 2 to be an array, string given in %s on line %d%d NULL -- Iteration 20 -- -Warning: array_map(): Argument #2 should be an array in %s on line %d%d +Warning: array_map(): Expected parameter 2 to be an array, string given in %s on line %d%d NULL -- Iteration 21 -- -Warning: array_map(): Argument #2 should be an array in %s on line %d%d +Warning: array_map(): Expected parameter 2 to be an array, object given in %s on line %d%d NULL -- Iteration 22 -- -Warning: array_map(): Argument #2 should be an array in %s on line %d%d +Warning: array_map(): Expected parameter 2 to be an array, null given in %s on line %d%d NULL -- Iteration 23 -- -Warning: array_map(): Argument #2 should be an array in %s on line %d%d +Warning: array_map(): Expected parameter 2 to be an array, null given in %s on line %d%d NULL -- Iteration 24 -- -Warning: array_map(): Argument #2 should be an array in %s on line %d%d +Warning: array_map(): Expected parameter 2 to be an array, null given in %s on line %d%d NULL -- Iteration 25 -- -Warning: array_map(): Argument #2 should be an array in %s on line %d%d +Warning: array_map(): Expected parameter 2 to be an array, resource given in %s on line %d%d NULL Done diff --git a/ext/standard/tests/array/array_map_variation19.phpt b/ext/standard/tests/array/array_map_variation19.phpt index 84ba7bfb96..b842c8243c 100644 --- a/ext/standard/tests/array/array_map_variation19.phpt +++ b/ext/standard/tests/array/array_map_variation19.phpt @@ -25,7 +25,7 @@ $ref =& $arr2[0]; array_map("callback", $arr2); var_dump($arr2); ?> ---EXPECTF-- +--EXPECT-- array(2) { [0]=> string(10) "original.0" diff --git a/ext/standard/tests/array/array_map_variation3.phpt b/ext/standard/tests/array/array_map_variation3.phpt index a0715504e9..3e8bfea962 100644 --- a/ext/standard/tests/array/array_map_variation3.phpt +++ b/ext/standard/tests/array/array_map_variation3.phpt @@ -56,7 +56,7 @@ foreach($arrays as $arr1) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_map() : different arrays for 'arr1' argument *** -- Iteration 1 -- array(2) { diff --git a/ext/standard/tests/array/array_map_variation6.phpt b/ext/standard/tests/array/array_map_variation6.phpt index 566fd95e0b..ee4c65ceb3 100644 --- a/ext/standard/tests/array/array_map_variation6.phpt +++ b/ext/standard/tests/array/array_map_variation6.phpt @@ -30,7 +30,7 @@ $arr1 = array( var_dump( array_map('callback', $arr1)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_map() : array having subarrays *** array(5) { [0]=> diff --git a/ext/standard/tests/array/array_map_variation7.phpt b/ext/standard/tests/array/array_map_variation7.phpt index dc29fdf770..e75cec186a 100644 --- a/ext/standard/tests/array/array_map_variation7.phpt +++ b/ext/standard/tests/array/array_map_variation7.phpt @@ -32,7 +32,7 @@ var_dump( array_map('callback', array(), array(1, 2, 3), array('a', 'b')) ); // echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_map() : arrays with diff. size *** array(3) { [0]=> diff --git a/ext/standard/tests/array/array_map_variation8.phpt b/ext/standard/tests/array/array_map_variation8.phpt index 5672e6cd95..99b206d0f9 100644 --- a/ext/standard/tests/array/array_map_variation8.phpt +++ b/ext/standard/tests/array/array_map_variation8.phpt @@ -46,7 +46,7 @@ var_dump( array_map('callback_cat', $arr1, $arr1) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_map() : array with references for 'arr1' argument *** -- with one array -- array(6) { diff --git a/ext/standard/tests/array/array_map_variation9.phpt b/ext/standard/tests/array/array_map_variation9.phpt index f33b717c6c..9c70340b30 100644 --- a/ext/standard/tests/array/array_map_variation9.phpt +++ b/ext/standard/tests/array/array_map_variation9.phpt @@ -37,7 +37,7 @@ try { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_map() : array with binary data for 'arr1' argument *** -- checking binary safe array with one parameter callback function -- array(4) { diff --git a/ext/standard/tests/array/array_merge.phpt b/ext/standard/tests/array/array_merge.phpt index c8c0551344..e6a8096282 100644 --- a/ext/standard/tests/array/array_merge.phpt +++ b/ext/standard/tests/array/array_merge.phpt @@ -749,14 +749,14 @@ array(7) { Warning: array_merge() expects at least 1 parameter, 0 given in %s on line %d NULL -Warning: array_merge(): Argument #1 is not an array in %s on line %d +Warning: array_merge(): Expected parameter 1 to be an array, int given in %s on line %d NULL -Warning: array_merge(): Argument #3 is not an array in %s on line %d +Warning: array_merge(): Expected parameter 3 to be an array, int given in %s on line %d NULL Notice: Undefined variable: arr4 in %s on line %d -Warning: array_merge(): Argument #3 is not an array in %s on line %d +Warning: array_merge(): Expected parameter 3 to be an array, null given in %s on line %d NULL Done diff --git a/ext/standard/tests/array/array_merge_basic.phpt b/ext/standard/tests/array/array_merge_basic.phpt index 5fbf3fd021..f78fb744be 100644 --- a/ext/standard/tests/array/array_merge_basic.phpt +++ b/ext/standard/tests/array/array_merge_basic.phpt @@ -24,7 +24,7 @@ var_dump(array_merge($array2, $array1)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_merge() : basic functionality *** array(6) { [0]=> diff --git a/ext/standard/tests/array/array_merge_recursive_basic1.phpt b/ext/standard/tests/array/array_merge_recursive_basic1.phpt index c1cf40b845..efda3d531b 100644 --- a/ext/standard/tests/array/array_merge_recursive_basic1.phpt +++ b/ext/standard/tests/array/array_merge_recursive_basic1.phpt @@ -25,7 +25,7 @@ var_dump( array_merge_recursive($arr1,$arr2,$arr3) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_merge_recursive() : array with default keys *** -- With default argument -- array(2) { diff --git a/ext/standard/tests/array/array_merge_recursive_basic2.phpt b/ext/standard/tests/array/array_merge_recursive_basic2.phpt index e52d087322..3cdc90e2bb 100644 --- a/ext/standard/tests/array/array_merge_recursive_basic2.phpt +++ b/ext/standard/tests/array/array_merge_recursive_basic2.phpt @@ -25,7 +25,7 @@ var_dump( array_merge_recursive($arr1,$arr2,$arr3) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_merge_recursive() : associative arrays *** -- With default argument -- array(2) { diff --git a/ext/standard/tests/array/array_merge_recursive_variation1.phpt b/ext/standard/tests/array/array_merge_recursive_variation1.phpt index 1d9a3d813f..071e9eadb5 100644 --- a/ext/standard/tests/array/array_merge_recursive_variation1.phpt +++ b/ext/standard/tests/array/array_merge_recursive_variation1.phpt @@ -111,193 +111,193 @@ echo "Done"; -- Iteration 1 -- -- With default argument -- -Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d +Warning: array_merge_recursive(): Expected parameter 1 to be an array, int given in %s on line %d NULL -- With more arguments -- -Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d +Warning: array_merge_recursive(): Expected parameter 1 to be an array, int given in %s on line %d NULL -- Iteration 2 -- -- With default argument -- -Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d +Warning: array_merge_recursive(): Expected parameter 1 to be an array, int given in %s on line %d NULL -- With more arguments -- -Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d +Warning: array_merge_recursive(): Expected parameter 1 to be an array, int given in %s on line %d NULL -- Iteration 3 -- -- With default argument -- -Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d +Warning: array_merge_recursive(): Expected parameter 1 to be an array, int given in %s on line %d NULL -- With more arguments -- -Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d +Warning: array_merge_recursive(): Expected parameter 1 to be an array, int given in %s on line %d NULL -- Iteration 4 -- -- With default argument -- -Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d +Warning: array_merge_recursive(): Expected parameter 1 to be an array, int given in %s on line %d NULL -- With more arguments -- -Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d +Warning: array_merge_recursive(): Expected parameter 1 to be an array, int given in %s on line %d NULL -- Iteration 5 -- -- With default argument -- -Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d +Warning: array_merge_recursive(): Expected parameter 1 to be an array, float given in %s on line %d NULL -- With more arguments -- -Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d +Warning: array_merge_recursive(): Expected parameter 1 to be an array, float given in %s on line %d NULL -- Iteration 6 -- -- With default argument -- -Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d +Warning: array_merge_recursive(): Expected parameter 1 to be an array, float given in %s on line %d NULL -- With more arguments -- -Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d +Warning: array_merge_recursive(): Expected parameter 1 to be an array, float given in %s on line %d NULL -- Iteration 7 -- -- With default argument -- -Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d +Warning: array_merge_recursive(): Expected parameter 1 to be an array, float given in %s on line %d NULL -- With more arguments -- -Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d +Warning: array_merge_recursive(): Expected parameter 1 to be an array, float given in %s on line %d NULL -- Iteration 8 -- -- With default argument -- -Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d +Warning: array_merge_recursive(): Expected parameter 1 to be an array, float given in %s on line %d NULL -- With more arguments -- -Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d +Warning: array_merge_recursive(): Expected parameter 1 to be an array, float given in %s on line %d NULL -- Iteration 9 -- -- With default argument -- -Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d +Warning: array_merge_recursive(): Expected parameter 1 to be an array, float given in %s on line %d NULL -- With more arguments -- -Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d +Warning: array_merge_recursive(): Expected parameter 1 to be an array, float given in %s on line %d NULL -- Iteration 10 -- -- With default argument -- -Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d +Warning: array_merge_recursive(): Expected parameter 1 to be an array, null given in %s on line %d NULL -- With more arguments -- -Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d +Warning: array_merge_recursive(): Expected parameter 1 to be an array, null given in %s on line %d NULL -- Iteration 11 -- -- With default argument -- -Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d +Warning: array_merge_recursive(): Expected parameter 1 to be an array, null given in %s on line %d NULL -- With more arguments -- -Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d +Warning: array_merge_recursive(): Expected parameter 1 to be an array, null given in %s on line %d NULL -- Iteration 12 -- -- With default argument -- -Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d +Warning: array_merge_recursive(): Expected parameter 1 to be an array, bool given in %s on line %d NULL -- With more arguments -- -Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d +Warning: array_merge_recursive(): Expected parameter 1 to be an array, bool given in %s on line %d NULL -- Iteration 13 -- -- With default argument -- -Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d +Warning: array_merge_recursive(): Expected parameter 1 to be an array, bool given in %s on line %d NULL -- With more arguments -- -Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d +Warning: array_merge_recursive(): Expected parameter 1 to be an array, bool given in %s on line %d NULL -- Iteration 14 -- -- With default argument -- -Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d +Warning: array_merge_recursive(): Expected parameter 1 to be an array, bool given in %s on line %d NULL -- With more arguments -- -Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d +Warning: array_merge_recursive(): Expected parameter 1 to be an array, bool given in %s on line %d NULL -- Iteration 15 -- -- With default argument -- -Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d +Warning: array_merge_recursive(): Expected parameter 1 to be an array, bool given in %s on line %d NULL -- With more arguments -- -Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d +Warning: array_merge_recursive(): Expected parameter 1 to be an array, bool given in %s on line %d NULL -- Iteration 16 -- -- With default argument -- -Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d +Warning: array_merge_recursive(): Expected parameter 1 to be an array, string given in %s on line %d NULL -- With more arguments -- -Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d +Warning: array_merge_recursive(): Expected parameter 1 to be an array, string given in %s on line %d NULL -- Iteration 17 -- -- With default argument -- -Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d +Warning: array_merge_recursive(): Expected parameter 1 to be an array, string given in %s on line %d NULL -- With more arguments -- -Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d +Warning: array_merge_recursive(): Expected parameter 1 to be an array, string given in %s on line %d NULL -- Iteration 18 -- -- With default argument -- -Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d +Warning: array_merge_recursive(): Expected parameter 1 to be an array, string given in %s on line %d NULL -- With more arguments -- -Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d +Warning: array_merge_recursive(): Expected parameter 1 to be an array, string given in %s on line %d NULL -- Iteration 19 -- -- With default argument -- -Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d +Warning: array_merge_recursive(): Expected parameter 1 to be an array, string given in %s on line %d NULL -- With more arguments -- -Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d +Warning: array_merge_recursive(): Expected parameter 1 to be an array, string given in %s on line %d NULL -- Iteration 20 -- -- With default argument -- -Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d +Warning: array_merge_recursive(): Expected parameter 1 to be an array, string given in %s on line %d NULL -- With more arguments -- -Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d +Warning: array_merge_recursive(): Expected parameter 1 to be an array, string given in %s on line %d NULL -- Iteration 21 -- -- With default argument -- -Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d +Warning: array_merge_recursive(): Expected parameter 1 to be an array, null given in %s on line %d NULL -- With more arguments -- -Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d +Warning: array_merge_recursive(): Expected parameter 1 to be an array, null given in %s on line %d NULL -- Iteration 22 -- -- With default argument -- -Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d +Warning: array_merge_recursive(): Expected parameter 1 to be an array, null given in %s on line %d NULL -- With more arguments -- -Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d +Warning: array_merge_recursive(): Expected parameter 1 to be an array, null given in %s on line %d NULL -- Iteration 23 -- -- With default argument -- -Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d +Warning: array_merge_recursive(): Expected parameter 1 to be an array, resource given in %s on line %d NULL -- With more arguments -- -Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d +Warning: array_merge_recursive(): Expected parameter 1 to be an array, resource given in %s on line %d NULL -- Iteration 24 -- -- With default argument -- -Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d +Warning: array_merge_recursive(): Expected parameter 1 to be an array, object given in %s on line %d NULL -- With more arguments -- -Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d +Warning: array_merge_recursive(): Expected parameter 1 to be an array, object given in %s on line %d NULL Done diff --git a/ext/standard/tests/array/array_merge_recursive_variation10.phpt b/ext/standard/tests/array/array_merge_recursive_variation10.phpt index 387f604a05..8e28b7434c 100644 --- a/ext/standard/tests/array/array_merge_recursive_variation10.phpt +++ b/ext/standard/tests/array/array_merge_recursive_variation10.phpt @@ -39,7 +39,7 @@ var_dump( array_merge_recursive($arr1["array"], $arr2["array"]) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_merge_recursive() : two dimensional array for $arr1 argument *** -- Passing the entire 2-d array -- -- With default argument -- diff --git a/ext/standard/tests/array/array_merge_recursive_variation2.phpt b/ext/standard/tests/array/array_merge_recursive_variation2.phpt index 48ad02877f..f14d5d9bb3 100644 --- a/ext/standard/tests/array/array_merge_recursive_variation2.phpt +++ b/ext/standard/tests/array/array_merge_recursive_variation2.phpt @@ -102,98 +102,98 @@ echo "Done"; *** Testing array_merge_recursive() : Passing non array values to $arr2 argument *** -- Iteration 1 -- -Warning: array_merge_recursive(): Argument #2 is not an array in %s on line %d +Warning: array_merge_recursive(): Expected parameter 2 to be an array, int given in %s on line %d NULL -- Iteration 2 -- -Warning: array_merge_recursive(): Argument #2 is not an array in %s on line %d +Warning: array_merge_recursive(): Expected parameter 2 to be an array, int given in %s on line %d NULL -- Iteration 3 -- -Warning: array_merge_recursive(): Argument #2 is not an array in %s on line %d +Warning: array_merge_recursive(): Expected parameter 2 to be an array, int given in %s on line %d NULL -- Iteration 4 -- -Warning: array_merge_recursive(): Argument #2 is not an array in %s on line %d +Warning: array_merge_recursive(): Expected parameter 2 to be an array, int given in %s on line %d NULL -- Iteration 5 -- -Warning: array_merge_recursive(): Argument #2 is not an array in %s on line %d +Warning: array_merge_recursive(): Expected parameter 2 to be an array, float given in %s on line %d NULL -- Iteration 6 -- -Warning: array_merge_recursive(): Argument #2 is not an array in %s on line %d +Warning: array_merge_recursive(): Expected parameter 2 to be an array, float given in %s on line %d NULL -- Iteration 7 -- -Warning: array_merge_recursive(): Argument #2 is not an array in %s on line %d +Warning: array_merge_recursive(): Expected parameter 2 to be an array, float given in %s on line %d NULL -- Iteration 8 -- -Warning: array_merge_recursive(): Argument #2 is not an array in %s on line %d +Warning: array_merge_recursive(): Expected parameter 2 to be an array, float given in %s on line %d NULL -- Iteration 9 -- -Warning: array_merge_recursive(): Argument #2 is not an array in %s on line %d +Warning: array_merge_recursive(): Expected parameter 2 to be an array, float given in %s on line %d NULL -- Iteration 10 -- -Warning: array_merge_recursive(): Argument #2 is not an array in %s on line %d +Warning: array_merge_recursive(): Expected parameter 2 to be an array, null given in %s on line %d NULL -- Iteration 11 -- -Warning: array_merge_recursive(): Argument #2 is not an array in %s on line %d +Warning: array_merge_recursive(): Expected parameter 2 to be an array, null given in %s on line %d NULL -- Iteration 12 -- -Warning: array_merge_recursive(): Argument #2 is not an array in %s on line %d +Warning: array_merge_recursive(): Expected parameter 2 to be an array, bool given in %s on line %d NULL -- Iteration 13 -- -Warning: array_merge_recursive(): Argument #2 is not an array in %s on line %d +Warning: array_merge_recursive(): Expected parameter 2 to be an array, bool given in %s on line %d NULL -- Iteration 14 -- -Warning: array_merge_recursive(): Argument #2 is not an array in %s on line %d +Warning: array_merge_recursive(): Expected parameter 2 to be an array, bool given in %s on line %d NULL -- Iteration 15 -- -Warning: array_merge_recursive(): Argument #2 is not an array in %s on line %d +Warning: array_merge_recursive(): Expected parameter 2 to be an array, bool given in %s on line %d NULL -- Iteration 16 -- -Warning: array_merge_recursive(): Argument #2 is not an array in %s on line %d +Warning: array_merge_recursive(): Expected parameter 2 to be an array, string given in %s on line %d NULL -- Iteration 17 -- -Warning: array_merge_recursive(): Argument #2 is not an array in %s on line %d +Warning: array_merge_recursive(): Expected parameter 2 to be an array, string given in %s on line %d NULL -- Iteration 18 -- -Warning: array_merge_recursive(): Argument #2 is not an array in %s on line %d +Warning: array_merge_recursive(): Expected parameter 2 to be an array, string given in %s on line %d NULL -- Iteration 19 -- -Warning: array_merge_recursive(): Argument #2 is not an array in %s on line %d +Warning: array_merge_recursive(): Expected parameter 2 to be an array, string given in %s on line %d NULL -- Iteration 20 -- -Warning: array_merge_recursive(): Argument #2 is not an array in %s on line %d +Warning: array_merge_recursive(): Expected parameter 2 to be an array, string given in %s on line %d NULL -- Iteration 21 -- -Warning: array_merge_recursive(): Argument #2 is not an array in %s on line %d +Warning: array_merge_recursive(): Expected parameter 2 to be an array, null given in %s on line %d NULL -- Iteration 22 -- -Warning: array_merge_recursive(): Argument #2 is not an array in %s on line %d +Warning: array_merge_recursive(): Expected parameter 2 to be an array, null given in %s on line %d NULL -- Iteration 23 -- -Warning: array_merge_recursive(): Argument #2 is not an array in %s on line %d +Warning: array_merge_recursive(): Expected parameter 2 to be an array, resource given in %s on line %d NULL -- Iteration 24 -- -Warning: array_merge_recursive(): Argument #2 is not an array in %s on line %d +Warning: array_merge_recursive(): Expected parameter 2 to be an array, object given in %s on line %d NULL Done diff --git a/ext/standard/tests/array/array_merge_recursive_variation3.phpt b/ext/standard/tests/array/array_merge_recursive_variation3.phpt index d63037d898..12d225a0d5 100644 --- a/ext/standard/tests/array/array_merge_recursive_variation3.phpt +++ b/ext/standard/tests/array/array_merge_recursive_variation3.phpt @@ -95,7 +95,7 @@ foreach($arrays as $arr1) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_merge_recursive() : Passing different arrays to $arr1 argument *** -- Iteration 1 -- -- With default argument -- diff --git a/ext/standard/tests/array/array_merge_recursive_variation6.phpt b/ext/standard/tests/array/array_merge_recursive_variation6.phpt index 56c67916c7..17fb7eb070 100644 --- a/ext/standard/tests/array/array_merge_recursive_variation6.phpt +++ b/ext/standard/tests/array/array_merge_recursive_variation6.phpt @@ -33,7 +33,7 @@ var_dump( array_merge_recursive($arr1_string_key, $arr2) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_merge_recursive() : array with duplicate keys for $arr1 argument *** -- With default argument -- array(3) { diff --git a/ext/standard/tests/array/array_merge_recursive_variation7.phpt b/ext/standard/tests/array/array_merge_recursive_variation7.phpt index fce0cb1070..45e6c7ee77 100644 --- a/ext/standard/tests/array/array_merge_recursive_variation7.phpt +++ b/ext/standard/tests/array/array_merge_recursive_variation7.phpt @@ -40,7 +40,7 @@ var_dump( array_merge_recursive($arr1, $arr2) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_merge_recursive() : array with reference variables for $arr1 argument *** -- With default argument -- array(6) { diff --git a/ext/standard/tests/array/array_merge_recursive_variation8.phpt b/ext/standard/tests/array/array_merge_recursive_variation8.phpt index 482bab1f72..ff76ed959c 100644 --- a/ext/standard/tests/array/array_merge_recursive_variation8.phpt +++ b/ext/standard/tests/array/array_merge_recursive_variation8.phpt @@ -27,7 +27,7 @@ var_dump( array_merge_recursive($arr1, $arr2) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_merge_recursive() : array with binary data for $arr1 argument *** -- With default argument -- array(5) { diff --git a/ext/standard/tests/array/array_merge_recursive_variation9.phpt b/ext/standard/tests/array/array_merge_recursive_variation9.phpt index e3bd8a173f..c35e976b5e 100644 --- a/ext/standard/tests/array/array_merge_recursive_variation9.phpt +++ b/ext/standard/tests/array/array_merge_recursive_variation9.phpt @@ -48,7 +48,7 @@ var_dump( array_merge_recursive($arr1, $arr2) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_merge_recursive() : arrays with common key and value *** -- Integer values -- array(3) { diff --git a/ext/standard/tests/array/array_merge_variation1.phpt b/ext/standard/tests/array/array_merge_variation1.phpt index ecfdb8e2b2..0335fe473b 100644 --- a/ext/standard/tests/array/array_merge_variation1.phpt +++ b/ext/standard/tests/array/array_merge_variation1.phpt @@ -102,87 +102,87 @@ echo "Done"; -- Iteration 1 -- -Warning: array_merge(): Argument #1 is not an array in %s on line %d +Warning: array_merge(): Expected parameter 1 to be an array, int given in %s on line %d NULL -- Iteration 2 -- -Warning: array_merge(): Argument #1 is not an array in %s on line %d +Warning: array_merge(): Expected parameter 1 to be an array, int given in %s on line %d NULL -- Iteration 3 -- -Warning: array_merge(): Argument #1 is not an array in %s on line %d +Warning: array_merge(): Expected parameter 1 to be an array, int given in %s on line %d NULL -- Iteration 4 -- -Warning: array_merge(): Argument #1 is not an array in %s on line %d +Warning: array_merge(): Expected parameter 1 to be an array, int given in %s on line %d NULL -- Iteration 5 -- -Warning: array_merge(): Argument #1 is not an array in %s on line %d +Warning: array_merge(): Expected parameter 1 to be an array, float given in %s on line %d NULL -- Iteration 6 -- -Warning: array_merge(): Argument #1 is not an array in %s on line %d +Warning: array_merge(): Expected parameter 1 to be an array, float given in %s on line %d NULL -- Iteration 7 -- -Warning: array_merge(): Argument #1 is not an array in %s on line %d +Warning: array_merge(): Expected parameter 1 to be an array, float given in %s on line %d NULL -- Iteration 8 -- -Warning: array_merge(): Argument #1 is not an array in %s on line %d +Warning: array_merge(): Expected parameter 1 to be an array, float given in %s on line %d NULL -- Iteration 9 -- -Warning: array_merge(): Argument #1 is not an array in %s on line %d +Warning: array_merge(): Expected parameter 1 to be an array, float given in %s on line %d NULL -- Iteration 10 -- -Warning: array_merge(): Argument #1 is not an array in %s on line %d +Warning: array_merge(): Expected parameter 1 to be an array, null given in %s on line %d NULL -- Iteration 11 -- -Warning: array_merge(): Argument #1 is not an array in %s on line %d +Warning: array_merge(): Expected parameter 1 to be an array, null given in %s on line %d NULL -- Iteration 12 -- -Warning: array_merge(): Argument #1 is not an array in %s on line %d +Warning: array_merge(): Expected parameter 1 to be an array, bool given in %s on line %d NULL -- Iteration 13 -- -Warning: array_merge(): Argument #1 is not an array in %s on line %d +Warning: array_merge(): Expected parameter 1 to be an array, bool given in %s on line %d NULL -- Iteration 14 -- -Warning: array_merge(): Argument #1 is not an array in %s on line %d +Warning: array_merge(): Expected parameter 1 to be an array, bool given in %s on line %d NULL -- Iteration 15 -- -Warning: array_merge(): Argument #1 is not an array in %s on line %d +Warning: array_merge(): Expected parameter 1 to be an array, bool given in %s on line %d NULL -- Iteration 16 -- -Warning: array_merge(): Argument #1 is not an array in %s on line %d +Warning: array_merge(): Expected parameter 1 to be an array, string given in %s on line %d NULL -- Iteration 17 -- -Warning: array_merge(): Argument #1 is not an array in %s on line %d +Warning: array_merge(): Expected parameter 1 to be an array, string given in %s on line %d NULL -- Iteration 18 -- @@ -195,36 +195,36 @@ array(2) { -- Iteration 19 -- -Warning: array_merge(): Argument #1 is not an array in %s on line %d +Warning: array_merge(): Expected parameter 1 to be an array, string given in %s on line %d NULL -- Iteration 20 -- -Warning: array_merge(): Argument #1 is not an array in %s on line %d +Warning: array_merge(): Expected parameter 1 to be an array, string given in %s on line %d NULL -- Iteration 21 -- -Warning: array_merge(): Argument #1 is not an array in %s on line %d +Warning: array_merge(): Expected parameter 1 to be an array, string given in %s on line %d NULL -- Iteration 22 -- -Warning: array_merge(): Argument #1 is not an array in %s on line %d +Warning: array_merge(): Expected parameter 1 to be an array, object given in %s on line %d NULL -- Iteration 23 -- -Warning: array_merge(): Argument #1 is not an array in %s on line %d +Warning: array_merge(): Expected parameter 1 to be an array, null given in %s on line %d NULL -- Iteration 24 -- -Warning: array_merge(): Argument #1 is not an array in %s on line %d +Warning: array_merge(): Expected parameter 1 to be an array, null given in %s on line %d NULL -- Iteration 25 -- -Warning: array_merge(): Argument #1 is not an array in %s on line %d +Warning: array_merge(): Expected parameter 1 to be an array, resource given in %s on line %d NULL Done diff --git a/ext/standard/tests/array/array_merge_variation10.phpt b/ext/standard/tests/array/array_merge_variation10.phpt index 6cc08be325..123c08ece1 100644 --- a/ext/standard/tests/array/array_merge_variation10.phpt +++ b/ext/standard/tests/array/array_merge_variation10.phpt @@ -34,7 +34,7 @@ echo key($arr3) . " => " . current ($arr3) . "\n"; echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_merge() : usage variations *** -- Call array_merge() -- diff --git a/ext/standard/tests/array/array_merge_variation2.phpt b/ext/standard/tests/array/array_merge_variation2.phpt index 2db4dfddef..fd7e9ccfc8 100644 --- a/ext/standard/tests/array/array_merge_variation2.phpt +++ b/ext/standard/tests/array/array_merge_variation2.phpt @@ -102,87 +102,87 @@ echo "Done"; -- Iteration 1 -- -Warning: array_merge(): Argument #2 is not an array in %s on line %d +Warning: array_merge(): Expected parameter 2 to be an array, int given in %s on line %d NULL -- Iteration 2 -- -Warning: array_merge(): Argument #2 is not an array in %s on line %d +Warning: array_merge(): Expected parameter 2 to be an array, int given in %s on line %d NULL -- Iteration 3 -- -Warning: array_merge(): Argument #2 is not an array in %s on line %d +Warning: array_merge(): Expected parameter 2 to be an array, int given in %s on line %d NULL -- Iteration 4 -- -Warning: array_merge(): Argument #2 is not an array in %s on line %d +Warning: array_merge(): Expected parameter 2 to be an array, int given in %s on line %d NULL -- Iteration 5 -- -Warning: array_merge(): Argument #2 is not an array in %s on line %d +Warning: array_merge(): Expected parameter 2 to be an array, float given in %s on line %d NULL -- Iteration 6 -- -Warning: array_merge(): Argument #2 is not an array in %s on line %d +Warning: array_merge(): Expected parameter 2 to be an array, float given in %s on line %d NULL -- Iteration 7 -- -Warning: array_merge(): Argument #2 is not an array in %s on line %d +Warning: array_merge(): Expected parameter 2 to be an array, float given in %s on line %d NULL -- Iteration 8 -- -Warning: array_merge(): Argument #2 is not an array in %s on line %d +Warning: array_merge(): Expected parameter 2 to be an array, float given in %s on line %d NULL -- Iteration 9 -- -Warning: array_merge(): Argument #2 is not an array in %s on line %d +Warning: array_merge(): Expected parameter 2 to be an array, float given in %s on line %d NULL -- Iteration 10 -- -Warning: array_merge(): Argument #2 is not an array in %s on line %d +Warning: array_merge(): Expected parameter 2 to be an array, null given in %s on line %d NULL -- Iteration 11 -- -Warning: array_merge(): Argument #2 is not an array in %s on line %d +Warning: array_merge(): Expected parameter 2 to be an array, null given in %s on line %d NULL -- Iteration 12 -- -Warning: array_merge(): Argument #2 is not an array in %s on line %d +Warning: array_merge(): Expected parameter 2 to be an array, bool given in %s on line %d NULL -- Iteration 13 -- -Warning: array_merge(): Argument #2 is not an array in %s on line %d +Warning: array_merge(): Expected parameter 2 to be an array, bool given in %s on line %d NULL -- Iteration 14 -- -Warning: array_merge(): Argument #2 is not an array in %s on line %d +Warning: array_merge(): Expected parameter 2 to be an array, bool given in %s on line %d NULL -- Iteration 15 -- -Warning: array_merge(): Argument #2 is not an array in %s on line %d +Warning: array_merge(): Expected parameter 2 to be an array, bool given in %s on line %d NULL -- Iteration 16 -- -Warning: array_merge(): Argument #2 is not an array in %s on line %d +Warning: array_merge(): Expected parameter 2 to be an array, string given in %s on line %d NULL -- Iteration 17 -- -Warning: array_merge(): Argument #2 is not an array in %s on line %d +Warning: array_merge(): Expected parameter 2 to be an array, string given in %s on line %d NULL -- Iteration 18 -- @@ -195,36 +195,36 @@ array(2) { -- Iteration 19 -- -Warning: array_merge(): Argument #2 is not an array in %s on line %d +Warning: array_merge(): Expected parameter 2 to be an array, string given in %s on line %d NULL -- Iteration 20 -- -Warning: array_merge(): Argument #2 is not an array in %s on line %d +Warning: array_merge(): Expected parameter 2 to be an array, string given in %s on line %d NULL -- Iteration 21 -- -Warning: array_merge(): Argument #2 is not an array in %s on line %d +Warning: array_merge(): Expected parameter 2 to be an array, string given in %s on line %d NULL -- Iteration 22 -- -Warning: array_merge(): Argument #2 is not an array in %s on line %d +Warning: array_merge(): Expected parameter 2 to be an array, object given in %s on line %d NULL -- Iteration 23 -- -Warning: array_merge(): Argument #2 is not an array in %s on line %d +Warning: array_merge(): Expected parameter 2 to be an array, null given in %s on line %d NULL -- Iteration 24 -- -Warning: array_merge(): Argument #2 is not an array in %s on line %d +Warning: array_merge(): Expected parameter 2 to be an array, null given in %s on line %d NULL -- Iteration 25 -- -Warning: array_merge(): Argument #2 is not an array in %s on line %d +Warning: array_merge(): Expected parameter 2 to be an array, resource given in %s on line %d NULL Done diff --git a/ext/standard/tests/array/array_merge_variation4.phpt b/ext/standard/tests/array/array_merge_variation4.phpt index ce2d4c47fc..f061520d1d 100644 --- a/ext/standard/tests/array/array_merge_variation4.phpt +++ b/ext/standard/tests/array/array_merge_variation4.phpt @@ -107,7 +107,7 @@ foreach($inputs as $key => $input) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_merge() : usage variations *** -- Iteration 1: int data -- diff --git a/ext/standard/tests/array/array_merge_variation5.phpt b/ext/standard/tests/array/array_merge_variation5.phpt index b858cfed8c..18e0ce2000 100644 --- a/ext/standard/tests/array/array_merge_variation5.phpt +++ b/ext/standard/tests/array/array_merge_variation5.phpt @@ -23,7 +23,7 @@ var_dump(array_merge($arr2, $arr1)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_merge() : usage variations *** array(7) { [0]=> diff --git a/ext/standard/tests/array/array_merge_variation6.phpt b/ext/standard/tests/array/array_merge_variation6.phpt index bce2fa1360..8483a00339 100644 --- a/ext/standard/tests/array/array_merge_variation6.phpt +++ b/ext/standard/tests/array/array_merge_variation6.phpt @@ -23,7 +23,7 @@ var_dump(array_merge($arr2, $arr1)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_merge() : usage variations *** array(5) { ["zero"]=> diff --git a/ext/standard/tests/array/array_merge_variation7.phpt b/ext/standard/tests/array/array_merge_variation7.phpt index 309b452d7c..0e52a99f38 100644 --- a/ext/standard/tests/array/array_merge_variation7.phpt +++ b/ext/standard/tests/array/array_merge_variation7.phpt @@ -23,7 +23,7 @@ var_dump(array_merge($arr2, $arr1)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_merge() : usage variations *** array(8) { [0]=> diff --git a/ext/standard/tests/array/array_merge_variation8.phpt b/ext/standard/tests/array/array_merge_variation8.phpt index 70b3b5cef5..40699b3339 100644 --- a/ext/standard/tests/array/array_merge_variation8.phpt +++ b/ext/standard/tests/array/array_merge_variation8.phpt @@ -25,7 +25,7 @@ var_dump(array_merge($arr2, $arr1[3])); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_merge() : usage variations *** -- Merge a two-dimensional and a one-dimensional array -- diff --git a/ext/standard/tests/array/array_merge_variation9.phpt b/ext/standard/tests/array/array_merge_variation9.phpt index 0a8db26fcc..b23a96ea9c 100644 --- a/ext/standard/tests/array/array_merge_variation9.phpt +++ b/ext/standard/tests/array/array_merge_variation9.phpt @@ -33,7 +33,7 @@ var_dump(array_merge($arr2, $arr1)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_merge() : usage variations *** -- Merge an array made up of referenced variables to an assoc. array -- diff --git a/ext/standard/tests/array/array_multisort_basic1.phpt b/ext/standard/tests/array/array_multisort_basic1.phpt index 28361375d4..20e90be415 100644 --- a/ext/standard/tests/array/array_multisort_basic1.phpt +++ b/ext/standard/tests/array/array_multisort_basic1.phpt @@ -25,7 +25,7 @@ var_dump($ar2); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_multisort() : basic functionality *** -- Testing array_multisort() function with all normal arguments -- diff --git a/ext/standard/tests/array/array_multisort_basic2.phpt b/ext/standard/tests/array/array_multisort_basic2.phpt index 1c26916b89..e7af3b352f 100644 --- a/ext/standard/tests/array/array_multisort_basic2.phpt +++ b/ext/standard/tests/array/array_multisort_basic2.phpt @@ -20,7 +20,7 @@ var_dump($ar1, $ar2); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_multisort() : basic functionality - renumbering of numeric keys *** -- Testing array_multisort() function with all normal arguments -- diff --git a/ext/standard/tests/array/array_multisort_case.phpt b/ext/standard/tests/array/array_multisort_case.phpt index 35faa08f23..390640700c 100644 --- a/ext/standard/tests/array/array_multisort_case.phpt +++ b/ext/standard/tests/array/array_multisort_case.phpt @@ -36,7 +36,7 @@ var_dump($a, $b); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_multisort() : case-sensitive array(7) { [0]=> diff --git a/ext/standard/tests/array/array_multisort_incase.phpt b/ext/standard/tests/array/array_multisort_incase.phpt index c15785b69c..a20a0f1151 100644 --- a/ext/standard/tests/array/array_multisort_incase.phpt +++ b/ext/standard/tests/array/array_multisort_incase.phpt @@ -36,7 +36,7 @@ var_dump($a, $b); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_multisort() : case-insensitive array(7) { [0]=> diff --git a/ext/standard/tests/array/array_multisort_natural.phpt b/ext/standard/tests/array/array_multisort_natural.phpt index 2d9b7f1838..56fb3df582 100644 --- a/ext/standard/tests/array/array_multisort_natural.phpt +++ b/ext/standard/tests/array/array_multisort_natural.phpt @@ -32,7 +32,7 @@ var_dump($a, $b); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_multisort() : natural sorting array(5) { [0]=> diff --git a/ext/standard/tests/array/array_multisort_natural_case.phpt b/ext/standard/tests/array/array_multisort_natural_case.phpt index 7795bacd94..79ff8e99c6 100644 --- a/ext/standard/tests/array/array_multisort_natural_case.phpt +++ b/ext/standard/tests/array/array_multisort_natural_case.phpt @@ -36,7 +36,7 @@ var_dump($a, $b); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_multisort() : natural sorting case-sensitive array(7) { [0]=> diff --git a/ext/standard/tests/array/array_multisort_natural_incase.phpt b/ext/standard/tests/array/array_multisort_natural_incase.phpt index 73e2fe2514..f34c501eec 100644 --- a/ext/standard/tests/array/array_multisort_natural_incase.phpt +++ b/ext/standard/tests/array/array_multisort_natural_incase.phpt @@ -36,7 +36,7 @@ var_dump($a, $b); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_multisort() : natural sorting case-insensitive array(7) { [0]=> diff --git a/ext/standard/tests/array/array_multisort_variation10.phpt b/ext/standard/tests/array/array_multisort_variation10.phpt index 34c7ad4b29..17bdeae5cd 100644 --- a/ext/standard/tests/array/array_multisort_variation10.phpt +++ b/ext/standard/tests/array/array_multisort_variation10.phpt @@ -14,7 +14,7 @@ var_dump(array_multisort(array(1,3,2,4))); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_multisort() : Testing with anonymous arguments *** bool(true) ===DONE=== diff --git a/ext/standard/tests/array/array_multisort_variation11.phpt b/ext/standard/tests/array/array_multisort_variation11.phpt index 046b45f020..49e8d0f30e 100644 --- a/ext/standard/tests/array/array_multisort_variation11.phpt +++ b/ext/standard/tests/array/array_multisort_variation11.phpt @@ -15,7 +15,7 @@ var_dump(array_multisort(array())); ?> ===DONE=== <?php exit(0); ?> ---EXPECTF-- +--EXPECT-- *** Testing array_multisort() : Testing with empty array *** bool(true) ===DONE=== diff --git a/ext/standard/tests/array/array_multisort_variation4.phpt b/ext/standard/tests/array/array_multisort_variation4.phpt index fc123d7544..562be2e70e 100644 --- a/ext/standard/tests/array/array_multisort_variation4.phpt +++ b/ext/standard/tests/array/array_multisort_variation4.phpt @@ -22,7 +22,7 @@ var_dump($arr3); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_multisort() : Testing with multiple array arguments *** bool(true) array(4) { diff --git a/ext/standard/tests/array/array_multisort_variation5.phpt b/ext/standard/tests/array/array_multisort_variation5.phpt index 0458e7a4fb..2953846825 100644 --- a/ext/standard/tests/array/array_multisort_variation5.phpt +++ b/ext/standard/tests/array/array_multisort_variation5.phpt @@ -24,7 +24,7 @@ var_dump($ar); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_multisort() : Testing all array sort specifiers *** array(3) { [0]=> diff --git a/ext/standard/tests/array/array_multisort_variation6.phpt b/ext/standard/tests/array/array_multisort_variation6.phpt index 6261f8db6a..f5ffb8a7e4 100644 --- a/ext/standard/tests/array/array_multisort_variation6.phpt +++ b/ext/standard/tests/array/array_multisort_variation6.phpt @@ -24,7 +24,7 @@ var_dump($ar); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_multisort() : Testing all array sort specifiers *** array(3) { [0]=> diff --git a/ext/standard/tests/array/array_multisort_variation7.phpt b/ext/standard/tests/array/array_multisort_variation7.phpt index 87c2f4170e..4ad68efe19 100644 --- a/ext/standard/tests/array/array_multisort_variation7.phpt +++ b/ext/standard/tests/array/array_multisort_variation7.phpt @@ -37,7 +37,7 @@ var_dump($inputs); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_multisort() : usage variation - test sort order of all types*** bool(true) array(10) { diff --git a/ext/standard/tests/array/array_multisort_variation8.phpt b/ext/standard/tests/array/array_multisort_variation8.phpt index 41dd8eebc6..6d89dd0c6c 100644 --- a/ext/standard/tests/array/array_multisort_variation8.phpt +++ b/ext/standard/tests/array/array_multisort_variation8.phpt @@ -43,7 +43,7 @@ var_dump($inputs); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_multisort() : usage variation - test sort order of all types*** bool(true) array(10) { diff --git a/ext/standard/tests/array/array_pad_variation1.phpt b/ext/standard/tests/array/array_pad_variation1.phpt index 3fb93fa834..b806139d57 100644 --- a/ext/standard/tests/array/array_pad_variation1.phpt +++ b/ext/standard/tests/array/array_pad_variation1.phpt @@ -101,31 +101,31 @@ echo "Done"; *** Testing array_pad() : passing non array values to $input argument *** -- Iteration 1 -- -Warning: array_pad() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_pad() expects parameter 1 to be array, int given in %s on line %d NULL -Warning: array_pad() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_pad() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 2 -- -Warning: array_pad() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_pad() expects parameter 1 to be array, int given in %s on line %d NULL -Warning: array_pad() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_pad() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 3 -- -Warning: array_pad() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_pad() expects parameter 1 to be array, int given in %s on line %d NULL -Warning: array_pad() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_pad() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 4 -- -Warning: array_pad() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_pad() expects parameter 1 to be array, int given in %s on line %d NULL -Warning: array_pad() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_pad() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 5 -- @@ -178,31 +178,31 @@ Warning: array_pad() expects parameter 1 to be array, null given in %s on line % NULL -- Iteration 12 -- -Warning: array_pad() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_pad() expects parameter 1 to be array, bool given in %s on line %d NULL -Warning: array_pad() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_pad() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 13 -- -Warning: array_pad() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_pad() expects parameter 1 to be array, bool given in %s on line %d NULL -Warning: array_pad() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_pad() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 14 -- -Warning: array_pad() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_pad() expects parameter 1 to be array, bool given in %s on line %d NULL -Warning: array_pad() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_pad() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 15 -- -Warning: array_pad() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_pad() expects parameter 1 to be array, bool given in %s on line %d NULL -Warning: array_pad() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_pad() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 16 -- diff --git a/ext/standard/tests/array/array_pad_variation2.phpt b/ext/standard/tests/array/array_pad_variation2.phpt index 42782fa205..c95303974d 100644 --- a/ext/standard/tests/array/array_pad_variation2.phpt +++ b/ext/standard/tests/array/array_pad_variation2.phpt @@ -161,23 +161,23 @@ array(2) { } -- Iteration 7 -- -Warning: array_pad() expects parameter 2 to be integer, array given in %s on line %d +Warning: array_pad() expects parameter 2 to be int, array given in %s on line %d NULL -- Iteration 8 -- -Warning: array_pad() expects parameter 2 to be integer, array given in %s on line %d +Warning: array_pad() expects parameter 2 to be int, array given in %s on line %d NULL -- Iteration 9 -- -Warning: array_pad() expects parameter 2 to be integer, array given in %s on line %d +Warning: array_pad() expects parameter 2 to be int, array given in %s on line %d NULL -- Iteration 10 -- -Warning: array_pad() expects parameter 2 to be integer, array given in %s on line %d +Warning: array_pad() expects parameter 2 to be int, array given in %s on line %d NULL -- Iteration 11 -- -Warning: array_pad() expects parameter 2 to be integer, array given in %s on line %d +Warning: array_pad() expects parameter 2 to be int, array given in %s on line %d NULL -- Iteration 12 -- array(2) { @@ -223,23 +223,23 @@ array(2) { } -- Iteration 18 -- -Warning: array_pad() expects parameter 2 to be integer, string given in %s on line %d +Warning: array_pad() expects parameter 2 to be int, string given in %s on line %d NULL -- Iteration 19 -- -Warning: array_pad() expects parameter 2 to be integer, string given in %s on line %d +Warning: array_pad() expects parameter 2 to be int, string given in %s on line %d NULL -- Iteration 20 -- -Warning: array_pad() expects parameter 2 to be integer, string given in %s on line %d +Warning: array_pad() expects parameter 2 to be int, string given in %s on line %d NULL -- Iteration 21 -- -Warning: array_pad() expects parameter 2 to be integer, string given in %s on line %d +Warning: array_pad() expects parameter 2 to be int, string given in %s on line %d NULL -- Iteration 22 -- -Warning: array_pad() expects parameter 2 to be integer, object given in %s on line %d +Warning: array_pad() expects parameter 2 to be int, object given in %s on line %d NULL -- Iteration 23 -- array(2) { diff --git a/ext/standard/tests/array/array_pad_variation4.phpt b/ext/standard/tests/array/array_pad_variation4.phpt index 83c1e8300d..0216245cc2 100644 --- a/ext/standard/tests/array/array_pad_variation4.phpt +++ b/ext/standard/tests/array/array_pad_variation4.phpt @@ -27,7 +27,7 @@ var_dump( array_pad($input, -$pad_size, $binary) ); // negative 'pad_size' echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_pad() : Passing binary values to $pad_value argument *** array(6) { [0]=> diff --git a/ext/standard/tests/array/array_pad_variation5.phpt b/ext/standard/tests/array/array_pad_variation5.phpt index 4e8e0f1132..ec4c87eee6 100644 --- a/ext/standard/tests/array/array_pad_variation5.phpt +++ b/ext/standard/tests/array/array_pad_variation5.phpt @@ -31,7 +31,7 @@ var_dump( array_pad($input, -$pad_size, $pad_value) ); // negative 'pad_value' echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_pad() : Passing 2-d array to $pad_value argument *** array(5) { [0]=> diff --git a/ext/standard/tests/array/array_pad_variation6.phpt b/ext/standard/tests/array/array_pad_variation6.phpt index a491573909..1ef1ef067c 100644 --- a/ext/standard/tests/array/array_pad_variation6.phpt +++ b/ext/standard/tests/array/array_pad_variation6.phpt @@ -90,7 +90,7 @@ foreach($inputs as $input) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_pad() : Passing different arrays to $input argument *** -- Iteration 1 -- array(6) { diff --git a/ext/standard/tests/array/array_pad_variation7.phpt b/ext/standard/tests/array/array_pad_variation7.phpt index 887f351948..06836b8239 100644 --- a/ext/standard/tests/array/array_pad_variation7.phpt +++ b/ext/standard/tests/array/array_pad_variation7.phpt @@ -38,7 +38,7 @@ var_dump( array_pad($input[1], -$pad_size, $pad_value) ); // negative 'pad_size echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_pad() : Passing 2-D array to $input argument *** -- Entire 2-d array for $input argument -- array(5) { diff --git a/ext/standard/tests/array/array_pop.phpt b/ext/standard/tests/array/array_pop.phpt index a6a563fca3..843a618f2e 100644 --- a/ext/standard/tests/array/array_pop.phpt +++ b/ext/standard/tests/array/array_pop.phpt @@ -42,7 +42,7 @@ foreach( $mixed_array as $sub_array ) echo"\nDone"; ?> ---EXPECTF-- +--EXPECT-- *** Normal testing with various array inputs *** -- Input Array for Iteration 1 is -- diff --git a/ext/standard/tests/array/array_pop_errors.phpt b/ext/standard/tests/array/array_pop_errors.phpt index d6c86c3794..fd6147731c 100644 --- a/ext/standard/tests/array/array_pop_errors.phpt +++ b/ext/standard/tests/array/array_pop_errors.phpt @@ -51,7 +51,7 @@ echo"\nDone"; Warning: array_pop() expects exactly 1 parameter, 0 given in %s on line %d NULL -Warning: array_pop() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_pop() expects parameter 1 to be array, int given in %s on line %d NULL Warning: array_pop() expects parameter 1 to be array, string given in %s on line %d diff --git a/ext/standard/tests/array/array_pop_variation.phpt b/ext/standard/tests/array/array_pop_variation.phpt index 795a8bcf86..c2e30cb7a3 100644 --- a/ext/standard/tests/array/array_pop_variation.phpt +++ b/ext/standard/tests/array/array_pop_variation.phpt @@ -39,7 +39,7 @@ var_dump( current($mixed_array[1]) ); echo"\nDone"; ?> ---EXPECTF-- +--EXPECT-- *** Checking for internal array pointer being reset when pop is called *** Current Element is : int(1) diff --git a/ext/standard/tests/array/array_product_variation2.phpt b/ext/standard/tests/array/array_product_variation2.phpt index 410f2c827e..38faf712e1 100644 --- a/ext/standard/tests/array/array_product_variation2.phpt +++ b/ext/standard/tests/array/array_product_variation2.phpt @@ -14,7 +14,7 @@ echo "\n-- Testing array_product() function with a keyed array array --\n"; var_dump( array_product(array("bob" => 2, "janet" => 5)) ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_product() : variations *** -- Testing array_product() function with a keyed array array -- diff --git a/ext/standard/tests/array/array_product_variation3.phpt b/ext/standard/tests/array/array_product_variation3.phpt index a203d8be74..a325879e45 100644 --- a/ext/standard/tests/array/array_product_variation3.phpt +++ b/ext/standard/tests/array/array_product_variation3.phpt @@ -28,7 +28,7 @@ var_dump( array_product(array(-99999999.9, 99999999.1))); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_product() : variations - negative numbers*** -- Testing array_product() function with one negative number -- diff --git a/ext/standard/tests/array/array_product_variation4.phpt b/ext/standard/tests/array/array_product_variation4.phpt index c3ff22c3c7..c79077c78f 100644 --- a/ext/standard/tests/array/array_product_variation4.phpt +++ b/ext/standard/tests/array/array_product_variation4.phpt @@ -21,7 +21,7 @@ for ($i = 0; $i < 999; $i++) { var_dump( array_product($array) ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_product() : variations *** -- Testing array_product() function with a very large array -- diff --git a/ext/standard/tests/array/array_product_variation5.phpt b/ext/standard/tests/array/array_product_variation5.phpt index 6d595280fd..09284d9096 100644 --- a/ext/standard/tests/array/array_product_variation5.phpt +++ b/ext/standard/tests/array/array_product_variation5.phpt @@ -98,22 +98,22 @@ foreach($inputs as $key =>$value) { --int 0-- -Warning: array_product() expects parameter 1 to be array, integer given in %sarray_product_variation5.php on line %d +Warning: array_product() expects parameter 1 to be array, int given in %sarray_product_variation5.php on line %d NULL --int 1-- -Warning: array_product() expects parameter 1 to be array, integer given in %sarray_product_variation5.php on line %d +Warning: array_product() expects parameter 1 to be array, int given in %sarray_product_variation5.php on line %d NULL --int 12345-- -Warning: array_product() expects parameter 1 to be array, integer given in %sarray_product_variation5.php on line %d +Warning: array_product() expects parameter 1 to be array, int given in %sarray_product_variation5.php on line %d NULL --int -12345-- -Warning: array_product() expects parameter 1 to be array, integer given in %sarray_product_variation5.php on line %d +Warning: array_product() expects parameter 1 to be array, int given in %sarray_product_variation5.php on line %d NULL --float 10.5-- @@ -153,22 +153,22 @@ NULL --lowercase true-- -Warning: array_product() expects parameter 1 to be array, boolean given in %sarray_product_variation5.php on line %d +Warning: array_product() expects parameter 1 to be array, bool given in %sarray_product_variation5.php on line %d NULL --lowercase false-- -Warning: array_product() expects parameter 1 to be array, boolean given in %sarray_product_variation5.php on line %d +Warning: array_product() expects parameter 1 to be array, bool given in %sarray_product_variation5.php on line %d NULL --uppercase TRUE-- -Warning: array_product() expects parameter 1 to be array, boolean given in %sarray_product_variation5.php on line %d +Warning: array_product() expects parameter 1 to be array, bool given in %sarray_product_variation5.php on line %d NULL --uppercase FALSE-- -Warning: array_product() expects parameter 1 to be array, boolean given in %sarray_product_variation5.php on line %d +Warning: array_product() expects parameter 1 to be array, bool given in %sarray_product_variation5.php on line %d NULL --empty string DQ-- diff --git a/ext/standard/tests/array/array_push.phpt b/ext/standard/tests/array/array_push.phpt index da2442f454..52e754f94d 100644 --- a/ext/standard/tests/array/array_push.phpt +++ b/ext/standard/tests/array/array_push.phpt @@ -72,10 +72,10 @@ echo"\nDone"; --EXPECTF-- *** Testing Error Conditions *** -Warning: array_push() expects at least 2 parameters, 0 given in %s on line %d +Warning: array_push() expects at least 1 parameter, 0 given in %s on line %d NULL -Warning: array_push() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_push() expects parameter 1 to be array, int given in %s on line %d NULL Warning: array_push() expects parameter 1 to be array, string given in %s on line %d diff --git a/ext/standard/tests/array/array_push_basic.phpt b/ext/standard/tests/array/array_push_basic.phpt index 7b41a2f5e9..697eaccaf2 100644 --- a/ext/standard/tests/array/array_push_basic.phpt +++ b/ext/standard/tests/array/array_push_basic.phpt @@ -29,7 +29,7 @@ var_dump($array_assoc); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_push() : basic functionality *** -- Push values onto an indexed array -- diff --git a/ext/standard/tests/array/array_push_empty.phpt b/ext/standard/tests/array/array_push_empty.phpt new file mode 100644 index 0000000000..7ca7e7fdd2 --- /dev/null +++ b/ext/standard/tests/array/array_push_empty.phpt @@ -0,0 +1,30 @@ +--TEST-- +Test array_push() function : push empty set to the array +--FILE-- +<?php +/* Prototype : int array_push(array $stack[, mixed $...]) + * Description: Pushes elements onto the end of the array + * Source code: ext/standard/array.c + */ + +$array = [1,2,3]; +$values = []; + +var_dump( array_push($array) ); +var_dump( array_push($array, ...$values) ); +var_dump( $array ); + +echo "Done"; +?> +--EXPECTF-- +int(3) +int(3) +array(3) { + [0]=> + int(1) + [1]=> + int(2) + [2]=> + int(3) +} +Done diff --git a/ext/standard/tests/array/array_push_error1.phpt b/ext/standard/tests/array/array_push_error1.phpt index 9a7d6f3fc8..163c0984eb 100644 --- a/ext/standard/tests/array/array_push_error1.phpt +++ b/ext/standard/tests/array/array_push_error1.phpt @@ -2,7 +2,7 @@ Test array_push() function : error conditions - Pass incorrect number of args --FILE-- <?php -/* Prototype : int array_push(array $stack, mixed $var [, mixed $...]) +/* Prototype : int array_push(array $stack[, mixed $...]) * Description: Pushes elements onto the end of the array * Source code: ext/standard/array.c */ @@ -15,8 +15,7 @@ echo "*** Testing array_push() : error conditions ***\n"; // Testing array_push with one less than the expected number of arguments echo "\n-- Testing array_push() function with less than expected no. of arguments --\n"; -$stack = array(1, 2); -var_dump( array_push($stack) ); +var_dump( array_push() ); echo "Done"; ?> @@ -25,6 +24,6 @@ echo "Done"; -- Testing array_push() function with less than expected no. of arguments -- -Warning: array_push() expects at least 2 parameters, 1 given in %s on line %d +Warning: array_push() expects at least 1 parameter, 0 given in %s on line %d NULL Done diff --git a/ext/standard/tests/array/array_push_variation1.phpt b/ext/standard/tests/array/array_push_variation1.phpt index 9bb9c8dc84..c04cf4073f 100644 --- a/ext/standard/tests/array/array_push_variation1.phpt +++ b/ext/standard/tests/array/array_push_variation1.phpt @@ -102,22 +102,22 @@ echo "Done"; -- Iteration 1 -- -Warning: array_push() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_push() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 2 -- -Warning: array_push() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_push() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 3 -- -Warning: array_push() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_push() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 4 -- -Warning: array_push() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_push() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 5 -- @@ -157,22 +157,22 @@ NULL -- Iteration 12 -- -Warning: array_push() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_push() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 13 -- -Warning: array_push() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_push() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 14 -- -Warning: array_push() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_push() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 15 -- -Warning: array_push() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_push() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 16 -- diff --git a/ext/standard/tests/array/array_push_variation2.phpt b/ext/standard/tests/array/array_push_variation2.phpt index e4f69cb114..f0884639a5 100644 --- a/ext/standard/tests/array/array_push_variation2.phpt +++ b/ext/standard/tests/array/array_push_variation2.phpt @@ -98,7 +98,7 @@ fclose($fp); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_push() : usage variations *** -- Iteration 1 -- diff --git a/ext/standard/tests/array/array_push_variation3.phpt b/ext/standard/tests/array/array_push_variation3.phpt index be7717283d..ddb258ab8a 100644 --- a/ext/standard/tests/array/array_push_variation3.phpt +++ b/ext/standard/tests/array/array_push_variation3.phpt @@ -27,7 +27,7 @@ var_dump($array); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_push() : usage variations *** -- Pass array as $var argument -- diff --git a/ext/standard/tests/array/array_push_variation5.phpt b/ext/standard/tests/array/array_push_variation5.phpt index f79c9f8cf1..b3611d2159 100644 --- a/ext/standard/tests/array/array_push_variation5.phpt +++ b/ext/standard/tests/array/array_push_variation5.phpt @@ -24,7 +24,7 @@ echo key($stack) . " => " . current ($stack) . "\n"; echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_push() : usage variations *** -- Call array_push() -- diff --git a/ext/standard/tests/array/array_push_variation6.phpt b/ext/standard/tests/array/array_push_variation6.phpt index 3ba6b7b50d..97b9aff140 100644 --- a/ext/standard/tests/array/array_push_variation6.phpt +++ b/ext/standard/tests/array/array_push_variation6.phpt @@ -105,7 +105,7 @@ foreach($inputs as $key => $input) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_push() : usage variations *** -- Iteration 1 : int data -- diff --git a/ext/standard/tests/array/array_rand.phpt b/ext/standard/tests/array/array_rand.phpt index c36ab3de7a..db432dc9b4 100644 --- a/ext/standard/tests/array/array_rand.phpt +++ b/ext/standard/tests/array/array_rand.phpt @@ -25,7 +25,7 @@ NULL Warning: array_rand(): Array is empty in %s on line %d NULL -Warning: array_rand() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_rand() expects parameter 1 to be array, int given in %s on line %d NULL Warning: array_rand(): Second argument has to be between 1 and the number of elements in the array in %s on line %d diff --git a/ext/standard/tests/array/array_rand_variation1.phpt b/ext/standard/tests/array/array_rand_variation1.phpt index de9de17626..7aaf48f99f 100644 --- a/ext/standard/tests/array/array_rand_variation1.phpt +++ b/ext/standard/tests/array/array_rand_variation1.phpt @@ -101,22 +101,22 @@ echo "Done"; -- Iteration 1 -- -Warning: array_rand() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_rand() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 2 -- -Warning: array_rand() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_rand() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 3 -- -Warning: array_rand() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_rand() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 4 -- -Warning: array_rand() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_rand() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 5 -- @@ -156,22 +156,22 @@ NULL -- Iteration 12 -- -Warning: array_rand() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_rand() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 13 -- -Warning: array_rand() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_rand() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 14 -- -Warning: array_rand() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_rand() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 15 -- -Warning: array_rand() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_rand() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 16 -- diff --git a/ext/standard/tests/array/array_rand_variation2.phpt b/ext/standard/tests/array/array_rand_variation2.phpt index b36c77b93f..1182d1aeea 100644 --- a/ext/standard/tests/array/array_rand_variation2.phpt +++ b/ext/standard/tests/array/array_rand_variation2.phpt @@ -181,27 +181,27 @@ NULL -- Iteration 16 -- -Warning: array_rand() expects parameter 2 to be integer, string given in %s on line %d +Warning: array_rand() expects parameter 2 to be int, string given in %s on line %d NULL -- Iteration 17 -- -Warning: array_rand() expects parameter 2 to be integer, string given in %s on line %d +Warning: array_rand() expects parameter 2 to be int, string given in %s on line %d NULL -- Iteration 18 -- -Warning: array_rand() expects parameter 2 to be integer, string given in %s on line %d +Warning: array_rand() expects parameter 2 to be int, string given in %s on line %d NULL -- Iteration 19 -- -Warning: array_rand() expects parameter 2 to be integer, string given in %s on line %d +Warning: array_rand() expects parameter 2 to be int, string given in %s on line %d NULL -- Iteration 20 -- -Warning: array_rand() expects parameter 2 to be integer, object given in %s on line %d +Warning: array_rand() expects parameter 2 to be int, object given in %s on line %d NULL -- Iteration 21 -- diff --git a/ext/standard/tests/array/array_reduce.phpt b/ext/standard/tests/array/array_reduce.phpt index 1ec9885da8..4a73a8eb95 100644 --- a/ext/standard/tests/array/array_reduce.phpt +++ b/ext/standard/tests/array/array_reduce.phpt @@ -37,7 +37,7 @@ var_dump(array_reduce($array, 'reduce_null', $initial), $initial); echo "\nDone"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_reduce() to integer *** int(61) int(42) diff --git a/ext/standard/tests/array/array_reduce_variation1.phpt b/ext/standard/tests/array/array_reduce_variation1.phpt index 96268f6605..618a22282a 100644 --- a/ext/standard/tests/array/array_reduce_variation1.phpt +++ b/ext/standard/tests/array/array_reduce_variation1.phpt @@ -33,7 +33,7 @@ try { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_reduce() : variation *** --- Testing with a callback with too few parameters --- diff --git a/ext/standard/tests/array/array_reduce_variation3.phpt b/ext/standard/tests/array/array_reduce_variation3.phpt index 04a625a0b6..01bd6d79d6 100644 --- a/ext/standard/tests/array/array_reduce_variation3.phpt +++ b/ext/standard/tests/array/array_reduce_variation3.phpt @@ -25,7 +25,7 @@ var_dump(array_reduce($array, array(new A(), "adder2"))); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_reduce() : variation - object callbacks *** --- Static method callback --- diff --git a/ext/standard/tests/array/array_reverse_basic1.phpt b/ext/standard/tests/array/array_reverse_basic1.phpt index 84f841318c..5ec38461a6 100644 --- a/ext/standard/tests/array/array_reverse_basic1.phpt +++ b/ext/standard/tests/array/array_reverse_basic1.phpt @@ -25,7 +25,7 @@ var_dump( array_reverse($array, false) ); // expects the keys not to be preserv echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_reverse() : basic functionality *** array(6) { [0]=> diff --git a/ext/standard/tests/array/array_reverse_basic2.phpt b/ext/standard/tests/array/array_reverse_basic2.phpt index a9b52cd320..c6844be47a 100644 --- a/ext/standard/tests/array/array_reverse_basic2.phpt +++ b/ext/standard/tests/array/array_reverse_basic2.phpt @@ -25,7 +25,7 @@ var_dump( array_reverse($array, false) ); // expects the keys not to be preserv echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_reverse() : basic functionality *** array(4) { [0]=> diff --git a/ext/standard/tests/array/array_reverse_variation1.phpt b/ext/standard/tests/array/array_reverse_variation1.phpt index 82c797e5fe..b2936c171c 100644 --- a/ext/standard/tests/array/array_reverse_variation1.phpt +++ b/ext/standard/tests/array/array_reverse_variation1.phpt @@ -99,43 +99,43 @@ echo "Done"; *** Testing array_reverse() : usage variations - unexpected values for 'array' argument *** -- Iteration 1 -- -Warning: array_reverse() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_reverse() expects parameter 1 to be array, int given in %s on line %d NULL -Warning: array_reverse() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_reverse() expects parameter 1 to be array, int given in %s on line %d NULL -Warning: array_reverse() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_reverse() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 2 -- -Warning: array_reverse() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_reverse() expects parameter 1 to be array, int given in %s on line %d NULL -Warning: array_reverse() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_reverse() expects parameter 1 to be array, int given in %s on line %d NULL -Warning: array_reverse() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_reverse() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 3 -- -Warning: array_reverse() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_reverse() expects parameter 1 to be array, int given in %s on line %d NULL -Warning: array_reverse() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_reverse() expects parameter 1 to be array, int given in %s on line %d NULL -Warning: array_reverse() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_reverse() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 4 -- -Warning: array_reverse() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_reverse() expects parameter 1 to be array, int given in %s on line %d NULL -Warning: array_reverse() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_reverse() expects parameter 1 to be array, int given in %s on line %d NULL -Warning: array_reverse() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_reverse() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 5 -- @@ -209,43 +209,43 @@ Warning: array_reverse() expects parameter 1 to be array, null given in %s on li NULL -- Iteration 12 -- -Warning: array_reverse() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_reverse() expects parameter 1 to be array, bool given in %s on line %d NULL -Warning: array_reverse() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_reverse() expects parameter 1 to be array, bool given in %s on line %d NULL -Warning: array_reverse() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_reverse() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 13 -- -Warning: array_reverse() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_reverse() expects parameter 1 to be array, bool given in %s on line %d NULL -Warning: array_reverse() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_reverse() expects parameter 1 to be array, bool given in %s on line %d NULL -Warning: array_reverse() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_reverse() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 14 -- -Warning: array_reverse() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_reverse() expects parameter 1 to be array, bool given in %s on line %d NULL -Warning: array_reverse() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_reverse() expects parameter 1 to be array, bool given in %s on line %d NULL -Warning: array_reverse() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_reverse() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 15 -- -Warning: array_reverse() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_reverse() expects parameter 1 to be array, bool given in %s on line %d NULL -Warning: array_reverse() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_reverse() expects parameter 1 to be array, bool given in %s on line %d NULL -Warning: array_reverse() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_reverse() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 16 -- diff --git a/ext/standard/tests/array/array_reverse_variation2.phpt b/ext/standard/tests/array/array_reverse_variation2.phpt index 69e7a9f112..1cc9a3088e 100644 --- a/ext/standard/tests/array/array_reverse_variation2.phpt +++ b/ext/standard/tests/array/array_reverse_variation2.phpt @@ -235,23 +235,23 @@ array(6) { } -- Iteration 10 -- -Warning: array_reverse() expects parameter 2 to be boolean, array given in %s on line %d +Warning: array_reverse() expects parameter 2 to be bool, array given in %s on line %d NULL -- Iteration 11 -- -Warning: array_reverse() expects parameter 2 to be boolean, array given in %s on line %d +Warning: array_reverse() expects parameter 2 to be bool, array given in %s on line %d NULL -- Iteration 12 -- -Warning: array_reverse() expects parameter 2 to be boolean, array given in %s on line %d +Warning: array_reverse() expects parameter 2 to be bool, array given in %s on line %d NULL -- Iteration 13 -- -Warning: array_reverse() expects parameter 2 to be boolean, array given in %s on line %d +Warning: array_reverse() expects parameter 2 to be bool, array given in %s on line %d NULL -- Iteration 14 -- -Warning: array_reverse() expects parameter 2 to be boolean, array given in %s on line %d +Warning: array_reverse() expects parameter 2 to be bool, array given in %s on line %d NULL -- Iteration 15 -- array(6) { @@ -375,7 +375,7 @@ array(6) { } -- Iteration 23 -- -Warning: array_reverse() expects parameter 2 to be boolean, object given in %s on line %d +Warning: array_reverse() expects parameter 2 to be bool, object given in %s on line %d NULL -- Iteration 24 -- array(6) { @@ -409,6 +409,6 @@ array(6) { } -- Iteration 26 -- -Warning: array_reverse() expects parameter 2 to be boolean, resource given in %s on line %d +Warning: array_reverse() expects parameter 2 to be bool, resource given in %s on line %d NULL Done diff --git a/ext/standard/tests/array/array_reverse_variation3.phpt b/ext/standard/tests/array/array_reverse_variation3.phpt index 10298428f8..a5ef1e0d2b 100644 --- a/ext/standard/tests/array/array_reverse_variation3.phpt +++ b/ext/standard/tests/array/array_reverse_variation3.phpt @@ -81,7 +81,7 @@ fclose($fp); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_reverse() : usage variations *** -- Iteration 1 -- - with default argument - diff --git a/ext/standard/tests/array/array_reverse_variation6.phpt b/ext/standard/tests/array/array_reverse_variation6.phpt index 7c222b9286..e48673ec1d 100644 --- a/ext/standard/tests/array/array_reverse_variation6.phpt +++ b/ext/standard/tests/array/array_reverse_variation6.phpt @@ -43,7 +43,7 @@ var_dump( array_reverse($two_dimensional_array[1], false) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_reverse() : usage variations *** -- with default argument -- array(3) { diff --git a/ext/standard/tests/array/array_search.phpt b/ext/standard/tests/array/array_search.phpt Binary files differindex 1afcb1d4ba..1787e52163 100644 --- a/ext/standard/tests/array/array_search.phpt +++ b/ext/standard/tests/array/array_search.phpt diff --git a/ext/standard/tests/array/array_search1.phpt b/ext/standard/tests/array/array_search1.phpt index f3fcf872f4..49563f9712 100644 --- a/ext/standard/tests/array/array_search1.phpt +++ b/ext/standard/tests/array/array_search1.phpt @@ -22,7 +22,7 @@ echo "Done\n"; Warning: array_search() expects at least 2 parameters, 1 given in %s on line %d NULL -Warning: array_search() expects parameter 2 to be array, integer given in %s on line %d +Warning: array_search() expects parameter 2 to be array, int given in %s on line %d NULL int(1) bool(false) diff --git a/ext/standard/tests/array/array_search_errors.phpt b/ext/standard/tests/array/array_search_errors.phpt index 0127f62cbc..90502b2f53 100644 --- a/ext/standard/tests/array/array_search_errors.phpt +++ b/ext/standard/tests/array/array_search_errors.phpt @@ -39,6 +39,6 @@ NULL Warning: array_search() expects parameter 2 to be array, string given in %s on line %d NULL -Warning: array_search() expects parameter 2 to be array, integer given in %s on line %d +Warning: array_search() expects parameter 2 to be array, int given in %s on line %d NULL Done diff --git a/ext/standard/tests/array/array_search_variation1.phpt b/ext/standard/tests/array/array_search_variation1.phpt index 43f3888021..6c52a3bfed 100644 --- a/ext/standard/tests/array/array_search_variation1.phpt +++ b/ext/standard/tests/array/array_search_variation1.phpt @@ -60,7 +60,7 @@ foreach($arrays as $array) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_search() with different needle values *** -- Iteration 1 -- bool(false) diff --git a/ext/standard/tests/array/array_search_variation2.phpt b/ext/standard/tests/array/array_search_variation2.phpt index 2609ed82f7..fa43841984 100644 --- a/ext/standard/tests/array/array_search_variation2.phpt +++ b/ext/standard/tests/array/array_search_variation2.phpt @@ -49,7 +49,7 @@ foreach($array_type as $type) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_search() with different haystack values *** -- Iteration 1 -- int(0) diff --git a/ext/standard/tests/array/array_search_variation4.phpt b/ext/standard/tests/array/array_search_variation4.phpt index 425872afcc..cbbf714b6f 100644 --- a/ext/standard/tests/array/array_search_variation4.phpt +++ b/ext/standard/tests/array/array_search_variation4.phpt @@ -55,7 +55,7 @@ var_dump( array_search('123abc', array(123), TRUE) ); // false in strict mode echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing resource type with array_search() *** int(0) bool(false) diff --git a/ext/standard/tests/array/array_shift_basic.phpt b/ext/standard/tests/array/array_shift_basic.phpt index 80d58ec7d9..0f73c65fac 100644 --- a/ext/standard/tests/array/array_shift_basic.phpt +++ b/ext/standard/tests/array/array_shift_basic.phpt @@ -25,7 +25,7 @@ var_dump($array); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_shift() : basic functionality *** -- Before shift: -- diff --git a/ext/standard/tests/array/array_shift_variation1.phpt b/ext/standard/tests/array/array_shift_variation1.phpt index 872e75f41a..5734da4fb9 100644 --- a/ext/standard/tests/array/array_shift_variation1.phpt +++ b/ext/standard/tests/array/array_shift_variation1.phpt @@ -98,22 +98,22 @@ echo "Done"; -- Iteration 1 -- -Warning: array_shift() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_shift() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 2 -- -Warning: array_shift() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_shift() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 3 -- -Warning: array_shift() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_shift() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 4 -- -Warning: array_shift() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_shift() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 5 -- @@ -153,22 +153,22 @@ NULL -- Iteration 12 -- -Warning: array_shift() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_shift() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 13 -- -Warning: array_shift() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_shift() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 14 -- -Warning: array_shift() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_shift() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 15 -- -Warning: array_shift() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_shift() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 16 -- diff --git a/ext/standard/tests/array/array_shift_variation3.phpt b/ext/standard/tests/array/array_shift_variation3.phpt index 6dbdf3a25f..6bd8370f13 100644 --- a/ext/standard/tests/array/array_shift_variation3.phpt +++ b/ext/standard/tests/array/array_shift_variation3.phpt @@ -103,7 +103,7 @@ foreach($inputs as $key => $input) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_shift() : usage variations *** -- Iteration 1 : int data -- diff --git a/ext/standard/tests/array/array_shift_variation4.phpt b/ext/standard/tests/array/array_shift_variation4.phpt index d1620b8b2e..dc2d2ff700 100644 --- a/ext/standard/tests/array/array_shift_variation4.phpt +++ b/ext/standard/tests/array/array_shift_variation4.phpt @@ -36,7 +36,7 @@ var_dump($stack_last); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_shift() : usage variations *** -- Before shift: -- diff --git a/ext/standard/tests/array/array_shift_variation6.phpt b/ext/standard/tests/array/array_shift_variation6.phpt index 584ea36fa4..45466adc42 100644 --- a/ext/standard/tests/array/array_shift_variation6.phpt +++ b/ext/standard/tests/array/array_shift_variation6.phpt @@ -37,7 +37,7 @@ var_dump($copied_array); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_shift() : usage variations *** -- Variable is referenced array -- diff --git a/ext/standard/tests/array/array_shift_variation7.phpt b/ext/standard/tests/array/array_shift_variation7.phpt index 8b8272100c..38f2341d2b 100644 --- a/ext/standard/tests/array/array_shift_variation7.phpt +++ b/ext/standard/tests/array/array_shift_variation7.phpt @@ -23,7 +23,7 @@ echo key($stack) . " => " . current ($stack) . "\n"; echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_shift() : usage variations *** -- Call array_shift() -- diff --git a/ext/standard/tests/array/array_slice.phpt b/ext/standard/tests/array/array_slice.phpt index b17fbce66f..59d804350b 100644 --- a/ext/standard/tests/array/array_slice.phpt +++ b/ext/standard/tests/array/array_slice.phpt @@ -103,7 +103,7 @@ Warning: array_slice() expects at most 4 parameters, 5 given in %s on line %d *** Output for scalar Argument *** -Warning: array_slice() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_slice() expects parameter 1 to be array, int given in %s on line %d *** Output for string Argument *** diff --git a/ext/standard/tests/array/array_slice_basic.phpt b/ext/standard/tests/array/array_slice_basic.phpt index c1c63e0866..d4d2bafa7b 100644 --- a/ext/standard/tests/array/array_slice_basic.phpt +++ b/ext/standard/tests/array/array_slice_basic.phpt @@ -29,7 +29,7 @@ var_dump( array_slice($input, $offset) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_slice() : basic functionality *** -- All arguments -- diff --git a/ext/standard/tests/array/array_slice_variation1.phpt b/ext/standard/tests/array/array_slice_variation1.phpt index e6f23d9843..7b6d712a1f 100644 --- a/ext/standard/tests/array/array_slice_variation1.phpt +++ b/ext/standard/tests/array/array_slice_variation1.phpt @@ -20,7 +20,7 @@ var_dump(array_slice(range(1, 3), 0, $a)); var_dump($a); ?> ---EXPECTF-- +--EXPECT-- array(3) { [0]=> int(1) diff --git a/ext/standard/tests/array/array_slice_variation10.phpt b/ext/standard/tests/array/array_slice_variation10.phpt index ec468a65a2..4f62a82204 100644 --- a/ext/standard/tests/array/array_slice_variation10.phpt +++ b/ext/standard/tests/array/array_slice_variation10.phpt @@ -25,7 +25,7 @@ echo key($input) . " => " . current ($input) . "\n"; echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_slice() : usage variations *** -- Call array_slice() -- diff --git a/ext/standard/tests/array/array_slice_variation11.phpt b/ext/standard/tests/array/array_slice_variation11.phpt index d572f4c37f..93805ac026 100644 --- a/ext/standard/tests/array/array_slice_variation11.phpt +++ b/ext/standard/tests/array/array_slice_variation11.phpt @@ -102,22 +102,22 @@ echo "Done"; -- Iteration 1 -- -Warning: array_slice() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_slice() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 2 -- -Warning: array_slice() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_slice() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 3 -- -Warning: array_slice() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_slice() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 4 -- -Warning: array_slice() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_slice() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 5 -- @@ -157,22 +157,22 @@ NULL -- Iteration 12 -- -Warning: array_slice() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_slice() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 13 -- -Warning: array_slice() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_slice() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 14 -- -Warning: array_slice() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_slice() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 15 -- -Warning: array_slice() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_slice() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 16 -- diff --git a/ext/standard/tests/array/array_slice_variation2.phpt b/ext/standard/tests/array/array_slice_variation2.phpt index 1cc9eb47fb..a76d68e6e0 100644 --- a/ext/standard/tests/array/array_slice_variation2.phpt +++ b/ext/standard/tests/array/array_slice_variation2.phpt @@ -152,7 +152,7 @@ array(4) { -- Iteration 7 -- -Warning: array_slice() expects parameter 2 to be integer, float given in %s on line %d +Warning: array_slice() expects parameter 2 to be int, float given in %s on line %d NULL -- Iteration 8 -- @@ -249,32 +249,32 @@ array(4) { -- Iteration 16 -- -Warning: array_slice() expects parameter 2 to be integer, string given in %s on line %d +Warning: array_slice() expects parameter 2 to be int, string given in %s on line %d NULL -- Iteration 17 -- -Warning: array_slice() expects parameter 2 to be integer, string given in %s on line %d +Warning: array_slice() expects parameter 2 to be int, string given in %s on line %d NULL -- Iteration 18 -- -Warning: array_slice() expects parameter 2 to be integer, array given in %s on line %d +Warning: array_slice() expects parameter 2 to be int, array given in %s on line %d NULL -- Iteration 19 -- -Warning: array_slice() expects parameter 2 to be integer, string given in %s on line %d +Warning: array_slice() expects parameter 2 to be int, string given in %s on line %d NULL -- Iteration 20 -- -Warning: array_slice() expects parameter 2 to be integer, string given in %s on line %d +Warning: array_slice() expects parameter 2 to be int, string given in %s on line %d NULL -- Iteration 21 -- -Warning: array_slice() expects parameter 2 to be integer, string given in %s on line %d +Warning: array_slice() expects parameter 2 to be int, string given in %s on line %d NULL -- Iteration 22 -- diff --git a/ext/standard/tests/array/array_slice_variation3.phpt b/ext/standard/tests/array/array_slice_variation3.phpt index 2869ece032..6cec0bc4ba 100644 --- a/ext/standard/tests/array/array_slice_variation3.phpt +++ b/ext/standard/tests/array/array_slice_variation3.phpt @@ -81,7 +81,7 @@ foreach($inputs as $input) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_slice() : usage variations *** -- Iteration 1 -- diff --git a/ext/standard/tests/array/array_slice_variation4.phpt b/ext/standard/tests/array/array_slice_variation4.phpt index 0d447c393e..6591e113af 100644 --- a/ext/standard/tests/array/array_slice_variation4.phpt +++ b/ext/standard/tests/array/array_slice_variation4.phpt @@ -266,7 +266,7 @@ array(3) { -- Iteration 18 -- -Warning: array_slice() expects parameter 4 to be boolean, array given in %s on line %d +Warning: array_slice() expects parameter 4 to be bool, array given in %s on line %d NULL -- Iteration 19 -- @@ -301,7 +301,7 @@ array(3) { -- Iteration 22 -- -Warning: array_slice() expects parameter 4 to be boolean, object given in %s on line %d +Warning: array_slice() expects parameter 4 to be bool, object given in %s on line %d NULL -- Iteration 23 -- diff --git a/ext/standard/tests/array/array_slice_variation5.phpt b/ext/standard/tests/array/array_slice_variation5.phpt index 6ba8470d61..5f127fd2eb 100644 --- a/ext/standard/tests/array/array_slice_variation5.phpt +++ b/ext/standard/tests/array/array_slice_variation5.phpt @@ -27,7 +27,7 @@ var_dump(array_slice($input, -PHP_INT_MAX)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_slice() : usage variations *** -- $offset is -7 -- diff --git a/ext/standard/tests/array/array_slice_variation6.phpt b/ext/standard/tests/array/array_slice_variation6.phpt index f39a766f3b..86bde4ae3c 100644 --- a/ext/standard/tests/array/array_slice_variation6.phpt +++ b/ext/standard/tests/array/array_slice_variation6.phpt @@ -28,7 +28,7 @@ var_dump(array_slice($input, $offset, -PHP_INT_MAX)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_slice() : usage variations *** -- $length is -6 -- diff --git a/ext/standard/tests/array/array_slice_variation7.phpt b/ext/standard/tests/array/array_slice_variation7.phpt index 8b286a9113..e9c1e10d29 100644 --- a/ext/standard/tests/array/array_slice_variation7.phpt +++ b/ext/standard/tests/array/array_slice_variation7.phpt @@ -110,7 +110,7 @@ foreach($inputs as $type => $input) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_slice() : usage variations *** -- Iteration 1 : key type is int -- diff --git a/ext/standard/tests/array/array_slice_variation8.phpt b/ext/standard/tests/array/array_slice_variation8.phpt index 72a1e6cdb4..20fb376567 100644 --- a/ext/standard/tests/array/array_slice_variation8.phpt +++ b/ext/standard/tests/array/array_slice_variation8.phpt @@ -25,7 +25,7 @@ var_dump(array_slice($input[2], 1, 2)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_slice() : usage variations *** -- Slice a two-dimensional array -- diff --git a/ext/standard/tests/array/array_slice_variation9.phpt b/ext/standard/tests/array/array_slice_variation9.phpt index 714ad8363e..ff203ec622 100644 --- a/ext/standard/tests/array/array_slice_variation9.phpt +++ b/ext/standard/tests/array/array_slice_variation9.phpt @@ -29,7 +29,7 @@ var_dump(array_slice($input, 1, 2, true)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_slice() : usage variations *** -- Array of referenced variables ($preserve_keys = default) -- diff --git a/ext/standard/tests/array/array_splice_errors.phpt b/ext/standard/tests/array/array_splice_errors.phpt index 01d280c874..135a1ed0db 100644 --- a/ext/standard/tests/array/array_splice_errors.phpt +++ b/ext/standard/tests/array/array_splice_errors.phpt @@ -32,7 +32,7 @@ NULL Warning: array_splice() expects at least 2 parameters, 1 given in %s on line %d NULL -Warning: array_splice() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_splice() expects parameter 1 to be array, int given in %s on line %d NULL Warning: array_splice() expects parameter 1 to be array, object given in %s on line %d diff --git a/ext/standard/tests/array/array_sum_basic.phpt b/ext/standard/tests/array/array_sum_basic.phpt index 1f41dd0334..e7c69202a3 100644 --- a/ext/standard/tests/array/array_sum_basic.phpt +++ b/ext/standard/tests/array/array_sum_basic.phpt @@ -26,7 +26,7 @@ var_dump( array_sum($input) ); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing array_sum() : basic functionality *** -- array_sum() with integer array entries -- int(15) diff --git a/ext/standard/tests/array/array_sum_variation1.phpt b/ext/standard/tests/array/array_sum_variation1.phpt index 00540d16bc..30e2847004 100644 --- a/ext/standard/tests/array/array_sum_variation1.phpt +++ b/ext/standard/tests/array/array_sum_variation1.phpt @@ -86,19 +86,19 @@ echo "Done" *** Testing array_sum() : unexpected values for 'input' *** -- Iteration 1 -- -Warning: array_sum() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_sum() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 2 -- -Warning: array_sum() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_sum() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 3 -- -Warning: array_sum() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_sum() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 4 -- -Warning: array_sum() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_sum() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 5 -- @@ -130,19 +130,19 @@ Warning: array_sum() expects parameter 1 to be array, null given in %s on line % NULL -- Iteration 12 -- -Warning: array_sum() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_sum() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 13 -- -Warning: array_sum() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_sum() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 14 -- -Warning: array_sum() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_sum() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 15 -- -Warning: array_sum() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_sum() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 16 -- diff --git a/ext/standard/tests/array/array_sum_variation2.phpt b/ext/standard/tests/array/array_sum_variation2.phpt index 1f9b021256..71abe03696 100644 --- a/ext/standard/tests/array/array_sum_variation2.phpt +++ b/ext/standard/tests/array/array_sum_variation2.phpt @@ -36,7 +36,7 @@ var_dump( array_sum($mixed_int_value) ); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing array_sum() : different integer array *** -- Sum of Integer array -- int(-573) diff --git a/ext/standard/tests/array/array_sum_variation3.phpt b/ext/standard/tests/array/array_sum_variation3.phpt index 8c7151e220..15c11fcccf 100644 --- a/ext/standard/tests/array/array_sum_variation3.phpt +++ b/ext/standard/tests/array/array_sum_variation3.phpt @@ -42,7 +42,7 @@ var_dump( array_sum($float_input) ); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing array_sum() : array with different float values *** -- simple float array -- float(1.3) diff --git a/ext/standard/tests/array/array_sum_variation4.phpt b/ext/standard/tests/array/array_sum_variation4.phpt index 8dd6976eee..1b7043e56a 100644 --- a/ext/standard/tests/array/array_sum_variation4.phpt +++ b/ext/standard/tests/array/array_sum_variation4.phpt @@ -25,7 +25,7 @@ var_dump( array_sum($float_input) ); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing array_sum() : array with duplicate values *** -- With integer array -- int(117) diff --git a/ext/standard/tests/array/array_sum_variation5.phpt b/ext/standard/tests/array/array_sum_variation5.phpt index ec2dac6342..db73114aa0 100644 --- a/ext/standard/tests/array/array_sum_variation5.phpt +++ b/ext/standard/tests/array/array_sum_variation5.phpt @@ -31,7 +31,7 @@ var_dump( array_sum($input) ); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing array_sum() : array with elements as reference *** int(305) Done diff --git a/ext/standard/tests/array/array_sum_variation6.phpt b/ext/standard/tests/array/array_sum_variation6.phpt index 9966649318..c3a20af5ed 100644 --- a/ext/standard/tests/array/array_sum_variation6.phpt +++ b/ext/standard/tests/array/array_sum_variation6.phpt @@ -24,7 +24,7 @@ echo "-- with string keys --\n"; var_dump( array_sum($input) ); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing array_sum() : with associative array *** -- with numeric keys -- float(32.56) diff --git a/ext/standard/tests/array/array_sum_variation7.phpt b/ext/standard/tests/array/array_sum_variation7.phpt index 74e262bd0a..7ed8723be0 100644 --- a/ext/standard/tests/array/array_sum_variation7.phpt +++ b/ext/standard/tests/array/array_sum_variation7.phpt @@ -67,7 +67,7 @@ echo "-- array with mixed values --\n"; var_dump( array_sum($input) ); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing array_sum() : array with unexpected entries *** -- empty array -- int(0) diff --git a/ext/standard/tests/array/array_udiff_assoc_variation.phpt b/ext/standard/tests/array/array_udiff_assoc_variation.phpt index 9528cf69cd..eca26a30e6 100644 --- a/ext/standard/tests/array/array_udiff_assoc_variation.phpt +++ b/ext/standard/tests/array/array_udiff_assoc_variation.phpt @@ -25,7 +25,7 @@ var_dump( array_udiff_assoc($arr1, $arr2, $arr3, $arr4, $key_compare_function) ) ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_udiff_assoc() : variation - testing with multiple array arguments *** array(2) { [4]=> diff --git a/ext/standard/tests/array/array_udiff_assoc_variation1.phpt b/ext/standard/tests/array/array_udiff_assoc_variation1.phpt index b512e3c797..2cbc9572d2 100644 --- a/ext/standard/tests/array/array_udiff_assoc_variation1.phpt +++ b/ext/standard/tests/array/array_udiff_assoc_variation1.phpt @@ -102,126 +102,126 @@ foreach($inputs as $key =>$value) { --int 0-- -Warning: array_udiff_assoc(): Argument #1 is not an array in %sarray_udiff_assoc_variation1.php on line %d +Warning: array_udiff_assoc(): Expected parameter 1 to be an array, int given in %sarray_udiff_assoc_variation1.php on line %d NULL --int 1-- -Warning: array_udiff_assoc(): Argument #1 is not an array in %sarray_udiff_assoc_variation1.php on line %d +Warning: array_udiff_assoc(): Expected parameter 1 to be an array, int given in %sarray_udiff_assoc_variation1.php on line %d NULL --int 12345-- -Warning: array_udiff_assoc(): Argument #1 is not an array in %sarray_udiff_assoc_variation1.php on line %d +Warning: array_udiff_assoc(): Expected parameter 1 to be an array, int given in %sarray_udiff_assoc_variation1.php on line %d NULL --int -12345-- -Warning: array_udiff_assoc(): Argument #1 is not an array in %sarray_udiff_assoc_variation1.php on line %d +Warning: array_udiff_assoc(): Expected parameter 1 to be an array, int given in %sarray_udiff_assoc_variation1.php on line %d NULL --float 10.5-- -Warning: array_udiff_assoc(): Argument #1 is not an array in %sarray_udiff_assoc_variation1.php on line %d +Warning: array_udiff_assoc(): Expected parameter 1 to be an array, float given in %sarray_udiff_assoc_variation1.php on line %d NULL --float -10.5-- -Warning: array_udiff_assoc(): Argument #1 is not an array in %sarray_udiff_assoc_variation1.php on line %d +Warning: array_udiff_assoc(): Expected parameter 1 to be an array, float given in %sarray_udiff_assoc_variation1.php on line %d NULL --float 12.3456789000e10-- -Warning: array_udiff_assoc(): Argument #1 is not an array in %sarray_udiff_assoc_variation1.php on line %d +Warning: array_udiff_assoc(): Expected parameter 1 to be an array, float given in %sarray_udiff_assoc_variation1.php on line %d NULL --float -12.3456789000e10-- -Warning: array_udiff_assoc(): Argument #1 is not an array in %sarray_udiff_assoc_variation1.php on line %d +Warning: array_udiff_assoc(): Expected parameter 1 to be an array, float given in %sarray_udiff_assoc_variation1.php on line %d NULL --float .5-- -Warning: array_udiff_assoc(): Argument #1 is not an array in %sarray_udiff_assoc_variation1.php on line %d +Warning: array_udiff_assoc(): Expected parameter 1 to be an array, float given in %sarray_udiff_assoc_variation1.php on line %d NULL --uppercase NULL-- -Warning: array_udiff_assoc(): Argument #1 is not an array in %sarray_udiff_assoc_variation1.php on line %d +Warning: array_udiff_assoc(): Expected parameter 1 to be an array, null given in %sarray_udiff_assoc_variation1.php on line %d NULL --lowercase null-- -Warning: array_udiff_assoc(): Argument #1 is not an array in %sarray_udiff_assoc_variation1.php on line %d +Warning: array_udiff_assoc(): Expected parameter 1 to be an array, null given in %sarray_udiff_assoc_variation1.php on line %d NULL --lowercase true-- -Warning: array_udiff_assoc(): Argument #1 is not an array in %sarray_udiff_assoc_variation1.php on line %d +Warning: array_udiff_assoc(): Expected parameter 1 to be an array, bool given in %sarray_udiff_assoc_variation1.php on line %d NULL --lowercase false-- -Warning: array_udiff_assoc(): Argument #1 is not an array in %sarray_udiff_assoc_variation1.php on line %d +Warning: array_udiff_assoc(): Expected parameter 1 to be an array, bool given in %sarray_udiff_assoc_variation1.php on line %d NULL --uppercase TRUE-- -Warning: array_udiff_assoc(): Argument #1 is not an array in %sarray_udiff_assoc_variation1.php on line %d +Warning: array_udiff_assoc(): Expected parameter 1 to be an array, bool given in %sarray_udiff_assoc_variation1.php on line %d NULL --uppercase FALSE-- -Warning: array_udiff_assoc(): Argument #1 is not an array in %sarray_udiff_assoc_variation1.php on line %d +Warning: array_udiff_assoc(): Expected parameter 1 to be an array, bool given in %sarray_udiff_assoc_variation1.php on line %d NULL --empty string DQ-- -Warning: array_udiff_assoc(): Argument #1 is not an array in %sarray_udiff_assoc_variation1.php on line %d +Warning: array_udiff_assoc(): Expected parameter 1 to be an array, string given in %sarray_udiff_assoc_variation1.php on line %d NULL --empty string SQ-- -Warning: array_udiff_assoc(): Argument #1 is not an array in %sarray_udiff_assoc_variation1.php on line %d +Warning: array_udiff_assoc(): Expected parameter 1 to be an array, string given in %sarray_udiff_assoc_variation1.php on line %d NULL --string DQ-- -Warning: array_udiff_assoc(): Argument #1 is not an array in %sarray_udiff_assoc_variation1.php on line %d +Warning: array_udiff_assoc(): Expected parameter 1 to be an array, string given in %sarray_udiff_assoc_variation1.php on line %d NULL --string SQ-- -Warning: array_udiff_assoc(): Argument #1 is not an array in %sarray_udiff_assoc_variation1.php on line %d +Warning: array_udiff_assoc(): Expected parameter 1 to be an array, string given in %sarray_udiff_assoc_variation1.php on line %d NULL --mixed case string-- -Warning: array_udiff_assoc(): Argument #1 is not an array in %sarray_udiff_assoc_variation1.php on line %d +Warning: array_udiff_assoc(): Expected parameter 1 to be an array, string given in %sarray_udiff_assoc_variation1.php on line %d NULL --heredoc-- -Warning: array_udiff_assoc(): Argument #1 is not an array in %sarray_udiff_assoc_variation1.php on line %d +Warning: array_udiff_assoc(): Expected parameter 1 to be an array, string given in %sarray_udiff_assoc_variation1.php on line %d NULL --instance of classWithToString-- -Warning: array_udiff_assoc(): Argument #1 is not an array in %sarray_udiff_assoc_variation1.php on line %d +Warning: array_udiff_assoc(): Expected parameter 1 to be an array, object given in %sarray_udiff_assoc_variation1.php on line %d NULL --instance of classWithoutToString-- -Warning: array_udiff_assoc(): Argument #1 is not an array in %sarray_udiff_assoc_variation1.php on line %d +Warning: array_udiff_assoc(): Expected parameter 1 to be an array, object given in %sarray_udiff_assoc_variation1.php on line %d NULL --undefined var-- -Warning: array_udiff_assoc(): Argument #1 is not an array in %sarray_udiff_assoc_variation1.php on line %d +Warning: array_udiff_assoc(): Expected parameter 1 to be an array, null given in %sarray_udiff_assoc_variation1.php on line %d NULL --unset var-- -Warning: array_udiff_assoc(): Argument #1 is not an array in %sarray_udiff_assoc_variation1.php on line %d +Warning: array_udiff_assoc(): Expected parameter 1 to be an array, null given in %sarray_udiff_assoc_variation1.php on line %d NULL ===DONE=== diff --git a/ext/standard/tests/array/array_udiff_assoc_variation2.phpt b/ext/standard/tests/array/array_udiff_assoc_variation2.phpt index 418c0f0b7d..1a2c1ed978 100644 --- a/ext/standard/tests/array/array_udiff_assoc_variation2.phpt +++ b/ext/standard/tests/array/array_udiff_assoc_variation2.phpt @@ -102,126 +102,126 @@ foreach($inputs as $key =>$value) { --int 0-- -Warning: array_udiff_assoc(): Argument #2 is not an array in %sarray_udiff_assoc_variation2.php on line %d +Warning: array_udiff_assoc(): Expected parameter 2 to be an array, int given in %sarray_udiff_assoc_variation2.php on line %d NULL --int 1-- -Warning: array_udiff_assoc(): Argument #2 is not an array in %sarray_udiff_assoc_variation2.php on line %d +Warning: array_udiff_assoc(): Expected parameter 2 to be an array, int given in %sarray_udiff_assoc_variation2.php on line %d NULL --int 12345-- -Warning: array_udiff_assoc(): Argument #2 is not an array in %sarray_udiff_assoc_variation2.php on line %d +Warning: array_udiff_assoc(): Expected parameter 2 to be an array, int given in %sarray_udiff_assoc_variation2.php on line %d NULL --int -12345-- -Warning: array_udiff_assoc(): Argument #2 is not an array in %sarray_udiff_assoc_variation2.php on line %d +Warning: array_udiff_assoc(): Expected parameter 2 to be an array, int given in %sarray_udiff_assoc_variation2.php on line %d NULL --float 10.5-- -Warning: array_udiff_assoc(): Argument #2 is not an array in %sarray_udiff_assoc_variation2.php on line %d +Warning: array_udiff_assoc(): Expected parameter 2 to be an array, float given in %sarray_udiff_assoc_variation2.php on line %d NULL --float -10.5-- -Warning: array_udiff_assoc(): Argument #2 is not an array in %sarray_udiff_assoc_variation2.php on line %d +Warning: array_udiff_assoc(): Expected parameter 2 to be an array, float given in %sarray_udiff_assoc_variation2.php on line %d NULL --float 12.3456789000e10-- -Warning: array_udiff_assoc(): Argument #2 is not an array in %sarray_udiff_assoc_variation2.php on line %d +Warning: array_udiff_assoc(): Expected parameter 2 to be an array, float given in %sarray_udiff_assoc_variation2.php on line %d NULL --float -12.3456789000e10-- -Warning: array_udiff_assoc(): Argument #2 is not an array in %sarray_udiff_assoc_variation2.php on line %d +Warning: array_udiff_assoc(): Expected parameter 2 to be an array, float given in %sarray_udiff_assoc_variation2.php on line %d NULL --float .5-- -Warning: array_udiff_assoc(): Argument #2 is not an array in %sarray_udiff_assoc_variation2.php on line %d +Warning: array_udiff_assoc(): Expected parameter 2 to be an array, float given in %sarray_udiff_assoc_variation2.php on line %d NULL --uppercase NULL-- -Warning: array_udiff_assoc(): Argument #2 is not an array in %sarray_udiff_assoc_variation2.php on line %d +Warning: array_udiff_assoc(): Expected parameter 2 to be an array, null given in %sarray_udiff_assoc_variation2.php on line %d NULL --lowercase null-- -Warning: array_udiff_assoc(): Argument #2 is not an array in %sarray_udiff_assoc_variation2.php on line %d +Warning: array_udiff_assoc(): Expected parameter 2 to be an array, null given in %sarray_udiff_assoc_variation2.php on line %d NULL --lowercase true-- -Warning: array_udiff_assoc(): Argument #2 is not an array in %sarray_udiff_assoc_variation2.php on line %d +Warning: array_udiff_assoc(): Expected parameter 2 to be an array, bool given in %sarray_udiff_assoc_variation2.php on line %d NULL --lowercase false-- -Warning: array_udiff_assoc(): Argument #2 is not an array in %sarray_udiff_assoc_variation2.php on line %d +Warning: array_udiff_assoc(): Expected parameter 2 to be an array, bool given in %sarray_udiff_assoc_variation2.php on line %d NULL --uppercase TRUE-- -Warning: array_udiff_assoc(): Argument #2 is not an array in %sarray_udiff_assoc_variation2.php on line %d +Warning: array_udiff_assoc(): Expected parameter 2 to be an array, bool given in %sarray_udiff_assoc_variation2.php on line %d NULL --uppercase FALSE-- -Warning: array_udiff_assoc(): Argument #2 is not an array in %sarray_udiff_assoc_variation2.php on line %d +Warning: array_udiff_assoc(): Expected parameter 2 to be an array, bool given in %sarray_udiff_assoc_variation2.php on line %d NULL --empty string DQ-- -Warning: array_udiff_assoc(): Argument #2 is not an array in %sarray_udiff_assoc_variation2.php on line %d +Warning: array_udiff_assoc(): Expected parameter 2 to be an array, string given in %sarray_udiff_assoc_variation2.php on line %d NULL --empty string SQ-- -Warning: array_udiff_assoc(): Argument #2 is not an array in %sarray_udiff_assoc_variation2.php on line %d +Warning: array_udiff_assoc(): Expected parameter 2 to be an array, string given in %sarray_udiff_assoc_variation2.php on line %d NULL --string DQ-- -Warning: array_udiff_assoc(): Argument #2 is not an array in %sarray_udiff_assoc_variation2.php on line %d +Warning: array_udiff_assoc(): Expected parameter 2 to be an array, string given in %sarray_udiff_assoc_variation2.php on line %d NULL --string SQ-- -Warning: array_udiff_assoc(): Argument #2 is not an array in %sarray_udiff_assoc_variation2.php on line %d +Warning: array_udiff_assoc(): Expected parameter 2 to be an array, string given in %sarray_udiff_assoc_variation2.php on line %d NULL --mixed case string-- -Warning: array_udiff_assoc(): Argument #2 is not an array in %sarray_udiff_assoc_variation2.php on line %d +Warning: array_udiff_assoc(): Expected parameter 2 to be an array, string given in %sarray_udiff_assoc_variation2.php on line %d NULL --heredoc-- -Warning: array_udiff_assoc(): Argument #2 is not an array in %sarray_udiff_assoc_variation2.php on line %d +Warning: array_udiff_assoc(): Expected parameter 2 to be an array, string given in %sarray_udiff_assoc_variation2.php on line %d NULL --instance of classWithToString-- -Warning: array_udiff_assoc(): Argument #2 is not an array in %sarray_udiff_assoc_variation2.php on line %d +Warning: array_udiff_assoc(): Expected parameter 2 to be an array, object given in %sarray_udiff_assoc_variation2.php on line %d NULL --instance of classWithoutToString-- -Warning: array_udiff_assoc(): Argument #2 is not an array in %sarray_udiff_assoc_variation2.php on line %d +Warning: array_udiff_assoc(): Expected parameter 2 to be an array, object given in %sarray_udiff_assoc_variation2.php on line %d NULL --undefined var-- -Warning: array_udiff_assoc(): Argument #2 is not an array in %sarray_udiff_assoc_variation2.php on line %d +Warning: array_udiff_assoc(): Expected parameter 2 to be an array, null given in %sarray_udiff_assoc_variation2.php on line %d NULL --unset var-- -Warning: array_udiff_assoc(): Argument #2 is not an array in %sarray_udiff_assoc_variation2.php on line %d +Warning: array_udiff_assoc(): Expected parameter 2 to be an array, null given in %sarray_udiff_assoc_variation2.php on line %d NULL ===DONE=== diff --git a/ext/standard/tests/array/array_udiff_assoc_variation4.phpt b/ext/standard/tests/array/array_udiff_assoc_variation4.phpt index 375b35915f..20a5afa202 100644 --- a/ext/standard/tests/array/array_udiff_assoc_variation4.phpt +++ b/ext/standard/tests/array/array_udiff_assoc_variation4.phpt @@ -103,126 +103,126 @@ foreach($inputs as $key =>$value) { --int 0-- -Warning: array_udiff_assoc(): Argument #3 is not an array in %sarray_udiff_assoc_variation4.php on line %d +Warning: array_udiff_assoc(): Expected parameter 3 to be an array, int given in %sarray_udiff_assoc_variation4.php on line %d NULL --int 1-- -Warning: array_udiff_assoc(): Argument #3 is not an array in %sarray_udiff_assoc_variation4.php on line %d +Warning: array_udiff_assoc(): Expected parameter 3 to be an array, int given in %sarray_udiff_assoc_variation4.php on line %d NULL --int 12345-- -Warning: array_udiff_assoc(): Argument #3 is not an array in %sarray_udiff_assoc_variation4.php on line %d +Warning: array_udiff_assoc(): Expected parameter 3 to be an array, int given in %sarray_udiff_assoc_variation4.php on line %d NULL --int -12345-- -Warning: array_udiff_assoc(): Argument #3 is not an array in %sarray_udiff_assoc_variation4.php on line %d +Warning: array_udiff_assoc(): Expected parameter 3 to be an array, int given in %sarray_udiff_assoc_variation4.php on line %d NULL --float 10.5-- -Warning: array_udiff_assoc(): Argument #3 is not an array in %sarray_udiff_assoc_variation4.php on line %d +Warning: array_udiff_assoc(): Expected parameter 3 to be an array, float given in %sarray_udiff_assoc_variation4.php on line %d NULL --float -10.5-- -Warning: array_udiff_assoc(): Argument #3 is not an array in %sarray_udiff_assoc_variation4.php on line %d +Warning: array_udiff_assoc(): Expected parameter 3 to be an array, float given in %sarray_udiff_assoc_variation4.php on line %d NULL --float 12.3456789000e10-- -Warning: array_udiff_assoc(): Argument #3 is not an array in %sarray_udiff_assoc_variation4.php on line %d +Warning: array_udiff_assoc(): Expected parameter 3 to be an array, float given in %sarray_udiff_assoc_variation4.php on line %d NULL --float -12.3456789000e10-- -Warning: array_udiff_assoc(): Argument #3 is not an array in %sarray_udiff_assoc_variation4.php on line %d +Warning: array_udiff_assoc(): Expected parameter 3 to be an array, float given in %sarray_udiff_assoc_variation4.php on line %d NULL --float .5-- -Warning: array_udiff_assoc(): Argument #3 is not an array in %sarray_udiff_assoc_variation4.php on line %d +Warning: array_udiff_assoc(): Expected parameter 3 to be an array, float given in %sarray_udiff_assoc_variation4.php on line %d NULL --uppercase NULL-- -Warning: array_udiff_assoc(): Argument #3 is not an array in %sarray_udiff_assoc_variation4.php on line %d +Warning: array_udiff_assoc(): Expected parameter 3 to be an array, null given in %sarray_udiff_assoc_variation4.php on line %d NULL --lowercase null-- -Warning: array_udiff_assoc(): Argument #3 is not an array in %sarray_udiff_assoc_variation4.php on line %d +Warning: array_udiff_assoc(): Expected parameter 3 to be an array, null given in %sarray_udiff_assoc_variation4.php on line %d NULL --lowercase true-- -Warning: array_udiff_assoc(): Argument #3 is not an array in %sarray_udiff_assoc_variation4.php on line %d +Warning: array_udiff_assoc(): Expected parameter 3 to be an array, bool given in %sarray_udiff_assoc_variation4.php on line %d NULL --lowercase false-- -Warning: array_udiff_assoc(): Argument #3 is not an array in %sarray_udiff_assoc_variation4.php on line %d +Warning: array_udiff_assoc(): Expected parameter 3 to be an array, bool given in %sarray_udiff_assoc_variation4.php on line %d NULL --uppercase TRUE-- -Warning: array_udiff_assoc(): Argument #3 is not an array in %sarray_udiff_assoc_variation4.php on line %d +Warning: array_udiff_assoc(): Expected parameter 3 to be an array, bool given in %sarray_udiff_assoc_variation4.php on line %d NULL --uppercase FALSE-- -Warning: array_udiff_assoc(): Argument #3 is not an array in %sarray_udiff_assoc_variation4.php on line %d +Warning: array_udiff_assoc(): Expected parameter 3 to be an array, bool given in %sarray_udiff_assoc_variation4.php on line %d NULL --empty string DQ-- -Warning: array_udiff_assoc(): Argument #3 is not an array in %sarray_udiff_assoc_variation4.php on line %d +Warning: array_udiff_assoc(): Expected parameter 3 to be an array, string given in %sarray_udiff_assoc_variation4.php on line %d NULL --empty string SQ-- -Warning: array_udiff_assoc(): Argument #3 is not an array in %sarray_udiff_assoc_variation4.php on line %d +Warning: array_udiff_assoc(): Expected parameter 3 to be an array, string given in %sarray_udiff_assoc_variation4.php on line %d NULL --string DQ-- -Warning: array_udiff_assoc(): Argument #3 is not an array in %sarray_udiff_assoc_variation4.php on line %d +Warning: array_udiff_assoc(): Expected parameter 3 to be an array, string given in %sarray_udiff_assoc_variation4.php on line %d NULL --string SQ-- -Warning: array_udiff_assoc(): Argument #3 is not an array in %sarray_udiff_assoc_variation4.php on line %d +Warning: array_udiff_assoc(): Expected parameter 3 to be an array, string given in %sarray_udiff_assoc_variation4.php on line %d NULL --mixed case string-- -Warning: array_udiff_assoc(): Argument #3 is not an array in %sarray_udiff_assoc_variation4.php on line %d +Warning: array_udiff_assoc(): Expected parameter 3 to be an array, string given in %sarray_udiff_assoc_variation4.php on line %d NULL --heredoc-- -Warning: array_udiff_assoc(): Argument #3 is not an array in %sarray_udiff_assoc_variation4.php on line %d +Warning: array_udiff_assoc(): Expected parameter 3 to be an array, string given in %sarray_udiff_assoc_variation4.php on line %d NULL --instance of classWithToString-- -Warning: array_udiff_assoc(): Argument #3 is not an array in %sarray_udiff_assoc_variation4.php on line %d +Warning: array_udiff_assoc(): Expected parameter 3 to be an array, object given in %sarray_udiff_assoc_variation4.php on line %d NULL --instance of classWithoutToString-- -Warning: array_udiff_assoc(): Argument #3 is not an array in %sarray_udiff_assoc_variation4.php on line %d +Warning: array_udiff_assoc(): Expected parameter 3 to be an array, object given in %sarray_udiff_assoc_variation4.php on line %d NULL --undefined var-- -Warning: array_udiff_assoc(): Argument #3 is not an array in %sarray_udiff_assoc_variation4.php on line %d +Warning: array_udiff_assoc(): Expected parameter 3 to be an array, null given in %sarray_udiff_assoc_variation4.php on line %d NULL --unset var-- -Warning: array_udiff_assoc(): Argument #3 is not an array in %sarray_udiff_assoc_variation4.php on line %d +Warning: array_udiff_assoc(): Expected parameter 3 to be an array, null given in %sarray_udiff_assoc_variation4.php on line %d NULL ===DONE=== diff --git a/ext/standard/tests/array/array_udiff_assoc_variation5.phpt b/ext/standard/tests/array/array_udiff_assoc_variation5.phpt index 7543d782bf..10afe341a3 100644 --- a/ext/standard/tests/array/array_udiff_assoc_variation5.phpt +++ b/ext/standard/tests/array/array_udiff_assoc_variation5.phpt @@ -38,7 +38,7 @@ var_dump(array_udiff_assoc($arr1, $arr2, 'too_few_parameters')); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_udiff_assoc() : usage variation - differing comparison functions*** -- comparison function with an incorrect return value -- diff --git a/ext/standard/tests/array/array_udiff_uassoc_variation1.phpt b/ext/standard/tests/array/array_udiff_uassoc_variation1.phpt index 2dfdd87541..4496194b62 100644 --- a/ext/standard/tests/array/array_udiff_uassoc_variation1.phpt +++ b/ext/standard/tests/array/array_udiff_uassoc_variation1.phpt @@ -103,126 +103,126 @@ foreach($inputs as $key =>$value) { --int 0-- -Warning: array_udiff_uassoc(): Argument #1 is not an array in %sarray_udiff_uassoc_variation1.php on line %d +Warning: array_udiff_uassoc(): Expected parameter 1 to be an array, int given in %sarray_udiff_uassoc_variation1.php on line %d NULL --int 1-- -Warning: array_udiff_uassoc(): Argument #1 is not an array in %sarray_udiff_uassoc_variation1.php on line %d +Warning: array_udiff_uassoc(): Expected parameter 1 to be an array, int given in %sarray_udiff_uassoc_variation1.php on line %d NULL --int 12345-- -Warning: array_udiff_uassoc(): Argument #1 is not an array in %sarray_udiff_uassoc_variation1.php on line %d +Warning: array_udiff_uassoc(): Expected parameter 1 to be an array, int given in %sarray_udiff_uassoc_variation1.php on line %d NULL --int -12345-- -Warning: array_udiff_uassoc(): Argument #1 is not an array in %sarray_udiff_uassoc_variation1.php on line %d +Warning: array_udiff_uassoc(): Expected parameter 1 to be an array, int given in %sarray_udiff_uassoc_variation1.php on line %d NULL --float 10.5-- -Warning: array_udiff_uassoc(): Argument #1 is not an array in %sarray_udiff_uassoc_variation1.php on line %d +Warning: array_udiff_uassoc(): Expected parameter 1 to be an array, float given in %sarray_udiff_uassoc_variation1.php on line %d NULL --float -10.5-- -Warning: array_udiff_uassoc(): Argument #1 is not an array in %sarray_udiff_uassoc_variation1.php on line %d +Warning: array_udiff_uassoc(): Expected parameter 1 to be an array, float given in %sarray_udiff_uassoc_variation1.php on line %d NULL --float 12.3456789000e10-- -Warning: array_udiff_uassoc(): Argument #1 is not an array in %sarray_udiff_uassoc_variation1.php on line %d +Warning: array_udiff_uassoc(): Expected parameter 1 to be an array, float given in %sarray_udiff_uassoc_variation1.php on line %d NULL --float -12.3456789000e10-- -Warning: array_udiff_uassoc(): Argument #1 is not an array in %sarray_udiff_uassoc_variation1.php on line %d +Warning: array_udiff_uassoc(): Expected parameter 1 to be an array, float given in %sarray_udiff_uassoc_variation1.php on line %d NULL --float .5-- -Warning: array_udiff_uassoc(): Argument #1 is not an array in %sarray_udiff_uassoc_variation1.php on line %d +Warning: array_udiff_uassoc(): Expected parameter 1 to be an array, float given in %sarray_udiff_uassoc_variation1.php on line %d NULL --uppercase NULL-- -Warning: array_udiff_uassoc(): Argument #1 is not an array in %sarray_udiff_uassoc_variation1.php on line %d +Warning: array_udiff_uassoc(): Expected parameter 1 to be an array, null given in %sarray_udiff_uassoc_variation1.php on line %d NULL --lowercase null-- -Warning: array_udiff_uassoc(): Argument #1 is not an array in %sarray_udiff_uassoc_variation1.php on line %d +Warning: array_udiff_uassoc(): Expected parameter 1 to be an array, null given in %sarray_udiff_uassoc_variation1.php on line %d NULL --lowercase true-- -Warning: array_udiff_uassoc(): Argument #1 is not an array in %sarray_udiff_uassoc_variation1.php on line %d +Warning: array_udiff_uassoc(): Expected parameter 1 to be an array, bool given in %sarray_udiff_uassoc_variation1.php on line %d NULL --lowercase false-- -Warning: array_udiff_uassoc(): Argument #1 is not an array in %sarray_udiff_uassoc_variation1.php on line %d +Warning: array_udiff_uassoc(): Expected parameter 1 to be an array, bool given in %sarray_udiff_uassoc_variation1.php on line %d NULL --uppercase TRUE-- -Warning: array_udiff_uassoc(): Argument #1 is not an array in %sarray_udiff_uassoc_variation1.php on line %d +Warning: array_udiff_uassoc(): Expected parameter 1 to be an array, bool given in %sarray_udiff_uassoc_variation1.php on line %d NULL --uppercase FALSE-- -Warning: array_udiff_uassoc(): Argument #1 is not an array in %sarray_udiff_uassoc_variation1.php on line %d +Warning: array_udiff_uassoc(): Expected parameter 1 to be an array, bool given in %sarray_udiff_uassoc_variation1.php on line %d NULL --empty string DQ-- -Warning: array_udiff_uassoc(): Argument #1 is not an array in %sarray_udiff_uassoc_variation1.php on line %d +Warning: array_udiff_uassoc(): Expected parameter 1 to be an array, string given in %sarray_udiff_uassoc_variation1.php on line %d NULL --empty string SQ-- -Warning: array_udiff_uassoc(): Argument #1 is not an array in %sarray_udiff_uassoc_variation1.php on line %d +Warning: array_udiff_uassoc(): Expected parameter 1 to be an array, string given in %sarray_udiff_uassoc_variation1.php on line %d NULL --string DQ-- -Warning: array_udiff_uassoc(): Argument #1 is not an array in %sarray_udiff_uassoc_variation1.php on line %d +Warning: array_udiff_uassoc(): Expected parameter 1 to be an array, string given in %sarray_udiff_uassoc_variation1.php on line %d NULL --string SQ-- -Warning: array_udiff_uassoc(): Argument #1 is not an array in %sarray_udiff_uassoc_variation1.php on line %d +Warning: array_udiff_uassoc(): Expected parameter 1 to be an array, string given in %sarray_udiff_uassoc_variation1.php on line %d NULL --mixed case string-- -Warning: array_udiff_uassoc(): Argument #1 is not an array in %sarray_udiff_uassoc_variation1.php on line %d +Warning: array_udiff_uassoc(): Expected parameter 1 to be an array, string given in %sarray_udiff_uassoc_variation1.php on line %d NULL --heredoc-- -Warning: array_udiff_uassoc(): Argument #1 is not an array in %sarray_udiff_uassoc_variation1.php on line %d +Warning: array_udiff_uassoc(): Expected parameter 1 to be an array, string given in %sarray_udiff_uassoc_variation1.php on line %d NULL --instance of classWithToString-- -Warning: array_udiff_uassoc(): Argument #1 is not an array in %sarray_udiff_uassoc_variation1.php on line %d +Warning: array_udiff_uassoc(): Expected parameter 1 to be an array, object given in %sarray_udiff_uassoc_variation1.php on line %d NULL --instance of classWithoutToString-- -Warning: array_udiff_uassoc(): Argument #1 is not an array in %sarray_udiff_uassoc_variation1.php on line %d +Warning: array_udiff_uassoc(): Expected parameter 1 to be an array, object given in %sarray_udiff_uassoc_variation1.php on line %d NULL --undefined var-- -Warning: array_udiff_uassoc(): Argument #1 is not an array in %sarray_udiff_uassoc_variation1.php on line %d +Warning: array_udiff_uassoc(): Expected parameter 1 to be an array, null given in %sarray_udiff_uassoc_variation1.php on line %d NULL --unset var-- -Warning: array_udiff_uassoc(): Argument #1 is not an array in %sarray_udiff_uassoc_variation1.php on line %d +Warning: array_udiff_uassoc(): Expected parameter 1 to be an array, null given in %sarray_udiff_uassoc_variation1.php on line %d NULL ===DONE=== diff --git a/ext/standard/tests/array/array_udiff_uassoc_variation2.phpt b/ext/standard/tests/array/array_udiff_uassoc_variation2.phpt index af066b70bf..2324c5a47b 100644 --- a/ext/standard/tests/array/array_udiff_uassoc_variation2.phpt +++ b/ext/standard/tests/array/array_udiff_uassoc_variation2.phpt @@ -103,126 +103,126 @@ foreach($inputs as $key =>$value) { --int 0-- -Warning: array_udiff_uassoc(): Argument #2 is not an array in %sarray_udiff_uassoc_variation2.php on line %d +Warning: array_udiff_uassoc(): Expected parameter 2 to be an array, int given in %sarray_udiff_uassoc_variation2.php on line %d NULL --int 1-- -Warning: array_udiff_uassoc(): Argument #2 is not an array in %sarray_udiff_uassoc_variation2.php on line %d +Warning: array_udiff_uassoc(): Expected parameter 2 to be an array, int given in %sarray_udiff_uassoc_variation2.php on line %d NULL --int 12345-- -Warning: array_udiff_uassoc(): Argument #2 is not an array in %sarray_udiff_uassoc_variation2.php on line %d +Warning: array_udiff_uassoc(): Expected parameter 2 to be an array, int given in %sarray_udiff_uassoc_variation2.php on line %d NULL --int -12345-- -Warning: array_udiff_uassoc(): Argument #2 is not an array in %sarray_udiff_uassoc_variation2.php on line %d +Warning: array_udiff_uassoc(): Expected parameter 2 to be an array, int given in %sarray_udiff_uassoc_variation2.php on line %d NULL --float 10.5-- -Warning: array_udiff_uassoc(): Argument #2 is not an array in %sarray_udiff_uassoc_variation2.php on line %d +Warning: array_udiff_uassoc(): Expected parameter 2 to be an array, float given in %sarray_udiff_uassoc_variation2.php on line %d NULL --float -10.5-- -Warning: array_udiff_uassoc(): Argument #2 is not an array in %sarray_udiff_uassoc_variation2.php on line %d +Warning: array_udiff_uassoc(): Expected parameter 2 to be an array, float given in %sarray_udiff_uassoc_variation2.php on line %d NULL --float 12.3456789000e10-- -Warning: array_udiff_uassoc(): Argument #2 is not an array in %sarray_udiff_uassoc_variation2.php on line %d +Warning: array_udiff_uassoc(): Expected parameter 2 to be an array, float given in %sarray_udiff_uassoc_variation2.php on line %d NULL --float -12.3456789000e10-- -Warning: array_udiff_uassoc(): Argument #2 is not an array in %sarray_udiff_uassoc_variation2.php on line %d +Warning: array_udiff_uassoc(): Expected parameter 2 to be an array, float given in %sarray_udiff_uassoc_variation2.php on line %d NULL --float .5-- -Warning: array_udiff_uassoc(): Argument #2 is not an array in %sarray_udiff_uassoc_variation2.php on line %d +Warning: array_udiff_uassoc(): Expected parameter 2 to be an array, float given in %sarray_udiff_uassoc_variation2.php on line %d NULL --uppercase NULL-- -Warning: array_udiff_uassoc(): Argument #2 is not an array in %sarray_udiff_uassoc_variation2.php on line %d +Warning: array_udiff_uassoc(): Expected parameter 2 to be an array, null given in %sarray_udiff_uassoc_variation2.php on line %d NULL --lowercase null-- -Warning: array_udiff_uassoc(): Argument #2 is not an array in %sarray_udiff_uassoc_variation2.php on line %d +Warning: array_udiff_uassoc(): Expected parameter 2 to be an array, null given in %sarray_udiff_uassoc_variation2.php on line %d NULL --lowercase true-- -Warning: array_udiff_uassoc(): Argument #2 is not an array in %sarray_udiff_uassoc_variation2.php on line %d +Warning: array_udiff_uassoc(): Expected parameter 2 to be an array, bool given in %sarray_udiff_uassoc_variation2.php on line %d NULL --lowercase false-- -Warning: array_udiff_uassoc(): Argument #2 is not an array in %sarray_udiff_uassoc_variation2.php on line %d +Warning: array_udiff_uassoc(): Expected parameter 2 to be an array, bool given in %sarray_udiff_uassoc_variation2.php on line %d NULL --uppercase TRUE-- -Warning: array_udiff_uassoc(): Argument #2 is not an array in %sarray_udiff_uassoc_variation2.php on line %d +Warning: array_udiff_uassoc(): Expected parameter 2 to be an array, bool given in %sarray_udiff_uassoc_variation2.php on line %d NULL --uppercase FALSE-- -Warning: array_udiff_uassoc(): Argument #2 is not an array in %sarray_udiff_uassoc_variation2.php on line %d +Warning: array_udiff_uassoc(): Expected parameter 2 to be an array, bool given in %sarray_udiff_uassoc_variation2.php on line %d NULL --empty string DQ-- -Warning: array_udiff_uassoc(): Argument #2 is not an array in %sarray_udiff_uassoc_variation2.php on line %d +Warning: array_udiff_uassoc(): Expected parameter 2 to be an array, string given in %sarray_udiff_uassoc_variation2.php on line %d NULL --empty string SQ-- -Warning: array_udiff_uassoc(): Argument #2 is not an array in %sarray_udiff_uassoc_variation2.php on line %d +Warning: array_udiff_uassoc(): Expected parameter 2 to be an array, string given in %sarray_udiff_uassoc_variation2.php on line %d NULL --string DQ-- -Warning: array_udiff_uassoc(): Argument #2 is not an array in %sarray_udiff_uassoc_variation2.php on line %d +Warning: array_udiff_uassoc(): Expected parameter 2 to be an array, string given in %sarray_udiff_uassoc_variation2.php on line %d NULL --string SQ-- -Warning: array_udiff_uassoc(): Argument #2 is not an array in %sarray_udiff_uassoc_variation2.php on line %d +Warning: array_udiff_uassoc(): Expected parameter 2 to be an array, string given in %sarray_udiff_uassoc_variation2.php on line %d NULL --mixed case string-- -Warning: array_udiff_uassoc(): Argument #2 is not an array in %sarray_udiff_uassoc_variation2.php on line %d +Warning: array_udiff_uassoc(): Expected parameter 2 to be an array, string given in %sarray_udiff_uassoc_variation2.php on line %d NULL --heredoc-- -Warning: array_udiff_uassoc(): Argument #2 is not an array in %sarray_udiff_uassoc_variation2.php on line %d +Warning: array_udiff_uassoc(): Expected parameter 2 to be an array, string given in %sarray_udiff_uassoc_variation2.php on line %d NULL --instance of classWithToString-- -Warning: array_udiff_uassoc(): Argument #2 is not an array in %sarray_udiff_uassoc_variation2.php on line %d +Warning: array_udiff_uassoc(): Expected parameter 2 to be an array, object given in %sarray_udiff_uassoc_variation2.php on line %d NULL --instance of classWithoutToString-- -Warning: array_udiff_uassoc(): Argument #2 is not an array in %sarray_udiff_uassoc_variation2.php on line %d +Warning: array_udiff_uassoc(): Expected parameter 2 to be an array, object given in %sarray_udiff_uassoc_variation2.php on line %d NULL --undefined var-- -Warning: array_udiff_uassoc(): Argument #2 is not an array in %sarray_udiff_uassoc_variation2.php on line %d +Warning: array_udiff_uassoc(): Expected parameter 2 to be an array, null given in %sarray_udiff_uassoc_variation2.php on line %d NULL --unset var-- -Warning: array_udiff_uassoc(): Argument #2 is not an array in %sarray_udiff_uassoc_variation2.php on line %d +Warning: array_udiff_uassoc(): Expected parameter 2 to be an array, null given in %sarray_udiff_uassoc_variation2.php on line %d NULL ===DONE=== diff --git a/ext/standard/tests/array/array_udiff_uassoc_variation5.phpt b/ext/standard/tests/array/array_udiff_uassoc_variation5.phpt index ccfb9e8712..820f0466ad 100644 --- a/ext/standard/tests/array/array_udiff_uassoc_variation5.phpt +++ b/ext/standard/tests/array/array_udiff_uassoc_variation5.phpt @@ -104,126 +104,126 @@ foreach($inputs as $key =>$value) { --int 0-- -Warning: array_udiff_uassoc(): Argument #3 is not an array in %sarray_udiff_uassoc_variation5.php on line %d +Warning: array_udiff_uassoc(): Expected parameter 3 to be an array, int given in %sarray_udiff_uassoc_variation5.php on line %d NULL --int 1-- -Warning: array_udiff_uassoc(): Argument #3 is not an array in %sarray_udiff_uassoc_variation5.php on line %d +Warning: array_udiff_uassoc(): Expected parameter 3 to be an array, int given in %sarray_udiff_uassoc_variation5.php on line %d NULL --int 12345-- -Warning: array_udiff_uassoc(): Argument #3 is not an array in %sarray_udiff_uassoc_variation5.php on line %d +Warning: array_udiff_uassoc(): Expected parameter 3 to be an array, int given in %sarray_udiff_uassoc_variation5.php on line %d NULL --int -12345-- -Warning: array_udiff_uassoc(): Argument #3 is not an array in %sarray_udiff_uassoc_variation5.php on line %d +Warning: array_udiff_uassoc(): Expected parameter 3 to be an array, int given in %sarray_udiff_uassoc_variation5.php on line %d NULL --float 10.5-- -Warning: array_udiff_uassoc(): Argument #3 is not an array in %sarray_udiff_uassoc_variation5.php on line %d +Warning: array_udiff_uassoc(): Expected parameter 3 to be an array, float given in %sarray_udiff_uassoc_variation5.php on line %d NULL --float -10.5-- -Warning: array_udiff_uassoc(): Argument #3 is not an array in %sarray_udiff_uassoc_variation5.php on line %d +Warning: array_udiff_uassoc(): Expected parameter 3 to be an array, float given in %sarray_udiff_uassoc_variation5.php on line %d NULL --float 12.3456789000e10-- -Warning: array_udiff_uassoc(): Argument #3 is not an array in %sarray_udiff_uassoc_variation5.php on line %d +Warning: array_udiff_uassoc(): Expected parameter 3 to be an array, float given in %sarray_udiff_uassoc_variation5.php on line %d NULL --float -12.3456789000e10-- -Warning: array_udiff_uassoc(): Argument #3 is not an array in %sarray_udiff_uassoc_variation5.php on line %d +Warning: array_udiff_uassoc(): Expected parameter 3 to be an array, float given in %sarray_udiff_uassoc_variation5.php on line %d NULL --float .5-- -Warning: array_udiff_uassoc(): Argument #3 is not an array in %sarray_udiff_uassoc_variation5.php on line %d +Warning: array_udiff_uassoc(): Expected parameter 3 to be an array, float given in %sarray_udiff_uassoc_variation5.php on line %d NULL --uppercase NULL-- -Warning: array_udiff_uassoc(): Argument #3 is not an array in %sarray_udiff_uassoc_variation5.php on line %d +Warning: array_udiff_uassoc(): Expected parameter 3 to be an array, null given in %sarray_udiff_uassoc_variation5.php on line %d NULL --lowercase null-- -Warning: array_udiff_uassoc(): Argument #3 is not an array in %sarray_udiff_uassoc_variation5.php on line %d +Warning: array_udiff_uassoc(): Expected parameter 3 to be an array, null given in %sarray_udiff_uassoc_variation5.php on line %d NULL --lowercase true-- -Warning: array_udiff_uassoc(): Argument #3 is not an array in %sarray_udiff_uassoc_variation5.php on line %d +Warning: array_udiff_uassoc(): Expected parameter 3 to be an array, bool given in %sarray_udiff_uassoc_variation5.php on line %d NULL --lowercase false-- -Warning: array_udiff_uassoc(): Argument #3 is not an array in %sarray_udiff_uassoc_variation5.php on line %d +Warning: array_udiff_uassoc(): Expected parameter 3 to be an array, bool given in %sarray_udiff_uassoc_variation5.php on line %d NULL --uppercase TRUE-- -Warning: array_udiff_uassoc(): Argument #3 is not an array in %sarray_udiff_uassoc_variation5.php on line %d +Warning: array_udiff_uassoc(): Expected parameter 3 to be an array, bool given in %sarray_udiff_uassoc_variation5.php on line %d NULL --uppercase FALSE-- -Warning: array_udiff_uassoc(): Argument #3 is not an array in %sarray_udiff_uassoc_variation5.php on line %d +Warning: array_udiff_uassoc(): Expected parameter 3 to be an array, bool given in %sarray_udiff_uassoc_variation5.php on line %d NULL --empty string DQ-- -Warning: array_udiff_uassoc(): Argument #3 is not an array in %sarray_udiff_uassoc_variation5.php on line %d +Warning: array_udiff_uassoc(): Expected parameter 3 to be an array, string given in %sarray_udiff_uassoc_variation5.php on line %d NULL --empty string SQ-- -Warning: array_udiff_uassoc(): Argument #3 is not an array in %sarray_udiff_uassoc_variation5.php on line %d +Warning: array_udiff_uassoc(): Expected parameter 3 to be an array, string given in %sarray_udiff_uassoc_variation5.php on line %d NULL --string DQ-- -Warning: array_udiff_uassoc(): Argument #3 is not an array in %sarray_udiff_uassoc_variation5.php on line %d +Warning: array_udiff_uassoc(): Expected parameter 3 to be an array, string given in %sarray_udiff_uassoc_variation5.php on line %d NULL --string SQ-- -Warning: array_udiff_uassoc(): Argument #3 is not an array in %sarray_udiff_uassoc_variation5.php on line %d +Warning: array_udiff_uassoc(): Expected parameter 3 to be an array, string given in %sarray_udiff_uassoc_variation5.php on line %d NULL --mixed case string-- -Warning: array_udiff_uassoc(): Argument #3 is not an array in %sarray_udiff_uassoc_variation5.php on line %d +Warning: array_udiff_uassoc(): Expected parameter 3 to be an array, string given in %sarray_udiff_uassoc_variation5.php on line %d NULL --heredoc-- -Warning: array_udiff_uassoc(): Argument #3 is not an array in %sarray_udiff_uassoc_variation5.php on line %d +Warning: array_udiff_uassoc(): Expected parameter 3 to be an array, string given in %sarray_udiff_uassoc_variation5.php on line %d NULL --instance of classWithToString-- -Warning: array_udiff_uassoc(): Argument #3 is not an array in %sarray_udiff_uassoc_variation5.php on line %d +Warning: array_udiff_uassoc(): Expected parameter 3 to be an array, object given in %sarray_udiff_uassoc_variation5.php on line %d NULL --instance of classWithoutToString-- -Warning: array_udiff_uassoc(): Argument #3 is not an array in %sarray_udiff_uassoc_variation5.php on line %d +Warning: array_udiff_uassoc(): Expected parameter 3 to be an array, object given in %sarray_udiff_uassoc_variation5.php on line %d NULL --undefined var-- -Warning: array_udiff_uassoc(): Argument #3 is not an array in %sarray_udiff_uassoc_variation5.php on line %d +Warning: array_udiff_uassoc(): Expected parameter 3 to be an array, null given in %sarray_udiff_uassoc_variation5.php on line %d NULL --unset var-- -Warning: array_udiff_uassoc(): Argument #3 is not an array in %sarray_udiff_uassoc_variation5.php on line %d +Warning: array_udiff_uassoc(): Expected parameter 3 to be an array, null given in %sarray_udiff_uassoc_variation5.php on line %d NULL ===DONE=== diff --git a/ext/standard/tests/array/array_udiff_uassoc_variation6.phpt b/ext/standard/tests/array/array_udiff_uassoc_variation6.phpt index e07ee91d49..4939b8eba5 100644 --- a/ext/standard/tests/array/array_udiff_uassoc_variation6.phpt +++ b/ext/standard/tests/array/array_udiff_uassoc_variation6.phpt @@ -37,7 +37,7 @@ var_dump(array_udiff_uassoc($arr1, $arr2, 'too_few_parameters', 'too_few_paramet ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_udiff_uassoc() : usage variation - differing comparison functions*** -- comparison function with an incorrect return value -- diff --git a/ext/standard/tests/array/array_udiff_variation1.phpt b/ext/standard/tests/array/array_udiff_variation1.phpt index d5541a765b..5eb84146a1 100644 --- a/ext/standard/tests/array/array_udiff_variation1.phpt +++ b/ext/standard/tests/array/array_udiff_variation1.phpt @@ -102,126 +102,126 @@ foreach($inputs as $key =>$value) { --int 0-- -Warning: array_udiff(): Argument #1 is not an array in %sarray_udiff_variation1.php on line %d +Warning: array_udiff(): Expected parameter 1 to be an array, int given in %sarray_udiff_variation1.php on line %d NULL --int 1-- -Warning: array_udiff(): Argument #1 is not an array in %sarray_udiff_variation1.php on line %d +Warning: array_udiff(): Expected parameter 1 to be an array, int given in %sarray_udiff_variation1.php on line %d NULL --int 12345-- -Warning: array_udiff(): Argument #1 is not an array in %sarray_udiff_variation1.php on line %d +Warning: array_udiff(): Expected parameter 1 to be an array, int given in %sarray_udiff_variation1.php on line %d NULL --int -12345-- -Warning: array_udiff(): Argument #1 is not an array in %sarray_udiff_variation1.php on line %d +Warning: array_udiff(): Expected parameter 1 to be an array, int given in %sarray_udiff_variation1.php on line %d NULL --float 10.5-- -Warning: array_udiff(): Argument #1 is not an array in %sarray_udiff_variation1.php on line %d +Warning: array_udiff(): Expected parameter 1 to be an array, float given in %sarray_udiff_variation1.php on line %d NULL --float -10.5-- -Warning: array_udiff(): Argument #1 is not an array in %sarray_udiff_variation1.php on line %d +Warning: array_udiff(): Expected parameter 1 to be an array, float given in %sarray_udiff_variation1.php on line %d NULL --float 12.3456789000e10-- -Warning: array_udiff(): Argument #1 is not an array in %sarray_udiff_variation1.php on line %d +Warning: array_udiff(): Expected parameter 1 to be an array, float given in %sarray_udiff_variation1.php on line %d NULL --float -12.3456789000e10-- -Warning: array_udiff(): Argument #1 is not an array in %sarray_udiff_variation1.php on line %d +Warning: array_udiff(): Expected parameter 1 to be an array, float given in %sarray_udiff_variation1.php on line %d NULL --float .5-- -Warning: array_udiff(): Argument #1 is not an array in %sarray_udiff_variation1.php on line %d +Warning: array_udiff(): Expected parameter 1 to be an array, float given in %sarray_udiff_variation1.php on line %d NULL --uppercase NULL-- -Warning: array_udiff(): Argument #1 is not an array in %sarray_udiff_variation1.php on line %d +Warning: array_udiff(): Expected parameter 1 to be an array, null given in %sarray_udiff_variation1.php on line %d NULL --lowercase null-- -Warning: array_udiff(): Argument #1 is not an array in %sarray_udiff_variation1.php on line %d +Warning: array_udiff(): Expected parameter 1 to be an array, null given in %sarray_udiff_variation1.php on line %d NULL --lowercase true-- -Warning: array_udiff(): Argument #1 is not an array in %sarray_udiff_variation1.php on line %d +Warning: array_udiff(): Expected parameter 1 to be an array, bool given in %sarray_udiff_variation1.php on line %d NULL --lowercase false-- -Warning: array_udiff(): Argument #1 is not an array in %sarray_udiff_variation1.php on line %d +Warning: array_udiff(): Expected parameter 1 to be an array, bool given in %sarray_udiff_variation1.php on line %d NULL --uppercase TRUE-- -Warning: array_udiff(): Argument #1 is not an array in %sarray_udiff_variation1.php on line %d +Warning: array_udiff(): Expected parameter 1 to be an array, bool given in %sarray_udiff_variation1.php on line %d NULL --uppercase FALSE-- -Warning: array_udiff(): Argument #1 is not an array in %sarray_udiff_variation1.php on line %d +Warning: array_udiff(): Expected parameter 1 to be an array, bool given in %sarray_udiff_variation1.php on line %d NULL --empty string DQ-- -Warning: array_udiff(): Argument #1 is not an array in %sarray_udiff_variation1.php on line %d +Warning: array_udiff(): Expected parameter 1 to be an array, string given in %sarray_udiff_variation1.php on line %d NULL --empty string SQ-- -Warning: array_udiff(): Argument #1 is not an array in %sarray_udiff_variation1.php on line %d +Warning: array_udiff(): Expected parameter 1 to be an array, string given in %sarray_udiff_variation1.php on line %d NULL --string DQ-- -Warning: array_udiff(): Argument #1 is not an array in %sarray_udiff_variation1.php on line %d +Warning: array_udiff(): Expected parameter 1 to be an array, string given in %sarray_udiff_variation1.php on line %d NULL --string SQ-- -Warning: array_udiff(): Argument #1 is not an array in %sarray_udiff_variation1.php on line %d +Warning: array_udiff(): Expected parameter 1 to be an array, string given in %sarray_udiff_variation1.php on line %d NULL --mixed case string-- -Warning: array_udiff(): Argument #1 is not an array in %sarray_udiff_variation1.php on line %d +Warning: array_udiff(): Expected parameter 1 to be an array, string given in %sarray_udiff_variation1.php on line %d NULL --heredoc-- -Warning: array_udiff(): Argument #1 is not an array in %sarray_udiff_variation1.php on line %d +Warning: array_udiff(): Expected parameter 1 to be an array, string given in %sarray_udiff_variation1.php on line %d NULL --instance of classWithToString-- -Warning: array_udiff(): Argument #1 is not an array in %sarray_udiff_variation1.php on line %d +Warning: array_udiff(): Expected parameter 1 to be an array, object given in %sarray_udiff_variation1.php on line %d NULL --instance of classWithoutToString-- -Warning: array_udiff(): Argument #1 is not an array in %sarray_udiff_variation1.php on line %d +Warning: array_udiff(): Expected parameter 1 to be an array, object given in %sarray_udiff_variation1.php on line %d NULL --undefined var-- -Warning: array_udiff(): Argument #1 is not an array in %sarray_udiff_variation1.php on line %d +Warning: array_udiff(): Expected parameter 1 to be an array, null given in %sarray_udiff_variation1.php on line %d NULL --unset var-- -Warning: array_udiff(): Argument #1 is not an array in %sarray_udiff_variation1.php on line %d +Warning: array_udiff(): Expected parameter 1 to be an array, null given in %sarray_udiff_variation1.php on line %d NULL ===DONE=== diff --git a/ext/standard/tests/array/array_udiff_variation2.phpt b/ext/standard/tests/array/array_udiff_variation2.phpt index 40954dca67..61aa1f0c9a 100644 --- a/ext/standard/tests/array/array_udiff_variation2.phpt +++ b/ext/standard/tests/array/array_udiff_variation2.phpt @@ -102,126 +102,126 @@ foreach($inputs as $key =>$value) { --int 0-- -Warning: array_udiff(): Argument #2 is not an array in %sarray_udiff_variation2.php on line %d +Warning: array_udiff(): Expected parameter 2 to be an array, int given in %sarray_udiff_variation2.php on line %d NULL --int 1-- -Warning: array_udiff(): Argument #2 is not an array in %sarray_udiff_variation2.php on line %d +Warning: array_udiff(): Expected parameter 2 to be an array, int given in %sarray_udiff_variation2.php on line %d NULL --int 12345-- -Warning: array_udiff(): Argument #2 is not an array in %sarray_udiff_variation2.php on line %d +Warning: array_udiff(): Expected parameter 2 to be an array, int given in %sarray_udiff_variation2.php on line %d NULL --int -12345-- -Warning: array_udiff(): Argument #2 is not an array in %sarray_udiff_variation2.php on line %d +Warning: array_udiff(): Expected parameter 2 to be an array, int given in %sarray_udiff_variation2.php on line %d NULL --float 10.5-- -Warning: array_udiff(): Argument #2 is not an array in %sarray_udiff_variation2.php on line %d +Warning: array_udiff(): Expected parameter 2 to be an array, float given in %sarray_udiff_variation2.php on line %d NULL --float -10.5-- -Warning: array_udiff(): Argument #2 is not an array in %sarray_udiff_variation2.php on line %d +Warning: array_udiff(): Expected parameter 2 to be an array, float given in %sarray_udiff_variation2.php on line %d NULL --float 12.3456789000e10-- -Warning: array_udiff(): Argument #2 is not an array in %sarray_udiff_variation2.php on line %d +Warning: array_udiff(): Expected parameter 2 to be an array, float given in %sarray_udiff_variation2.php on line %d NULL --float -12.3456789000e10-- -Warning: array_udiff(): Argument #2 is not an array in %sarray_udiff_variation2.php on line %d +Warning: array_udiff(): Expected parameter 2 to be an array, float given in %sarray_udiff_variation2.php on line %d NULL --float .5-- -Warning: array_udiff(): Argument #2 is not an array in %sarray_udiff_variation2.php on line %d +Warning: array_udiff(): Expected parameter 2 to be an array, float given in %sarray_udiff_variation2.php on line %d NULL --uppercase NULL-- -Warning: array_udiff(): Argument #2 is not an array in %sarray_udiff_variation2.php on line %d +Warning: array_udiff(): Expected parameter 2 to be an array, null given in %sarray_udiff_variation2.php on line %d NULL --lowercase null-- -Warning: array_udiff(): Argument #2 is not an array in %sarray_udiff_variation2.php on line %d +Warning: array_udiff(): Expected parameter 2 to be an array, null given in %sarray_udiff_variation2.php on line %d NULL --lowercase true-- -Warning: array_udiff(): Argument #2 is not an array in %sarray_udiff_variation2.php on line %d +Warning: array_udiff(): Expected parameter 2 to be an array, bool given in %sarray_udiff_variation2.php on line %d NULL --lowercase false-- -Warning: array_udiff(): Argument #2 is not an array in %sarray_udiff_variation2.php on line %d +Warning: array_udiff(): Expected parameter 2 to be an array, bool given in %sarray_udiff_variation2.php on line %d NULL --uppercase TRUE-- -Warning: array_udiff(): Argument #2 is not an array in %sarray_udiff_variation2.php on line %d +Warning: array_udiff(): Expected parameter 2 to be an array, bool given in %sarray_udiff_variation2.php on line %d NULL --uppercase FALSE-- -Warning: array_udiff(): Argument #2 is not an array in %sarray_udiff_variation2.php on line %d +Warning: array_udiff(): Expected parameter 2 to be an array, bool given in %sarray_udiff_variation2.php on line %d NULL --empty string DQ-- -Warning: array_udiff(): Argument #2 is not an array in %sarray_udiff_variation2.php on line %d +Warning: array_udiff(): Expected parameter 2 to be an array, string given in %sarray_udiff_variation2.php on line %d NULL --empty string SQ-- -Warning: array_udiff(): Argument #2 is not an array in %sarray_udiff_variation2.php on line %d +Warning: array_udiff(): Expected parameter 2 to be an array, string given in %sarray_udiff_variation2.php on line %d NULL --string DQ-- -Warning: array_udiff(): Argument #2 is not an array in %sarray_udiff_variation2.php on line %d +Warning: array_udiff(): Expected parameter 2 to be an array, string given in %sarray_udiff_variation2.php on line %d NULL --string SQ-- -Warning: array_udiff(): Argument #2 is not an array in %sarray_udiff_variation2.php on line %d +Warning: array_udiff(): Expected parameter 2 to be an array, string given in %sarray_udiff_variation2.php on line %d NULL --mixed case string-- -Warning: array_udiff(): Argument #2 is not an array in %sarray_udiff_variation2.php on line %d +Warning: array_udiff(): Expected parameter 2 to be an array, string given in %sarray_udiff_variation2.php on line %d NULL --heredoc-- -Warning: array_udiff(): Argument #2 is not an array in %sarray_udiff_variation2.php on line %d +Warning: array_udiff(): Expected parameter 2 to be an array, string given in %sarray_udiff_variation2.php on line %d NULL --instance of classWithToString-- -Warning: array_udiff(): Argument #2 is not an array in %sarray_udiff_variation2.php on line %d +Warning: array_udiff(): Expected parameter 2 to be an array, object given in %sarray_udiff_variation2.php on line %d NULL --instance of classWithoutToString-- -Warning: array_udiff(): Argument #2 is not an array in %sarray_udiff_variation2.php on line %d +Warning: array_udiff(): Expected parameter 2 to be an array, object given in %sarray_udiff_variation2.php on line %d NULL --undefined var-- -Warning: array_udiff(): Argument #2 is not an array in %sarray_udiff_variation2.php on line %d +Warning: array_udiff(): Expected parameter 2 to be an array, null given in %sarray_udiff_variation2.php on line %d NULL --unset var-- -Warning: array_udiff(): Argument #2 is not an array in %sarray_udiff_variation2.php on line %d +Warning: array_udiff(): Expected parameter 2 to be an array, null given in %sarray_udiff_variation2.php on line %d NULL ===DONE=== diff --git a/ext/standard/tests/array/array_udiff_variation4.phpt b/ext/standard/tests/array/array_udiff_variation4.phpt index 1968312ce2..a92c5ddfdf 100644 --- a/ext/standard/tests/array/array_udiff_variation4.phpt +++ b/ext/standard/tests/array/array_udiff_variation4.phpt @@ -103,126 +103,126 @@ foreach($inputs as $key =>$value) { --int 0-- -Warning: array_udiff(): Argument #3 is not an array in %sarray_udiff_variation4.php on line %d +Warning: array_udiff(): Expected parameter 3 to be an array, int given in %sarray_udiff_variation4.php on line %d NULL --int 1-- -Warning: array_udiff(): Argument #3 is not an array in %sarray_udiff_variation4.php on line %d +Warning: array_udiff(): Expected parameter 3 to be an array, int given in %sarray_udiff_variation4.php on line %d NULL --int 12345-- -Warning: array_udiff(): Argument #3 is not an array in %sarray_udiff_variation4.php on line %d +Warning: array_udiff(): Expected parameter 3 to be an array, int given in %sarray_udiff_variation4.php on line %d NULL --int -12345-- -Warning: array_udiff(): Argument #3 is not an array in %sarray_udiff_variation4.php on line %d +Warning: array_udiff(): Expected parameter 3 to be an array, int given in %sarray_udiff_variation4.php on line %d NULL --float 10.5-- -Warning: array_udiff(): Argument #3 is not an array in %sarray_udiff_variation4.php on line %d +Warning: array_udiff(): Expected parameter 3 to be an array, float given in %sarray_udiff_variation4.php on line %d NULL --float -10.5-- -Warning: array_udiff(): Argument #3 is not an array in %sarray_udiff_variation4.php on line %d +Warning: array_udiff(): Expected parameter 3 to be an array, float given in %sarray_udiff_variation4.php on line %d NULL --float 12.3456789000e10-- -Warning: array_udiff(): Argument #3 is not an array in %sarray_udiff_variation4.php on line %d +Warning: array_udiff(): Expected parameter 3 to be an array, float given in %sarray_udiff_variation4.php on line %d NULL --float -12.3456789000e10-- -Warning: array_udiff(): Argument #3 is not an array in %sarray_udiff_variation4.php on line %d +Warning: array_udiff(): Expected parameter 3 to be an array, float given in %sarray_udiff_variation4.php on line %d NULL --float .5-- -Warning: array_udiff(): Argument #3 is not an array in %sarray_udiff_variation4.php on line %d +Warning: array_udiff(): Expected parameter 3 to be an array, float given in %sarray_udiff_variation4.php on line %d NULL --uppercase NULL-- -Warning: array_udiff(): Argument #3 is not an array in %sarray_udiff_variation4.php on line %d +Warning: array_udiff(): Expected parameter 3 to be an array, null given in %sarray_udiff_variation4.php on line %d NULL --lowercase null-- -Warning: array_udiff(): Argument #3 is not an array in %sarray_udiff_variation4.php on line %d +Warning: array_udiff(): Expected parameter 3 to be an array, null given in %sarray_udiff_variation4.php on line %d NULL --lowercase true-- -Warning: array_udiff(): Argument #3 is not an array in %sarray_udiff_variation4.php on line %d +Warning: array_udiff(): Expected parameter 3 to be an array, bool given in %sarray_udiff_variation4.php on line %d NULL --lowercase false-- -Warning: array_udiff(): Argument #3 is not an array in %sarray_udiff_variation4.php on line %d +Warning: array_udiff(): Expected parameter 3 to be an array, bool given in %sarray_udiff_variation4.php on line %d NULL --uppercase TRUE-- -Warning: array_udiff(): Argument #3 is not an array in %sarray_udiff_variation4.php on line %d +Warning: array_udiff(): Expected parameter 3 to be an array, bool given in %sarray_udiff_variation4.php on line %d NULL --uppercase FALSE-- -Warning: array_udiff(): Argument #3 is not an array in %sarray_udiff_variation4.php on line %d +Warning: array_udiff(): Expected parameter 3 to be an array, bool given in %sarray_udiff_variation4.php on line %d NULL --empty string DQ-- -Warning: array_udiff(): Argument #3 is not an array in %sarray_udiff_variation4.php on line %d +Warning: array_udiff(): Expected parameter 3 to be an array, string given in %sarray_udiff_variation4.php on line %d NULL --empty string SQ-- -Warning: array_udiff(): Argument #3 is not an array in %sarray_udiff_variation4.php on line %d +Warning: array_udiff(): Expected parameter 3 to be an array, string given in %sarray_udiff_variation4.php on line %d NULL --string DQ-- -Warning: array_udiff(): Argument #3 is not an array in %sarray_udiff_variation4.php on line %d +Warning: array_udiff(): Expected parameter 3 to be an array, string given in %sarray_udiff_variation4.php on line %d NULL --string SQ-- -Warning: array_udiff(): Argument #3 is not an array in %sarray_udiff_variation4.php on line %d +Warning: array_udiff(): Expected parameter 3 to be an array, string given in %sarray_udiff_variation4.php on line %d NULL --mixed case string-- -Warning: array_udiff(): Argument #3 is not an array in %sarray_udiff_variation4.php on line %d +Warning: array_udiff(): Expected parameter 3 to be an array, string given in %sarray_udiff_variation4.php on line %d NULL --heredoc-- -Warning: array_udiff(): Argument #3 is not an array in %sarray_udiff_variation4.php on line %d +Warning: array_udiff(): Expected parameter 3 to be an array, string given in %sarray_udiff_variation4.php on line %d NULL --instance of classWithToString-- -Warning: array_udiff(): Argument #3 is not an array in %sarray_udiff_variation4.php on line %d +Warning: array_udiff(): Expected parameter 3 to be an array, object given in %sarray_udiff_variation4.php on line %d NULL --instance of classWithoutToString-- -Warning: array_udiff(): Argument #3 is not an array in %sarray_udiff_variation4.php on line %d +Warning: array_udiff(): Expected parameter 3 to be an array, object given in %sarray_udiff_variation4.php on line %d NULL --undefined var-- -Warning: array_udiff(): Argument #3 is not an array in %sarray_udiff_variation4.php on line %d +Warning: array_udiff(): Expected parameter 3 to be an array, null given in %sarray_udiff_variation4.php on line %d NULL --unset var-- -Warning: array_udiff(): Argument #3 is not an array in %sarray_udiff_variation4.php on line %d +Warning: array_udiff(): Expected parameter 3 to be an array, null given in %sarray_udiff_variation4.php on line %d NULL ===DONE=== diff --git a/ext/standard/tests/array/array_udiff_variation5.phpt b/ext/standard/tests/array/array_udiff_variation5.phpt index 02438fa927..967817bac3 100644 --- a/ext/standard/tests/array/array_udiff_variation5.phpt +++ b/ext/standard/tests/array/array_udiff_variation5.phpt @@ -38,7 +38,7 @@ var_dump(array_udiff($arr1, $arr2, 'too_few_parameters')); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_udiff() : usage variation *** -- comparison function with an incorrect return value -- diff --git a/ext/standard/tests/array/array_uintersect_assoc_basic2.phpt b/ext/standard/tests/array/array_uintersect_assoc_basic2.phpt index 6a54b3bfc7..b9837e7954 100644 --- a/ext/standard/tests/array/array_uintersect_assoc_basic2.phpt +++ b/ext/standard/tests/array/array_uintersect_assoc_basic2.phpt @@ -25,7 +25,7 @@ var_dump( array_uintersect_assoc($arr1, $arr2, $arr3, $arr4, $data_compare_funct ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_uintersect_assoc() : basic functionality - testing with multiple array arguments *** array(2) { ["one"]=> diff --git a/ext/standard/tests/array/array_uintersect_assoc_variation1.phpt b/ext/standard/tests/array/array_uintersect_assoc_variation1.phpt index f9d6249d81..a2babcdb02 100644 --- a/ext/standard/tests/array/array_uintersect_assoc_variation1.phpt +++ b/ext/standard/tests/array/array_uintersect_assoc_variation1.phpt @@ -102,126 +102,126 @@ foreach($inputs as $key =>$value) { --int 0-- -Warning: array_uintersect_assoc(): Argument #1 is not an array in %sarray_uintersect_assoc_variation1.php on line %d +Warning: array_uintersect_assoc(): Expected parameter 1 to be an array, int given in %sarray_uintersect_assoc_variation1.php on line %d NULL --int 1-- -Warning: array_uintersect_assoc(): Argument #1 is not an array in %sarray_uintersect_assoc_variation1.php on line %d +Warning: array_uintersect_assoc(): Expected parameter 1 to be an array, int given in %sarray_uintersect_assoc_variation1.php on line %d NULL --int 12345-- -Warning: array_uintersect_assoc(): Argument #1 is not an array in %sarray_uintersect_assoc_variation1.php on line %d +Warning: array_uintersect_assoc(): Expected parameter 1 to be an array, int given in %sarray_uintersect_assoc_variation1.php on line %d NULL --int -12345-- -Warning: array_uintersect_assoc(): Argument #1 is not an array in %sarray_uintersect_assoc_variation1.php on line %d +Warning: array_uintersect_assoc(): Expected parameter 1 to be an array, int given in %sarray_uintersect_assoc_variation1.php on line %d NULL --float 10.5-- -Warning: array_uintersect_assoc(): Argument #1 is not an array in %sarray_uintersect_assoc_variation1.php on line %d +Warning: array_uintersect_assoc(): Expected parameter 1 to be an array, float given in %sarray_uintersect_assoc_variation1.php on line %d NULL --float -10.5-- -Warning: array_uintersect_assoc(): Argument #1 is not an array in %sarray_uintersect_assoc_variation1.php on line %d +Warning: array_uintersect_assoc(): Expected parameter 1 to be an array, float given in %sarray_uintersect_assoc_variation1.php on line %d NULL --float 12.3456789000e10-- -Warning: array_uintersect_assoc(): Argument #1 is not an array in %sarray_uintersect_assoc_variation1.php on line %d +Warning: array_uintersect_assoc(): Expected parameter 1 to be an array, float given in %sarray_uintersect_assoc_variation1.php on line %d NULL --float -12.3456789000e10-- -Warning: array_uintersect_assoc(): Argument #1 is not an array in %sarray_uintersect_assoc_variation1.php on line %d +Warning: array_uintersect_assoc(): Expected parameter 1 to be an array, float given in %sarray_uintersect_assoc_variation1.php on line %d NULL --float .5-- -Warning: array_uintersect_assoc(): Argument #1 is not an array in %sarray_uintersect_assoc_variation1.php on line %d +Warning: array_uintersect_assoc(): Expected parameter 1 to be an array, float given in %sarray_uintersect_assoc_variation1.php on line %d NULL --uppercase NULL-- -Warning: array_uintersect_assoc(): Argument #1 is not an array in %sarray_uintersect_assoc_variation1.php on line %d +Warning: array_uintersect_assoc(): Expected parameter 1 to be an array, null given in %sarray_uintersect_assoc_variation1.php on line %d NULL --lowercase null-- -Warning: array_uintersect_assoc(): Argument #1 is not an array in %sarray_uintersect_assoc_variation1.php on line %d +Warning: array_uintersect_assoc(): Expected parameter 1 to be an array, null given in %sarray_uintersect_assoc_variation1.php on line %d NULL --lowercase true-- -Warning: array_uintersect_assoc(): Argument #1 is not an array in %sarray_uintersect_assoc_variation1.php on line %d +Warning: array_uintersect_assoc(): Expected parameter 1 to be an array, bool given in %sarray_uintersect_assoc_variation1.php on line %d NULL --lowercase false-- -Warning: array_uintersect_assoc(): Argument #1 is not an array in %sarray_uintersect_assoc_variation1.php on line %d +Warning: array_uintersect_assoc(): Expected parameter 1 to be an array, bool given in %sarray_uintersect_assoc_variation1.php on line %d NULL --uppercase TRUE-- -Warning: array_uintersect_assoc(): Argument #1 is not an array in %sarray_uintersect_assoc_variation1.php on line %d +Warning: array_uintersect_assoc(): Expected parameter 1 to be an array, bool given in %sarray_uintersect_assoc_variation1.php on line %d NULL --uppercase FALSE-- -Warning: array_uintersect_assoc(): Argument #1 is not an array in %sarray_uintersect_assoc_variation1.php on line %d +Warning: array_uintersect_assoc(): Expected parameter 1 to be an array, bool given in %sarray_uintersect_assoc_variation1.php on line %d NULL --empty string DQ-- -Warning: array_uintersect_assoc(): Argument #1 is not an array in %sarray_uintersect_assoc_variation1.php on line %d +Warning: array_uintersect_assoc(): Expected parameter 1 to be an array, string given in %sarray_uintersect_assoc_variation1.php on line %d NULL --empty string SQ-- -Warning: array_uintersect_assoc(): Argument #1 is not an array in %sarray_uintersect_assoc_variation1.php on line %d +Warning: array_uintersect_assoc(): Expected parameter 1 to be an array, string given in %sarray_uintersect_assoc_variation1.php on line %d NULL --string DQ-- -Warning: array_uintersect_assoc(): Argument #1 is not an array in %sarray_uintersect_assoc_variation1.php on line %d +Warning: array_uintersect_assoc(): Expected parameter 1 to be an array, string given in %sarray_uintersect_assoc_variation1.php on line %d NULL --string SQ-- -Warning: array_uintersect_assoc(): Argument #1 is not an array in %sarray_uintersect_assoc_variation1.php on line %d +Warning: array_uintersect_assoc(): Expected parameter 1 to be an array, string given in %sarray_uintersect_assoc_variation1.php on line %d NULL --mixed case string-- -Warning: array_uintersect_assoc(): Argument #1 is not an array in %sarray_uintersect_assoc_variation1.php on line %d +Warning: array_uintersect_assoc(): Expected parameter 1 to be an array, string given in %sarray_uintersect_assoc_variation1.php on line %d NULL --heredoc-- -Warning: array_uintersect_assoc(): Argument #1 is not an array in %sarray_uintersect_assoc_variation1.php on line %d +Warning: array_uintersect_assoc(): Expected parameter 1 to be an array, string given in %sarray_uintersect_assoc_variation1.php on line %d NULL --instance of classWithToString-- -Warning: array_uintersect_assoc(): Argument #1 is not an array in %sarray_uintersect_assoc_variation1.php on line %d +Warning: array_uintersect_assoc(): Expected parameter 1 to be an array, object given in %sarray_uintersect_assoc_variation1.php on line %d NULL --instance of classWithoutToString-- -Warning: array_uintersect_assoc(): Argument #1 is not an array in %sarray_uintersect_assoc_variation1.php on line %d +Warning: array_uintersect_assoc(): Expected parameter 1 to be an array, object given in %sarray_uintersect_assoc_variation1.php on line %d NULL --undefined var-- -Warning: array_uintersect_assoc(): Argument #1 is not an array in %sarray_uintersect_assoc_variation1.php on line %d +Warning: array_uintersect_assoc(): Expected parameter 1 to be an array, null given in %sarray_uintersect_assoc_variation1.php on line %d NULL --unset var-- -Warning: array_uintersect_assoc(): Argument #1 is not an array in %sarray_uintersect_assoc_variation1.php on line %d +Warning: array_uintersect_assoc(): Expected parameter 1 to be an array, null given in %sarray_uintersect_assoc_variation1.php on line %d NULL ===DONE=== diff --git a/ext/standard/tests/array/array_uintersect_assoc_variation2.phpt b/ext/standard/tests/array/array_uintersect_assoc_variation2.phpt index f5771e6396..8723157506 100644 --- a/ext/standard/tests/array/array_uintersect_assoc_variation2.phpt +++ b/ext/standard/tests/array/array_uintersect_assoc_variation2.phpt @@ -102,126 +102,126 @@ foreach($inputs as $key =>$value) { --int 0-- -Warning: array_uintersect_assoc(): Argument #2 is not an array in %sarray_uintersect_assoc_variation2.php on line %d +Warning: array_uintersect_assoc(): Expected parameter 2 to be an array, int given in %sarray_uintersect_assoc_variation2.php on line %d NULL --int 1-- -Warning: array_uintersect_assoc(): Argument #2 is not an array in %sarray_uintersect_assoc_variation2.php on line %d +Warning: array_uintersect_assoc(): Expected parameter 2 to be an array, int given in %sarray_uintersect_assoc_variation2.php on line %d NULL --int 12345-- -Warning: array_uintersect_assoc(): Argument #2 is not an array in %sarray_uintersect_assoc_variation2.php on line %d +Warning: array_uintersect_assoc(): Expected parameter 2 to be an array, int given in %sarray_uintersect_assoc_variation2.php on line %d NULL --int -12345-- -Warning: array_uintersect_assoc(): Argument #2 is not an array in %sarray_uintersect_assoc_variation2.php on line %d +Warning: array_uintersect_assoc(): Expected parameter 2 to be an array, int given in %sarray_uintersect_assoc_variation2.php on line %d NULL --float 10.5-- -Warning: array_uintersect_assoc(): Argument #2 is not an array in %sarray_uintersect_assoc_variation2.php on line %d +Warning: array_uintersect_assoc(): Expected parameter 2 to be an array, float given in %sarray_uintersect_assoc_variation2.php on line %d NULL --float -10.5-- -Warning: array_uintersect_assoc(): Argument #2 is not an array in %sarray_uintersect_assoc_variation2.php on line %d +Warning: array_uintersect_assoc(): Expected parameter 2 to be an array, float given in %sarray_uintersect_assoc_variation2.php on line %d NULL --float 12.3456789000e10-- -Warning: array_uintersect_assoc(): Argument #2 is not an array in %sarray_uintersect_assoc_variation2.php on line %d +Warning: array_uintersect_assoc(): Expected parameter 2 to be an array, float given in %sarray_uintersect_assoc_variation2.php on line %d NULL --float -12.3456789000e10-- -Warning: array_uintersect_assoc(): Argument #2 is not an array in %sarray_uintersect_assoc_variation2.php on line %d +Warning: array_uintersect_assoc(): Expected parameter 2 to be an array, float given in %sarray_uintersect_assoc_variation2.php on line %d NULL --float .5-- -Warning: array_uintersect_assoc(): Argument #2 is not an array in %sarray_uintersect_assoc_variation2.php on line %d +Warning: array_uintersect_assoc(): Expected parameter 2 to be an array, float given in %sarray_uintersect_assoc_variation2.php on line %d NULL --uppercase NULL-- -Warning: array_uintersect_assoc(): Argument #2 is not an array in %sarray_uintersect_assoc_variation2.php on line %d +Warning: array_uintersect_assoc(): Expected parameter 2 to be an array, null given in %sarray_uintersect_assoc_variation2.php on line %d NULL --lowercase null-- -Warning: array_uintersect_assoc(): Argument #2 is not an array in %sarray_uintersect_assoc_variation2.php on line %d +Warning: array_uintersect_assoc(): Expected parameter 2 to be an array, null given in %sarray_uintersect_assoc_variation2.php on line %d NULL --lowercase true-- -Warning: array_uintersect_assoc(): Argument #2 is not an array in %sarray_uintersect_assoc_variation2.php on line %d +Warning: array_uintersect_assoc(): Expected parameter 2 to be an array, bool given in %sarray_uintersect_assoc_variation2.php on line %d NULL --lowercase false-- -Warning: array_uintersect_assoc(): Argument #2 is not an array in %sarray_uintersect_assoc_variation2.php on line %d +Warning: array_uintersect_assoc(): Expected parameter 2 to be an array, bool given in %sarray_uintersect_assoc_variation2.php on line %d NULL --uppercase TRUE-- -Warning: array_uintersect_assoc(): Argument #2 is not an array in %sarray_uintersect_assoc_variation2.php on line %d +Warning: array_uintersect_assoc(): Expected parameter 2 to be an array, bool given in %sarray_uintersect_assoc_variation2.php on line %d NULL --uppercase FALSE-- -Warning: array_uintersect_assoc(): Argument #2 is not an array in %sarray_uintersect_assoc_variation2.php on line %d +Warning: array_uintersect_assoc(): Expected parameter 2 to be an array, bool given in %sarray_uintersect_assoc_variation2.php on line %d NULL --empty string DQ-- -Warning: array_uintersect_assoc(): Argument #2 is not an array in %sarray_uintersect_assoc_variation2.php on line %d +Warning: array_uintersect_assoc(): Expected parameter 2 to be an array, string given in %sarray_uintersect_assoc_variation2.php on line %d NULL --empty string SQ-- -Warning: array_uintersect_assoc(): Argument #2 is not an array in %sarray_uintersect_assoc_variation2.php on line %d +Warning: array_uintersect_assoc(): Expected parameter 2 to be an array, string given in %sarray_uintersect_assoc_variation2.php on line %d NULL --string DQ-- -Warning: array_uintersect_assoc(): Argument #2 is not an array in %sarray_uintersect_assoc_variation2.php on line %d +Warning: array_uintersect_assoc(): Expected parameter 2 to be an array, string given in %sarray_uintersect_assoc_variation2.php on line %d NULL --string SQ-- -Warning: array_uintersect_assoc(): Argument #2 is not an array in %sarray_uintersect_assoc_variation2.php on line %d +Warning: array_uintersect_assoc(): Expected parameter 2 to be an array, string given in %sarray_uintersect_assoc_variation2.php on line %d NULL --mixed case string-- -Warning: array_uintersect_assoc(): Argument #2 is not an array in %sarray_uintersect_assoc_variation2.php on line %d +Warning: array_uintersect_assoc(): Expected parameter 2 to be an array, string given in %sarray_uintersect_assoc_variation2.php on line %d NULL --heredoc-- -Warning: array_uintersect_assoc(): Argument #2 is not an array in %sarray_uintersect_assoc_variation2.php on line %d +Warning: array_uintersect_assoc(): Expected parameter 2 to be an array, string given in %sarray_uintersect_assoc_variation2.php on line %d NULL --instance of classWithToString-- -Warning: array_uintersect_assoc(): Argument #2 is not an array in %sarray_uintersect_assoc_variation2.php on line %d +Warning: array_uintersect_assoc(): Expected parameter 2 to be an array, object given in %sarray_uintersect_assoc_variation2.php on line %d NULL --instance of classWithoutToString-- -Warning: array_uintersect_assoc(): Argument #2 is not an array in %sarray_uintersect_assoc_variation2.php on line %d +Warning: array_uintersect_assoc(): Expected parameter 2 to be an array, object given in %sarray_uintersect_assoc_variation2.php on line %d NULL --undefined var-- -Warning: array_uintersect_assoc(): Argument #2 is not an array in %sarray_uintersect_assoc_variation2.php on line %d +Warning: array_uintersect_assoc(): Expected parameter 2 to be an array, null given in %sarray_uintersect_assoc_variation2.php on line %d NULL --unset var-- -Warning: array_uintersect_assoc(): Argument #2 is not an array in %sarray_uintersect_assoc_variation2.php on line %d +Warning: array_uintersect_assoc(): Expected parameter 2 to be an array, null given in %sarray_uintersect_assoc_variation2.php on line %d NULL ===DONE=== diff --git a/ext/standard/tests/array/array_uintersect_assoc_variation4.phpt b/ext/standard/tests/array/array_uintersect_assoc_variation4.phpt index 7681211c80..3024246a3d 100644 --- a/ext/standard/tests/array/array_uintersect_assoc_variation4.phpt +++ b/ext/standard/tests/array/array_uintersect_assoc_variation4.phpt @@ -103,126 +103,126 @@ foreach($inputs as $key =>$value) { --int 0-- -Warning: array_uintersect_assoc(): Argument #3 is not an array in %sarray_uintersect_assoc_variation4.php on line %d +Warning: array_uintersect_assoc(): Expected parameter 3 to be an array, int given in %sarray_uintersect_assoc_variation4.php on line %d NULL --int 1-- -Warning: array_uintersect_assoc(): Argument #3 is not an array in %sarray_uintersect_assoc_variation4.php on line %d +Warning: array_uintersect_assoc(): Expected parameter 3 to be an array, int given in %sarray_uintersect_assoc_variation4.php on line %d NULL --int 12345-- -Warning: array_uintersect_assoc(): Argument #3 is not an array in %sarray_uintersect_assoc_variation4.php on line %d +Warning: array_uintersect_assoc(): Expected parameter 3 to be an array, int given in %sarray_uintersect_assoc_variation4.php on line %d NULL --int -12345-- -Warning: array_uintersect_assoc(): Argument #3 is not an array in %sarray_uintersect_assoc_variation4.php on line %d +Warning: array_uintersect_assoc(): Expected parameter 3 to be an array, int given in %sarray_uintersect_assoc_variation4.php on line %d NULL --float 10.5-- -Warning: array_uintersect_assoc(): Argument #3 is not an array in %sarray_uintersect_assoc_variation4.php on line %d +Warning: array_uintersect_assoc(): Expected parameter 3 to be an array, float given in %sarray_uintersect_assoc_variation4.php on line %d NULL --float -10.5-- -Warning: array_uintersect_assoc(): Argument #3 is not an array in %sarray_uintersect_assoc_variation4.php on line %d +Warning: array_uintersect_assoc(): Expected parameter 3 to be an array, float given in %sarray_uintersect_assoc_variation4.php on line %d NULL --float 12.3456789000e10-- -Warning: array_uintersect_assoc(): Argument #3 is not an array in %sarray_uintersect_assoc_variation4.php on line %d +Warning: array_uintersect_assoc(): Expected parameter 3 to be an array, float given in %sarray_uintersect_assoc_variation4.php on line %d NULL --float -12.3456789000e10-- -Warning: array_uintersect_assoc(): Argument #3 is not an array in %sarray_uintersect_assoc_variation4.php on line %d +Warning: array_uintersect_assoc(): Expected parameter 3 to be an array, float given in %sarray_uintersect_assoc_variation4.php on line %d NULL --float .5-- -Warning: array_uintersect_assoc(): Argument #3 is not an array in %sarray_uintersect_assoc_variation4.php on line %d +Warning: array_uintersect_assoc(): Expected parameter 3 to be an array, float given in %sarray_uintersect_assoc_variation4.php on line %d NULL --uppercase NULL-- -Warning: array_uintersect_assoc(): Argument #3 is not an array in %sarray_uintersect_assoc_variation4.php on line %d +Warning: array_uintersect_assoc(): Expected parameter 3 to be an array, null given in %sarray_uintersect_assoc_variation4.php on line %d NULL --lowercase null-- -Warning: array_uintersect_assoc(): Argument #3 is not an array in %sarray_uintersect_assoc_variation4.php on line %d +Warning: array_uintersect_assoc(): Expected parameter 3 to be an array, null given in %sarray_uintersect_assoc_variation4.php on line %d NULL --lowercase true-- -Warning: array_uintersect_assoc(): Argument #3 is not an array in %sarray_uintersect_assoc_variation4.php on line %d +Warning: array_uintersect_assoc(): Expected parameter 3 to be an array, bool given in %sarray_uintersect_assoc_variation4.php on line %d NULL --lowercase false-- -Warning: array_uintersect_assoc(): Argument #3 is not an array in %sarray_uintersect_assoc_variation4.php on line %d +Warning: array_uintersect_assoc(): Expected parameter 3 to be an array, bool given in %sarray_uintersect_assoc_variation4.php on line %d NULL --uppercase TRUE-- -Warning: array_uintersect_assoc(): Argument #3 is not an array in %sarray_uintersect_assoc_variation4.php on line %d +Warning: array_uintersect_assoc(): Expected parameter 3 to be an array, bool given in %sarray_uintersect_assoc_variation4.php on line %d NULL --uppercase FALSE-- -Warning: array_uintersect_assoc(): Argument #3 is not an array in %sarray_uintersect_assoc_variation4.php on line %d +Warning: array_uintersect_assoc(): Expected parameter 3 to be an array, bool given in %sarray_uintersect_assoc_variation4.php on line %d NULL --empty string DQ-- -Warning: array_uintersect_assoc(): Argument #3 is not an array in %sarray_uintersect_assoc_variation4.php on line %d +Warning: array_uintersect_assoc(): Expected parameter 3 to be an array, string given in %sarray_uintersect_assoc_variation4.php on line %d NULL --empty string SQ-- -Warning: array_uintersect_assoc(): Argument #3 is not an array in %sarray_uintersect_assoc_variation4.php on line %d +Warning: array_uintersect_assoc(): Expected parameter 3 to be an array, string given in %sarray_uintersect_assoc_variation4.php on line %d NULL --string DQ-- -Warning: array_uintersect_assoc(): Argument #3 is not an array in %sarray_uintersect_assoc_variation4.php on line %d +Warning: array_uintersect_assoc(): Expected parameter 3 to be an array, string given in %sarray_uintersect_assoc_variation4.php on line %d NULL --string SQ-- -Warning: array_uintersect_assoc(): Argument #3 is not an array in %sarray_uintersect_assoc_variation4.php on line %d +Warning: array_uintersect_assoc(): Expected parameter 3 to be an array, string given in %sarray_uintersect_assoc_variation4.php on line %d NULL --mixed case string-- -Warning: array_uintersect_assoc(): Argument #3 is not an array in %sarray_uintersect_assoc_variation4.php on line %d +Warning: array_uintersect_assoc(): Expected parameter 3 to be an array, string given in %sarray_uintersect_assoc_variation4.php on line %d NULL --heredoc-- -Warning: array_uintersect_assoc(): Argument #3 is not an array in %sarray_uintersect_assoc_variation4.php on line %d +Warning: array_uintersect_assoc(): Expected parameter 3 to be an array, string given in %sarray_uintersect_assoc_variation4.php on line %d NULL --instance of classWithToString-- -Warning: array_uintersect_assoc(): Argument #3 is not an array in %sarray_uintersect_assoc_variation4.php on line %d +Warning: array_uintersect_assoc(): Expected parameter 3 to be an array, object given in %sarray_uintersect_assoc_variation4.php on line %d NULL --instance of classWithoutToString-- -Warning: array_uintersect_assoc(): Argument #3 is not an array in %sarray_uintersect_assoc_variation4.php on line %d +Warning: array_uintersect_assoc(): Expected parameter 3 to be an array, object given in %sarray_uintersect_assoc_variation4.php on line %d NULL --undefined var-- -Warning: array_uintersect_assoc(): Argument #3 is not an array in %sarray_uintersect_assoc_variation4.php on line %d +Warning: array_uintersect_assoc(): Expected parameter 3 to be an array, null given in %sarray_uintersect_assoc_variation4.php on line %d NULL --unset var-- -Warning: array_uintersect_assoc(): Argument #3 is not an array in %sarray_uintersect_assoc_variation4.php on line %d +Warning: array_uintersect_assoc(): Expected parameter 3 to be an array, null given in %sarray_uintersect_assoc_variation4.php on line %d NULL ===DONE=== diff --git a/ext/standard/tests/array/array_uintersect_assoc_variation5.phpt b/ext/standard/tests/array/array_uintersect_assoc_variation5.phpt index 07b9259c8c..34b10af344 100644 --- a/ext/standard/tests/array/array_uintersect_assoc_variation5.phpt +++ b/ext/standard/tests/array/array_uintersect_assoc_variation5.phpt @@ -38,7 +38,7 @@ var_dump(array_uintersect_assoc($arr1, $arr2, 'too_few_parameters')); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_uintersect_assoc() : usage variation - differing comparison functions*** -- comparison function with an incorrect return value -- diff --git a/ext/standard/tests/array/array_uintersect_uassoc_variation1.phpt b/ext/standard/tests/array/array_uintersect_uassoc_variation1.phpt index e6709f364d..84d4e634cf 100644 --- a/ext/standard/tests/array/array_uintersect_uassoc_variation1.phpt +++ b/ext/standard/tests/array/array_uintersect_uassoc_variation1.phpt @@ -103,126 +103,126 @@ foreach($inputs as $key =>$value) { --int 0-- -Warning: array_uintersect_uassoc(): Argument #1 is not an array in %sarray_uintersect_uassoc_variation1.php on line %d +Warning: array_uintersect_uassoc(): Expected parameter 1 to be an array, int given in %sarray_uintersect_uassoc_variation1.php on line %d NULL --int 1-- -Warning: array_uintersect_uassoc(): Argument #1 is not an array in %sarray_uintersect_uassoc_variation1.php on line %d +Warning: array_uintersect_uassoc(): Expected parameter 1 to be an array, int given in %sarray_uintersect_uassoc_variation1.php on line %d NULL --int 12345-- -Warning: array_uintersect_uassoc(): Argument #1 is not an array in %sarray_uintersect_uassoc_variation1.php on line %d +Warning: array_uintersect_uassoc(): Expected parameter 1 to be an array, int given in %sarray_uintersect_uassoc_variation1.php on line %d NULL --int -12345-- -Warning: array_uintersect_uassoc(): Argument #1 is not an array in %sarray_uintersect_uassoc_variation1.php on line %d +Warning: array_uintersect_uassoc(): Expected parameter 1 to be an array, int given in %sarray_uintersect_uassoc_variation1.php on line %d NULL --float 10.5-- -Warning: array_uintersect_uassoc(): Argument #1 is not an array in %sarray_uintersect_uassoc_variation1.php on line %d +Warning: array_uintersect_uassoc(): Expected parameter 1 to be an array, float given in %sarray_uintersect_uassoc_variation1.php on line %d NULL --float -10.5-- -Warning: array_uintersect_uassoc(): Argument #1 is not an array in %sarray_uintersect_uassoc_variation1.php on line %d +Warning: array_uintersect_uassoc(): Expected parameter 1 to be an array, float given in %sarray_uintersect_uassoc_variation1.php on line %d NULL --float 12.3456789000e10-- -Warning: array_uintersect_uassoc(): Argument #1 is not an array in %sarray_uintersect_uassoc_variation1.php on line %d +Warning: array_uintersect_uassoc(): Expected parameter 1 to be an array, float given in %sarray_uintersect_uassoc_variation1.php on line %d NULL --float -12.3456789000e10-- -Warning: array_uintersect_uassoc(): Argument #1 is not an array in %sarray_uintersect_uassoc_variation1.php on line %d +Warning: array_uintersect_uassoc(): Expected parameter 1 to be an array, float given in %sarray_uintersect_uassoc_variation1.php on line %d NULL --float .5-- -Warning: array_uintersect_uassoc(): Argument #1 is not an array in %sarray_uintersect_uassoc_variation1.php on line %d +Warning: array_uintersect_uassoc(): Expected parameter 1 to be an array, float given in %sarray_uintersect_uassoc_variation1.php on line %d NULL --uppercase NULL-- -Warning: array_uintersect_uassoc(): Argument #1 is not an array in %sarray_uintersect_uassoc_variation1.php on line %d +Warning: array_uintersect_uassoc(): Expected parameter 1 to be an array, null given in %sarray_uintersect_uassoc_variation1.php on line %d NULL --lowercase null-- -Warning: array_uintersect_uassoc(): Argument #1 is not an array in %sarray_uintersect_uassoc_variation1.php on line %d +Warning: array_uintersect_uassoc(): Expected parameter 1 to be an array, null given in %sarray_uintersect_uassoc_variation1.php on line %d NULL --lowercase true-- -Warning: array_uintersect_uassoc(): Argument #1 is not an array in %sarray_uintersect_uassoc_variation1.php on line %d +Warning: array_uintersect_uassoc(): Expected parameter 1 to be an array, bool given in %sarray_uintersect_uassoc_variation1.php on line %d NULL --lowercase false-- -Warning: array_uintersect_uassoc(): Argument #1 is not an array in %sarray_uintersect_uassoc_variation1.php on line %d +Warning: array_uintersect_uassoc(): Expected parameter 1 to be an array, bool given in %sarray_uintersect_uassoc_variation1.php on line %d NULL --uppercase TRUE-- -Warning: array_uintersect_uassoc(): Argument #1 is not an array in %sarray_uintersect_uassoc_variation1.php on line %d +Warning: array_uintersect_uassoc(): Expected parameter 1 to be an array, bool given in %sarray_uintersect_uassoc_variation1.php on line %d NULL --uppercase FALSE-- -Warning: array_uintersect_uassoc(): Argument #1 is not an array in %sarray_uintersect_uassoc_variation1.php on line %d +Warning: array_uintersect_uassoc(): Expected parameter 1 to be an array, bool given in %sarray_uintersect_uassoc_variation1.php on line %d NULL --empty string DQ-- -Warning: array_uintersect_uassoc(): Argument #1 is not an array in %sarray_uintersect_uassoc_variation1.php on line %d +Warning: array_uintersect_uassoc(): Expected parameter 1 to be an array, string given in %sarray_uintersect_uassoc_variation1.php on line %d NULL --empty string SQ-- -Warning: array_uintersect_uassoc(): Argument #1 is not an array in %sarray_uintersect_uassoc_variation1.php on line %d +Warning: array_uintersect_uassoc(): Expected parameter 1 to be an array, string given in %sarray_uintersect_uassoc_variation1.php on line %d NULL --string DQ-- -Warning: array_uintersect_uassoc(): Argument #1 is not an array in %sarray_uintersect_uassoc_variation1.php on line %d +Warning: array_uintersect_uassoc(): Expected parameter 1 to be an array, string given in %sarray_uintersect_uassoc_variation1.php on line %d NULL --string SQ-- -Warning: array_uintersect_uassoc(): Argument #1 is not an array in %sarray_uintersect_uassoc_variation1.php on line %d +Warning: array_uintersect_uassoc(): Expected parameter 1 to be an array, string given in %sarray_uintersect_uassoc_variation1.php on line %d NULL --mixed case string-- -Warning: array_uintersect_uassoc(): Argument #1 is not an array in %sarray_uintersect_uassoc_variation1.php on line %d +Warning: array_uintersect_uassoc(): Expected parameter 1 to be an array, string given in %sarray_uintersect_uassoc_variation1.php on line %d NULL --heredoc-- -Warning: array_uintersect_uassoc(): Argument #1 is not an array in %sarray_uintersect_uassoc_variation1.php on line %d +Warning: array_uintersect_uassoc(): Expected parameter 1 to be an array, string given in %sarray_uintersect_uassoc_variation1.php on line %d NULL --instance of classWithToString-- -Warning: array_uintersect_uassoc(): Argument #1 is not an array in %sarray_uintersect_uassoc_variation1.php on line %d +Warning: array_uintersect_uassoc(): Expected parameter 1 to be an array, object given in %sarray_uintersect_uassoc_variation1.php on line %d NULL --instance of classWithoutToString-- -Warning: array_uintersect_uassoc(): Argument #1 is not an array in %sarray_uintersect_uassoc_variation1.php on line %d +Warning: array_uintersect_uassoc(): Expected parameter 1 to be an array, object given in %sarray_uintersect_uassoc_variation1.php on line %d NULL --undefined var-- -Warning: array_uintersect_uassoc(): Argument #1 is not an array in %sarray_uintersect_uassoc_variation1.php on line %d +Warning: array_uintersect_uassoc(): Expected parameter 1 to be an array, null given in %sarray_uintersect_uassoc_variation1.php on line %d NULL --unset var-- -Warning: array_uintersect_uassoc(): Argument #1 is not an array in %sarray_uintersect_uassoc_variation1.php on line %d +Warning: array_uintersect_uassoc(): Expected parameter 1 to be an array, null given in %sarray_uintersect_uassoc_variation1.php on line %d NULL ===DONE=== diff --git a/ext/standard/tests/array/array_uintersect_uassoc_variation2.phpt b/ext/standard/tests/array/array_uintersect_uassoc_variation2.phpt index 922778fadb..8692026fc4 100644 --- a/ext/standard/tests/array/array_uintersect_uassoc_variation2.phpt +++ b/ext/standard/tests/array/array_uintersect_uassoc_variation2.phpt @@ -103,126 +103,126 @@ foreach($inputs as $key =>$value) { --int 0-- -Warning: array_uintersect_uassoc(): Argument #2 is not an array in %sarray_uintersect_uassoc_variation2.php on line %d +Warning: array_uintersect_uassoc(): Expected parameter 2 to be an array, int given in %sarray_uintersect_uassoc_variation2.php on line %d NULL --int 1-- -Warning: array_uintersect_uassoc(): Argument #2 is not an array in %sarray_uintersect_uassoc_variation2.php on line %d +Warning: array_uintersect_uassoc(): Expected parameter 2 to be an array, int given in %sarray_uintersect_uassoc_variation2.php on line %d NULL --int 12345-- -Warning: array_uintersect_uassoc(): Argument #2 is not an array in %sarray_uintersect_uassoc_variation2.php on line %d +Warning: array_uintersect_uassoc(): Expected parameter 2 to be an array, int given in %sarray_uintersect_uassoc_variation2.php on line %d NULL --int -12345-- -Warning: array_uintersect_uassoc(): Argument #2 is not an array in %sarray_uintersect_uassoc_variation2.php on line %d +Warning: array_uintersect_uassoc(): Expected parameter 2 to be an array, int given in %sarray_uintersect_uassoc_variation2.php on line %d NULL --float 10.5-- -Warning: array_uintersect_uassoc(): Argument #2 is not an array in %sarray_uintersect_uassoc_variation2.php on line %d +Warning: array_uintersect_uassoc(): Expected parameter 2 to be an array, float given in %sarray_uintersect_uassoc_variation2.php on line %d NULL --float -10.5-- -Warning: array_uintersect_uassoc(): Argument #2 is not an array in %sarray_uintersect_uassoc_variation2.php on line %d +Warning: array_uintersect_uassoc(): Expected parameter 2 to be an array, float given in %sarray_uintersect_uassoc_variation2.php on line %d NULL --float 12.3456789000e10-- -Warning: array_uintersect_uassoc(): Argument #2 is not an array in %sarray_uintersect_uassoc_variation2.php on line %d +Warning: array_uintersect_uassoc(): Expected parameter 2 to be an array, float given in %sarray_uintersect_uassoc_variation2.php on line %d NULL --float -12.3456789000e10-- -Warning: array_uintersect_uassoc(): Argument #2 is not an array in %sarray_uintersect_uassoc_variation2.php on line %d +Warning: array_uintersect_uassoc(): Expected parameter 2 to be an array, float given in %sarray_uintersect_uassoc_variation2.php on line %d NULL --float .5-- -Warning: array_uintersect_uassoc(): Argument #2 is not an array in %sarray_uintersect_uassoc_variation2.php on line %d +Warning: array_uintersect_uassoc(): Expected parameter 2 to be an array, float given in %sarray_uintersect_uassoc_variation2.php on line %d NULL --uppercase NULL-- -Warning: array_uintersect_uassoc(): Argument #2 is not an array in %sarray_uintersect_uassoc_variation2.php on line %d +Warning: array_uintersect_uassoc(): Expected parameter 2 to be an array, null given in %sarray_uintersect_uassoc_variation2.php on line %d NULL --lowercase null-- -Warning: array_uintersect_uassoc(): Argument #2 is not an array in %sarray_uintersect_uassoc_variation2.php on line %d +Warning: array_uintersect_uassoc(): Expected parameter 2 to be an array, null given in %sarray_uintersect_uassoc_variation2.php on line %d NULL --lowercase true-- -Warning: array_uintersect_uassoc(): Argument #2 is not an array in %sarray_uintersect_uassoc_variation2.php on line %d +Warning: array_uintersect_uassoc(): Expected parameter 2 to be an array, bool given in %sarray_uintersect_uassoc_variation2.php on line %d NULL --lowercase false-- -Warning: array_uintersect_uassoc(): Argument #2 is not an array in %sarray_uintersect_uassoc_variation2.php on line %d +Warning: array_uintersect_uassoc(): Expected parameter 2 to be an array, bool given in %sarray_uintersect_uassoc_variation2.php on line %d NULL --uppercase TRUE-- -Warning: array_uintersect_uassoc(): Argument #2 is not an array in %sarray_uintersect_uassoc_variation2.php on line %d +Warning: array_uintersect_uassoc(): Expected parameter 2 to be an array, bool given in %sarray_uintersect_uassoc_variation2.php on line %d NULL --uppercase FALSE-- -Warning: array_uintersect_uassoc(): Argument #2 is not an array in %sarray_uintersect_uassoc_variation2.php on line %d +Warning: array_uintersect_uassoc(): Expected parameter 2 to be an array, bool given in %sarray_uintersect_uassoc_variation2.php on line %d NULL --empty string DQ-- -Warning: array_uintersect_uassoc(): Argument #2 is not an array in %sarray_uintersect_uassoc_variation2.php on line %d +Warning: array_uintersect_uassoc(): Expected parameter 2 to be an array, string given in %sarray_uintersect_uassoc_variation2.php on line %d NULL --empty string SQ-- -Warning: array_uintersect_uassoc(): Argument #2 is not an array in %sarray_uintersect_uassoc_variation2.php on line %d +Warning: array_uintersect_uassoc(): Expected parameter 2 to be an array, string given in %sarray_uintersect_uassoc_variation2.php on line %d NULL --string DQ-- -Warning: array_uintersect_uassoc(): Argument #2 is not an array in %sarray_uintersect_uassoc_variation2.php on line %d +Warning: array_uintersect_uassoc(): Expected parameter 2 to be an array, string given in %sarray_uintersect_uassoc_variation2.php on line %d NULL --string SQ-- -Warning: array_uintersect_uassoc(): Argument #2 is not an array in %sarray_uintersect_uassoc_variation2.php on line %d +Warning: array_uintersect_uassoc(): Expected parameter 2 to be an array, string given in %sarray_uintersect_uassoc_variation2.php on line %d NULL --mixed case string-- -Warning: array_uintersect_uassoc(): Argument #2 is not an array in %sarray_uintersect_uassoc_variation2.php on line %d +Warning: array_uintersect_uassoc(): Expected parameter 2 to be an array, string given in %sarray_uintersect_uassoc_variation2.php on line %d NULL --heredoc-- -Warning: array_uintersect_uassoc(): Argument #2 is not an array in %sarray_uintersect_uassoc_variation2.php on line %d +Warning: array_uintersect_uassoc(): Expected parameter 2 to be an array, string given in %sarray_uintersect_uassoc_variation2.php on line %d NULL --instance of classWithToString-- -Warning: array_uintersect_uassoc(): Argument #2 is not an array in %sarray_uintersect_uassoc_variation2.php on line %d +Warning: array_uintersect_uassoc(): Expected parameter 2 to be an array, object given in %sarray_uintersect_uassoc_variation2.php on line %d NULL --instance of classWithoutToString-- -Warning: array_uintersect_uassoc(): Argument #2 is not an array in %sarray_uintersect_uassoc_variation2.php on line %d +Warning: array_uintersect_uassoc(): Expected parameter 2 to be an array, object given in %sarray_uintersect_uassoc_variation2.php on line %d NULL --undefined var-- -Warning: array_uintersect_uassoc(): Argument #2 is not an array in %sarray_uintersect_uassoc_variation2.php on line %d +Warning: array_uintersect_uassoc(): Expected parameter 2 to be an array, null given in %sarray_uintersect_uassoc_variation2.php on line %d NULL --unset var-- -Warning: array_uintersect_uassoc(): Argument #2 is not an array in %sarray_uintersect_uassoc_variation2.php on line %d +Warning: array_uintersect_uassoc(): Expected parameter 2 to be an array, null given in %sarray_uintersect_uassoc_variation2.php on line %d NULL ===DONE=== diff --git a/ext/standard/tests/array/array_uintersect_uassoc_variation5.phpt b/ext/standard/tests/array/array_uintersect_uassoc_variation5.phpt index c46a036d19..d1db008416 100644 --- a/ext/standard/tests/array/array_uintersect_uassoc_variation5.phpt +++ b/ext/standard/tests/array/array_uintersect_uassoc_variation5.phpt @@ -104,126 +104,126 @@ foreach($inputs as $key =>$value) { --int 0-- -Warning: array_uintersect_uassoc(): Argument #3 is not an array in %sarray_uintersect_uassoc_variation5.php on line %d +Warning: array_uintersect_uassoc(): Expected parameter 3 to be an array, int given in %sarray_uintersect_uassoc_variation5.php on line %d NULL --int 1-- -Warning: array_uintersect_uassoc(): Argument #3 is not an array in %sarray_uintersect_uassoc_variation5.php on line %d +Warning: array_uintersect_uassoc(): Expected parameter 3 to be an array, int given in %sarray_uintersect_uassoc_variation5.php on line %d NULL --int 12345-- -Warning: array_uintersect_uassoc(): Argument #3 is not an array in %sarray_uintersect_uassoc_variation5.php on line %d +Warning: array_uintersect_uassoc(): Expected parameter 3 to be an array, int given in %sarray_uintersect_uassoc_variation5.php on line %d NULL --int -12345-- -Warning: array_uintersect_uassoc(): Argument #3 is not an array in %sarray_uintersect_uassoc_variation5.php on line %d +Warning: array_uintersect_uassoc(): Expected parameter 3 to be an array, int given in %sarray_uintersect_uassoc_variation5.php on line %d NULL --float 10.5-- -Warning: array_uintersect_uassoc(): Argument #3 is not an array in %sarray_uintersect_uassoc_variation5.php on line %d +Warning: array_uintersect_uassoc(): Expected parameter 3 to be an array, float given in %sarray_uintersect_uassoc_variation5.php on line %d NULL --float -10.5-- -Warning: array_uintersect_uassoc(): Argument #3 is not an array in %sarray_uintersect_uassoc_variation5.php on line %d +Warning: array_uintersect_uassoc(): Expected parameter 3 to be an array, float given in %sarray_uintersect_uassoc_variation5.php on line %d NULL --float 12.3456789000e10-- -Warning: array_uintersect_uassoc(): Argument #3 is not an array in %sarray_uintersect_uassoc_variation5.php on line %d +Warning: array_uintersect_uassoc(): Expected parameter 3 to be an array, float given in %sarray_uintersect_uassoc_variation5.php on line %d NULL --float -12.3456789000e10-- -Warning: array_uintersect_uassoc(): Argument #3 is not an array in %sarray_uintersect_uassoc_variation5.php on line %d +Warning: array_uintersect_uassoc(): Expected parameter 3 to be an array, float given in %sarray_uintersect_uassoc_variation5.php on line %d NULL --float .5-- -Warning: array_uintersect_uassoc(): Argument #3 is not an array in %sarray_uintersect_uassoc_variation5.php on line %d +Warning: array_uintersect_uassoc(): Expected parameter 3 to be an array, float given in %sarray_uintersect_uassoc_variation5.php on line %d NULL --uppercase NULL-- -Warning: array_uintersect_uassoc(): Argument #3 is not an array in %sarray_uintersect_uassoc_variation5.php on line %d +Warning: array_uintersect_uassoc(): Expected parameter 3 to be an array, null given in %sarray_uintersect_uassoc_variation5.php on line %d NULL --lowercase null-- -Warning: array_uintersect_uassoc(): Argument #3 is not an array in %sarray_uintersect_uassoc_variation5.php on line %d +Warning: array_uintersect_uassoc(): Expected parameter 3 to be an array, null given in %sarray_uintersect_uassoc_variation5.php on line %d NULL --lowercase true-- -Warning: array_uintersect_uassoc(): Argument #3 is not an array in %sarray_uintersect_uassoc_variation5.php on line %d +Warning: array_uintersect_uassoc(): Expected parameter 3 to be an array, bool given in %sarray_uintersect_uassoc_variation5.php on line %d NULL --lowercase false-- -Warning: array_uintersect_uassoc(): Argument #3 is not an array in %sarray_uintersect_uassoc_variation5.php on line %d +Warning: array_uintersect_uassoc(): Expected parameter 3 to be an array, bool given in %sarray_uintersect_uassoc_variation5.php on line %d NULL --uppercase TRUE-- -Warning: array_uintersect_uassoc(): Argument #3 is not an array in %sarray_uintersect_uassoc_variation5.php on line %d +Warning: array_uintersect_uassoc(): Expected parameter 3 to be an array, bool given in %sarray_uintersect_uassoc_variation5.php on line %d NULL --uppercase FALSE-- -Warning: array_uintersect_uassoc(): Argument #3 is not an array in %sarray_uintersect_uassoc_variation5.php on line %d +Warning: array_uintersect_uassoc(): Expected parameter 3 to be an array, bool given in %sarray_uintersect_uassoc_variation5.php on line %d NULL --empty string DQ-- -Warning: array_uintersect_uassoc(): Argument #3 is not an array in %sarray_uintersect_uassoc_variation5.php on line %d +Warning: array_uintersect_uassoc(): Expected parameter 3 to be an array, string given in %sarray_uintersect_uassoc_variation5.php on line %d NULL --empty string SQ-- -Warning: array_uintersect_uassoc(): Argument #3 is not an array in %sarray_uintersect_uassoc_variation5.php on line %d +Warning: array_uintersect_uassoc(): Expected parameter 3 to be an array, string given in %sarray_uintersect_uassoc_variation5.php on line %d NULL --string DQ-- -Warning: array_uintersect_uassoc(): Argument #3 is not an array in %sarray_uintersect_uassoc_variation5.php on line %d +Warning: array_uintersect_uassoc(): Expected parameter 3 to be an array, string given in %sarray_uintersect_uassoc_variation5.php on line %d NULL --string SQ-- -Warning: array_uintersect_uassoc(): Argument #3 is not an array in %sarray_uintersect_uassoc_variation5.php on line %d +Warning: array_uintersect_uassoc(): Expected parameter 3 to be an array, string given in %sarray_uintersect_uassoc_variation5.php on line %d NULL --mixed case string-- -Warning: array_uintersect_uassoc(): Argument #3 is not an array in %sarray_uintersect_uassoc_variation5.php on line %d +Warning: array_uintersect_uassoc(): Expected parameter 3 to be an array, string given in %sarray_uintersect_uassoc_variation5.php on line %d NULL --heredoc-- -Warning: array_uintersect_uassoc(): Argument #3 is not an array in %sarray_uintersect_uassoc_variation5.php on line %d +Warning: array_uintersect_uassoc(): Expected parameter 3 to be an array, string given in %sarray_uintersect_uassoc_variation5.php on line %d NULL --instance of classWithToString-- -Warning: array_uintersect_uassoc(): Argument #3 is not an array in %sarray_uintersect_uassoc_variation5.php on line %d +Warning: array_uintersect_uassoc(): Expected parameter 3 to be an array, object given in %sarray_uintersect_uassoc_variation5.php on line %d NULL --instance of classWithoutToString-- -Warning: array_uintersect_uassoc(): Argument #3 is not an array in %sarray_uintersect_uassoc_variation5.php on line %d +Warning: array_uintersect_uassoc(): Expected parameter 3 to be an array, object given in %sarray_uintersect_uassoc_variation5.php on line %d NULL --undefined var-- -Warning: array_uintersect_uassoc(): Argument #3 is not an array in %sarray_uintersect_uassoc_variation5.php on line %d +Warning: array_uintersect_uassoc(): Expected parameter 3 to be an array, null given in %sarray_uintersect_uassoc_variation5.php on line %d NULL --unset var-- -Warning: array_uintersect_uassoc(): Argument #3 is not an array in %sarray_uintersect_uassoc_variation5.php on line %d +Warning: array_uintersect_uassoc(): Expected parameter 3 to be an array, null given in %sarray_uintersect_uassoc_variation5.php on line %d NULL ===DONE=== diff --git a/ext/standard/tests/array/array_uintersect_uassoc_variation6.phpt b/ext/standard/tests/array/array_uintersect_uassoc_variation6.phpt index c548b8bc9e..6abeac09b7 100644 --- a/ext/standard/tests/array/array_uintersect_uassoc_variation6.phpt +++ b/ext/standard/tests/array/array_uintersect_uassoc_variation6.phpt @@ -37,7 +37,7 @@ var_dump(array_uintersect_uassoc($arr1, $arr2, 'too_few_parameters', 'too_few_pa ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_uintersect_uassoc() : usage variation - incorrect callbacks *** -- comparison function with an incorrect return value -- diff --git a/ext/standard/tests/array/array_uintersect_variation1.phpt b/ext/standard/tests/array/array_uintersect_variation1.phpt index e9879a115b..c88177018b 100644 --- a/ext/standard/tests/array/array_uintersect_variation1.phpt +++ b/ext/standard/tests/array/array_uintersect_variation1.phpt @@ -102,126 +102,126 @@ foreach($inputs as $key =>$value) { --int 0-- -Warning: array_uintersect(): Argument #1 is not an array in %sarray_uintersect_variation1.php on line %d +Warning: array_uintersect(): Expected parameter 1 to be an array, int given in %sarray_uintersect_variation1.php on line %d NULL --int 1-- -Warning: array_uintersect(): Argument #1 is not an array in %sarray_uintersect_variation1.php on line %d +Warning: array_uintersect(): Expected parameter 1 to be an array, int given in %sarray_uintersect_variation1.php on line %d NULL --int 12345-- -Warning: array_uintersect(): Argument #1 is not an array in %sarray_uintersect_variation1.php on line %d +Warning: array_uintersect(): Expected parameter 1 to be an array, int given in %sarray_uintersect_variation1.php on line %d NULL --int -12345-- -Warning: array_uintersect(): Argument #1 is not an array in %sarray_uintersect_variation1.php on line %d +Warning: array_uintersect(): Expected parameter 1 to be an array, int given in %sarray_uintersect_variation1.php on line %d NULL --float 10.5-- -Warning: array_uintersect(): Argument #1 is not an array in %sarray_uintersect_variation1.php on line %d +Warning: array_uintersect(): Expected parameter 1 to be an array, float given in %sarray_uintersect_variation1.php on line %d NULL --float -10.5-- -Warning: array_uintersect(): Argument #1 is not an array in %sarray_uintersect_variation1.php on line %d +Warning: array_uintersect(): Expected parameter 1 to be an array, float given in %sarray_uintersect_variation1.php on line %d NULL --float 12.3456789000e10-- -Warning: array_uintersect(): Argument #1 is not an array in %sarray_uintersect_variation1.php on line %d +Warning: array_uintersect(): Expected parameter 1 to be an array, float given in %sarray_uintersect_variation1.php on line %d NULL --float -12.3456789000e10-- -Warning: array_uintersect(): Argument #1 is not an array in %sarray_uintersect_variation1.php on line %d +Warning: array_uintersect(): Expected parameter 1 to be an array, float given in %sarray_uintersect_variation1.php on line %d NULL --float .5-- -Warning: array_uintersect(): Argument #1 is not an array in %sarray_uintersect_variation1.php on line %d +Warning: array_uintersect(): Expected parameter 1 to be an array, float given in %sarray_uintersect_variation1.php on line %d NULL --uppercase NULL-- -Warning: array_uintersect(): Argument #1 is not an array in %sarray_uintersect_variation1.php on line %d +Warning: array_uintersect(): Expected parameter 1 to be an array, null given in %sarray_uintersect_variation1.php on line %d NULL --lowercase null-- -Warning: array_uintersect(): Argument #1 is not an array in %sarray_uintersect_variation1.php on line %d +Warning: array_uintersect(): Expected parameter 1 to be an array, null given in %sarray_uintersect_variation1.php on line %d NULL --lowercase true-- -Warning: array_uintersect(): Argument #1 is not an array in %sarray_uintersect_variation1.php on line %d +Warning: array_uintersect(): Expected parameter 1 to be an array, bool given in %sarray_uintersect_variation1.php on line %d NULL --lowercase false-- -Warning: array_uintersect(): Argument #1 is not an array in %sarray_uintersect_variation1.php on line %d +Warning: array_uintersect(): Expected parameter 1 to be an array, bool given in %sarray_uintersect_variation1.php on line %d NULL --uppercase TRUE-- -Warning: array_uintersect(): Argument #1 is not an array in %sarray_uintersect_variation1.php on line %d +Warning: array_uintersect(): Expected parameter 1 to be an array, bool given in %sarray_uintersect_variation1.php on line %d NULL --uppercase FALSE-- -Warning: array_uintersect(): Argument #1 is not an array in %sarray_uintersect_variation1.php on line %d +Warning: array_uintersect(): Expected parameter 1 to be an array, bool given in %sarray_uintersect_variation1.php on line %d NULL --empty string DQ-- -Warning: array_uintersect(): Argument #1 is not an array in %sarray_uintersect_variation1.php on line %d +Warning: array_uintersect(): Expected parameter 1 to be an array, string given in %sarray_uintersect_variation1.php on line %d NULL --empty string SQ-- -Warning: array_uintersect(): Argument #1 is not an array in %sarray_uintersect_variation1.php on line %d +Warning: array_uintersect(): Expected parameter 1 to be an array, string given in %sarray_uintersect_variation1.php on line %d NULL --string DQ-- -Warning: array_uintersect(): Argument #1 is not an array in %sarray_uintersect_variation1.php on line %d +Warning: array_uintersect(): Expected parameter 1 to be an array, string given in %sarray_uintersect_variation1.php on line %d NULL --string SQ-- -Warning: array_uintersect(): Argument #1 is not an array in %sarray_uintersect_variation1.php on line %d +Warning: array_uintersect(): Expected parameter 1 to be an array, string given in %sarray_uintersect_variation1.php on line %d NULL --mixed case string-- -Warning: array_uintersect(): Argument #1 is not an array in %sarray_uintersect_variation1.php on line %d +Warning: array_uintersect(): Expected parameter 1 to be an array, string given in %sarray_uintersect_variation1.php on line %d NULL --heredoc-- -Warning: array_uintersect(): Argument #1 is not an array in %sarray_uintersect_variation1.php on line %d +Warning: array_uintersect(): Expected parameter 1 to be an array, string given in %sarray_uintersect_variation1.php on line %d NULL --instance of classWithToString-- -Warning: array_uintersect(): Argument #1 is not an array in %sarray_uintersect_variation1.php on line %d +Warning: array_uintersect(): Expected parameter 1 to be an array, object given in %sarray_uintersect_variation1.php on line %d NULL --instance of classWithoutToString-- -Warning: array_uintersect(): Argument #1 is not an array in %sarray_uintersect_variation1.php on line %d +Warning: array_uintersect(): Expected parameter 1 to be an array, object given in %sarray_uintersect_variation1.php on line %d NULL --undefined var-- -Warning: array_uintersect(): Argument #1 is not an array in %sarray_uintersect_variation1.php on line %d +Warning: array_uintersect(): Expected parameter 1 to be an array, null given in %sarray_uintersect_variation1.php on line %d NULL --unset var-- -Warning: array_uintersect(): Argument #1 is not an array in %sarray_uintersect_variation1.php on line %d +Warning: array_uintersect(): Expected parameter 1 to be an array, null given in %sarray_uintersect_variation1.php on line %d NULL ===DONE=== diff --git a/ext/standard/tests/array/array_uintersect_variation2.phpt b/ext/standard/tests/array/array_uintersect_variation2.phpt index 36f315a4c0..ee52e21c72 100644 --- a/ext/standard/tests/array/array_uintersect_variation2.phpt +++ b/ext/standard/tests/array/array_uintersect_variation2.phpt @@ -102,126 +102,126 @@ foreach($inputs as $key =>$value) { --int 0-- -Warning: array_uintersect(): Argument #2 is not an array in %sarray_uintersect_variation2.php on line %d +Warning: array_uintersect(): Expected parameter 2 to be an array, int given in %sarray_uintersect_variation2.php on line %d NULL --int 1-- -Warning: array_uintersect(): Argument #2 is not an array in %sarray_uintersect_variation2.php on line %d +Warning: array_uintersect(): Expected parameter 2 to be an array, int given in %sarray_uintersect_variation2.php on line %d NULL --int 12345-- -Warning: array_uintersect(): Argument #2 is not an array in %sarray_uintersect_variation2.php on line %d +Warning: array_uintersect(): Expected parameter 2 to be an array, int given in %sarray_uintersect_variation2.php on line %d NULL --int -12345-- -Warning: array_uintersect(): Argument #2 is not an array in %sarray_uintersect_variation2.php on line %d +Warning: array_uintersect(): Expected parameter 2 to be an array, int given in %sarray_uintersect_variation2.php on line %d NULL --float 10.5-- -Warning: array_uintersect(): Argument #2 is not an array in %sarray_uintersect_variation2.php on line %d +Warning: array_uintersect(): Expected parameter 2 to be an array, float given in %sarray_uintersect_variation2.php on line %d NULL --float -10.5-- -Warning: array_uintersect(): Argument #2 is not an array in %sarray_uintersect_variation2.php on line %d +Warning: array_uintersect(): Expected parameter 2 to be an array, float given in %sarray_uintersect_variation2.php on line %d NULL --float 12.3456789000e10-- -Warning: array_uintersect(): Argument #2 is not an array in %sarray_uintersect_variation2.php on line %d +Warning: array_uintersect(): Expected parameter 2 to be an array, float given in %sarray_uintersect_variation2.php on line %d NULL --float -12.3456789000e10-- -Warning: array_uintersect(): Argument #2 is not an array in %sarray_uintersect_variation2.php on line %d +Warning: array_uintersect(): Expected parameter 2 to be an array, float given in %sarray_uintersect_variation2.php on line %d NULL --float .5-- -Warning: array_uintersect(): Argument #2 is not an array in %sarray_uintersect_variation2.php on line %d +Warning: array_uintersect(): Expected parameter 2 to be an array, float given in %sarray_uintersect_variation2.php on line %d NULL --uppercase NULL-- -Warning: array_uintersect(): Argument #2 is not an array in %sarray_uintersect_variation2.php on line %d +Warning: array_uintersect(): Expected parameter 2 to be an array, null given in %sarray_uintersect_variation2.php on line %d NULL --lowercase null-- -Warning: array_uintersect(): Argument #2 is not an array in %sarray_uintersect_variation2.php on line %d +Warning: array_uintersect(): Expected parameter 2 to be an array, null given in %sarray_uintersect_variation2.php on line %d NULL --lowercase true-- -Warning: array_uintersect(): Argument #2 is not an array in %sarray_uintersect_variation2.php on line %d +Warning: array_uintersect(): Expected parameter 2 to be an array, bool given in %sarray_uintersect_variation2.php on line %d NULL --lowercase false-- -Warning: array_uintersect(): Argument #2 is not an array in %sarray_uintersect_variation2.php on line %d +Warning: array_uintersect(): Expected parameter 2 to be an array, bool given in %sarray_uintersect_variation2.php on line %d NULL --uppercase TRUE-- -Warning: array_uintersect(): Argument #2 is not an array in %sarray_uintersect_variation2.php on line %d +Warning: array_uintersect(): Expected parameter 2 to be an array, bool given in %sarray_uintersect_variation2.php on line %d NULL --uppercase FALSE-- -Warning: array_uintersect(): Argument #2 is not an array in %sarray_uintersect_variation2.php on line %d +Warning: array_uintersect(): Expected parameter 2 to be an array, bool given in %sarray_uintersect_variation2.php on line %d NULL --empty string DQ-- -Warning: array_uintersect(): Argument #2 is not an array in %sarray_uintersect_variation2.php on line %d +Warning: array_uintersect(): Expected parameter 2 to be an array, string given in %sarray_uintersect_variation2.php on line %d NULL --empty string SQ-- -Warning: array_uintersect(): Argument #2 is not an array in %sarray_uintersect_variation2.php on line %d +Warning: array_uintersect(): Expected parameter 2 to be an array, string given in %sarray_uintersect_variation2.php on line %d NULL --string DQ-- -Warning: array_uintersect(): Argument #2 is not an array in %sarray_uintersect_variation2.php on line %d +Warning: array_uintersect(): Expected parameter 2 to be an array, string given in %sarray_uintersect_variation2.php on line %d NULL --string SQ-- -Warning: array_uintersect(): Argument #2 is not an array in %sarray_uintersect_variation2.php on line %d +Warning: array_uintersect(): Expected parameter 2 to be an array, string given in %sarray_uintersect_variation2.php on line %d NULL --mixed case string-- -Warning: array_uintersect(): Argument #2 is not an array in %sarray_uintersect_variation2.php on line %d +Warning: array_uintersect(): Expected parameter 2 to be an array, string given in %sarray_uintersect_variation2.php on line %d NULL --heredoc-- -Warning: array_uintersect(): Argument #2 is not an array in %sarray_uintersect_variation2.php on line %d +Warning: array_uintersect(): Expected parameter 2 to be an array, string given in %sarray_uintersect_variation2.php on line %d NULL --instance of classWithToString-- -Warning: array_uintersect(): Argument #2 is not an array in %sarray_uintersect_variation2.php on line %d +Warning: array_uintersect(): Expected parameter 2 to be an array, object given in %sarray_uintersect_variation2.php on line %d NULL --instance of classWithoutToString-- -Warning: array_uintersect(): Argument #2 is not an array in %sarray_uintersect_variation2.php on line %d +Warning: array_uintersect(): Expected parameter 2 to be an array, object given in %sarray_uintersect_variation2.php on line %d NULL --undefined var-- -Warning: array_uintersect(): Argument #2 is not an array in %sarray_uintersect_variation2.php on line %d +Warning: array_uintersect(): Expected parameter 2 to be an array, null given in %sarray_uintersect_variation2.php on line %d NULL --unset var-- -Warning: array_uintersect(): Argument #2 is not an array in %sarray_uintersect_variation2.php on line %d +Warning: array_uintersect(): Expected parameter 2 to be an array, null given in %sarray_uintersect_variation2.php on line %d NULL ===DONE=== diff --git a/ext/standard/tests/array/array_uintersect_variation4.phpt b/ext/standard/tests/array/array_uintersect_variation4.phpt index efff02389d..abc33e591b 100644 --- a/ext/standard/tests/array/array_uintersect_variation4.phpt +++ b/ext/standard/tests/array/array_uintersect_variation4.phpt @@ -103,126 +103,126 @@ foreach($inputs as $key =>$value) { --int 0-- -Warning: array_uintersect(): Argument #3 is not an array in %sarray_uintersect_variation4.php on line %d +Warning: array_uintersect(): Expected parameter 3 to be an array, int given in %sarray_uintersect_variation4.php on line %d NULL --int 1-- -Warning: array_uintersect(): Argument #3 is not an array in %sarray_uintersect_variation4.php on line %d +Warning: array_uintersect(): Expected parameter 3 to be an array, int given in %sarray_uintersect_variation4.php on line %d NULL --int 12345-- -Warning: array_uintersect(): Argument #3 is not an array in %sarray_uintersect_variation4.php on line %d +Warning: array_uintersect(): Expected parameter 3 to be an array, int given in %sarray_uintersect_variation4.php on line %d NULL --int -12345-- -Warning: array_uintersect(): Argument #3 is not an array in %sarray_uintersect_variation4.php on line %d +Warning: array_uintersect(): Expected parameter 3 to be an array, int given in %sarray_uintersect_variation4.php on line %d NULL --float 10.5-- -Warning: array_uintersect(): Argument #3 is not an array in %sarray_uintersect_variation4.php on line %d +Warning: array_uintersect(): Expected parameter 3 to be an array, float given in %sarray_uintersect_variation4.php on line %d NULL --float -10.5-- -Warning: array_uintersect(): Argument #3 is not an array in %sarray_uintersect_variation4.php on line %d +Warning: array_uintersect(): Expected parameter 3 to be an array, float given in %sarray_uintersect_variation4.php on line %d NULL --float 12.3456789000e10-- -Warning: array_uintersect(): Argument #3 is not an array in %sarray_uintersect_variation4.php on line %d +Warning: array_uintersect(): Expected parameter 3 to be an array, float given in %sarray_uintersect_variation4.php on line %d NULL --float -12.3456789000e10-- -Warning: array_uintersect(): Argument #3 is not an array in %sarray_uintersect_variation4.php on line %d +Warning: array_uintersect(): Expected parameter 3 to be an array, float given in %sarray_uintersect_variation4.php on line %d NULL --float .5-- -Warning: array_uintersect(): Argument #3 is not an array in %sarray_uintersect_variation4.php on line %d +Warning: array_uintersect(): Expected parameter 3 to be an array, float given in %sarray_uintersect_variation4.php on line %d NULL --uppercase NULL-- -Warning: array_uintersect(): Argument #3 is not an array in %sarray_uintersect_variation4.php on line %d +Warning: array_uintersect(): Expected parameter 3 to be an array, null given in %sarray_uintersect_variation4.php on line %d NULL --lowercase null-- -Warning: array_uintersect(): Argument #3 is not an array in %sarray_uintersect_variation4.php on line %d +Warning: array_uintersect(): Expected parameter 3 to be an array, null given in %sarray_uintersect_variation4.php on line %d NULL --lowercase true-- -Warning: array_uintersect(): Argument #3 is not an array in %sarray_uintersect_variation4.php on line %d +Warning: array_uintersect(): Expected parameter 3 to be an array, bool given in %sarray_uintersect_variation4.php on line %d NULL --lowercase false-- -Warning: array_uintersect(): Argument #3 is not an array in %sarray_uintersect_variation4.php on line %d +Warning: array_uintersect(): Expected parameter 3 to be an array, bool given in %sarray_uintersect_variation4.php on line %d NULL --uppercase TRUE-- -Warning: array_uintersect(): Argument #3 is not an array in %sarray_uintersect_variation4.php on line %d +Warning: array_uintersect(): Expected parameter 3 to be an array, bool given in %sarray_uintersect_variation4.php on line %d NULL --uppercase FALSE-- -Warning: array_uintersect(): Argument #3 is not an array in %sarray_uintersect_variation4.php on line %d +Warning: array_uintersect(): Expected parameter 3 to be an array, bool given in %sarray_uintersect_variation4.php on line %d NULL --empty string DQ-- -Warning: array_uintersect(): Argument #3 is not an array in %sarray_uintersect_variation4.php on line %d +Warning: array_uintersect(): Expected parameter 3 to be an array, string given in %sarray_uintersect_variation4.php on line %d NULL --empty string SQ-- -Warning: array_uintersect(): Argument #3 is not an array in %sarray_uintersect_variation4.php on line %d +Warning: array_uintersect(): Expected parameter 3 to be an array, string given in %sarray_uintersect_variation4.php on line %d NULL --string DQ-- -Warning: array_uintersect(): Argument #3 is not an array in %sarray_uintersect_variation4.php on line %d +Warning: array_uintersect(): Expected parameter 3 to be an array, string given in %sarray_uintersect_variation4.php on line %d NULL --string SQ-- -Warning: array_uintersect(): Argument #3 is not an array in %sarray_uintersect_variation4.php on line %d +Warning: array_uintersect(): Expected parameter 3 to be an array, string given in %sarray_uintersect_variation4.php on line %d NULL --mixed case string-- -Warning: array_uintersect(): Argument #3 is not an array in %sarray_uintersect_variation4.php on line %d +Warning: array_uintersect(): Expected parameter 3 to be an array, string given in %sarray_uintersect_variation4.php on line %d NULL --heredoc-- -Warning: array_uintersect(): Argument #3 is not an array in %sarray_uintersect_variation4.php on line %d +Warning: array_uintersect(): Expected parameter 3 to be an array, string given in %sarray_uintersect_variation4.php on line %d NULL --instance of classWithToString-- -Warning: array_uintersect(): Argument #3 is not an array in %sarray_uintersect_variation4.php on line %d +Warning: array_uintersect(): Expected parameter 3 to be an array, object given in %sarray_uintersect_variation4.php on line %d NULL --instance of classWithoutToString-- -Warning: array_uintersect(): Argument #3 is not an array in %sarray_uintersect_variation4.php on line %d +Warning: array_uintersect(): Expected parameter 3 to be an array, object given in %sarray_uintersect_variation4.php on line %d NULL --undefined var-- -Warning: array_uintersect(): Argument #3 is not an array in %sarray_uintersect_variation4.php on line %d +Warning: array_uintersect(): Expected parameter 3 to be an array, null given in %sarray_uintersect_variation4.php on line %d NULL --unset var-- -Warning: array_uintersect(): Argument #3 is not an array in %sarray_uintersect_variation4.php on line %d +Warning: array_uintersect(): Expected parameter 3 to be an array, null given in %sarray_uintersect_variation4.php on line %d NULL ===DONE=== diff --git a/ext/standard/tests/array/array_uintersect_variation5.phpt b/ext/standard/tests/array/array_uintersect_variation5.phpt index 83263594da..699188290b 100644 --- a/ext/standard/tests/array/array_uintersect_variation5.phpt +++ b/ext/standard/tests/array/array_uintersect_variation5.phpt @@ -38,7 +38,7 @@ var_dump(array_uintersect($arr1, $arr2, 'too_few_parameters')); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing array_uintersect() : usage variation - differing comparison functions*** -- comparison function with an incorrect return value -- diff --git a/ext/standard/tests/array/array_unique_basic.phpt b/ext/standard/tests/array/array_unique_basic.phpt index 41e3f37187..e24e393f8d 100644 --- a/ext/standard/tests/array/array_unique_basic.phpt +++ b/ext/standard/tests/array/array_unique_basic.phpt @@ -23,7 +23,7 @@ var_dump( array_unique($input) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_unique() : basic functionality *** array(2) { [0]=> diff --git a/ext/standard/tests/array/array_unique_variation1.phpt b/ext/standard/tests/array/array_unique_variation1.phpt index 9fe882b4b2..cc9a695c86 100644 --- a/ext/standard/tests/array/array_unique_variation1.phpt +++ b/ext/standard/tests/array/array_unique_variation1.phpt @@ -98,19 +98,19 @@ echo "Done"; *** Testing array_unique() : Passing non array values to $input argument *** -- Iteration 1 -- -Warning: array_unique() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_unique() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 2 -- -Warning: array_unique() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_unique() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 3 -- -Warning: array_unique() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_unique() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 4 -- -Warning: array_unique() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_unique() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 5 -- @@ -142,19 +142,19 @@ Warning: array_unique() expects parameter 1 to be array, null given in %s on lin NULL -- Iteration 12 -- -Warning: array_unique() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_unique() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 13 -- -Warning: array_unique() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_unique() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 14 -- -Warning: array_unique() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_unique() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 15 -- -Warning: array_unique() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_unique() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 16 -- diff --git a/ext/standard/tests/array/array_unique_variation2.phpt b/ext/standard/tests/array/array_unique_variation2.phpt index 7a960d4c66..bbeb9e4fa8 100644 --- a/ext/standard/tests/array/array_unique_variation2.phpt +++ b/ext/standard/tests/array/array_unique_variation2.phpt @@ -80,7 +80,7 @@ foreach($inputs as $input) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_unique() : Passing different arrays to $input argument *** -- Iteration 1 -- array(2) { diff --git a/ext/standard/tests/array/array_unique_variation5.phpt b/ext/standard/tests/array/array_unique_variation5.phpt index bb69f2e9c7..bcf6d8a6de 100644 --- a/ext/standard/tests/array/array_unique_variation5.phpt +++ b/ext/standard/tests/array/array_unique_variation5.phpt @@ -20,7 +20,7 @@ var_dump( array_unique($input) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_unique() : array with duplicate keys for $input argument *** array(3) { [1]=> diff --git a/ext/standard/tests/array/array_unique_variation6.phpt b/ext/standard/tests/array/array_unique_variation6.phpt index 5ec452758a..334a0d0468 100644 --- a/ext/standard/tests/array/array_unique_variation6.phpt +++ b/ext/standard/tests/array/array_unique_variation6.phpt @@ -33,7 +33,7 @@ var_dump( array_unique($input, SORT_STRING) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_unique() : array with reference variables for $input argument *** array(2) { [0]=> diff --git a/ext/standard/tests/array/array_unique_variation7.phpt b/ext/standard/tests/array/array_unique_variation7.phpt index b0cb2825e1..98712fba3f 100644 --- a/ext/standard/tests/array/array_unique_variation7.phpt +++ b/ext/standard/tests/array/array_unique_variation7.phpt @@ -20,7 +20,7 @@ var_dump( array_unique($input) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_unique() : array with binary data for $input argument *** array(3) { [0]=> diff --git a/ext/standard/tests/array/array_unique_variation9.phpt b/ext/standard/tests/array/array_unique_variation9.phpt index bbbbf0ec8a..aa0830100d 100644 --- a/ext/standard/tests/array/array_unique_variation9.phpt +++ b/ext/standard/tests/array/array_unique_variation9.phpt @@ -79,7 +79,7 @@ $a = array ( print_r(array_unique($a)); ?> ---EXPECTF-- +--EXPECT-- Array ( [0] => acls_channel diff --git a/ext/standard/tests/array/array_unshift_basic1.phpt b/ext/standard/tests/array/array_unshift_basic1.phpt index 7a0b7ba3b2..9c3c1b6226 100644 --- a/ext/standard/tests/array/array_unshift_basic1.phpt +++ b/ext/standard/tests/array/array_unshift_basic1.phpt @@ -36,7 +36,7 @@ var_dump($temp_array); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_unshift() : basic functionality with default key array *** int(3) array(3) { diff --git a/ext/standard/tests/array/array_unshift_basic2.phpt b/ext/standard/tests/array/array_unshift_basic2.phpt index 7ed114fcbd..6c4af71b29 100644 --- a/ext/standard/tests/array/array_unshift_basic2.phpt +++ b/ext/standard/tests/array/array_unshift_basic2.phpt @@ -36,7 +36,7 @@ var_dump($temp_array); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_unshift() : basic functionality with associative array *** int(5) array(5) { diff --git a/ext/standard/tests/array/array_unshift_empty.phpt b/ext/standard/tests/array/array_unshift_empty.phpt new file mode 100644 index 0000000000..546a24a98a --- /dev/null +++ b/ext/standard/tests/array/array_unshift_empty.phpt @@ -0,0 +1,30 @@ +--TEST-- +Test array_unshift() function : prepend array with empty set +--FILE-- +<?php +/* Prototype : int array_unshift(array $array[, mixed ...]) + * Description: Pushes elements onto the beginning of the array + * Source code: ext/standard/array.c +*/ + +$array = [1,2,3]; +$values = []; + +var_dump( array_unshift($array) ); +var_dump( array_unshift($array, ...$values) ); +var_dump( $array ); + +echo "Done"; +?> +--EXPECTF-- +int(3) +int(3) +array(3) { + [0]=> + int(1) + [1]=> + int(2) + [2]=> + int(3) +} +Done diff --git a/ext/standard/tests/array/array_unshift_error.phpt b/ext/standard/tests/array/array_unshift_error.phpt index 18646f376e..d37abb22e0 100644 --- a/ext/standard/tests/array/array_unshift_error.phpt +++ b/ext/standard/tests/array/array_unshift_error.phpt @@ -2,7 +2,7 @@ Test array_unshift() function : error conditions --FILE-- <?php -/* Prototype : int array_unshift(array $array, mixed $var [, mixed ...]) +/* Prototype : int array_unshift(array $array[, mixed ...]) * Description: Pushes elements onto the beginning of the array * Source code: ext/standard/array.c */ @@ -12,11 +12,6 @@ echo "*** Testing array_unshift() : error conditions ***\n"; // Zero arguments echo "\n-- Testing array_unshift() function with Zero arguments --\n"; var_dump( array_unshift() ); - -// Testing array_unshift with one less than the expected number of arguments -echo "\n-- Testing array_unshift() function with less than expected no. of arguments --\n"; -$array = array(1, 2); -var_dump( array_unshift($array) ); echo "Done"; ?> --EXPECTF-- @@ -24,11 +19,6 @@ echo "Done"; -- Testing array_unshift() function with Zero arguments -- -Warning: array_unshift() expects at least 2 parameters, 0 given in %s on line %d -NULL - --- Testing array_unshift() function with less than expected no. of arguments -- - -Warning: array_unshift() expects at least 2 parameters, 1 given in %s on line %d +Warning: array_unshift() expects at least 1 parameter, 0 given in %s on line %d NULL Done diff --git a/ext/standard/tests/array/array_unshift_variation1.phpt b/ext/standard/tests/array/array_unshift_variation1.phpt index cb4ac0bd7b..f80fc0ebc6 100644 --- a/ext/standard/tests/array/array_unshift_variation1.phpt +++ b/ext/standard/tests/array/array_unshift_variation1.phpt @@ -119,38 +119,38 @@ echo "Done"; *** Testing array_unshift() : unexpected values for $array argument *** -- Iteration 1 -- -Warning: array_unshift() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_unshift() expects parameter 1 to be array, int given in %s on line %d NULL int(0) -Warning: array_unshift() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_unshift() expects parameter 1 to be array, int given in %s on line %d NULL int(0) -- Iteration 2 -- -Warning: array_unshift() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_unshift() expects parameter 1 to be array, int given in %s on line %d NULL int(1) -Warning: array_unshift() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_unshift() expects parameter 1 to be array, int given in %s on line %d NULL int(1) -- Iteration 3 -- -Warning: array_unshift() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_unshift() expects parameter 1 to be array, int given in %s on line %d NULL int(12345) -Warning: array_unshift() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_unshift() expects parameter 1 to be array, int given in %s on line %d NULL int(12345) -- Iteration 4 -- -Warning: array_unshift() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_unshift() expects parameter 1 to be array, int given in %s on line %d NULL int(-2345) -Warning: array_unshift() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_unshift() expects parameter 1 to be array, int given in %s on line %d NULL int(-2345) @@ -218,38 +218,38 @@ NULL NULL -- Iteration 12 -- -Warning: array_unshift() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_unshift() expects parameter 1 to be array, bool given in %s on line %d NULL bool(true) -Warning: array_unshift() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_unshift() expects parameter 1 to be array, bool given in %s on line %d NULL bool(true) -- Iteration 13 -- -Warning: array_unshift() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_unshift() expects parameter 1 to be array, bool given in %s on line %d NULL bool(false) -Warning: array_unshift() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_unshift() expects parameter 1 to be array, bool given in %s on line %d NULL bool(false) -- Iteration 14 -- -Warning: array_unshift() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_unshift() expects parameter 1 to be array, bool given in %s on line %d NULL bool(true) -Warning: array_unshift() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_unshift() expects parameter 1 to be array, bool given in %s on line %d NULL bool(true) -- Iteration 15 -- -Warning: array_unshift() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_unshift() expects parameter 1 to be array, bool given in %s on line %d NULL bool(false) -Warning: array_unshift() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_unshift() expects parameter 1 to be array, bool given in %s on line %d NULL bool(false) diff --git a/ext/standard/tests/array/array_unshift_variation3.phpt b/ext/standard/tests/array/array_unshift_variation3.phpt index fa4f6b5853..3c0e0a3400 100644 --- a/ext/standard/tests/array/array_unshift_variation3.phpt +++ b/ext/standard/tests/array/array_unshift_variation3.phpt @@ -72,7 +72,7 @@ foreach($arrays as $array) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_unshift() : different arrays for $array argument *** -- Iteration 1 -- int(3) diff --git a/ext/standard/tests/array/array_unshift_variation6.phpt b/ext/standard/tests/array/array_unshift_variation6.phpt index 62a83929a2..a3e2cad516 100644 --- a/ext/standard/tests/array/array_unshift_variation6.phpt +++ b/ext/standard/tests/array/array_unshift_variation6.phpt @@ -73,7 +73,7 @@ var_dump($temp_array); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_unshift() : two dimensional arrays for $array argument *** int(4) array(4) { diff --git a/ext/standard/tests/array/array_unshift_variation7.phpt b/ext/standard/tests/array/array_unshift_variation7.phpt index 099aa390d7..95b58132d5 100644 --- a/ext/standard/tests/array/array_unshift_variation7.phpt +++ b/ext/standard/tests/array/array_unshift_variation7.phpt @@ -54,7 +54,7 @@ foreach($vars as $var) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_unshift() : double quoted strings for $var argument *** -- Iteration 1 -- int(5) diff --git a/ext/standard/tests/array/array_unshift_variation8.phpt b/ext/standard/tests/array/array_unshift_variation8.phpt index baa1be38a1..66955b906d 100644 --- a/ext/standard/tests/array/array_unshift_variation8.phpt +++ b/ext/standard/tests/array/array_unshift_variation8.phpt @@ -54,7 +54,7 @@ foreach($vars as $var) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_unshift() : single quoted strings for $var argument *** -- Iteration 1 -- int(5) diff --git a/ext/standard/tests/array/array_unshift_variation9.phpt b/ext/standard/tests/array/array_unshift_variation9.phpt index 96c5790ff0..2141e57e2e 100644 --- a/ext/standard/tests/array/array_unshift_variation9.phpt +++ b/ext/standard/tests/array/array_unshift_variation9.phpt @@ -94,7 +94,7 @@ foreach($vars as $var) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_unshift() : heredoc strings for $var argument *** -- Iteration 1 -- int(5) diff --git a/ext/standard/tests/array/array_user_key_compare.phpt b/ext/standard/tests/array/array_user_key_compare.phpt index 933e6d679a..69bc37f48a 100644 --- a/ext/standard/tests/array/array_user_key_compare.phpt +++ b/ext/standard/tests/array/array_user_key_compare.phpt @@ -15,5 +15,5 @@ uksort($arr, "array_compare"); var_dump($a); ?> ---EXPECTF-- +--EXPECT-- string(1) "B" diff --git a/ext/standard/tests/array/array_values.phpt b/ext/standard/tests/array/array_values.phpt Binary files differindex c14b0ecae2..b490684333 100644 --- a/ext/standard/tests/array/array_values.phpt +++ b/ext/standard/tests/array/array_values.phpt diff --git a/ext/standard/tests/array/array_values_basic.phpt b/ext/standard/tests/array/array_values_basic.phpt index 7d700a2fab..f1c8007be4 100644 --- a/ext/standard/tests/array/array_values_basic.phpt +++ b/ext/standard/tests/array/array_values_basic.phpt @@ -22,7 +22,7 @@ var_dump( array_values($input) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_values() : basic functionality *** array(5) { [0]=> diff --git a/ext/standard/tests/array/array_values_errors.phpt b/ext/standard/tests/array/array_values_errors.phpt index 5f88f9aa8d..4f723c2b3b 100644 --- a/ext/standard/tests/array/array_values_errors.phpt +++ b/ext/standard/tests/array/array_values_errors.phpt @@ -28,7 +28,7 @@ NULL Warning: array_values() expects parameter 1 to be array, string given in %s on line %d NULL -Warning: array_values() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_values() expects parameter 1 to be array, int given in %s on line %d NULL Warning: array_values() expects parameter 1 to be array, object given in %s on line %d diff --git a/ext/standard/tests/array/array_values_variation1.phpt b/ext/standard/tests/array/array_values_variation1.phpt index 90a7d2b49b..0ee93e2a12 100644 --- a/ext/standard/tests/array/array_values_variation1.phpt +++ b/ext/standard/tests/array/array_values_variation1.phpt @@ -99,22 +99,22 @@ echo "Done"; -- Iteration 1 -- -Warning: array_values() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_values() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 2 -- -Warning: array_values() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_values() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 3 -- -Warning: array_values() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_values() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 4 -- -Warning: array_values() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_values() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 5 -- @@ -154,22 +154,22 @@ NULL -- Iteration 12 -- -Warning: array_values() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_values() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 13 -- -Warning: array_values() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_values() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 14 -- -Warning: array_values() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_values() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 15 -- -Warning: array_values() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_values() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 16 -- diff --git a/ext/standard/tests/array/array_values_variation3.phpt b/ext/standard/tests/array/array_values_variation3.phpt index 0106f0f9b3..7b409c3cde 100644 --- a/ext/standard/tests/array/array_values_variation3.phpt +++ b/ext/standard/tests/array/array_values_variation3.phpt @@ -102,7 +102,7 @@ foreach($inputs as $key => $input) { }; echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_values() : usage variations *** -- Iteration 1: int data -- diff --git a/ext/standard/tests/array/array_values_variation4.phpt b/ext/standard/tests/array/array_values_variation4.phpt index f51f2b6977..4fe8c9a9cc 100644 --- a/ext/standard/tests/array/array_values_variation4.phpt +++ b/ext/standard/tests/array/array_values_variation4.phpt @@ -31,7 +31,7 @@ var_dump(array_values($input)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_values() : usage variations *** -- Array values of a two-dimensional array -- diff --git a/ext/standard/tests/array/array_values_variation5.phpt b/ext/standard/tests/array/array_values_variation5.phpt index a6bf3b1d45..c7a2cb7e50 100644 --- a/ext/standard/tests/array/array_values_variation5.phpt +++ b/ext/standard/tests/array/array_values_variation5.phpt @@ -25,7 +25,7 @@ echo key($input) . " => " . current ($input) . "\n"; echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_values() : usage variations *** -- Call array_values() -- diff --git a/ext/standard/tests/array/array_values_variation6.phpt b/ext/standard/tests/array/array_values_variation6.phpt index fcfe14651f..941df4d875 100644 --- a/ext/standard/tests/array/array_values_variation6.phpt +++ b/ext/standard/tests/array/array_values_variation6.phpt @@ -29,7 +29,7 @@ var_dump($result1); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_values() : usage variations *** -- $input is an array made up of referenced variables: -- diff --git a/ext/standard/tests/array/array_values_variation7.phpt b/ext/standard/tests/array/array_values_variation7.phpt index b3be08a855..6ec1f4c92c 100644 --- a/ext/standard/tests/array/array_values_variation7.phpt +++ b/ext/standard/tests/array/array_values_variation7.phpt @@ -25,7 +25,7 @@ var_dump(array_values($input)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing array_values() : usage variations *** -- $input argument: -- diff --git a/ext/standard/tests/array/array_walk.phpt b/ext/standard/tests/array/array_walk.phpt index 5808f4b948..7cd8a8cf7a 100644 --- a/ext/standard/tests/array/array_walk.phpt +++ b/ext/standard/tests/array/array_walk.phpt @@ -34,7 +34,7 @@ echo "Done\n"; Warning: array_walk() expects at least 2 parameters, 0 given in %s on line %d NULL -Warning: array_walk() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_walk() expects parameter 1 to be array, int given in %s on line %d NULL Warning: array_walk() expects parameter 2 to be a valid callback, function '' not found or invalid function name in %s on line %d diff --git a/ext/standard/tests/array/array_walk_closure.phpt b/ext/standard/tests/array/array_walk_closure.phpt index 3799fde1cc..0a5d854582 100644 --- a/ext/standard/tests/array/array_walk_closure.phpt +++ b/ext/standard/tests/array/array_walk_closure.phpt @@ -97,7 +97,7 @@ echo "Done\n"; Warning: array_walk() expects at least 2 parameters, 0 given in %s on line %d NULL -Warning: array_walk() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_walk() expects parameter 1 to be array, bool given in %s on line %d NULL Warning: array_walk() expects parameter 1 to be array, null given in %s on line %d diff --git a/ext/standard/tests/array/array_walk_object2.phpt b/ext/standard/tests/array/array_walk_object2.phpt index 89442078b1..3994269378 100644 --- a/ext/standard/tests/array/array_walk_object2.phpt +++ b/ext/standard/tests/array/array_walk_object2.phpt @@ -77,7 +77,7 @@ var_dump( array_walk($input, "callback_protected")); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing array_walk() : array of objects *** -- For private member -- value : int(3) diff --git a/ext/standard/tests/array/array_walk_recursive.phpt b/ext/standard/tests/array/array_walk_recursive.phpt index c3b37c321c..c8523055e9 100644 --- a/ext/standard/tests/array/array_walk_recursive.phpt +++ b/ext/standard/tests/array/array_walk_recursive.phpt @@ -15,7 +15,7 @@ var_dump (array_walk_recursive ($arr, 'foo')); var_dump (array_walk_recursive ($arr, 'bar')); ?> ---EXPECTF-- +--EXPECT-- 1 foo 2 foo 3 foo diff --git a/ext/standard/tests/array/array_walk_recursive1.phpt b/ext/standard/tests/array/array_walk_recursive1.phpt index a030011f7c..962f133e4c 100644 --- a/ext/standard/tests/array/array_walk_recursive1.phpt +++ b/ext/standard/tests/array/array_walk_recursive1.phpt @@ -34,7 +34,7 @@ echo "Done\n"; Warning: array_walk_recursive() expects at least 2 parameters, 0 given in %s on line %d NULL -Warning: array_walk_recursive() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_walk_recursive() expects parameter 1 to be array, int given in %s on line %d NULL Warning: array_walk_recursive() expects parameter 2 to be a valid callback, function '' not found or invalid function name in %s on line %d diff --git a/ext/standard/tests/array/array_walk_recursive_object2.phpt b/ext/standard/tests/array/array_walk_recursive_object2.phpt index 89e8feb71c..b379e663fc 100644 --- a/ext/standard/tests/array/array_walk_recursive_object2.phpt +++ b/ext/standard/tests/array/array_walk_recursive_object2.phpt @@ -79,7 +79,7 @@ var_dump( array_walk_recursive($input, "callback_protected")); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing array_walk_recursive() : array of objects *** -- For private member -- value : int(3) diff --git a/ext/standard/tests/array/array_walk_recursive_variation1.phpt b/ext/standard/tests/array/array_walk_recursive_variation1.phpt index daea816456..56abaca83d 100644 --- a/ext/standard/tests/array/array_walk_recursive_variation1.phpt +++ b/ext/standard/tests/array/array_walk_recursive_variation1.phpt @@ -95,31 +95,31 @@ echo "Done" *** Testing array_walk_recursive() : unexpected values for 'input' argument *** -- Iteration 1 -- -Warning: array_walk_recursive() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_walk_recursive() expects parameter 1 to be array, int given in %s on line %d NULL -Warning: array_walk_recursive() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_walk_recursive() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 2 -- -Warning: array_walk_recursive() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_walk_recursive() expects parameter 1 to be array, int given in %s on line %d NULL -Warning: array_walk_recursive() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_walk_recursive() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 3 -- -Warning: array_walk_recursive() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_walk_recursive() expects parameter 1 to be array, int given in %s on line %d NULL -Warning: array_walk_recursive() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_walk_recursive() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 4 -- -Warning: array_walk_recursive() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_walk_recursive() expects parameter 1 to be array, int given in %s on line %d NULL -Warning: array_walk_recursive() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_walk_recursive() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 5 -- @@ -172,31 +172,31 @@ Warning: array_walk_recursive() expects parameter 1 to be array, null given in % NULL -- Iteration 12 -- -Warning: array_walk_recursive() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_walk_recursive() expects parameter 1 to be array, bool given in %s on line %d NULL -Warning: array_walk_recursive() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_walk_recursive() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 13 -- -Warning: array_walk_recursive() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_walk_recursive() expects parameter 1 to be array, bool given in %s on line %d NULL -Warning: array_walk_recursive() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_walk_recursive() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 14 -- -Warning: array_walk_recursive() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_walk_recursive() expects parameter 1 to be array, bool given in %s on line %d NULL -Warning: array_walk_recursive() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_walk_recursive() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 15 -- -Warning: array_walk_recursive() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_walk_recursive() expects parameter 1 to be array, bool given in %s on line %d NULL -Warning: array_walk_recursive() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_walk_recursive() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 16 -- diff --git a/ext/standard/tests/array/array_walk_recursive_variation3.phpt b/ext/standard/tests/array/array_walk_recursive_variation3.phpt index 2a056acb26..a6d623b011 100644 --- a/ext/standard/tests/array/array_walk_recursive_variation3.phpt +++ b/ext/standard/tests/array/array_walk_recursive_variation3.phpt @@ -61,7 +61,7 @@ for($count = 0; $count < count($input_values); $count++) { } echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing array_walk_recursive() : 'input' array with different values*** -- Iteration 1 -- diff --git a/ext/standard/tests/array/array_walk_recursive_variation4.phpt b/ext/standard/tests/array/array_walk_recursive_variation4.phpt index 009148633b..3540421f2c 100644 --- a/ext/standard/tests/array/array_walk_recursive_variation4.phpt +++ b/ext/standard/tests/array/array_walk_recursive_variation4.phpt @@ -40,7 +40,7 @@ var_dump( array_walk_recursive( $input, "callback")); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing array_walk_recursive() : array with subarray *** int(0) int(1) diff --git a/ext/standard/tests/array/array_walk_recursive_variation5.phpt b/ext/standard/tests/array/array_walk_recursive_variation5.phpt index 666ead212c..ce85fe7e4b 100644 --- a/ext/standard/tests/array/array_walk_recursive_variation5.phpt +++ b/ext/standard/tests/array/array_walk_recursive_variation5.phpt @@ -40,7 +40,7 @@ var_dump( array_walk_recursive($input, "callback")); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing array_walk_recursive() : array with references *** int(0) int(10) diff --git a/ext/standard/tests/array/array_walk_recursive_variation6.phpt b/ext/standard/tests/array/array_walk_recursive_variation6.phpt index 423102dc55..dea712e5b4 100644 --- a/ext/standard/tests/array/array_walk_recursive_variation6.phpt +++ b/ext/standard/tests/array/array_walk_recursive_variation6.phpt @@ -81,7 +81,7 @@ var_dump( array_walk_recursive($input, "for_mixed")); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing array_walk_recursive() : 'input' as an associative array *** -- Associative array with numeric keys -- int(1) diff --git a/ext/standard/tests/array/array_walk_recursive_variation9.phpt b/ext/standard/tests/array/array_walk_recursive_variation9.phpt index 73619ada19..f436ea206f 100644 --- a/ext/standard/tests/array/array_walk_recursive_variation9.phpt +++ b/ext/standard/tests/array/array_walk_recursive_variation9.phpt @@ -50,7 +50,7 @@ var_dump( array_walk_recursive($input, 'callback_two_parameter', 10)); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing array_walk_recursive() : callback function variation *** -- callback function with both parameters -- int(0) diff --git a/ext/standard/tests/array/array_walk_variation1.phpt b/ext/standard/tests/array/array_walk_variation1.phpt index f9d8782ed4..5fc3e62f2a 100644 --- a/ext/standard/tests/array/array_walk_variation1.phpt +++ b/ext/standard/tests/array/array_walk_variation1.phpt @@ -95,31 +95,31 @@ echo "Done" *** Testing array_walk() : unexpected values for 'input' argument *** -- Iteration 1 -- -Warning: array_walk() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_walk() expects parameter 1 to be array, int given in %s on line %d NULL -Warning: array_walk() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_walk() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 2 -- -Warning: array_walk() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_walk() expects parameter 1 to be array, int given in %s on line %d NULL -Warning: array_walk() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_walk() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 3 -- -Warning: array_walk() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_walk() expects parameter 1 to be array, int given in %s on line %d NULL -Warning: array_walk() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_walk() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 4 -- -Warning: array_walk() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_walk() expects parameter 1 to be array, int given in %s on line %d NULL -Warning: array_walk() expects parameter 1 to be array, integer given in %s on line %d +Warning: array_walk() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 5 -- @@ -172,31 +172,31 @@ Warning: array_walk() expects parameter 1 to be array, null given in %s on line NULL -- Iteration 12 -- -Warning: array_walk() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_walk() expects parameter 1 to be array, bool given in %s on line %d NULL -Warning: array_walk() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_walk() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 13 -- -Warning: array_walk() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_walk() expects parameter 1 to be array, bool given in %s on line %d NULL -Warning: array_walk() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_walk() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 14 -- -Warning: array_walk() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_walk() expects parameter 1 to be array, bool given in %s on line %d NULL -Warning: array_walk() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_walk() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 15 -- -Warning: array_walk() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_walk() expects parameter 1 to be array, bool given in %s on line %d NULL -Warning: array_walk() expects parameter 1 to be array, boolean given in %s on line %d +Warning: array_walk() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 16 -- diff --git a/ext/standard/tests/array/array_walk_variation3.phpt b/ext/standard/tests/array/array_walk_variation3.phpt index 5f33bc1f15..ff466e5280 100644 --- a/ext/standard/tests/array/array_walk_variation3.phpt +++ b/ext/standard/tests/array/array_walk_variation3.phpt @@ -61,7 +61,7 @@ for($count = 0; $count < count($input_values); $count++) { } echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing array_walk() : 'input' array with different values*** -- Iteration 1 -- diff --git a/ext/standard/tests/array/array_walk_variation4.phpt b/ext/standard/tests/array/array_walk_variation4.phpt index a94338209a..d141bc20f7 100644 --- a/ext/standard/tests/array/array_walk_variation4.phpt +++ b/ext/standard/tests/array/array_walk_variation4.phpt @@ -40,7 +40,7 @@ var_dump( array_walk( $input, "callback")); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing array_walk() : array with subarray *** int(0) array(0) { diff --git a/ext/standard/tests/array/array_walk_variation5.phpt b/ext/standard/tests/array/array_walk_variation5.phpt index a3b910d3ba..e36ab88efc 100644 --- a/ext/standard/tests/array/array_walk_variation5.phpt +++ b/ext/standard/tests/array/array_walk_variation5.phpt @@ -40,7 +40,7 @@ var_dump( array_walk($input, "callback")); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing array_walk() : array with references *** int(0) int(10) diff --git a/ext/standard/tests/array/array_walk_variation6.phpt b/ext/standard/tests/array/array_walk_variation6.phpt index 5b5711c647..8fe16362aa 100644 --- a/ext/standard/tests/array/array_walk_variation6.phpt +++ b/ext/standard/tests/array/array_walk_variation6.phpt @@ -81,7 +81,7 @@ var_dump( array_walk($input, "for_mixed")); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing array_walk() : 'input' as an associative array *** -- Associative array with numeric keys -- int(1) diff --git a/ext/standard/tests/array/array_walk_variation9.phpt b/ext/standard/tests/array/array_walk_variation9.phpt index 65ef50cc8e..e1bee47998 100644 --- a/ext/standard/tests/array/array_walk_variation9.phpt +++ b/ext/standard/tests/array/array_walk_variation9.phpt @@ -50,7 +50,7 @@ var_dump( array_walk($input, 'callback_two_parameter', 10)); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing array_walk() : callback function variation *** -- callback function with both parameters -- int(0) diff --git a/ext/standard/tests/array/arsort_basic.phpt b/ext/standard/tests/array/arsort_basic.phpt index d16afdeaff..afd8bb8f49 100644 --- a/ext/standard/tests/array/arsort_basic.phpt +++ b/ext/standard/tests/array/arsort_basic.phpt @@ -75,7 +75,7 @@ var_dump( $temp_array); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing arsort() : basic functionality *** -- Testing arsort() by supplying string array, 'flag' value is default -- diff --git a/ext/standard/tests/array/arsort_variation1.phpt b/ext/standard/tests/array/arsort_variation1.phpt index 998493d8ce..d4156e3a9c 100644 --- a/ext/standard/tests/array/arsort_variation1.phpt +++ b/ext/standard/tests/array/arsort_variation1.phpt @@ -63,10 +63,10 @@ $unexpected_values = array ( 19 => new stdclass(), // undefined data - 20 => @undefined_var, + 20 => @$undefined_var, // unset data - 21 => @unset_var, + 21 => @$unset_var, // resource variable 22 => $fp @@ -99,301 +99,301 @@ echo "Done"; -- Flag values are defualt, SORT_REGULAR, SORT_NUMERIC, SORT_STRING -- -- Iteration 1 -- -Warning: arsort() expects parameter 1 to be array, integer given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, int given in %s on line %d bool(false) -Warning: arsort() expects parameter 1 to be array, integer given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, int given in %s on line %d bool(false) -Warning: arsort() expects parameter 1 to be array, integer given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, int given in %s on line %d bool(false) -Warning: arsort() expects parameter 1 to be array, integer given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, int given in %s on line %d bool(false) -- Iteration 2 -- -Warning: arsort() expects parameter 1 to be array, integer given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, int given in %s on line %d bool(false) -Warning: arsort() expects parameter 1 to be array, integer given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, int given in %s on line %d bool(false) -Warning: arsort() expects parameter 1 to be array, integer given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, int given in %s on line %d bool(false) -Warning: arsort() expects parameter 1 to be array, integer given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, int given in %s on line %d bool(false) -- Iteration 3 -- -Warning: arsort() expects parameter 1 to be array, integer given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, int given in %s on line %d bool(false) -Warning: arsort() expects parameter 1 to be array, integer given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, int given in %s on line %d bool(false) -Warning: arsort() expects parameter 1 to be array, integer given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, int given in %s on line %d bool(false) -Warning: arsort() expects parameter 1 to be array, integer given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, int given in %s on line %d bool(false) -- Iteration 4 -- -Warning: arsort() expects parameter 1 to be array, integer given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, int given in %s on line %d bool(false) -Warning: arsort() expects parameter 1 to be array, integer given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, int given in %s on line %d bool(false) -Warning: arsort() expects parameter 1 to be array, integer given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, int given in %s on line %d bool(false) -Warning: arsort() expects parameter 1 to be array, integer given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, int given in %s on line %d bool(false) -- Iteration 5 -- -Warning: arsort() expects parameter 1 to be array, float given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, float given in %s on line %d bool(false) -Warning: arsort() expects parameter 1 to be array, float given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, float given in %s on line %d bool(false) -Warning: arsort() expects parameter 1 to be array, float given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, float given in %s on line %d bool(false) -Warning: arsort() expects parameter 1 to be array, float given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, float given in %s on line %d bool(false) -- Iteration 6 -- -Warning: arsort() expects parameter 1 to be array, float given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, float given in %s on line %d bool(false) -Warning: arsort() expects parameter 1 to be array, float given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, float given in %s on line %d bool(false) -Warning: arsort() expects parameter 1 to be array, float given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, float given in %s on line %d bool(false) -Warning: arsort() expects parameter 1 to be array, float given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, float given in %s on line %d bool(false) -- Iteration 7 -- -Warning: arsort() expects parameter 1 to be array, float given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, float given in %s on line %d bool(false) -Warning: arsort() expects parameter 1 to be array, float given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, float given in %s on line %d bool(false) -Warning: arsort() expects parameter 1 to be array, float given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, float given in %s on line %d bool(false) -Warning: arsort() expects parameter 1 to be array, float given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, float given in %s on line %d bool(false) -- Iteration 8 -- -Warning: arsort() expects parameter 1 to be array, float given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, float given in %s on line %d bool(false) -Warning: arsort() expects parameter 1 to be array, float given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, float given in %s on line %d bool(false) -Warning: arsort() expects parameter 1 to be array, float given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, float given in %s on line %d bool(false) -Warning: arsort() expects parameter 1 to be array, float given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, float given in %s on line %d bool(false) -- Iteration 9 -- -Warning: arsort() expects parameter 1 to be array, float given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, float given in %s on line %d bool(false) -Warning: arsort() expects parameter 1 to be array, float given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, float given in %s on line %d bool(false) -Warning: arsort() expects parameter 1 to be array, float given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, float given in %s on line %d bool(false) -Warning: arsort() expects parameter 1 to be array, float given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, float given in %s on line %d bool(false) -- Iteration 10 -- -Warning: arsort() expects parameter 1 to be array, null given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, null given in %s on line %d bool(false) -Warning: arsort() expects parameter 1 to be array, null given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, null given in %s on line %d bool(false) -Warning: arsort() expects parameter 1 to be array, null given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, null given in %s on line %d bool(false) -Warning: arsort() expects parameter 1 to be array, null given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, null given in %s on line %d bool(false) -- Iteration 11 -- -Warning: arsort() expects parameter 1 to be array, null given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, null given in %s on line %d bool(false) -Warning: arsort() expects parameter 1 to be array, null given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, null given in %s on line %d bool(false) -Warning: arsort() expects parameter 1 to be array, null given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, null given in %s on line %d bool(false) -Warning: arsort() expects parameter 1 to be array, null given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, null given in %s on line %d bool(false) -- Iteration 12 -- -Warning: arsort() expects parameter 1 to be array, boolean given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, bool given in %s on line %d bool(false) -Warning: arsort() expects parameter 1 to be array, boolean given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, bool given in %s on line %d bool(false) -Warning: arsort() expects parameter 1 to be array, boolean given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, bool given in %s on line %d bool(false) -Warning: arsort() expects parameter 1 to be array, boolean given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, bool given in %s on line %d bool(false) -- Iteration 13 -- -Warning: arsort() expects parameter 1 to be array, boolean given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, bool given in %s on line %d bool(false) -Warning: arsort() expects parameter 1 to be array, boolean given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, bool given in %s on line %d bool(false) -Warning: arsort() expects parameter 1 to be array, boolean given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, bool given in %s on line %d bool(false) -Warning: arsort() expects parameter 1 to be array, boolean given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, bool given in %s on line %d bool(false) -- Iteration 14 -- -Warning: arsort() expects parameter 1 to be array, boolean given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, bool given in %s on line %d bool(false) -Warning: arsort() expects parameter 1 to be array, boolean given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, bool given in %s on line %d bool(false) -Warning: arsort() expects parameter 1 to be array, boolean given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, bool given in %s on line %d bool(false) -Warning: arsort() expects parameter 1 to be array, boolean given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, bool given in %s on line %d bool(false) -- Iteration 15 -- -Warning: arsort() expects parameter 1 to be array, boolean given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, bool given in %s on line %d bool(false) -Warning: arsort() expects parameter 1 to be array, boolean given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, bool given in %s on line %d bool(false) -Warning: arsort() expects parameter 1 to be array, boolean given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, bool given in %s on line %d bool(false) -Warning: arsort() expects parameter 1 to be array, boolean given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, bool given in %s on line %d bool(false) -- Iteration 16 -- -Warning: arsort() expects parameter 1 to be array, string given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, string given in %s on line %d bool(false) -Warning: arsort() expects parameter 1 to be array, string given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, string given in %s on line %d bool(false) -Warning: arsort() expects parameter 1 to be array, string given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, string given in %s on line %d bool(false) -Warning: arsort() expects parameter 1 to be array, string given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, string given in %s on line %d bool(false) -- Iteration 17 -- -Warning: arsort() expects parameter 1 to be array, string given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, string given in %s on line %d bool(false) -Warning: arsort() expects parameter 1 to be array, string given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, string given in %s on line %d bool(false) -Warning: arsort() expects parameter 1 to be array, string given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, string given in %s on line %d bool(false) -Warning: arsort() expects parameter 1 to be array, string given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, string given in %s on line %d bool(false) -- Iteration 18 -- -Warning: arsort() expects parameter 1 to be array, string given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, string given in %s on line %d bool(false) -Warning: arsort() expects parameter 1 to be array, string given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, string given in %s on line %d bool(false) -Warning: arsort() expects parameter 1 to be array, string given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, string given in %s on line %d bool(false) -Warning: arsort() expects parameter 1 to be array, string given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, string given in %s on line %d bool(false) -- Iteration 19 -- -Warning: arsort() expects parameter 1 to be array, string given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, string given in %s on line %d bool(false) -Warning: arsort() expects parameter 1 to be array, string given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, string given in %s on line %d bool(false) -Warning: arsort() expects parameter 1 to be array, string given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, string given in %s on line %d bool(false) -Warning: arsort() expects parameter 1 to be array, string given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, string given in %s on line %d bool(false) -- Iteration 20 -- -Warning: arsort() expects parameter 1 to be array, object given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, object given in %s on line %d bool(false) -Warning: arsort() expects parameter 1 to be array, object given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, object given in %s on line %d bool(false) -Warning: arsort() expects parameter 1 to be array, object given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, object given in %s on line %d bool(false) -Warning: arsort() expects parameter 1 to be array, object given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, object given in %s on line %d bool(false) -- Iteration 21 -- -Warning: arsort() expects parameter 1 to be array, string given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, null given in %s on line %d bool(false) -Warning: arsort() expects parameter 1 to be array, string given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, null given in %s on line %d bool(false) -Warning: arsort() expects parameter 1 to be array, string given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, null given in %s on line %d bool(false) -Warning: arsort() expects parameter 1 to be array, string given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, null given in %s on line %d bool(false) -- Iteration 22 -- -Warning: arsort() expects parameter 1 to be array, string given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, null given in %s on line %d bool(false) -Warning: arsort() expects parameter 1 to be array, string given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, null given in %s on line %d bool(false) -Warning: arsort() expects parameter 1 to be array, string given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, null given in %s on line %d bool(false) -Warning: arsort() expects parameter 1 to be array, string given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, null given in %s on line %d bool(false) -- Iteration 23 -- -Warning: arsort() expects parameter 1 to be array, resource given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, resource given in %s on line %d bool(false) -Warning: arsort() expects parameter 1 to be array, resource given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, resource given in %s on line %d bool(false) -Warning: arsort() expects parameter 1 to be array, resource given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, resource given in %s on line %d bool(false) -Warning: arsort() expects parameter 1 to be array, resource given in %sarsort_variation1.php on line %d +Warning: arsort() expects parameter 1 to be array, resource given in %s on line %d bool(false) Done diff --git a/ext/standard/tests/array/arsort_variation10.phpt b/ext/standard/tests/array/arsort_variation10.phpt index 0f5bcd130a..67a0499aa3 100644 --- a/ext/standard/tests/array/arsort_variation10.phpt +++ b/ext/standard/tests/array/arsort_variation10.phpt @@ -40,7 +40,7 @@ var_dump($temp_array); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing arsort() : usage variations *** -- Testing arsort() by supplying octal value array, 'flag' value is defualt -- diff --git a/ext/standard/tests/array/arsort_variation11.phpt b/ext/standard/tests/array/arsort_variation11.phpt Binary files differindex b70c3ad6c4..aa6f33ae6b 100644 --- a/ext/standard/tests/array/arsort_variation11.phpt +++ b/ext/standard/tests/array/arsort_variation11.phpt diff --git a/ext/standard/tests/array/arsort_variation2.phpt b/ext/standard/tests/array/arsort_variation2.phpt index 901c03950f..b2c4385d6e 100644 --- a/ext/standard/tests/array/arsort_variation2.phpt +++ b/ext/standard/tests/array/arsort_variation2.phpt @@ -59,10 +59,10 @@ $unexpected_values = array( /*16*/ new stdclass(), // undefined data -/*17*/ @undefined_var, +/*17*/ @$undefined_var, // unset data -/*18*/ @unset_var, +/*18*/ @$unset_var, // resource variable /*19*/ $fp @@ -211,7 +211,7 @@ array(3) { } -- Iteration 13 -- -Warning: arsort() expects parameter 2 to be integer, string given in %sarsort_variation2.php on line %d +Warning: arsort() expects parameter 2 to be int, string given in %s on line %d bool(false) array(3) { [1]=> @@ -223,7 +223,7 @@ array(3) { } -- Iteration 14 -- -Warning: arsort() expects parameter 2 to be integer, string given in %sarsort_variation2.php on line %d +Warning: arsort() expects parameter 2 to be int, string given in %s on line %d bool(false) array(3) { [1]=> @@ -235,7 +235,7 @@ array(3) { } -- Iteration 15 -- -Warning: arsort() expects parameter 2 to be integer, string given in %sarsort_variation2.php on line %d +Warning: arsort() expects parameter 2 to be int, string given in %s on line %d bool(false) array(3) { [1]=> @@ -247,7 +247,7 @@ array(3) { } -- Iteration 16 -- -Warning: arsort() expects parameter 2 to be integer, string given in %sarsort_variation2.php on line %d +Warning: arsort() expects parameter 2 to be int, string given in %s on line %d bool(false) array(3) { [1]=> @@ -259,7 +259,7 @@ array(3) { } -- Iteration 17 -- -Warning: arsort() expects parameter 2 to be integer, object given in %sarsort_variation2.php on line %d +Warning: arsort() expects parameter 2 to be int, object given in %s on line %d bool(false) array(3) { [1]=> @@ -270,32 +270,28 @@ array(3) { int(45) } -- Iteration 18 -- - -Warning: arsort() expects parameter 2 to be integer, string given in %sarsort_variation2.php on line %d -bool(false) +bool(true) array(3) { + [3]=> + int(45) [1]=> int(10) [2]=> int(2) - [3]=> - int(45) } -- Iteration 19 -- - -Warning: arsort() expects parameter 2 to be integer, string given in %sarsort_variation2.php on line %d -bool(false) +bool(true) array(3) { + [3]=> + int(45) [1]=> int(10) [2]=> int(2) - [3]=> - int(45) } -- Iteration 20 -- -Warning: arsort() expects parameter 2 to be integer, resource given in %sarsort_variation2.php on line %d +Warning: arsort() expects parameter 2 to be int, resource given in %s on line %d bool(false) array(3) { [1]=> diff --git a/ext/standard/tests/array/arsort_variation4.phpt b/ext/standard/tests/array/arsort_variation4.phpt index 3d9418fb8a..fa939472b9 100644 --- a/ext/standard/tests/array/arsort_variation4.phpt +++ b/ext/standard/tests/array/arsort_variation4.phpt @@ -41,7 +41,7 @@ var_dump( $temp_array); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing arsort() :usage variations *** -- Testing arsort() by supplying reference variable array, 'flag' value is defualt -- diff --git a/ext/standard/tests/array/arsort_variation5.phpt b/ext/standard/tests/array/arsort_variation5.phpt index acdff90957..ea3fc18b7c 100644 --- a/ext/standard/tests/array/arsort_variation5.phpt +++ b/ext/standard/tests/array/arsort_variation5.phpt @@ -62,7 +62,7 @@ foreach ($various_arrays as $array) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing arsort() : usage variations *** -- Testing arsort() by supplying various string arrays -- diff --git a/ext/standard/tests/array/arsort_variation6.phpt b/ext/standard/tests/array/arsort_variation6.phpt index 4bbcf4531d..058a5077b1 100644 --- a/ext/standard/tests/array/arsort_variation6.phpt +++ b/ext/standard/tests/array/arsort_variation6.phpt @@ -40,7 +40,7 @@ var_dump($temp_array); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing arsort() : usage variations *** -- Testing arsort() by supplying hexadecimal value array, 'flag' value is defualt -- diff --git a/ext/standard/tests/array/arsort_variation7.phpt b/ext/standard/tests/array/arsort_variation7.phpt index b4bbdd0d0e..3c8b6206c2 100644 --- a/ext/standard/tests/array/arsort_variation7.phpt +++ b/ext/standard/tests/array/arsort_variation7.phpt @@ -41,7 +41,7 @@ var_dump($temp_array); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing arsort() : usage variations *** -- Testing arsort() by supplying bool value array, 'flag' value is defualt -- diff --git a/ext/standard/tests/array/arsort_variation8.phpt b/ext/standard/tests/array/arsort_variation8.phpt index 9ae48fcf11..cddcb3c335 100644 --- a/ext/standard/tests/array/arsort_variation8.phpt +++ b/ext/standard/tests/array/arsort_variation8.phpt @@ -57,7 +57,7 @@ foreach ($various_arrays as $array) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing arsort() : usage variations *** -- Testing arsort() by supplying various arrays containing sub arrays -- diff --git a/ext/standard/tests/array/arsort_variation9.phpt b/ext/standard/tests/array/arsort_variation9.phpt index 2e746e2fa4..07c7f1be51 100644 --- a/ext/standard/tests/array/arsort_variation9.phpt +++ b/ext/standard/tests/array/arsort_variation9.phpt @@ -49,7 +49,7 @@ foreach ($various_arrays as $array) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing arsort() : usage variations *** -- Testing arsort() by supplying various arrays with key values -- diff --git a/ext/standard/tests/array/asort_basic.phpt b/ext/standard/tests/array/asort_basic.phpt index eba07e7d94..c0ae2bc88d 100644 --- a/ext/standard/tests/array/asort_basic.phpt +++ b/ext/standard/tests/array/asort_basic.phpt @@ -75,7 +75,7 @@ var_dump( $temp_array); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing asort() : basic functionality *** -- Testing asort() by supplying string array, 'flag' value is default -- diff --git a/ext/standard/tests/array/asort_variation1.phpt b/ext/standard/tests/array/asort_variation1.phpt index 15c4faa67a..efc109d28f 100644 --- a/ext/standard/tests/array/asort_variation1.phpt +++ b/ext/standard/tests/array/asort_variation1.phpt @@ -63,10 +63,10 @@ $unexpected_values = array ( 19 => new stdclass(), // undefined data - 20 => @undefined_var, + 20 => @$undefined_var, // unset data - 21 => @unset_var, + 21 => @$unset_var, // resource variable 22 => $fp @@ -99,55 +99,55 @@ echo "Done"; -- Flag values are defualt, SORT_REGULAR, SORT_NUMERIC, SORT_STRING -- -- Iteration 1 -- -Warning: asort() expects parameter 1 to be array, integer given in %s on line %d +Warning: asort() expects parameter 1 to be array, int given in %s on line %d bool(false) -Warning: asort() expects parameter 1 to be array, integer given in %s on line %d +Warning: asort() expects parameter 1 to be array, int given in %s on line %d bool(false) -Warning: asort() expects parameter 1 to be array, integer given in %s on line %d +Warning: asort() expects parameter 1 to be array, int given in %s on line %d bool(false) -Warning: asort() expects parameter 1 to be array, integer given in %s on line %d +Warning: asort() expects parameter 1 to be array, int given in %s on line %d bool(false) -- Iteration 2 -- -Warning: asort() expects parameter 1 to be array, integer given in %s on line %d +Warning: asort() expects parameter 1 to be array, int given in %s on line %d bool(false) -Warning: asort() expects parameter 1 to be array, integer given in %s on line %d +Warning: asort() expects parameter 1 to be array, int given in %s on line %d bool(false) -Warning: asort() expects parameter 1 to be array, integer given in %s on line %d +Warning: asort() expects parameter 1 to be array, int given in %s on line %d bool(false) -Warning: asort() expects parameter 1 to be array, integer given in %s on line %d +Warning: asort() expects parameter 1 to be array, int given in %s on line %d bool(false) -- Iteration 3 -- -Warning: asort() expects parameter 1 to be array, integer given in %s on line %d +Warning: asort() expects parameter 1 to be array, int given in %s on line %d bool(false) -Warning: asort() expects parameter 1 to be array, integer given in %s on line %d +Warning: asort() expects parameter 1 to be array, int given in %s on line %d bool(false) -Warning: asort() expects parameter 1 to be array, integer given in %s on line %d +Warning: asort() expects parameter 1 to be array, int given in %s on line %d bool(false) -Warning: asort() expects parameter 1 to be array, integer given in %s on line %d +Warning: asort() expects parameter 1 to be array, int given in %s on line %d bool(false) -- Iteration 4 -- -Warning: asort() expects parameter 1 to be array, integer given in %s on line %d +Warning: asort() expects parameter 1 to be array, int given in %s on line %d bool(false) -Warning: asort() expects parameter 1 to be array, integer given in %s on line %d +Warning: asort() expects parameter 1 to be array, int given in %s on line %d bool(false) -Warning: asort() expects parameter 1 to be array, integer given in %s on line %d +Warning: asort() expects parameter 1 to be array, int given in %s on line %d bool(false) -Warning: asort() expects parameter 1 to be array, integer given in %s on line %d +Warning: asort() expects parameter 1 to be array, int given in %s on line %d bool(false) -- Iteration 5 -- @@ -242,55 +242,55 @@ Warning: asort() expects parameter 1 to be array, null given in %s on line %d bool(false) -- Iteration 12 -- -Warning: asort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: asort() expects parameter 1 to be array, bool given in %s on line %d bool(false) -Warning: asort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: asort() expects parameter 1 to be array, bool given in %s on line %d bool(false) -Warning: asort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: asort() expects parameter 1 to be array, bool given in %s on line %d bool(false) -Warning: asort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: asort() expects parameter 1 to be array, bool given in %s on line %d bool(false) -- Iteration 13 -- -Warning: asort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: asort() expects parameter 1 to be array, bool given in %s on line %d bool(false) -Warning: asort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: asort() expects parameter 1 to be array, bool given in %s on line %d bool(false) -Warning: asort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: asort() expects parameter 1 to be array, bool given in %s on line %d bool(false) -Warning: asort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: asort() expects parameter 1 to be array, bool given in %s on line %d bool(false) -- Iteration 14 -- -Warning: asort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: asort() expects parameter 1 to be array, bool given in %s on line %d bool(false) -Warning: asort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: asort() expects parameter 1 to be array, bool given in %s on line %d bool(false) -Warning: asort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: asort() expects parameter 1 to be array, bool given in %s on line %d bool(false) -Warning: asort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: asort() expects parameter 1 to be array, bool given in %s on line %d bool(false) -- Iteration 15 -- -Warning: asort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: asort() expects parameter 1 to be array, bool given in %s on line %d bool(false) -Warning: asort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: asort() expects parameter 1 to be array, bool given in %s on line %d bool(false) -Warning: asort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: asort() expects parameter 1 to be array, bool given in %s on line %d bool(false) -Warning: asort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: asort() expects parameter 1 to be array, bool given in %s on line %d bool(false) -- Iteration 16 -- @@ -359,29 +359,29 @@ Warning: asort() expects parameter 1 to be array, object given in %s on line %d bool(false) -- Iteration 21 -- -Warning: asort() expects parameter 1 to be array, string given in %s on line %d +Warning: asort() expects parameter 1 to be array, null given in %s on line %d bool(false) -Warning: asort() expects parameter 1 to be array, string given in %s on line %d +Warning: asort() expects parameter 1 to be array, null given in %s on line %d bool(false) -Warning: asort() expects parameter 1 to be array, string given in %s on line %d +Warning: asort() expects parameter 1 to be array, null given in %s on line %d bool(false) -Warning: asort() expects parameter 1 to be array, string given in %s on line %d +Warning: asort() expects parameter 1 to be array, null given in %s on line %d bool(false) -- Iteration 22 -- -Warning: asort() expects parameter 1 to be array, string given in %s on line %d +Warning: asort() expects parameter 1 to be array, null given in %s on line %d bool(false) -Warning: asort() expects parameter 1 to be array, string given in %s on line %d +Warning: asort() expects parameter 1 to be array, null given in %s on line %d bool(false) -Warning: asort() expects parameter 1 to be array, string given in %s on line %d +Warning: asort() expects parameter 1 to be array, null given in %s on line %d bool(false) -Warning: asort() expects parameter 1 to be array, string given in %s on line %d +Warning: asort() expects parameter 1 to be array, null given in %s on line %d bool(false) -- Iteration 23 -- diff --git a/ext/standard/tests/array/asort_variation10.phpt b/ext/standard/tests/array/asort_variation10.phpt index 39b05c1700..4b9ccd2f51 100644 --- a/ext/standard/tests/array/asort_variation10.phpt +++ b/ext/standard/tests/array/asort_variation10.phpt @@ -40,7 +40,7 @@ var_dump($temp_array); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing asort() : usage variations *** -- Testing asort() by supplying octal value array, 'flag' value is defualt -- diff --git a/ext/standard/tests/array/asort_variation11.phpt b/ext/standard/tests/array/asort_variation11.phpt Binary files differindex 6872ca235c..c32c96cbf6 100644 --- a/ext/standard/tests/array/asort_variation11.phpt +++ b/ext/standard/tests/array/asort_variation11.phpt diff --git a/ext/standard/tests/array/asort_variation2.phpt b/ext/standard/tests/array/asort_variation2.phpt index c35d112034..a3960cfddd 100644 --- a/ext/standard/tests/array/asort_variation2.phpt +++ b/ext/standard/tests/array/asort_variation2.phpt @@ -59,10 +59,10 @@ $unexpected_values = array( /*16*/ new stdclass(), // undefined data -/*17*/ @undefined_var, +/*17*/ @$undefined_var, // unset data -/*18*/ @unset_var, +/*18*/ @$unset_var, // resource variable /*19*/ $fp @@ -211,7 +211,7 @@ array(3) { } -- Iteration 13 -- -Warning: asort() expects parameter 2 to be integer, string given in %s on line %d +Warning: asort() expects parameter 2 to be int, string given in %s on line %d bool(false) array(3) { [1]=> @@ -223,7 +223,7 @@ array(3) { } -- Iteration 14 -- -Warning: asort() expects parameter 2 to be integer, string given in %s on line %d +Warning: asort() expects parameter 2 to be int, string given in %s on line %d bool(false) array(3) { [1]=> @@ -235,7 +235,7 @@ array(3) { } -- Iteration 15 -- -Warning: asort() expects parameter 2 to be integer, string given in %s on line %d +Warning: asort() expects parameter 2 to be int, string given in %s on line %d bool(false) array(3) { [1]=> @@ -247,7 +247,7 @@ array(3) { } -- Iteration 16 -- -Warning: asort() expects parameter 2 to be integer, string given in %s on line %d +Warning: asort() expects parameter 2 to be int, string given in %s on line %d bool(false) array(3) { [1]=> @@ -259,7 +259,7 @@ array(3) { } -- Iteration 17 -- -Warning: asort() expects parameter 2 to be integer, object given in %s on line %d +Warning: asort() expects parameter 2 to be int, object given in %s on line %d bool(false) array(3) { [1]=> @@ -270,32 +270,28 @@ array(3) { int(45) } -- Iteration 18 -- - -Warning: asort() expects parameter 2 to be integer, string given in %s on line %d -bool(false) +bool(true) array(3) { - [1]=> - int(10) [2]=> int(2) + [1]=> + int(10) [3]=> int(45) } -- Iteration 19 -- - -Warning: asort() expects parameter 2 to be integer, string given in %s on line %d -bool(false) +bool(true) array(3) { - [1]=> - int(10) [2]=> int(2) + [1]=> + int(10) [3]=> int(45) } -- Iteration 20 -- -Warning: asort() expects parameter 2 to be integer, resource given in %s on line %d +Warning: asort() expects parameter 2 to be int, resource given in %s on line %d bool(false) array(3) { [1]=> diff --git a/ext/standard/tests/array/asort_variation4.phpt b/ext/standard/tests/array/asort_variation4.phpt index 222ed2d1d0..6dd60e3e7e 100644 --- a/ext/standard/tests/array/asort_variation4.phpt +++ b/ext/standard/tests/array/asort_variation4.phpt @@ -41,7 +41,7 @@ var_dump( $temp_array); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing asort() :usage variations *** -- Testing asort() by supplying reference variable array, 'flag' value is defualt -- diff --git a/ext/standard/tests/array/asort_variation5.phpt b/ext/standard/tests/array/asort_variation5.phpt index ae7c3c4784..c7ca503aea 100644 --- a/ext/standard/tests/array/asort_variation5.phpt +++ b/ext/standard/tests/array/asort_variation5.phpt @@ -62,7 +62,7 @@ foreach ($various_arrays as $array) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing asort() : usage variations *** -- Testing asort() by supplying various string arrays -- diff --git a/ext/standard/tests/array/asort_variation6.phpt b/ext/standard/tests/array/asort_variation6.phpt index 3d9b5e5070..3d879c1b3b 100644 --- a/ext/standard/tests/array/asort_variation6.phpt +++ b/ext/standard/tests/array/asort_variation6.phpt @@ -40,7 +40,7 @@ var_dump($temp_array); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing asort() : usage variations *** -- Testing asort() by supplying hexadecimal value array, 'flag' value is defualt -- diff --git a/ext/standard/tests/array/asort_variation7.phpt b/ext/standard/tests/array/asort_variation7.phpt index 10c03cb840..892dd82238 100644 --- a/ext/standard/tests/array/asort_variation7.phpt +++ b/ext/standard/tests/array/asort_variation7.phpt @@ -41,7 +41,7 @@ var_dump($temp_array); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing asort() : usage variations *** -- Testing asort() by supplying bool value array, 'flag' value is defualt -- diff --git a/ext/standard/tests/array/asort_variation8.phpt b/ext/standard/tests/array/asort_variation8.phpt index 9e8c2c9296..ec02224617 100644 --- a/ext/standard/tests/array/asort_variation8.phpt +++ b/ext/standard/tests/array/asort_variation8.phpt @@ -57,7 +57,7 @@ foreach ($various_arrays as $array) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing asort() : usage variations *** -- Testing asort() by supplying various arrays containing sub arrays -- diff --git a/ext/standard/tests/array/asort_variation9.phpt b/ext/standard/tests/array/asort_variation9.phpt index 60b647b5d5..f371a07daf 100644 --- a/ext/standard/tests/array/asort_variation9.phpt +++ b/ext/standard/tests/array/asort_variation9.phpt @@ -49,7 +49,7 @@ foreach ($various_arrays as $array) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing asort() : usage variations *** -- Testing asort() by supplying various arrays with key values -- diff --git a/ext/standard/tests/array/bug29253.phpt b/ext/standard/tests/array/bug29253.phpt index 4be9839221..4a1a90ebea 100644 --- a/ext/standard/tests/array/bug29253.phpt +++ b/ext/standard/tests/array/bug29253.phpt @@ -7,7 +7,7 @@ $gg = 'afad'; var_dump(@array_diff_assoc($GLOBALS, $zz)); var_dump($gg); ?> ---EXPECTF-- +--EXPECT-- array(0) { } string(4) "afad" diff --git a/ext/standard/tests/array/bug34066.phpt b/ext/standard/tests/array/bug34066.phpt index 9110379d9d..44710b0426 100644 --- a/ext/standard/tests/array/bug34066.phpt +++ b/ext/standard/tests/array/bug34066.phpt @@ -265,7 +265,7 @@ function gen_xml($val, $key, $prefix) } echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- gen_xml(prefix=/Docs/) gen_xml(prefix=/Docs/@) /Docs/@Version=1.0 diff --git a/ext/standard/tests/array/bug34066_1.phpt b/ext/standard/tests/array/bug34066_1.phpt index 2f0a361aa0..5200fa86a6 100644 --- a/ext/standard/tests/array/bug34066_1.phpt +++ b/ext/standard/tests/array/bug34066_1.phpt @@ -265,7 +265,7 @@ function gen_xml($val, $key, $prefix) } echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- gen_xml(prefix=/Docs/) /Docs/Version=1.0 gen_xml(prefix=/Docs/) end diff --git a/ext/standard/tests/array/bug40191.phpt b/ext/standard/tests/array/bug40191.phpt index db239487ea..f5e439821d 100644 --- a/ext/standard/tests/array/bug40191.phpt +++ b/ext/standard/tests/array/bug40191.phpt @@ -1,7 +1,5 @@ --TEST-- Bug #40191 (use of array_unique() with objects triggers segfault) ---SKIPIF-- -<?php if (!extension_loaded('spl')) die("skip SPL is not available"); ?> --FILE-- <?php diff --git a/ext/standard/tests/array/bug43505.phpt b/ext/standard/tests/array/bug43505.phpt index dd39e41f85..802534dfec 100644 --- a/ext/standard/tests/array/bug43505.phpt +++ b/ext/standard/tests/array/bug43505.phpt @@ -2,8 +2,6 @@ Bug #43505 (Assign by reference bug) --INI-- error_reporting=0 ---SKIPIF-- -<?php if (!extension_loaded('spl')) die("skip SPL is not available"); ?> --FILE-- <?php class Test implements Countable { diff --git a/ext/standard/tests/array/bug48854.phpt b/ext/standard/tests/array/bug48854.phpt index 7aaade03a4..ed5b8e1ad1 100644 --- a/ext/standard/tests/array/bug48854.phpt +++ b/ext/standard/tests/array/bug48854.phpt @@ -22,7 +22,7 @@ $merged = array_merge_recursive($array1, $array2); var_dump($array1, $array2); ?> ---EXPECTF-- +--EXPECT-- array(2) { ["friends"]=> int(5) diff --git a/ext/standard/tests/array/bug50006.phpt b/ext/standard/tests/array/bug50006.phpt index 948866361a..2ae15eab33 100644 --- a/ext/standard/tests/array/bug50006.phpt +++ b/ext/standard/tests/array/bug50006.phpt @@ -20,7 +20,7 @@ function magic_sort_cmp($a, $b) { } ?> ---EXPECTF-- +--EXPECT-- Array ( [foo] => 0 diff --git a/ext/standard/tests/array/bug50006_1.phpt b/ext/standard/tests/array/bug50006_1.phpt index 13d70bc42a..aac0e2a535 100644 --- a/ext/standard/tests/array/bug50006_1.phpt +++ b/ext/standard/tests/array/bug50006_1.phpt @@ -20,7 +20,7 @@ function magic_sort_cmp($a, $b) { } ?> ---EXPECTF-- +--EXPECT-- Array ( [0] => foo diff --git a/ext/standard/tests/array/bug50006_2.phpt b/ext/standard/tests/array/bug50006_2.phpt index 04e799eaff..70b602256b 100644 --- a/ext/standard/tests/array/bug50006_2.phpt +++ b/ext/standard/tests/array/bug50006_2.phpt @@ -20,7 +20,7 @@ function magic_sort_cmp($a, $b) { } ?> ---EXPECTF-- +--EXPECT-- Array ( [2] => foo diff --git a/ext/standard/tests/array/bug52719.phpt b/ext/standard/tests/array/bug52719.phpt index 078c53d225..b3f0a31101 100644 --- a/ext/standard/tests/array/bug52719.phpt +++ b/ext/standard/tests/array/bug52719.phpt @@ -11,5 +11,5 @@ array_walk_recursive( ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- Done diff --git a/ext/standard/tests/array/bug69198.phpt b/ext/standard/tests/array/bug69198.phpt index 3faa5aac1c..96a0f9a963 100644 --- a/ext/standard/tests/array/bug69198.phpt +++ b/ext/standard/tests/array/bug69198.phpt @@ -7,7 +7,9 @@ if (false) { } $result = compact('willNeverBeDefined'); var_dump($result, empty($result), $result === array(), empty($willNeverBeDefined)); ---EXPECT-- +?> +--EXPECTF-- +Notice: compact(): Undefined variable: willNeverBeDefined in %s on line %d array(0) { } bool(true) diff --git a/ext/standard/tests/array/bug76713.phpt b/ext/standard/tests/array/bug76713.phpt new file mode 100644 index 0000000000..0c993f5721 --- /dev/null +++ b/ext/standard/tests/array/bug76713.phpt @@ -0,0 +1,39 @@ +--TEST-- +Bug #76713 (Segmentation fault caused by property corruption) +--FILE-- +<?php + +function test($obj) { + return array_column(array($obj), "prop"); +} + +$obj = new Stdclass(); + +$obj->prop = str_pad("a", 10, 'a'); + +test($obj); +test($obj); +test($obj); + +var_dump($obj->prop); + +class C { + public $name; + public function __get($name) { + return $this->name; + } +} + +$obj = new C; + +$obj->name = str_pad("b", 10, 'b'); + +test($obj); +test($obj); +test($obj); + +var_dump($obj->prop); +?> +--EXPECT-- +string(10) "aaaaaaaaaa" +string(10) "bbbbbbbbbb" diff --git a/ext/standard/tests/array/bug77793.phpt b/ext/standard/tests/array/bug77793.phpt new file mode 100644 index 0000000000..6c0ba80a50 --- /dev/null +++ b/ext/standard/tests/array/bug77793.phpt @@ -0,0 +1,18 @@ +--TEST-- +Bug #77793: Segmentation fault in extract() when overwriting reference with itself +--FILE-- +<?php + +$str = 'foo'; +$vars = ['var' => $str . 'bar']; +$var = &$vars['var']; +extract($vars); +var_dump($vars, $var); + +?> +--EXPECT-- +array(1) { + ["var"]=> + &string(6) "foobar" +} +string(6) "foobar" diff --git a/ext/standard/tests/array/bug77931.phpt b/ext/standard/tests/array/bug77931.phpt new file mode 100644 index 0000000000..98a2eb91cf --- /dev/null +++ b/ext/standard/tests/array/bug77931.phpt @@ -0,0 +1,16 @@ +--TEST-- +Bug #77931: Warning for array_map mentions wrong type +--FILE-- +<?php + +array_map('trim', array(), 1); +array_map('trim', array(), array(), true); +array_map('trim', array(), array(), array(), null); + +?> +--EXPECTF-- +Warning: array_map(): Expected parameter 3 to be an array, int given in %s on line %d + +Warning: array_map(): Expected parameter 4 to be an array, bool given in %s on line %d + +Warning: array_map(): Expected parameter 5 to be an array, null given in %s on line %d diff --git a/ext/standard/tests/array/compact.phpt b/ext/standard/tests/array/compact.phpt index e264be1977..d18f3d83e9 100644 --- a/ext/standard/tests/array/compact.phpt +++ b/ext/standard/tests/array/compact.phpt @@ -12,7 +12,8 @@ $location_vars = array("c\\u0327ity", "state"); $result = compact("event", $location_vars); var_dump($result); ?> ---EXPECT-- +--EXPECTF-- +Notice: compact(): Undefined variable: c\u0327ity in %s on line %d array(2) { ["event"]=> string(8) "SIGGRAPH" diff --git a/ext/standard/tests/array/compact_basic.phpt b/ext/standard/tests/array/compact_basic.phpt index 63471ba620..c71215fe1b 100644 --- a/ext/standard/tests/array/compact_basic.phpt +++ b/ext/standard/tests/array/compact_basic.phpt @@ -80,6 +80,8 @@ array(0) { } array(0) { } + +Notice: compact(): Undefined variable: g in %s on line %d array(0) { } Done diff --git a/ext/standard/tests/array/compact_variation1.phpt b/ext/standard/tests/array/compact_variation1.phpt index ea48132857..d2b9fc45df 100644 --- a/ext/standard/tests/array/compact_variation1.phpt +++ b/ext/standard/tests/array/compact_variation1.phpt @@ -37,10 +37,6 @@ array(1) { Warning: compact(): recursion detected in %s on line %d Warning: compact(): recursion detected in %s on line %d - -Warning: compact(): recursion detected in %s on line %d - -Warning: compact(): recursion detected in %s on line %d array(2) { ["a"]=> int(1) diff --git a/ext/standard/tests/array/compact_variation2.phpt b/ext/standard/tests/array/compact_variation2.phpt index da0cd7b635..8ca5020d6d 100644 --- a/ext/standard/tests/array/compact_variation2.phpt +++ b/ext/standard/tests/array/compact_variation2.phpt @@ -25,12 +25,16 @@ f(); ==Done== --EXPECTF-- *** Testing compact() : usage variations - variables outside of current scope *** + +Notice: compact(): Undefined variable: a in %s on line %d array(2) { ["b"]=> string(3) "f.b" ["c"]=> string(3) "f.c" } + +Notice: compact(): Undefined variable: a in %s on line %d array(2) { ["b"]=> string(3) "f.b" diff --git a/ext/standard/tests/array/count_basic.phpt b/ext/standard/tests/array/count_basic.phpt index 142a747314..3b22c582db 100644 --- a/ext/standard/tests/array/count_basic.phpt +++ b/ext/standard/tests/array/count_basic.phpt @@ -31,7 +31,7 @@ var_dump(count($array_multi, 1)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing count() : basic functionality *** -- One Dimensional Array: -- diff --git a/ext/standard/tests/array/count_recursive.phpt b/ext/standard/tests/array/count_recursive.phpt index 1e73bef27a..175cfe7118 100644 --- a/ext/standard/tests/array/count_recursive.phpt +++ b/ext/standard/tests/array/count_recursive.phpt @@ -1,7 +1,5 @@ --TEST-- Test count() function ---SKIPIF-- -<?php if (!extension_loaded("spl")) die("skip no SPL extension"); ?> --FILE-- <?php /* Prototype: int count ( mixed $var [, int $mode] ); @@ -241,13 +239,13 @@ NULL Warning: Use of undefined constant ABCD - assumed 'ABCD' (this will throw an Error in a future version of PHP) in %s on line %d -Warning: count() expects parameter 2 to be integer, %s given in %s on line %d +Warning: count() expects parameter 2 to be int, %s given in %s on line %d NULL -Warning: count() expects parameter 2 to be integer, %s given in %s on line %d +Warning: count() expects parameter 2 to be int, %s given in %s on line %d NULL -Warning: count() expects parameter 2 to be integer, %s given in %s on line %d +Warning: count() expects parameter 2 to be int, %s given in %s on line %d NULL Done diff --git a/ext/standard/tests/array/count_variation2.phpt b/ext/standard/tests/array/count_variation2.phpt index 67c8938eca..0a654be183 100644 --- a/ext/standard/tests/array/count_variation2.phpt +++ b/ext/standard/tests/array/count_variation2.phpt @@ -148,32 +148,32 @@ int(3) -- Iteration 16 -- -Warning: count() expects parameter 2 to be integer, string given in %s on line %d +Warning: count() expects parameter 2 to be int, string given in %s on line %d NULL -- Iteration 17 -- -Warning: count() expects parameter 2 to be integer, string given in %s on line %d +Warning: count() expects parameter 2 to be int, string given in %s on line %d NULL -- Iteration 18 -- -Warning: count() expects parameter 2 to be integer, string given in %s on line %d +Warning: count() expects parameter 2 to be int, string given in %s on line %d NULL -- Iteration 19 -- -Warning: count() expects parameter 2 to be integer, string given in %s on line %d +Warning: count() expects parameter 2 to be int, string given in %s on line %d NULL -- Iteration 20 -- -Warning: count() expects parameter 2 to be integer, string given in %s on line %d +Warning: count() expects parameter 2 to be int, string given in %s on line %d NULL -- Iteration 21 -- -Warning: count() expects parameter 2 to be integer, object given in %s on line %d +Warning: count() expects parameter 2 to be int, object given in %s on line %d NULL -- Iteration 22 -- @@ -184,6 +184,6 @@ int(3) -- Iteration 24 -- -Warning: count() expects parameter 2 to be integer, resource given in %s on line %d +Warning: count() expects parameter 2 to be int, resource given in %s on line %d NULL Done diff --git a/ext/standard/tests/array/count_variation3.phpt b/ext/standard/tests/array/count_variation3.phpt index 417e2e20cc..30cae18964 100644 --- a/ext/standard/tests/array/count_variation3.phpt +++ b/ext/standard/tests/array/count_variation3.phpt @@ -35,5 +35,5 @@ int(4) -- $mode = 1: -- Warning: count(): recursion detected in %s on line %d -int(12) +int(4) Done diff --git a/ext/standard/tests/array/current_basic.phpt b/ext/standard/tests/array/current_basic.phpt index f95ca85d19..287a479067 100644 --- a/ext/standard/tests/array/current_basic.phpt +++ b/ext/standard/tests/array/current_basic.phpt @@ -23,7 +23,7 @@ next($array); var_dump(current($array)); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing current() : basic functionality *** string(4) "zero" string(3) "one" diff --git a/ext/standard/tests/array/current_variation1.phpt b/ext/standard/tests/array/current_variation1.phpt index 39918cc4b1..c6c66f43c9 100644 --- a/ext/standard/tests/array/current_variation1.phpt +++ b/ext/standard/tests/array/current_variation1.phpt @@ -99,22 +99,22 @@ fclose($fp); -- Iteration 1 -- -Warning: current() expects parameter 1 to be array, integer given in %s on line %d +Warning: current() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 2 -- -Warning: current() expects parameter 1 to be array, integer given in %s on line %d +Warning: current() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 3 -- -Warning: current() expects parameter 1 to be array, integer given in %s on line %d +Warning: current() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 4 -- -Warning: current() expects parameter 1 to be array, integer given in %s on line %d +Warning: current() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 5 -- @@ -154,22 +154,22 @@ NULL -- Iteration 12 -- -Warning: current() expects parameter 1 to be array, boolean given in %s on line %d +Warning: current() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 13 -- -Warning: current() expects parameter 1 to be array, boolean given in %s on line %d +Warning: current() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 14 -- -Warning: current() expects parameter 1 to be array, boolean given in %s on line %d +Warning: current() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 15 -- -Warning: current() expects parameter 1 to be array, boolean given in %s on line %d +Warning: current() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 16 -- diff --git a/ext/standard/tests/array/current_variation3.phpt b/ext/standard/tests/array/current_variation3.phpt index bab5e6e0c5..decb043116 100644 --- a/ext/standard/tests/array/current_variation3.phpt +++ b/ext/standard/tests/array/current_variation3.phpt @@ -30,7 +30,7 @@ echo "\$array2: "; var_dump(current($array2)); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing current() : usage variations *** -- Initial position of internal pointer -- diff --git a/ext/standard/tests/array/current_variation4.phpt b/ext/standard/tests/array/current_variation4.phpt index 741fced2e7..5862a86129 100644 --- a/ext/standard/tests/array/current_variation4.phpt +++ b/ext/standard/tests/array/current_variation4.phpt @@ -46,7 +46,7 @@ var_dump(current($multi_array[3][3][3])); var_dump(current($multi_array[3][3][3][1])); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing current() : usage variations *** -- Two Dimensional Array -- diff --git a/ext/standard/tests/array/current_variation5.phpt b/ext/standard/tests/array/current_variation5.phpt index 9e7c9e8d9d..d49353c24f 100644 --- a/ext/standard/tests/array/current_variation5.phpt +++ b/ext/standard/tests/array/current_variation5.phpt @@ -41,7 +41,7 @@ current_variation5($a); ?> ===DONE=== <?php exit(0); ?> ---EXPECTF-- +--EXPECT-- *** Testing current() : usage variations *** -- Function: reference parameter -- diff --git a/ext/standard/tests/array/current_variation6.phpt b/ext/standard/tests/array/current_variation6.phpt new file mode 100644 index 0000000000..d7fb0dccb1 --- /dev/null +++ b/ext/standard/tests/array/current_variation6.phpt @@ -0,0 +1,20 @@ +--TEST-- +Test current() function : internal pointer maintenance at the end of array +--FILE-- +<?php +$array = ["foo" => 1, "bar" => 2, "baz" => 3]; +reset($array); +while ($cur = current($array)) { + var_dump($cur); + next($array); +} + +unset($array["baz"]); +$array[] = 4; +var_dump(current($array)); +?> +--EXPECT-- +int(1) +int(2) +int(3) +int(4) diff --git a/ext/standard/tests/array/end.phpt b/ext/standard/tests/array/end.phpt index e7f312646e..dc3f2eb75e 100644 --- a/ext/standard/tests/array/end.phpt +++ b/ext/standard/tests/array/end.phpt @@ -228,7 +228,7 @@ NULL Warning: end() expects exactly 1 parameter, 2 given in %s on line %d NULL -Warning: end() expects parameter 1 to be array, integer given in %s on line %d +Warning: end() expects parameter 1 to be array, int given in %s on line %d NULL Warning: end() expects parameter 1 to be array, string given in %s on line %d diff --git a/ext/standard/tests/array/end_64bit.phpt b/ext/standard/tests/array/end_64bit.phpt index 469400fcea..0af5064e82 100644 --- a/ext/standard/tests/array/end_64bit.phpt +++ b/ext/standard/tests/array/end_64bit.phpt @@ -227,7 +227,7 @@ NULL Warning: end() expects exactly 1 parameter, 2 given in %s on line %d NULL -Warning: end() expects parameter 1 to be array, integer given in %s on line %d +Warning: end() expects parameter 1 to be array, int given in %s on line %d NULL Warning: end() expects parameter 1 to be array, string given in %s on line %d diff --git a/ext/standard/tests/array/end_basic.phpt b/ext/standard/tests/array/end_basic.phpt index aa899eb939..b14cc2f836 100644 --- a/ext/standard/tests/array/end_basic.phpt +++ b/ext/standard/tests/array/end_basic.phpt @@ -29,7 +29,7 @@ $array[2] = 'foo'; var_dump(end($array)); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing end() : basic functionality *** -- Initial Position: -- diff --git a/ext/standard/tests/array/end_variation1.phpt b/ext/standard/tests/array/end_variation1.phpt index 3dffd793ca..2b7f4cd9d4 100644 --- a/ext/standard/tests/array/end_variation1.phpt +++ b/ext/standard/tests/array/end_variation1.phpt @@ -99,22 +99,22 @@ fclose($fp); -- Iteration 1 -- -Warning: end() expects parameter 1 to be array, integer given in %s on line %d +Warning: end() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 2 -- -Warning: end() expects parameter 1 to be array, integer given in %s on line %d +Warning: end() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 3 -- -Warning: end() expects parameter 1 to be array, integer given in %s on line %d +Warning: end() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 4 -- -Warning: end() expects parameter 1 to be array, integer given in %s on line %d +Warning: end() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 5 -- @@ -154,22 +154,22 @@ NULL -- Iteration 12 -- -Warning: end() expects parameter 1 to be array, boolean given in %s on line %d +Warning: end() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 13 -- -Warning: end() expects parameter 1 to be array, boolean given in %s on line %d +Warning: end() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 14 -- -Warning: end() expects parameter 1 to be array, boolean given in %s on line %d +Warning: end() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 15 -- -Warning: end() expects parameter 1 to be array, boolean given in %s on line %d +Warning: end() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 16 -- diff --git a/ext/standard/tests/array/end_variation2.phpt b/ext/standard/tests/array/end_variation2.phpt index 98884a0147..43972b751e 100644 --- a/ext/standard/tests/array/end_variation2.phpt +++ b/ext/standard/tests/array/end_variation2.phpt @@ -25,7 +25,7 @@ echo "\n-- Pass a sub-array as \$array_arg --\n"; var_dump(end($array_arg[0])); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing end() : usage variations *** -- Pass a two-dimensional array as $array_arg -- diff --git a/ext/standard/tests/array/end_variation3.phpt b/ext/standard/tests/array/end_variation3.phpt index 3309d04edd..fbeea68a12 100644 --- a/ext/standard/tests/array/end_variation3.phpt +++ b/ext/standard/tests/array/end_variation3.phpt @@ -29,7 +29,7 @@ echo "\$array2: "; var_dump(current($array2)); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing end() : usage variations *** -- Initial position of internal pointer -- diff --git a/ext/standard/tests/array/extract_error.phpt b/ext/standard/tests/array/extract_error.phpt index 2dc12e1c82..e8bcf8f5d8 100644 --- a/ext/standard/tests/array/extract_error.phpt +++ b/ext/standard/tests/array/extract_error.phpt @@ -44,7 +44,7 @@ NULL Warning: extract(): Invalid extract type in %s on line %d NULL -Warning: extract() expects parameter 1 to be array, integer given in %s on line %d +Warning: extract() expects parameter 1 to be array, int given in %s on line %d NULL Warning: extract() expects parameter 1 to be array, string given in %s on line %d diff --git a/ext/standard/tests/array/extract_variation10.phpt b/ext/standard/tests/array/extract_variation10.phpt index bc0adf903e..078a7e8c40 100644 --- a/ext/standard/tests/array/extract_variation10.phpt +++ b/ext/standard/tests/array/extract_variation10.phpt @@ -9,5 +9,5 @@ extract($a, EXTR_REFS); $a['foo'] = 'changed.foo'; var_dump($nonref); ?> ---EXPECTF-- +--EXPECT-- string(12) "original.foo" diff --git a/ext/standard/tests/array/extract_variation11.phpt b/ext/standard/tests/array/extract_variation11.phpt index b26207b970..c8238050ae 100644 --- a/ext/standard/tests/array/extract_variation11.phpt +++ b/ext/standard/tests/array/extract_variation11.phpt @@ -9,5 +9,5 @@ extract($a, EXTR_OVERWRITE|EXTR_REFS); $foo = 'changed.foo'; var_dump($a['foo']); ?> ---EXPECTF-- +--EXPECT-- string(11) "changed.foo" diff --git a/ext/standard/tests/array/extract_variation2.phpt b/ext/standard/tests/array/extract_variation2.phpt index 99d1016a70..a0dcdf9673 100644 --- a/ext/standard/tests/array/extract_variation2.phpt +++ b/ext/standard/tests/array/extract_variation2.phpt @@ -33,7 +33,7 @@ foreach ( $mixed_array as $sub_array ) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- -- Iteration 0 -- int(0) int(0) diff --git a/ext/standard/tests/array/extract_variation3.phpt b/ext/standard/tests/array/extract_variation3.phpt index 1a1265922a..a858c597b5 100644 --- a/ext/standard/tests/array/extract_variation3.phpt +++ b/ext/standard/tests/array/extract_variation3.phpt @@ -33,7 +33,7 @@ foreach ( $mixed_array as $sub_array ) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- -- Iteration 0 -- int(0) int(0) diff --git a/ext/standard/tests/array/extract_variation4.phpt b/ext/standard/tests/array/extract_variation4.phpt index b9600b68ab..d755a6a214 100644 --- a/ext/standard/tests/array/extract_variation4.phpt +++ b/ext/standard/tests/array/extract_variation4.phpt @@ -33,7 +33,7 @@ foreach ( $mixed_array as $sub_array ) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- -- Iteration 0 -- int(0) int(0) diff --git a/ext/standard/tests/array/extract_variation5.phpt b/ext/standard/tests/array/extract_variation5.phpt index 3e405797e0..91867b1112 100644 --- a/ext/standard/tests/array/extract_variation5.phpt +++ b/ext/standard/tests/array/extract_variation5.phpt @@ -32,7 +32,7 @@ foreach ( $mixed_array as $sub_array ) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- -- Iteration 0 -- int(0) int(0) diff --git a/ext/standard/tests/array/extract_variation6.phpt b/ext/standard/tests/array/extract_variation6.phpt index e552b53325..fba1e97b83 100644 --- a/ext/standard/tests/array/extract_variation6.phpt +++ b/ext/standard/tests/array/extract_variation6.phpt @@ -16,7 +16,7 @@ var_dump($a); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- int(1) string(3) "aaa" int(1) diff --git a/ext/standard/tests/array/extract_variation7.phpt b/ext/standard/tests/array/extract_variation7.phpt index c27b019e50..1502a52380 100644 --- a/ext/standard/tests/array/extract_variation7.phpt +++ b/ext/standard/tests/array/extract_variation7.phpt @@ -15,7 +15,7 @@ var_dump ( extract($b, EXTR_PREFIX_ALL, "diff")); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing for EXTR_PREFIX_ALL called twice with same prefix string *** int(5) int(11) diff --git a/ext/standard/tests/array/extract_variation8.phpt b/ext/standard/tests/array/extract_variation8.phpt index d89b0803bd..3e6a9ad374 100644 --- a/ext/standard/tests/array/extract_variation8.phpt +++ b/ext/standard/tests/array/extract_variation8.phpt @@ -17,7 +17,7 @@ var_dump ( extract($var1)); echo "\nDone"; ?> ---EXPECTF-- +--EXPECT-- *** Testing for Numerical prefixes *** int(3) int(1) diff --git a/ext/standard/tests/array/in_array_errors.phpt b/ext/standard/tests/array/in_array_errors.phpt index 62b67c8db9..cef3fdf446 100644 --- a/ext/standard/tests/array/in_array_errors.phpt +++ b/ext/standard/tests/array/in_array_errors.phpt @@ -40,6 +40,6 @@ NULL Warning: in_array() expects parameter 2 to be array, string given in %s on line %d NULL -Warning: in_array() expects parameter 2 to be array, integer given in %s on line %d +Warning: in_array() expects parameter 2 to be array, int given in %s on line %d NULL Done diff --git a/ext/standard/tests/array/in_array_variation1.phpt b/ext/standard/tests/array/in_array_variation1.phpt index dc8d233a7e..bddffa6058 100644 --- a/ext/standard/tests/array/in_array_variation1.phpt +++ b/ext/standard/tests/array/in_array_variation1.phpt @@ -61,7 +61,7 @@ foreach($arrays as $array) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing in_array() with different needle values *** -- Iteration 1 -- bool(false) diff --git a/ext/standard/tests/array/in_array_variation2.phpt b/ext/standard/tests/array/in_array_variation2.phpt index a394b6035e..0815e3ee94 100644 --- a/ext/standard/tests/array/in_array_variation2.phpt +++ b/ext/standard/tests/array/in_array_variation2.phpt @@ -49,7 +49,7 @@ foreach($array_type as $type) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing in_array() with different haystack values *** -- Iteration 1 -- bool(true) diff --git a/ext/standard/tests/array/in_array_variation4.phpt b/ext/standard/tests/array/in_array_variation4.phpt index e166bdfad5..186eb2718d 100644 --- a/ext/standard/tests/array/in_array_variation4.phpt +++ b/ext/standard/tests/array/in_array_variation4.phpt @@ -9,7 +9,7 @@ Test in_array() function : usage variations - haystack as resource/multi dimensi * Source Code: ext/standard/array.c */ -/* Test in_array() with haystack as resouce and multidimentional arrays */ +/* Test in_array() with haystack as resouce and multidimensional arrays */ /* checking for Resources */ echo "*** Testing resource type with in_array() ***\n"; @@ -58,7 +58,7 @@ var_dump( in_array('123abc', array(123), TRUE) ); // false in strict mode echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing resource type with in_array() *** bool(true) bool(false) diff --git a/ext/standard/tests/array/key_basic.phpt b/ext/standard/tests/array/key_basic.phpt index 4d5b15b340..2b45124921 100644 --- a/ext/standard/tests/array/key_basic.phpt +++ b/ext/standard/tests/array/key_basic.phpt @@ -30,7 +30,7 @@ next($array); var_dump(key($array)); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing key() : basic functionality *** -- Initial Position: -- diff --git a/ext/standard/tests/array/key_exists_basic.phpt b/ext/standard/tests/array/key_exists_basic.phpt index b4b7771f63..510ec09dcc 100644 --- a/ext/standard/tests/array/key_exists_basic.phpt +++ b/ext/standard/tests/array/key_exists_basic.phpt @@ -9,7 +9,7 @@ echo "*** test key_exists() by calling it with its expected arguments ***\n"; $a = array('bar' => 1); var_dump(key_exists('bar', $a)); var_dump(key_exists('foo', $a)); ---EXPECTF-- +--EXPECT-- *** test key_exists() by calling it with its expected arguments *** bool(true) bool(false) diff --git a/ext/standard/tests/array/key_exists_variation1.phpt b/ext/standard/tests/array/key_exists_variation1.phpt index 0baa17eff7..490d564246 100644 --- a/ext/standard/tests/array/key_exists_variation1.phpt +++ b/ext/standard/tests/array/key_exists_variation1.phpt @@ -9,7 +9,7 @@ echo "*** test key_exists() by calling it with its expected arguments ***\n"; $a = array('bar' => 1, 'foo' => array('bar' => 2, 'baz' => 3)); var_dump(key_exists('baz', $a)); var_dump(key_exists('baz', $a['foo'])); ---EXPECTF-- +--EXPECT-- *** test key_exists() by calling it with its expected arguments *** bool(false) bool(true) diff --git a/ext/standard/tests/array/key_exists_variation2.phpt b/ext/standard/tests/array/key_exists_variation2.phpt index d5f803e0ad..4a06762410 100644 --- a/ext/standard/tests/array/key_exists_variation2.phpt +++ b/ext/standard/tests/array/key_exists_variation2.phpt @@ -54,7 +54,7 @@ var_dump(key_exists(0, $h)); // stream resource has index = 0, netherless its position is the latest $i = array('foo' => 'baz', $st); var_dump(key_exists(0, $i)); ---EXPECTF-- +--EXPECT-- *** test key_exists() by using mixed type of arrays *** bool(false) integer diff --git a/ext/standard/tests/array/key_variation1.phpt b/ext/standard/tests/array/key_variation1.phpt index bf0a1ef614..12a97e1421 100644 --- a/ext/standard/tests/array/key_variation1.phpt +++ b/ext/standard/tests/array/key_variation1.phpt @@ -99,22 +99,22 @@ fclose($fp); -- Iteration 1 -- -Warning: key() expects parameter 1 to be array, integer given in %s on line %d +Warning: key() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 2 -- -Warning: key() expects parameter 1 to be array, integer given in %s on line %d +Warning: key() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 3 -- -Warning: key() expects parameter 1 to be array, integer given in %s on line %d +Warning: key() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 4 -- -Warning: key() expects parameter 1 to be array, integer given in %s on line %d +Warning: key() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 5 -- @@ -154,22 +154,22 @@ NULL -- Iteration 12 -- -Warning: key() expects parameter 1 to be array, boolean given in %s on line %d +Warning: key() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 13 -- -Warning: key() expects parameter 1 to be array, boolean given in %s on line %d +Warning: key() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 14 -- -Warning: key() expects parameter 1 to be array, boolean given in %s on line %d +Warning: key() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 15 -- -Warning: key() expects parameter 1 to be array, boolean given in %s on line %d +Warning: key() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 16 -- diff --git a/ext/standard/tests/array/key_variation2.phpt b/ext/standard/tests/array/key_variation2.phpt index e9bcb75d68..cf7ca37531 100644 --- a/ext/standard/tests/array/key_variation2.phpt +++ b/ext/standard/tests/array/key_variation2.phpt @@ -104,7 +104,7 @@ foreach($inputs as $key => $input) { }; ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing key() : usage variations *** -- Iteration 1 : int data -- diff --git a/ext/standard/tests/array/key_variation3.phpt b/ext/standard/tests/array/key_variation3.phpt index 2d8058d51c..2d5387e56e 100644 --- a/ext/standard/tests/array/key_variation3.phpt +++ b/ext/standard/tests/array/key_variation3.phpt @@ -31,7 +31,7 @@ echo "\$array2: "; var_dump(key($array2)); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing key() : usage variations *** -- Initial position of internal pointer -- diff --git a/ext/standard/tests/array/key_variation4.phpt b/ext/standard/tests/array/key_variation4.phpt index 27421c2f63..a7fa8d7bf9 100644 --- a/ext/standard/tests/array/key_variation4.phpt +++ b/ext/standard/tests/array/key_variation4.phpt @@ -45,7 +45,7 @@ var_dump(key($multi_array[3][3][3])); var_dump(key($multi_array[3][3][3][1])); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing key() : usage variations *** -- Two Dimensional Array -- diff --git a/ext/standard/tests/array/krsort_basic.phpt b/ext/standard/tests/array/krsort_basic.phpt index 1f5cc8b67b..f65fa0a553 100644 --- a/ext/standard/tests/array/krsort_basic.phpt +++ b/ext/standard/tests/array/krsort_basic.phpt @@ -75,7 +75,7 @@ var_dump( $temp_array); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing krsort() : basic functionality *** -- Testing krsort() by supplying string array, 'flag' value is defualt -- diff --git a/ext/standard/tests/array/krsort_variation1.phpt b/ext/standard/tests/array/krsort_variation1.phpt index 9a30c4ec1e..aaba5b91ce 100644 --- a/ext/standard/tests/array/krsort_variation1.phpt +++ b/ext/standard/tests/array/krsort_variation1.phpt @@ -62,10 +62,10 @@ $unexpected_values = array ( /*19*/ new stdclass(), // undefined data -/*20*/ @undefined_var, +/*20*/ @$undefined_var, // unset data -/*21*/ @unset_var, +/*21*/ @$unset_var, // resource variable /*22*/ $fp @@ -97,55 +97,55 @@ echo "Done"; -- Flag values are defualt, SORT_REGULAR, SORT_NUMERIC, SORT_STRING -- -- Iteration 1 -- -Warning: krsort() expects parameter 1 to be array, integer given in %s on line %d +Warning: krsort() expects parameter 1 to be array, int given in %s on line %d bool(false) -Warning: krsort() expects parameter 1 to be array, integer given in %s on line %d +Warning: krsort() expects parameter 1 to be array, int given in %s on line %d bool(false) -Warning: krsort() expects parameter 1 to be array, integer given in %s on line %d +Warning: krsort() expects parameter 1 to be array, int given in %s on line %d bool(false) -Warning: krsort() expects parameter 1 to be array, integer given in %s on line %d +Warning: krsort() expects parameter 1 to be array, int given in %s on line %d bool(false) -- Iteration 2 -- -Warning: krsort() expects parameter 1 to be array, integer given in %s on line %d +Warning: krsort() expects parameter 1 to be array, int given in %s on line %d bool(false) -Warning: krsort() expects parameter 1 to be array, integer given in %s on line %d +Warning: krsort() expects parameter 1 to be array, int given in %s on line %d bool(false) -Warning: krsort() expects parameter 1 to be array, integer given in %s on line %d +Warning: krsort() expects parameter 1 to be array, int given in %s on line %d bool(false) -Warning: krsort() expects parameter 1 to be array, integer given in %s on line %d +Warning: krsort() expects parameter 1 to be array, int given in %s on line %d bool(false) -- Iteration 3 -- -Warning: krsort() expects parameter 1 to be array, integer given in %s on line %d +Warning: krsort() expects parameter 1 to be array, int given in %s on line %d bool(false) -Warning: krsort() expects parameter 1 to be array, integer given in %s on line %d +Warning: krsort() expects parameter 1 to be array, int given in %s on line %d bool(false) -Warning: krsort() expects parameter 1 to be array, integer given in %s on line %d +Warning: krsort() expects parameter 1 to be array, int given in %s on line %d bool(false) -Warning: krsort() expects parameter 1 to be array, integer given in %s on line %d +Warning: krsort() expects parameter 1 to be array, int given in %s on line %d bool(false) -- Iteration 4 -- -Warning: krsort() expects parameter 1 to be array, integer given in %s on line %d +Warning: krsort() expects parameter 1 to be array, int given in %s on line %d bool(false) -Warning: krsort() expects parameter 1 to be array, integer given in %s on line %d +Warning: krsort() expects parameter 1 to be array, int given in %s on line %d bool(false) -Warning: krsort() expects parameter 1 to be array, integer given in %s on line %d +Warning: krsort() expects parameter 1 to be array, int given in %s on line %d bool(false) -Warning: krsort() expects parameter 1 to be array, integer given in %s on line %d +Warning: krsort() expects parameter 1 to be array, int given in %s on line %d bool(false) -- Iteration 5 -- @@ -240,55 +240,55 @@ Warning: krsort() expects parameter 1 to be array, null given in %s on line %d bool(false) -- Iteration 12 -- -Warning: krsort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: krsort() expects parameter 1 to be array, bool given in %s on line %d bool(false) -Warning: krsort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: krsort() expects parameter 1 to be array, bool given in %s on line %d bool(false) -Warning: krsort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: krsort() expects parameter 1 to be array, bool given in %s on line %d bool(false) -Warning: krsort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: krsort() expects parameter 1 to be array, bool given in %s on line %d bool(false) -- Iteration 13 -- -Warning: krsort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: krsort() expects parameter 1 to be array, bool given in %s on line %d bool(false) -Warning: krsort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: krsort() expects parameter 1 to be array, bool given in %s on line %d bool(false) -Warning: krsort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: krsort() expects parameter 1 to be array, bool given in %s on line %d bool(false) -Warning: krsort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: krsort() expects parameter 1 to be array, bool given in %s on line %d bool(false) -- Iteration 14 -- -Warning: krsort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: krsort() expects parameter 1 to be array, bool given in %s on line %d bool(false) -Warning: krsort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: krsort() expects parameter 1 to be array, bool given in %s on line %d bool(false) -Warning: krsort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: krsort() expects parameter 1 to be array, bool given in %s on line %d bool(false) -Warning: krsort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: krsort() expects parameter 1 to be array, bool given in %s on line %d bool(false) -- Iteration 15 -- -Warning: krsort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: krsort() expects parameter 1 to be array, bool given in %s on line %d bool(false) -Warning: krsort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: krsort() expects parameter 1 to be array, bool given in %s on line %d bool(false) -Warning: krsort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: krsort() expects parameter 1 to be array, bool given in %s on line %d bool(false) -Warning: krsort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: krsort() expects parameter 1 to be array, bool given in %s on line %d bool(false) -- Iteration 16 -- @@ -357,29 +357,29 @@ Warning: krsort() expects parameter 1 to be array, object given in %s on line %d bool(false) -- Iteration 21 -- -Warning: krsort() expects parameter 1 to be array, string given in %s on line %d +Warning: krsort() expects parameter 1 to be array, null given in %s on line %d bool(false) -Warning: krsort() expects parameter 1 to be array, string given in %s on line %d +Warning: krsort() expects parameter 1 to be array, null given in %s on line %d bool(false) -Warning: krsort() expects parameter 1 to be array, string given in %s on line %d +Warning: krsort() expects parameter 1 to be array, null given in %s on line %d bool(false) -Warning: krsort() expects parameter 1 to be array, string given in %s on line %d +Warning: krsort() expects parameter 1 to be array, null given in %s on line %d bool(false) -- Iteration 22 -- -Warning: krsort() expects parameter 1 to be array, string given in %s on line %d +Warning: krsort() expects parameter 1 to be array, null given in %s on line %d bool(false) -Warning: krsort() expects parameter 1 to be array, string given in %s on line %d +Warning: krsort() expects parameter 1 to be array, null given in %s on line %d bool(false) -Warning: krsort() expects parameter 1 to be array, string given in %s on line %d +Warning: krsort() expects parameter 1 to be array, null given in %s on line %d bool(false) -Warning: krsort() expects parameter 1 to be array, string given in %s on line %d +Warning: krsort() expects parameter 1 to be array, null given in %s on line %d bool(false) -- Iteration 23 -- diff --git a/ext/standard/tests/array/krsort_variation10.phpt b/ext/standard/tests/array/krsort_variation10.phpt index 32e9b8b3ef..c22656d173 100644 --- a/ext/standard/tests/array/krsort_variation10.phpt +++ b/ext/standard/tests/array/krsort_variation10.phpt @@ -54,7 +54,7 @@ var_dump($temp_array); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing krsort() : usage variations *** -- Testing krsort() by supplying heredoc string array, 'flag' value is defualt -- diff --git a/ext/standard/tests/array/krsort_variation11.phpt b/ext/standard/tests/array/krsort_variation11.phpt index 4e8d1c1800..32ca85c6ec 100644 --- a/ext/standard/tests/array/krsort_variation11.phpt +++ b/ext/standard/tests/array/krsort_variation11.phpt @@ -40,7 +40,7 @@ var_dump($temp_array); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing krsort() : usage variations *** -- Testing krsort() by supplying boolean value array, 'flag' value is defualt -- diff --git a/ext/standard/tests/array/krsort_variation2.phpt b/ext/standard/tests/array/krsort_variation2.phpt index b754021bb5..303a9a1eb6 100644 --- a/ext/standard/tests/array/krsort_variation2.phpt +++ b/ext/standard/tests/array/krsort_variation2.phpt @@ -58,10 +58,10 @@ $unexpected_values = array ( /*16*/ new stdclass(), // undefined data -/*17*/ @undefined_var, +/*17*/ @$undefined_var, // unset data -/*18*/ @unset_var, +/*18*/ @$unset_var, // resource variable /*19*/ $fp @@ -210,7 +210,7 @@ array(3) { } -- Iteration 13 -- -Warning: krsort() expects parameter 2 to be integer, string given in %s on line %d +Warning: krsort() expects parameter 2 to be int, string given in %s on line %d bool(false) array(3) { [10]=> @@ -222,7 +222,7 @@ array(3) { } -- Iteration 14 -- -Warning: krsort() expects parameter 2 to be integer, string given in %s on line %d +Warning: krsort() expects parameter 2 to be int, string given in %s on line %d bool(false) array(3) { [10]=> @@ -234,7 +234,7 @@ array(3) { } -- Iteration 15 -- -Warning: krsort() expects parameter 2 to be integer, string given in %s on line %d +Warning: krsort() expects parameter 2 to be int, string given in %s on line %d bool(false) array(3) { [10]=> @@ -246,7 +246,7 @@ array(3) { } -- Iteration 16 -- -Warning: krsort() expects parameter 2 to be integer, string given in %s on line %d +Warning: krsort() expects parameter 2 to be int, string given in %s on line %d bool(false) array(3) { [10]=> @@ -258,7 +258,7 @@ array(3) { } -- Iteration 17 -- -Warning: krsort() expects parameter 2 to be integer, object given in %s on line %d +Warning: krsort() expects parameter 2 to be int, object given in %s on line %d bool(false) array(3) { [10]=> @@ -269,32 +269,28 @@ array(3) { int(45) } -- Iteration 18 -- - -Warning: krsort() expects parameter 2 to be integer, string given in %s on line %d -bool(false) +bool(true) array(3) { + [45]=> + int(45) [10]=> int(10) [2]=> int(2) - [45]=> - int(45) } -- Iteration 19 -- - -Warning: krsort() expects parameter 2 to be integer, string given in %s on line %d -bool(false) +bool(true) array(3) { + [45]=> + int(45) [10]=> int(10) [2]=> int(2) - [45]=> - int(45) } -- Iteration 20 -- -Warning: krsort() expects parameter 2 to be integer, resource given in %s on line %d +Warning: krsort() expects parameter 2 to be int, resource given in %s on line %d bool(false) array(3) { [10]=> diff --git a/ext/standard/tests/array/krsort_variation3.phpt b/ext/standard/tests/array/krsort_variation3.phpt index 63c46ce02b..506b0cfa57 100644 --- a/ext/standard/tests/array/krsort_variation3.phpt +++ b/ext/standard/tests/array/krsort_variation3.phpt @@ -57,7 +57,7 @@ foreach ($various_arrays as $array) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing krsort() : usage variations *** -- Testing krsort() by supplying various integer/float arrays -- diff --git a/ext/standard/tests/array/krsort_variation4.phpt b/ext/standard/tests/array/krsort_variation4.phpt index 335cbea003..dbbac1e85a 100644 --- a/ext/standard/tests/array/krsort_variation4.phpt +++ b/ext/standard/tests/array/krsort_variation4.phpt @@ -40,7 +40,7 @@ var_dump($temp_array); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing krsort() : usage variations *** -- Testing krsort() by supplying octal value array, 'flag' value is defualt -- diff --git a/ext/standard/tests/array/krsort_variation5.phpt b/ext/standard/tests/array/krsort_variation5.phpt index 7abe5504c5..3af411135c 100644 --- a/ext/standard/tests/array/krsort_variation5.phpt +++ b/ext/standard/tests/array/krsort_variation5.phpt @@ -62,7 +62,7 @@ foreach ($various_arrays as $array) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing krsort() : usage variations *** -- Testing krsort() by supplying various string arrays -- diff --git a/ext/standard/tests/array/krsort_variation6.phpt b/ext/standard/tests/array/krsort_variation6.phpt index c0c789fd2b..357fb5c1a0 100644 --- a/ext/standard/tests/array/krsort_variation6.phpt +++ b/ext/standard/tests/array/krsort_variation6.phpt @@ -40,7 +40,7 @@ var_dump($temp_array); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing krsort() : usage variations *** -- Testing krsort() by supplying hexadecimal value array, 'flag' value is defualt -- diff --git a/ext/standard/tests/array/krsort_variation7.phpt b/ext/standard/tests/array/krsort_variation7.phpt index c08d89ec20..14a3310a65 100644 --- a/ext/standard/tests/array/krsort_variation7.phpt +++ b/ext/standard/tests/array/krsort_variation7.phpt @@ -54,7 +54,7 @@ foreach ($various_arrays as $array) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing krsort() : usage variations *** -- Testing krsort() by supplying various arrays containing sub arrays -- diff --git a/ext/standard/tests/array/krsort_variation8.phpt b/ext/standard/tests/array/krsort_variation8.phpt Binary files differindex 50a9d63e57..67a402a8df 100644 --- a/ext/standard/tests/array/krsort_variation8.phpt +++ b/ext/standard/tests/array/krsort_variation8.phpt diff --git a/ext/standard/tests/array/krsort_variation9.phpt b/ext/standard/tests/array/krsort_variation9.phpt index 52b857b972..5317228931 100644 --- a/ext/standard/tests/array/krsort_variation9.phpt +++ b/ext/standard/tests/array/krsort_variation9.phpt @@ -48,7 +48,7 @@ foreach ($various_arrays as $array) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing krsort() : usage variations *** -- Testing krsort() by supplying various arrays with/without key values -- diff --git a/ext/standard/tests/array/ksort_basic.phpt b/ext/standard/tests/array/ksort_basic.phpt index cc9c8713d3..ff0469e7a3 100644 --- a/ext/standard/tests/array/ksort_basic.phpt +++ b/ext/standard/tests/array/ksort_basic.phpt @@ -73,7 +73,7 @@ var_dump( $temp_array); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing ksort() : basic functionality *** -- Testing ksort() by supplying string array, 'flag' value is defualt -- diff --git a/ext/standard/tests/array/ksort_variation1.phpt b/ext/standard/tests/array/ksort_variation1.phpt index df3b294240..87de1647d7 100644 --- a/ext/standard/tests/array/ksort_variation1.phpt +++ b/ext/standard/tests/array/ksort_variation1.phpt @@ -61,10 +61,10 @@ $unexpected_values = array ( /*19*/ new stdclass(), // undefined data -/*20*/ @undefined_var, +/*20*/ @$undefined_var, // unset data -/*21*/ @unset_var, +/*21*/ @$unset_var, // resource variable /*22*/ $fp @@ -97,55 +97,55 @@ echo "Done"; -- Flag values are defualt, SORT_REGULAR, SORT_NUMERIC, SORT_STRING -- -- Iteration 1 -- -Warning: ksort() expects parameter 1 to be array, integer given in %s on line %d +Warning: ksort() expects parameter 1 to be array, int given in %s on line %d bool(false) -Warning: ksort() expects parameter 1 to be array, integer given in %s on line %d +Warning: ksort() expects parameter 1 to be array, int given in %s on line %d bool(false) -Warning: ksort() expects parameter 1 to be array, integer given in %s on line %d +Warning: ksort() expects parameter 1 to be array, int given in %s on line %d bool(false) -Warning: ksort() expects parameter 1 to be array, integer given in %s on line %d +Warning: ksort() expects parameter 1 to be array, int given in %s on line %d bool(false) -- Iteration 2 -- -Warning: ksort() expects parameter 1 to be array, integer given in %s on line %d +Warning: ksort() expects parameter 1 to be array, int given in %s on line %d bool(false) -Warning: ksort() expects parameter 1 to be array, integer given in %s on line %d +Warning: ksort() expects parameter 1 to be array, int given in %s on line %d bool(false) -Warning: ksort() expects parameter 1 to be array, integer given in %s on line %d +Warning: ksort() expects parameter 1 to be array, int given in %s on line %d bool(false) -Warning: ksort() expects parameter 1 to be array, integer given in %s on line %d +Warning: ksort() expects parameter 1 to be array, int given in %s on line %d bool(false) -- Iteration 3 -- -Warning: ksort() expects parameter 1 to be array, integer given in %s on line %d +Warning: ksort() expects parameter 1 to be array, int given in %s on line %d bool(false) -Warning: ksort() expects parameter 1 to be array, integer given in %s on line %d +Warning: ksort() expects parameter 1 to be array, int given in %s on line %d bool(false) -Warning: ksort() expects parameter 1 to be array, integer given in %s on line %d +Warning: ksort() expects parameter 1 to be array, int given in %s on line %d bool(false) -Warning: ksort() expects parameter 1 to be array, integer given in %s on line %d +Warning: ksort() expects parameter 1 to be array, int given in %s on line %d bool(false) -- Iteration 4 -- -Warning: ksort() expects parameter 1 to be array, integer given in %s on line %d +Warning: ksort() expects parameter 1 to be array, int given in %s on line %d bool(false) -Warning: ksort() expects parameter 1 to be array, integer given in %s on line %d +Warning: ksort() expects parameter 1 to be array, int given in %s on line %d bool(false) -Warning: ksort() expects parameter 1 to be array, integer given in %s on line %d +Warning: ksort() expects parameter 1 to be array, int given in %s on line %d bool(false) -Warning: ksort() expects parameter 1 to be array, integer given in %s on line %d +Warning: ksort() expects parameter 1 to be array, int given in %s on line %d bool(false) -- Iteration 5 -- @@ -240,55 +240,55 @@ Warning: ksort() expects parameter 1 to be array, null given in %s on line %d bool(false) -- Iteration 12 -- -Warning: ksort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: ksort() expects parameter 1 to be array, bool given in %s on line %d bool(false) -Warning: ksort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: ksort() expects parameter 1 to be array, bool given in %s on line %d bool(false) -Warning: ksort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: ksort() expects parameter 1 to be array, bool given in %s on line %d bool(false) -Warning: ksort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: ksort() expects parameter 1 to be array, bool given in %s on line %d bool(false) -- Iteration 13 -- -Warning: ksort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: ksort() expects parameter 1 to be array, bool given in %s on line %d bool(false) -Warning: ksort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: ksort() expects parameter 1 to be array, bool given in %s on line %d bool(false) -Warning: ksort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: ksort() expects parameter 1 to be array, bool given in %s on line %d bool(false) -Warning: ksort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: ksort() expects parameter 1 to be array, bool given in %s on line %d bool(false) -- Iteration 14 -- -Warning: ksort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: ksort() expects parameter 1 to be array, bool given in %s on line %d bool(false) -Warning: ksort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: ksort() expects parameter 1 to be array, bool given in %s on line %d bool(false) -Warning: ksort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: ksort() expects parameter 1 to be array, bool given in %s on line %d bool(false) -Warning: ksort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: ksort() expects parameter 1 to be array, bool given in %s on line %d bool(false) -- Iteration 15 -- -Warning: ksort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: ksort() expects parameter 1 to be array, bool given in %s on line %d bool(false) -Warning: ksort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: ksort() expects parameter 1 to be array, bool given in %s on line %d bool(false) -Warning: ksort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: ksort() expects parameter 1 to be array, bool given in %s on line %d bool(false) -Warning: ksort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: ksort() expects parameter 1 to be array, bool given in %s on line %d bool(false) -- Iteration 16 -- @@ -357,29 +357,29 @@ Warning: ksort() expects parameter 1 to be array, object given in %s on line %d bool(false) -- Iteration 21 -- -Warning: ksort() expects parameter 1 to be array, string given in %s on line %d +Warning: ksort() expects parameter 1 to be array, null given in %s on line %d bool(false) -Warning: ksort() expects parameter 1 to be array, string given in %s on line %d +Warning: ksort() expects parameter 1 to be array, null given in %s on line %d bool(false) -Warning: ksort() expects parameter 1 to be array, string given in %s on line %d +Warning: ksort() expects parameter 1 to be array, null given in %s on line %d bool(false) -Warning: ksort() expects parameter 1 to be array, string given in %s on line %d +Warning: ksort() expects parameter 1 to be array, null given in %s on line %d bool(false) -- Iteration 22 -- -Warning: ksort() expects parameter 1 to be array, string given in %s on line %d +Warning: ksort() expects parameter 1 to be array, null given in %s on line %d bool(false) -Warning: ksort() expects parameter 1 to be array, string given in %s on line %d +Warning: ksort() expects parameter 1 to be array, null given in %s on line %d bool(false) -Warning: ksort() expects parameter 1 to be array, string given in %s on line %d +Warning: ksort() expects parameter 1 to be array, null given in %s on line %d bool(false) -Warning: ksort() expects parameter 1 to be array, string given in %s on line %d +Warning: ksort() expects parameter 1 to be array, null given in %s on line %d bool(false) -- Iteration 23 -- diff --git a/ext/standard/tests/array/ksort_variation10.phpt b/ext/standard/tests/array/ksort_variation10.phpt index 1037042a7f..1a1a719b53 100644 --- a/ext/standard/tests/array/ksort_variation10.phpt +++ b/ext/standard/tests/array/ksort_variation10.phpt @@ -39,7 +39,7 @@ var_dump($temp_array); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing ksort() : usage variations *** -- Testing ksort() by supplying octal value array, 'flag' value is defualt -- diff --git a/ext/standard/tests/array/ksort_variation11.phpt b/ext/standard/tests/array/ksort_variation11.phpt index 4dfdad05fe..2c93512fea 100644 --- a/ext/standard/tests/array/ksort_variation11.phpt +++ b/ext/standard/tests/array/ksort_variation11.phpt @@ -54,7 +54,7 @@ var_dump($temp_array); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing ksort() : usage variations *** -- Testing ksort() by supplying heredoc string array, 'flag' value is defualt -- diff --git a/ext/standard/tests/array/ksort_variation2.phpt b/ext/standard/tests/array/ksort_variation2.phpt index 3ad987ccf4..83130d543e 100644 --- a/ext/standard/tests/array/ksort_variation2.phpt +++ b/ext/standard/tests/array/ksort_variation2.phpt @@ -58,10 +58,10 @@ $unexpected_values = array ( /*16*/ new stdclass(), // undefined data -/*17*/ @undefined_var, +/*17*/ @$undefined_var, // unset data -/*18*/ @unset_var, +/*18*/ @$unset_var, // resource variable /*19*/ $fp @@ -210,7 +210,7 @@ array(3) { } -- Iteration 13 -- -Warning: ksort() expects parameter 2 to be integer, string given in %s on line %d +Warning: ksort() expects parameter 2 to be int, string given in %s on line %d bool(false) array(3) { [10]=> @@ -222,7 +222,7 @@ array(3) { } -- Iteration 14 -- -Warning: ksort() expects parameter 2 to be integer, string given in %s on line %d +Warning: ksort() expects parameter 2 to be int, string given in %s on line %d bool(false) array(3) { [10]=> @@ -234,7 +234,7 @@ array(3) { } -- Iteration 15 -- -Warning: ksort() expects parameter 2 to be integer, string given in %s on line %d +Warning: ksort() expects parameter 2 to be int, string given in %s on line %d bool(false) array(3) { [10]=> @@ -246,7 +246,7 @@ array(3) { } -- Iteration 16 -- -Warning: ksort() expects parameter 2 to be integer, string given in %s on line %d +Warning: ksort() expects parameter 2 to be int, string given in %s on line %d bool(false) array(3) { [10]=> @@ -258,7 +258,7 @@ array(3) { } -- Iteration 17 -- -Warning: ksort() expects parameter 2 to be integer, object given in %s on line %d +Warning: ksort() expects parameter 2 to be int, object given in %s on line %d bool(false) array(3) { [10]=> @@ -269,32 +269,28 @@ array(3) { int(45) } -- Iteration 18 -- - -Warning: ksort() expects parameter 2 to be integer, string given in %s on line %d -bool(false) +bool(true) array(3) { - [10]=> - int(10) [2]=> int(2) + [10]=> + int(10) [45]=> int(45) } -- Iteration 19 -- - -Warning: ksort() expects parameter 2 to be integer, string given in %s on line %d -bool(false) +bool(true) array(3) { - [10]=> - int(10) [2]=> int(2) + [10]=> + int(10) [45]=> int(45) } -- Iteration 20 -- -Warning: ksort() expects parameter 2 to be integer, resource given in %s on line %d +Warning: ksort() expects parameter 2 to be int, resource given in %s on line %d bool(false) array(3) { [10]=> diff --git a/ext/standard/tests/array/ksort_variation3.phpt b/ext/standard/tests/array/ksort_variation3.phpt index 0ee73deb7b..3159a36be5 100644 --- a/ext/standard/tests/array/ksort_variation3.phpt +++ b/ext/standard/tests/array/ksort_variation3.phpt @@ -57,7 +57,7 @@ foreach ($various_arrays as $array) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing ksort() : usage variations *** -- Testing ksort() by supplying various integer/float arrays -- diff --git a/ext/standard/tests/array/ksort_variation4.phpt b/ext/standard/tests/array/ksort_variation4.phpt index d6b3f482bf..46e330229e 100644 --- a/ext/standard/tests/array/ksort_variation4.phpt +++ b/ext/standard/tests/array/ksort_variation4.phpt @@ -40,7 +40,7 @@ var_dump($temp_array); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing ksort() : usage variations *** -- Testing ksort() by supplying boolean value array, 'flag' value is defualt -- diff --git a/ext/standard/tests/array/ksort_variation5.phpt b/ext/standard/tests/array/ksort_variation5.phpt index eed437fd5b..7951c45eb5 100644 --- a/ext/standard/tests/array/ksort_variation5.phpt +++ b/ext/standard/tests/array/ksort_variation5.phpt @@ -62,7 +62,7 @@ foreach ($various_arrays as $array) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing ksort() : usage variations *** -- Testing ksort() by supplying various string arrays -- diff --git a/ext/standard/tests/array/ksort_variation6.phpt b/ext/standard/tests/array/ksort_variation6.phpt index 4ecf7a28ae..0e6d8fe372 100644 --- a/ext/standard/tests/array/ksort_variation6.phpt +++ b/ext/standard/tests/array/ksort_variation6.phpt @@ -40,7 +40,7 @@ var_dump($temp_array); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing ksort() : usage variations *** -- Testing ksort() by supplying hexadecimal value array, 'flag' value is defualt -- diff --git a/ext/standard/tests/array/ksort_variation7.phpt b/ext/standard/tests/array/ksort_variation7.phpt index 1d6d58960f..4b1f509c3c 100644 --- a/ext/standard/tests/array/ksort_variation7.phpt +++ b/ext/standard/tests/array/ksort_variation7.phpt @@ -54,7 +54,7 @@ foreach ($various_arrays as $array) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing ksort() : usage variations *** -- Testing ksort() by supplying various arrays containing sub arrays -- diff --git a/ext/standard/tests/array/ksort_variation8.phpt b/ext/standard/tests/array/ksort_variation8.phpt Binary files differindex 58f6a7aeb1..bedbeeed7c 100644 --- a/ext/standard/tests/array/ksort_variation8.phpt +++ b/ext/standard/tests/array/ksort_variation8.phpt diff --git a/ext/standard/tests/array/ksort_variation9.phpt b/ext/standard/tests/array/ksort_variation9.phpt index 39c672bbf5..be58e6d589 100644 --- a/ext/standard/tests/array/ksort_variation9.phpt +++ b/ext/standard/tests/array/ksort_variation9.phpt @@ -47,7 +47,7 @@ foreach ($various_arrays as $array) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing ksort() : usage variations *** -- Testing ksort() by supplying various arrays with/without key values -- diff --git a/ext/standard/tests/array/natcasesort_basic.phpt b/ext/standard/tests/array/natcasesort_basic.phpt index a2bee69829..539fa424fb 100644 --- a/ext/standard/tests/array/natcasesort_basic.phpt +++ b/ext/standard/tests/array/natcasesort_basic.phpt @@ -23,7 +23,7 @@ var_dump($array); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing natcasesort() : basic functionality *** -- Before sorting: -- diff --git a/ext/standard/tests/array/natcasesort_variation1.phpt b/ext/standard/tests/array/natcasesort_variation1.phpt index 3b18745d89..98d6297a3f 100644 --- a/ext/standard/tests/array/natcasesort_variation1.phpt +++ b/ext/standard/tests/array/natcasesort_variation1.phpt @@ -99,22 +99,22 @@ echo "Done"; -- Iteration 1 -- -Warning: natcasesort() expects parameter 1 to be array, integer given in %s on line %d +Warning: natcasesort() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 2 -- -Warning: natcasesort() expects parameter 1 to be array, integer given in %s on line %d +Warning: natcasesort() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 3 -- -Warning: natcasesort() expects parameter 1 to be array, integer given in %s on line %d +Warning: natcasesort() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 4 -- -Warning: natcasesort() expects parameter 1 to be array, integer given in %s on line %d +Warning: natcasesort() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 5 -- @@ -154,22 +154,22 @@ NULL -- Iteration 12 -- -Warning: natcasesort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: natcasesort() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 13 -- -Warning: natcasesort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: natcasesort() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 14 -- -Warning: natcasesort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: natcasesort() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 15 -- -Warning: natcasesort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: natcasesort() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 16 -- diff --git a/ext/standard/tests/array/natcasesort_variation10.phpt b/ext/standard/tests/array/natcasesort_variation10.phpt index 07c11485eb..3cfb36e2a4 100644 --- a/ext/standard/tests/array/natcasesort_variation10.phpt +++ b/ext/standard/tests/array/natcasesort_variation10.phpt @@ -27,7 +27,7 @@ echo key($array_arg) . " => " . current ($array_arg) . "\n"; echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing natcasesort() : usage variations *** -- Initial Position of Internal Pointer: -- diff --git a/ext/standard/tests/array/natcasesort_variation11.phpt b/ext/standard/tests/array/natcasesort_variation11.phpt index 9cb9117845..365600edd7 100644 --- a/ext/standard/tests/array/natcasesort_variation11.phpt +++ b/ext/standard/tests/array/natcasesort_variation11.phpt @@ -111,7 +111,7 @@ foreach($inputs as $input) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing natcasesort() : usage variations *** -- Iteration 1 -- diff --git a/ext/standard/tests/array/natcasesort_variation3.phpt b/ext/standard/tests/array/natcasesort_variation3.phpt index 10c3da6804..c3400f4d65 100644 --- a/ext/standard/tests/array/natcasesort_variation3.phpt +++ b/ext/standard/tests/array/natcasesort_variation3.phpt @@ -41,7 +41,7 @@ foreach ($inputs as $array_arg) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing natcasesort() : usage variation *** -- Iteration 1 -- diff --git a/ext/standard/tests/array/natcasesort_variation4.phpt b/ext/standard/tests/array/natcasesort_variation4.phpt index d7dee1e8e7..472cfe1dc4 100644 --- a/ext/standard/tests/array/natcasesort_variation4.phpt +++ b/ext/standard/tests/array/natcasesort_variation4.phpt @@ -33,7 +33,7 @@ foreach ($inputs as $array_arg) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing natcasesort() : usage variation *** bool(true) array(11) { diff --git a/ext/standard/tests/array/natcasesort_variation5.phpt b/ext/standard/tests/array/natcasesort_variation5.phpt index f7cd1ff8d9..f2cbd17191 100644 --- a/ext/standard/tests/array/natcasesort_variation5.phpt +++ b/ext/standard/tests/array/natcasesort_variation5.phpt @@ -19,7 +19,7 @@ var_dump($unsorted_hex_array); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing natcasesort() : usage variation *** bool(true) array(11) { diff --git a/ext/standard/tests/array/natcasesort_variation6.phpt b/ext/standard/tests/array/natcasesort_variation6.phpt index 1a4e22726a..bbbefa799e 100644 --- a/ext/standard/tests/array/natcasesort_variation6.phpt +++ b/ext/standard/tests/array/natcasesort_variation6.phpt @@ -29,7 +29,7 @@ var_dump($array); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing natcasesort() : usage variation *** -- Initial test -- diff --git a/ext/standard/tests/array/natcasesort_variation7.phpt b/ext/standard/tests/array/natcasesort_variation7.phpt index 91be7e262f..713f7c959c 100644 --- a/ext/standard/tests/array/natcasesort_variation7.phpt +++ b/ext/standard/tests/array/natcasesort_variation7.phpt @@ -22,7 +22,7 @@ var_dump($array); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing natcasesort() : usage variations *** array(5) { [0]=> diff --git a/ext/standard/tests/array/natcasesort_variation8.phpt b/ext/standard/tests/array/natcasesort_variation8.phpt index f238fc87cc..b0f7cbba50 100644 --- a/ext/standard/tests/array/natcasesort_variation8.phpt +++ b/ext/standard/tests/array/natcasesort_variation8.phpt @@ -20,7 +20,7 @@ var_dump($unsorted_oct_array); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing natcasesort() : usage variation *** bool(true) array(9) { diff --git a/ext/standard/tests/array/natcasesort_variation9.phpt b/ext/standard/tests/array/natcasesort_variation9.phpt Binary files differindex d531d95b7f..04b36f3695 100644 --- a/ext/standard/tests/array/natcasesort_variation9.phpt +++ b/ext/standard/tests/array/natcasesort_variation9.phpt diff --git a/ext/standard/tests/array/next_basic.phpt b/ext/standard/tests/array/next_basic.phpt index f66f14adf5..2813f7c514 100644 --- a/ext/standard/tests/array/next_basic.phpt +++ b/ext/standard/tests/array/next_basic.phpt @@ -24,7 +24,7 @@ echo key($array) . " => " . current($array) . "\n"; var_dump(next($array)); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing next() : basic functionality *** 0 => zero string(3) "one" diff --git a/ext/standard/tests/array/next_variation1.phpt b/ext/standard/tests/array/next_variation1.phpt index b87f3f9e15..405f34a435 100644 --- a/ext/standard/tests/array/next_variation1.phpt +++ b/ext/standard/tests/array/next_variation1.phpt @@ -98,22 +98,22 @@ fclose($fp); -- Iteration 1 -- -Warning: next() expects parameter 1 to be array, integer given in %s on line %d +Warning: next() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 2 -- -Warning: next() expects parameter 1 to be array, integer given in %s on line %d +Warning: next() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 3 -- -Warning: next() expects parameter 1 to be array, integer given in %s on line %d +Warning: next() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 4 -- -Warning: next() expects parameter 1 to be array, integer given in %s on line %d +Warning: next() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 5 -- @@ -153,22 +153,22 @@ NULL -- Iteration 12 -- -Warning: next() expects parameter 1 to be array, boolean given in %s on line %d +Warning: next() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 13 -- -Warning: next() expects parameter 1 to be array, boolean given in %s on line %d +Warning: next() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 14 -- -Warning: next() expects parameter 1 to be array, boolean given in %s on line %d +Warning: next() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 15 -- -Warning: next() expects parameter 1 to be array, boolean given in %s on line %d +Warning: next() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 16 -- diff --git a/ext/standard/tests/array/next_variation2.phpt b/ext/standard/tests/array/next_variation2.phpt index 49cb21a1da..aff03a619a 100644 --- a/ext/standard/tests/array/next_variation2.phpt +++ b/ext/standard/tests/array/next_variation2.phpt @@ -26,7 +26,7 @@ echo "\n-- Pass a sub-array as \$array_arg --\n"; var_dump(next($array_arg[0])); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing next() : usage variations *** -- Pass a two-dimensional array as $array_arg -- diff --git a/ext/standard/tests/array/prev_basic.phpt b/ext/standard/tests/array/prev_basic.phpt index 2cfdc22674..8e1703259e 100644 --- a/ext/standard/tests/array/prev_basic.phpt +++ b/ext/standard/tests/array/prev_basic.phpt @@ -34,7 +34,7 @@ for ($i = $length; $i > 0; $i--) { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing prev() : basic functionality *** 2 => two string(3) "one" diff --git a/ext/standard/tests/array/prev_variation1.phpt b/ext/standard/tests/array/prev_variation1.phpt index 6d1a79409f..01156d8239 100644 --- a/ext/standard/tests/array/prev_variation1.phpt +++ b/ext/standard/tests/array/prev_variation1.phpt @@ -98,22 +98,22 @@ fclose($fp); -- Iteration 1 -- -Warning: prev() expects parameter 1 to be array, integer given in %s on line %d +Warning: prev() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 2 -- -Warning: prev() expects parameter 1 to be array, integer given in %s on line %d +Warning: prev() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 3 -- -Warning: prev() expects parameter 1 to be array, integer given in %s on line %d +Warning: prev() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 4 -- -Warning: prev() expects parameter 1 to be array, integer given in %s on line %d +Warning: prev() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 5 -- @@ -153,22 +153,22 @@ NULL -- Iteration 12 -- -Warning: prev() expects parameter 1 to be array, boolean given in %s on line %d +Warning: prev() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 13 -- -Warning: prev() expects parameter 1 to be array, boolean given in %s on line %d +Warning: prev() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 14 -- -Warning: prev() expects parameter 1 to be array, boolean given in %s on line %d +Warning: prev() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 15 -- -Warning: prev() expects parameter 1 to be array, boolean given in %s on line %d +Warning: prev() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 16 -- diff --git a/ext/standard/tests/array/prev_variation2.phpt b/ext/standard/tests/array/prev_variation2.phpt index 3bb30f7cb3..e4c707124c 100644 --- a/ext/standard/tests/array/prev_variation2.phpt +++ b/ext/standard/tests/array/prev_variation2.phpt @@ -30,7 +30,7 @@ echo "\n-- Pass a sub-array as \$array_arg --\n"; var_dump(prev($array_arg[0])); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing prev() : usage variations *** -- Pass a two-dimensional array as $array_arg -- diff --git a/ext/standard/tests/array/range.phpt b/ext/standard/tests/array/range.phpt index cce50b3155..562335d099 100644 --- a/ext/standard/tests/array/range.phpt +++ b/ext/standard/tests/array/range.phpt @@ -48,7 +48,7 @@ var_dump( range("abcd", "mnop", 2) ); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing range() function on basic operations *** -- Integers as Low and High -- diff --git a/ext/standard/tests/array/range_variation.phpt b/ext/standard/tests/array/range_variation.phpt index e97d918d9b..f7fc9e0815 100644 --- a/ext/standard/tests/array/range_variation.phpt +++ b/ext/standard/tests/array/range_variation.phpt @@ -22,7 +22,7 @@ var_dump( range( 1, 5, array(1, 2) ) ); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing range() with various low and high values *** -- creating an array with low = 'ABCD' and high = 'ABCD' -- array(1) { diff --git a/ext/standard/tests/array/range_variation1.phpt b/ext/standard/tests/array/range_variation1.phpt index 6e57f73127..0747fab336 100644 --- a/ext/standard/tests/array/range_variation1.phpt +++ b/ext/standard/tests/array/range_variation1.phpt @@ -20,7 +20,7 @@ var_dump( range(-2147483649, -2147483647) ); echo "\nDone"; ?> ---EXPECTF-- +--EXPECT-- *** Testing max/outof range values *** array(2) { [0]=> diff --git a/ext/standard/tests/array/range_variation1_64bit.phpt b/ext/standard/tests/array/range_variation1_64bit.phpt index a14dae987f..555dbc2e1a 100644 --- a/ext/standard/tests/array/range_variation1_64bit.phpt +++ b/ext/standard/tests/array/range_variation1_64bit.phpt @@ -20,7 +20,7 @@ var_dump( range(-2147483649, -2147483647) ); echo "\nDone"; ?> ---EXPECTF-- +--EXPECT-- *** Testing max/outof range values *** array(2) { [0]=> diff --git a/ext/standard/tests/array/reset_basic.phpt b/ext/standard/tests/array/reset_basic.phpt index e698e5c4f2..04c676a4cf 100644 --- a/ext/standard/tests/array/reset_basic.phpt +++ b/ext/standard/tests/array/reset_basic.phpt @@ -28,7 +28,7 @@ echo "\n-- Call to reset() --\n"; var_dump(reset($array)); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing reset() : basic functionality *** -- Initial Position: -- diff --git a/ext/standard/tests/array/reset_variation1.phpt b/ext/standard/tests/array/reset_variation1.phpt index 51fb7cd431..f273324902 100644 --- a/ext/standard/tests/array/reset_variation1.phpt +++ b/ext/standard/tests/array/reset_variation1.phpt @@ -98,22 +98,22 @@ fclose($fp); -- Iteration 1 -- -Warning: reset() expects parameter 1 to be array, integer given in %s on line %d +Warning: reset() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 2 -- -Warning: reset() expects parameter 1 to be array, integer given in %s on line %d +Warning: reset() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 3 -- -Warning: reset() expects parameter 1 to be array, integer given in %s on line %d +Warning: reset() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 4 -- -Warning: reset() expects parameter 1 to be array, integer given in %s on line %d +Warning: reset() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 5 -- @@ -153,22 +153,22 @@ NULL -- Iteration 12 -- -Warning: reset() expects parameter 1 to be array, boolean given in %s on line %d +Warning: reset() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 13 -- -Warning: reset() expects parameter 1 to be array, boolean given in %s on line %d +Warning: reset() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 14 -- -Warning: reset() expects parameter 1 to be array, boolean given in %s on line %d +Warning: reset() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 15 -- -Warning: reset() expects parameter 1 to be array, boolean given in %s on line %d +Warning: reset() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 16 -- diff --git a/ext/standard/tests/array/reset_variation2.phpt b/ext/standard/tests/array/reset_variation2.phpt index de371ffeab..e155cad592 100644 --- a/ext/standard/tests/array/reset_variation2.phpt +++ b/ext/standard/tests/array/reset_variation2.phpt @@ -23,7 +23,7 @@ unset($array[0]); var_dump(reset($array)); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing reset() : usage variations *** -- Initial Position: -- diff --git a/ext/standard/tests/array/reset_variation3.phpt b/ext/standard/tests/array/reset_variation3.phpt index ad21ced4d2..ff17a0cc9e 100644 --- a/ext/standard/tests/array/reset_variation3.phpt +++ b/ext/standard/tests/array/reset_variation3.phpt @@ -39,7 +39,7 @@ echo "\$array2: "; var_dump(current($array2)); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing reset() : usage variations *** -- Initial position of internal pointer -- diff --git a/ext/standard/tests/array/rsort_basic.phpt b/ext/standard/tests/array/rsort_basic.phpt index 8f46a1afa7..2d75287841 100644 --- a/ext/standard/tests/array/rsort_basic.phpt +++ b/ext/standard/tests/array/rsort_basic.phpt @@ -70,7 +70,7 @@ var_dump( $temp_array); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing rsort() : basic functionality *** -- Testing rsort() by supplying string array, 'flag' value is defualt -- diff --git a/ext/standard/tests/array/rsort_variation1.phpt b/ext/standard/tests/array/rsort_variation1.phpt index 6a7431c426..5b83c89a29 100644 --- a/ext/standard/tests/array/rsort_variation1.phpt +++ b/ext/standard/tests/array/rsort_variation1.phpt @@ -105,70 +105,70 @@ echo "Done"; -- Iteration 1 -- Flag = default: -Warning: rsort() expects parameter 1 to be array, integer given in %s on line %d +Warning: rsort() expects parameter 1 to be array, int given in %s on line %d bool(false) Flag = SORT_REGULAR: -Warning: rsort() expects parameter 1 to be array, integer given in %s on line %d +Warning: rsort() expects parameter 1 to be array, int given in %s on line %d bool(false) Flag = SORT_NUMERIC: -Warning: rsort() expects parameter 1 to be array, integer given in %s on line %d +Warning: rsort() expects parameter 1 to be array, int given in %s on line %d bool(false) Flag = SORT_STRING: -Warning: rsort() expects parameter 1 to be array, integer given in %s on line %d +Warning: rsort() expects parameter 1 to be array, int given in %s on line %d bool(false) -- Iteration 2 -- Flag = default: -Warning: rsort() expects parameter 1 to be array, integer given in %s on line %d +Warning: rsort() expects parameter 1 to be array, int given in %s on line %d bool(false) Flag = SORT_REGULAR: -Warning: rsort() expects parameter 1 to be array, integer given in %s on line %d +Warning: rsort() expects parameter 1 to be array, int given in %s on line %d bool(false) Flag = SORT_NUMERIC: -Warning: rsort() expects parameter 1 to be array, integer given in %s on line %d +Warning: rsort() expects parameter 1 to be array, int given in %s on line %d bool(false) Flag = SORT_STRING: -Warning: rsort() expects parameter 1 to be array, integer given in %s on line %d +Warning: rsort() expects parameter 1 to be array, int given in %s on line %d bool(false) -- Iteration 3 -- Flag = default: -Warning: rsort() expects parameter 1 to be array, integer given in %s on line %d +Warning: rsort() expects parameter 1 to be array, int given in %s on line %d bool(false) Flag = SORT_REGULAR: -Warning: rsort() expects parameter 1 to be array, integer given in %s on line %d +Warning: rsort() expects parameter 1 to be array, int given in %s on line %d bool(false) Flag = SORT_NUMERIC: -Warning: rsort() expects parameter 1 to be array, integer given in %s on line %d +Warning: rsort() expects parameter 1 to be array, int given in %s on line %d bool(false) Flag = SORT_STRING: -Warning: rsort() expects parameter 1 to be array, integer given in %s on line %d +Warning: rsort() expects parameter 1 to be array, int given in %s on line %d bool(false) -- Iteration 4 -- Flag = default: -Warning: rsort() expects parameter 1 to be array, integer given in %s on line %d +Warning: rsort() expects parameter 1 to be array, int given in %s on line %d bool(false) Flag = SORT_REGULAR: -Warning: rsort() expects parameter 1 to be array, integer given in %s on line %d +Warning: rsort() expects parameter 1 to be array, int given in %s on line %d bool(false) Flag = SORT_NUMERIC: -Warning: rsort() expects parameter 1 to be array, integer given in %s on line %d +Warning: rsort() expects parameter 1 to be array, int given in %s on line %d bool(false) Flag = SORT_STRING: -Warning: rsort() expects parameter 1 to be array, integer given in %s on line %d +Warning: rsort() expects parameter 1 to be array, int given in %s on line %d bool(false) -- Iteration 5 -- Flag = default: @@ -292,70 +292,70 @@ bool(false) -- Iteration 12 -- Flag = default: -Warning: rsort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: rsort() expects parameter 1 to be array, bool given in %s on line %d bool(false) Flag = SORT_REGULAR: -Warning: rsort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: rsort() expects parameter 1 to be array, bool given in %s on line %d bool(false) Flag = SORT_NUMERIC: -Warning: rsort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: rsort() expects parameter 1 to be array, bool given in %s on line %d bool(false) Flag = SORT_STRING: -Warning: rsort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: rsort() expects parameter 1 to be array, bool given in %s on line %d bool(false) -- Iteration 13 -- Flag = default: -Warning: rsort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: rsort() expects parameter 1 to be array, bool given in %s on line %d bool(false) Flag = SORT_REGULAR: -Warning: rsort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: rsort() expects parameter 1 to be array, bool given in %s on line %d bool(false) Flag = SORT_NUMERIC: -Warning: rsort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: rsort() expects parameter 1 to be array, bool given in %s on line %d bool(false) Flag = SORT_STRING: -Warning: rsort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: rsort() expects parameter 1 to be array, bool given in %s on line %d bool(false) -- Iteration 14 -- Flag = default: -Warning: rsort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: rsort() expects parameter 1 to be array, bool given in %s on line %d bool(false) Flag = SORT_REGULAR: -Warning: rsort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: rsort() expects parameter 1 to be array, bool given in %s on line %d bool(false) Flag = SORT_NUMERIC: -Warning: rsort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: rsort() expects parameter 1 to be array, bool given in %s on line %d bool(false) Flag = SORT_STRING: -Warning: rsort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: rsort() expects parameter 1 to be array, bool given in %s on line %d bool(false) -- Iteration 15 -- Flag = default: -Warning: rsort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: rsort() expects parameter 1 to be array, bool given in %s on line %d bool(false) Flag = SORT_REGULAR: -Warning: rsort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: rsort() expects parameter 1 to be array, bool given in %s on line %d bool(false) Flag = SORT_NUMERIC: -Warning: rsort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: rsort() expects parameter 1 to be array, bool given in %s on line %d bool(false) Flag = SORT_STRING: -Warning: rsort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: rsort() expects parameter 1 to be array, bool given in %s on line %d bool(false) -- Iteration 16 -- Flag = default: diff --git a/ext/standard/tests/array/rsort_variation10.phpt b/ext/standard/tests/array/rsort_variation10.phpt index fd660d7550..22fe18f4e0 100644 --- a/ext/standard/tests/array/rsort_variation10.phpt +++ b/ext/standard/tests/array/rsort_variation10.phpt @@ -33,7 +33,7 @@ var_dump($temp_array); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing rsort() : variation *** -- Sort flag = default -- diff --git a/ext/standard/tests/array/rsort_variation11.phpt b/ext/standard/tests/array/rsort_variation11.phpt Binary files differindex f918a99797..5c851b4c4c 100644 --- a/ext/standard/tests/array/rsort_variation11.phpt +++ b/ext/standard/tests/array/rsort_variation11.phpt diff --git a/ext/standard/tests/array/rsort_variation2.phpt b/ext/standard/tests/array/rsort_variation2.phpt index 6e232492ed..d2b3e0e423 100644 --- a/ext/standard/tests/array/rsort_variation2.phpt +++ b/ext/standard/tests/array/rsort_variation2.phpt @@ -336,7 +336,7 @@ array(5) { -- Iteration 16 -- -Warning: rsort() expects parameter 2 to be integer, string given in %s on line %d +Warning: rsort() expects parameter 2 to be int, string given in %s on line %d bool(false) array(5) { [0]=> @@ -353,7 +353,7 @@ array(5) { -- Iteration 17 -- -Warning: rsort() expects parameter 2 to be integer, string given in %s on line %d +Warning: rsort() expects parameter 2 to be int, string given in %s on line %d bool(false) array(5) { [0]=> @@ -370,7 +370,7 @@ array(5) { -- Iteration 18 -- -Warning: rsort() expects parameter 2 to be integer, string given in %s on line %d +Warning: rsort() expects parameter 2 to be int, string given in %s on line %d bool(false) array(5) { [0]=> @@ -387,7 +387,7 @@ array(5) { -- Iteration 19 -- -Warning: rsort() expects parameter 2 to be integer, string given in %s on line %d +Warning: rsort() expects parameter 2 to be int, string given in %s on line %d bool(false) array(5) { [0]=> @@ -404,7 +404,7 @@ array(5) { -- Iteration 20 -- -Warning: rsort() expects parameter 2 to be integer, string given in %s on line %d +Warning: rsort() expects parameter 2 to be int, string given in %s on line %d bool(false) array(5) { [0]=> @@ -421,7 +421,7 @@ array(5) { -- Iteration 21 -- -Warning: rsort() expects parameter 2 to be integer, object given in %s on line %d +Warning: rsort() expects parameter 2 to be int, object given in %s on line %d bool(false) array(5) { [0]=> @@ -468,7 +468,7 @@ array(5) { -- Iteration 24 -- -Warning: rsort() expects parameter 2 to be integer, resource given in %s on line %d +Warning: rsort() expects parameter 2 to be int, resource given in %s on line %d bool(false) array(5) { [0]=> diff --git a/ext/standard/tests/array/rsort_variation3.phpt b/ext/standard/tests/array/rsort_variation3.phpt index 3fc8ae1db9..724764f48b 100644 --- a/ext/standard/tests/array/rsort_variation3.phpt +++ b/ext/standard/tests/array/rsort_variation3.phpt @@ -59,7 +59,7 @@ foreach ($various_arrays as $array) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing rsort() : variation *** -- Iteration 1 -- diff --git a/ext/standard/tests/array/rsort_variation4.phpt b/ext/standard/tests/array/rsort_variation4.phpt index 0960edd36c..75d8c8bb56 100644 --- a/ext/standard/tests/array/rsort_variation4.phpt +++ b/ext/standard/tests/array/rsort_variation4.phpt @@ -35,7 +35,7 @@ var_dump( $temp_array); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing rsort() : variation *** -- 'flag' value is defualt -- diff --git a/ext/standard/tests/array/rsort_variation5.phpt b/ext/standard/tests/array/rsort_variation5.phpt index 96becd88e2..f3d7f69041 100644 --- a/ext/standard/tests/array/rsort_variation5.phpt +++ b/ext/standard/tests/array/rsort_variation5.phpt @@ -51,7 +51,7 @@ foreach ($various_arrays as $array) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing rsort() : variation *** -- Iteration 1 -- diff --git a/ext/standard/tests/array/rsort_variation6.phpt b/ext/standard/tests/array/rsort_variation6.phpt index c16025c3b0..29c5d3c09d 100644 --- a/ext/standard/tests/array/rsort_variation6.phpt +++ b/ext/standard/tests/array/rsort_variation6.phpt @@ -33,7 +33,7 @@ var_dump($temp_array); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing rsort() : variation *** -- 'flag' value is defualt -- diff --git a/ext/standard/tests/array/rsort_variation7.phpt b/ext/standard/tests/array/rsort_variation7.phpt index 949fb2933b..51a0565cdb 100644 --- a/ext/standard/tests/array/rsort_variation7.phpt +++ b/ext/standard/tests/array/rsort_variation7.phpt @@ -38,7 +38,7 @@ var_dump($temp_array); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing rsort() : variation *** -- 'flag' value is defualt -- diff --git a/ext/standard/tests/array/rsort_variation8.phpt b/ext/standard/tests/array/rsort_variation8.phpt index 326fdfa444..8f1ee129c7 100644 --- a/ext/standard/tests/array/rsort_variation8.phpt +++ b/ext/standard/tests/array/rsort_variation8.phpt @@ -50,7 +50,7 @@ foreach ($various_arrays as $array) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing rsort() : variation *** -- Iteration 1 -- diff --git a/ext/standard/tests/array/rsort_variation9.phpt b/ext/standard/tests/array/rsort_variation9.phpt index 53fc8d4c0b..d3b44ec0bb 100644 --- a/ext/standard/tests/array/rsort_variation9.phpt +++ b/ext/standard/tests/array/rsort_variation9.phpt @@ -54,7 +54,7 @@ foreach ($various_arrays as $array) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing rsort() : variation *** -- Iteration 1 -- diff --git a/ext/standard/tests/array/shuffle_variation1.phpt b/ext/standard/tests/array/shuffle_variation1.phpt index 041199a769..3c0ab5051a 100644 --- a/ext/standard/tests/array/shuffle_variation1.phpt +++ b/ext/standard/tests/array/shuffle_variation1.phpt @@ -98,22 +98,22 @@ echo "Done"; -- Iteration 1 -- -Warning: shuffle() expects parameter 1 to be array, integer given in %s on line %d +Warning: shuffle() expects parameter 1 to be array, int given in %s on line %d bool(false) -- Iteration 2 -- -Warning: shuffle() expects parameter 1 to be array, integer given in %s on line %d +Warning: shuffle() expects parameter 1 to be array, int given in %s on line %d bool(false) -- Iteration 3 -- -Warning: shuffle() expects parameter 1 to be array, integer given in %s on line %d +Warning: shuffle() expects parameter 1 to be array, int given in %s on line %d bool(false) -- Iteration 4 -- -Warning: shuffle() expects parameter 1 to be array, integer given in %s on line %d +Warning: shuffle() expects parameter 1 to be array, int given in %s on line %d bool(false) -- Iteration 5 -- @@ -153,22 +153,22 @@ bool(false) -- Iteration 12 -- -Warning: shuffle() expects parameter 1 to be array, boolean given in %s on line %d +Warning: shuffle() expects parameter 1 to be array, bool given in %s on line %d bool(false) -- Iteration 13 -- -Warning: shuffle() expects parameter 1 to be array, boolean given in %s on line %d +Warning: shuffle() expects parameter 1 to be array, bool given in %s on line %d bool(false) -- Iteration 14 -- -Warning: shuffle() expects parameter 1 to be array, boolean given in %s on line %d +Warning: shuffle() expects parameter 1 to be array, bool given in %s on line %d bool(false) -- Iteration 15 -- -Warning: shuffle() expects parameter 1 to be array, boolean given in %s on line %d +Warning: shuffle() expects parameter 1 to be array, bool given in %s on line %d bool(false) -- Iteration 16 -- diff --git a/ext/standard/tests/array/sizeof_basic2.phpt b/ext/standard/tests/array/sizeof_basic2.phpt index 3dfbc7c662..a76e54d70a 100644 --- a/ext/standard/tests/array/sizeof_basic2.phpt +++ b/ext/standard/tests/array/sizeof_basic2.phpt @@ -67,7 +67,7 @@ var_dump( sizeof($mixed_array, COUNT_RECURSIVE) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sizeof() : basic functionality *** -- Testing sizeof() with integer array in default, COUNT_NORMAL, COUNT_RECURSIVE modes -- default mode: int(4) diff --git a/ext/standard/tests/array/sizeof_object1.phpt b/ext/standard/tests/array/sizeof_object1.phpt index f734887a59..43b49e5693 100644 --- a/ext/standard/tests/array/sizeof_object1.phpt +++ b/ext/standard/tests/array/sizeof_object1.phpt @@ -1,13 +1,5 @@ --TEST-- Test sizeof() function : object functionality - object with Countable interface ---SKIPIF-- -<?php -// Skip the test case if Standard PHP Library(spl) is not installed - if( !extension_loaded('spl')) - { - die('skip spl is not installed'); - } -?> --FILE-- <?php /* Prototype : int sizeof($mixed var[, int $mode]) @@ -43,7 +35,7 @@ var_dump( sizeof($obj, COUNT_RECURSIVE) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sizeof() : object functionality *** -- Testing sizeof() with an object which implements Countable interface -- -- Testing sizeof() in default mode -- diff --git a/ext/standard/tests/array/sizeof_variation2.phpt b/ext/standard/tests/array/sizeof_variation2.phpt index ba31157ff1..1bc815d7c4 100644 --- a/ext/standard/tests/array/sizeof_variation2.phpt +++ b/ext/standard/tests/array/sizeof_variation2.phpt @@ -59,7 +59,7 @@ for($i = 0; $i < count($values); $i++) echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sizeof() : usage variations *** --- Testing sizeof() with different array values for 'var' argument --- -- Iteration 1 -- diff --git a/ext/standard/tests/array/sizeof_variation3.phpt b/ext/standard/tests/array/sizeof_variation3.phpt index 8b5a7e1d54..cb77e07323 100644 --- a/ext/standard/tests/array/sizeof_variation3.phpt +++ b/ext/standard/tests/array/sizeof_variation3.phpt @@ -25,7 +25,7 @@ var_dump( sizeof($array4, COUNT_RECURSIVE) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sizeof() : usage variations *** -- Testing sizeof() for infinite recursion with arrays as argument in COUNT_RECURSIVE mode -- int(13) diff --git a/ext/standard/tests/array/sizeof_variation5.phpt b/ext/standard/tests/array/sizeof_variation5.phpt index 1c487045c6..905505fa06 100644 --- a/ext/standard/tests/array/sizeof_variation5.phpt +++ b/ext/standard/tests/array/sizeof_variation5.phpt @@ -105,28 +105,28 @@ int(6) int(6) -- Iteration 16 -- -Warning: sizeof() expects parameter 2 to be integer, string given in %s on line %d +Warning: sizeof() expects parameter 2 to be int, string given in %s on line %d NULL -- Iteration 17 -- -Warning: sizeof() expects parameter 2 to be integer, string given in %s on line %d +Warning: sizeof() expects parameter 2 to be int, string given in %s on line %d NULL -- Iteration 18 -- -Warning: sizeof() expects parameter 2 to be integer, string given in %s on line %d +Warning: sizeof() expects parameter 2 to be int, string given in %s on line %d NULL -- Iteration 19 -- -Warning: sizeof() expects parameter 2 to be integer, string given in %s on line %d +Warning: sizeof() expects parameter 2 to be int, string given in %s on line %d NULL -- Iteration 20 -- int(6) -- Iteration 21 -- -Warning: sizeof() expects parameter 2 to be integer, object given in %s on line %d +Warning: sizeof() expects parameter 2 to be int, object given in %s on line %d NULL -- Iteration 22 -- -Warning: sizeof() expects parameter 2 to be integer, resource given in %s on line %d +Warning: sizeof() expects parameter 2 to be int, resource given in %s on line %d NULL Done diff --git a/ext/standard/tests/array/sort_basic.phpt b/ext/standard/tests/array/sort_basic.phpt index ac47667b52..065889de11 100644 --- a/ext/standard/tests/array/sort_basic.phpt +++ b/ext/standard/tests/array/sort_basic.phpt @@ -76,7 +76,7 @@ var_dump( $temp_array); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sort() : basic functionality *** -- Testing sort() by supplying string array, 'flag' value is defualt -- diff --git a/ext/standard/tests/array/sort_variation1.phpt b/ext/standard/tests/array/sort_variation1.phpt index f3eba1265d..e8365ea131 100644 --- a/ext/standard/tests/array/sort_variation1.phpt +++ b/ext/standard/tests/array/sort_variation1.phpt @@ -63,10 +63,10 @@ $unexpected_values = array ( /*20*/ new stdclass(), // undefined data -/*21*/ @undefined_var, +/*21*/ @$undefined_var, // unset data -/*22*/ @unset_var, +/*22*/ @$unset_var, // resource variable /*23*/ $fp @@ -98,55 +98,55 @@ echo "Done"; -- Flag values are defualt, SORT_REGULAR, SORT_NUMERIC, SORT_STRING -- -- Iteration 1 -- -Warning: sort() expects parameter 1 to be array, integer given in %s on line %d +Warning: sort() expects parameter 1 to be array, int given in %s on line %d bool(false) -Warning: sort() expects parameter 1 to be array, integer given in %s on line %d +Warning: sort() expects parameter 1 to be array, int given in %s on line %d bool(false) -Warning: sort() expects parameter 1 to be array, integer given in %s on line %d +Warning: sort() expects parameter 1 to be array, int given in %s on line %d bool(false) -Warning: sort() expects parameter 1 to be array, integer given in %s on line %d +Warning: sort() expects parameter 1 to be array, int given in %s on line %d bool(false) -- Iteration 2 -- -Warning: sort() expects parameter 1 to be array, integer given in %s on line %d +Warning: sort() expects parameter 1 to be array, int given in %s on line %d bool(false) -Warning: sort() expects parameter 1 to be array, integer given in %s on line %d +Warning: sort() expects parameter 1 to be array, int given in %s on line %d bool(false) -Warning: sort() expects parameter 1 to be array, integer given in %s on line %d +Warning: sort() expects parameter 1 to be array, int given in %s on line %d bool(false) -Warning: sort() expects parameter 1 to be array, integer given in %s on line %d +Warning: sort() expects parameter 1 to be array, int given in %s on line %d bool(false) -- Iteration 3 -- -Warning: sort() expects parameter 1 to be array, integer given in %s on line %d +Warning: sort() expects parameter 1 to be array, int given in %s on line %d bool(false) -Warning: sort() expects parameter 1 to be array, integer given in %s on line %d +Warning: sort() expects parameter 1 to be array, int given in %s on line %d bool(false) -Warning: sort() expects parameter 1 to be array, integer given in %s on line %d +Warning: sort() expects parameter 1 to be array, int given in %s on line %d bool(false) -Warning: sort() expects parameter 1 to be array, integer given in %s on line %d +Warning: sort() expects parameter 1 to be array, int given in %s on line %d bool(false) -- Iteration 4 -- -Warning: sort() expects parameter 1 to be array, integer given in %s on line %d +Warning: sort() expects parameter 1 to be array, int given in %s on line %d bool(false) -Warning: sort() expects parameter 1 to be array, integer given in %s on line %d +Warning: sort() expects parameter 1 to be array, int given in %s on line %d bool(false) -Warning: sort() expects parameter 1 to be array, integer given in %s on line %d +Warning: sort() expects parameter 1 to be array, int given in %s on line %d bool(false) -Warning: sort() expects parameter 1 to be array, integer given in %s on line %d +Warning: sort() expects parameter 1 to be array, int given in %s on line %d bool(false) -- Iteration 5 -- @@ -241,55 +241,55 @@ Warning: sort() expects parameter 1 to be array, null given in %s on line %d bool(false) -- Iteration 12 -- -Warning: sort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: sort() expects parameter 1 to be array, bool given in %s on line %d bool(false) -Warning: sort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: sort() expects parameter 1 to be array, bool given in %s on line %d bool(false) -Warning: sort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: sort() expects parameter 1 to be array, bool given in %s on line %d bool(false) -Warning: sort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: sort() expects parameter 1 to be array, bool given in %s on line %d bool(false) -- Iteration 13 -- -Warning: sort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: sort() expects parameter 1 to be array, bool given in %s on line %d bool(false) -Warning: sort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: sort() expects parameter 1 to be array, bool given in %s on line %d bool(false) -Warning: sort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: sort() expects parameter 1 to be array, bool given in %s on line %d bool(false) -Warning: sort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: sort() expects parameter 1 to be array, bool given in %s on line %d bool(false) -- Iteration 14 -- -Warning: sort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: sort() expects parameter 1 to be array, bool given in %s on line %d bool(false) -Warning: sort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: sort() expects parameter 1 to be array, bool given in %s on line %d bool(false) -Warning: sort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: sort() expects parameter 1 to be array, bool given in %s on line %d bool(false) -Warning: sort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: sort() expects parameter 1 to be array, bool given in %s on line %d bool(false) -- Iteration 15 -- -Warning: sort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: sort() expects parameter 1 to be array, bool given in %s on line %d bool(false) -Warning: sort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: sort() expects parameter 1 to be array, bool given in %s on line %d bool(false) -Warning: sort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: sort() expects parameter 1 to be array, bool given in %s on line %d bool(false) -Warning: sort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: sort() expects parameter 1 to be array, bool given in %s on line %d bool(false) -- Iteration 16 -- @@ -358,29 +358,29 @@ Warning: sort() expects parameter 1 to be array, object given in %s on line %d bool(false) -- Iteration 21 -- -Warning: sort() expects parameter 1 to be array, string given in %s on line %d +Warning: sort() expects parameter 1 to be array, null given in %s on line %d bool(false) -Warning: sort() expects parameter 1 to be array, string given in %s on line %d +Warning: sort() expects parameter 1 to be array, null given in %s on line %d bool(false) -Warning: sort() expects parameter 1 to be array, string given in %s on line %d +Warning: sort() expects parameter 1 to be array, null given in %s on line %d bool(false) -Warning: sort() expects parameter 1 to be array, string given in %s on line %d +Warning: sort() expects parameter 1 to be array, null given in %s on line %d bool(false) -- Iteration 22 -- -Warning: sort() expects parameter 1 to be array, string given in %s on line %d +Warning: sort() expects parameter 1 to be array, null given in %s on line %d bool(false) -Warning: sort() expects parameter 1 to be array, string given in %s on line %d +Warning: sort() expects parameter 1 to be array, null given in %s on line %d bool(false) -Warning: sort() expects parameter 1 to be array, string given in %s on line %d +Warning: sort() expects parameter 1 to be array, null given in %s on line %d bool(false) -Warning: sort() expects parameter 1 to be array, string given in %s on line %d +Warning: sort() expects parameter 1 to be array, null given in %s on line %d bool(false) -- Iteration 23 -- diff --git a/ext/standard/tests/array/sort_variation10.phpt b/ext/standard/tests/array/sort_variation10.phpt index 2461915869..1ff71a3dc5 100644 --- a/ext/standard/tests/array/sort_variation10.phpt +++ b/ext/standard/tests/array/sort_variation10.phpt @@ -38,7 +38,7 @@ var_dump($temp_array); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sort() : usage variations *** -- Testing sort() by supplying octal value array, 'flag' value is defualt -- diff --git a/ext/standard/tests/array/sort_variation11.phpt b/ext/standard/tests/array/sort_variation11.phpt Binary files differindex 0c1b849488..0806ab6816 100644 --- a/ext/standard/tests/array/sort_variation11.phpt +++ b/ext/standard/tests/array/sort_variation11.phpt diff --git a/ext/standard/tests/array/sort_variation2.phpt b/ext/standard/tests/array/sort_variation2.phpt index ef16f05892..ee0e4b8b17 100644 --- a/ext/standard/tests/array/sort_variation2.phpt +++ b/ext/standard/tests/array/sort_variation2.phpt @@ -58,10 +58,10 @@ $unexpected_values = array( /*16*/ new stdclass(), // undefined data -/*17*/ @undefined_var, +/*17*/ @$undefined_var, // unset data -/*18*/ @unset_var, +/*18*/ @$unset_var, // resource variable /*19*/ $fp @@ -214,7 +214,7 @@ array(3) { } -- Iteration 13 -- -Warning: sort() expects parameter 2 to be integer, string given in %s on line %d +Warning: sort() expects parameter 2 to be int, string given in %s on line %d bool(false) array(3) { [0]=> @@ -226,7 +226,7 @@ array(3) { } -- Iteration 14 -- -Warning: sort() expects parameter 2 to be integer, string given in %s on line %d +Warning: sort() expects parameter 2 to be int, string given in %s on line %d bool(false) array(3) { [0]=> @@ -238,7 +238,7 @@ array(3) { } -- Iteration 15 -- -Warning: sort() expects parameter 2 to be integer, string given in %s on line %d +Warning: sort() expects parameter 2 to be int, string given in %s on line %d bool(false) array(3) { [0]=> @@ -250,7 +250,7 @@ array(3) { } -- Iteration 16 -- -Warning: sort() expects parameter 2 to be integer, string given in %s on line %d +Warning: sort() expects parameter 2 to be int, string given in %s on line %d bool(false) array(3) { [0]=> @@ -262,7 +262,7 @@ array(3) { } -- Iteration 17 -- -Warning: sort() expects parameter 2 to be integer, object given in %s on line %d +Warning: sort() expects parameter 2 to be int, object given in %s on line %d bool(false) array(3) { [0]=> @@ -273,32 +273,28 @@ array(3) { int(45) } -- Iteration 18 -- - -Warning: sort() expects parameter 2 to be integer, string given in %s on line %d -bool(false) +bool(true) array(3) { [0]=> - int(10) - [1]=> int(2) + [1]=> + int(10) [2]=> int(45) } -- Iteration 19 -- - -Warning: sort() expects parameter 2 to be integer, string given in %s on line %d -bool(false) +bool(true) array(3) { [0]=> - int(10) - [1]=> int(2) + [1]=> + int(10) [2]=> int(45) } -- Iteration 20 -- -Warning: sort() expects parameter 2 to be integer, resource given in %s on line %d +Warning: sort() expects parameter 2 to be int, resource given in %s on line %d bool(false) array(3) { [0]=> diff --git a/ext/standard/tests/array/sort_variation4.phpt b/ext/standard/tests/array/sort_variation4.phpt index cdc067a0e8..56b25223bf 100644 --- a/ext/standard/tests/array/sort_variation4.phpt +++ b/ext/standard/tests/array/sort_variation4.phpt @@ -41,7 +41,7 @@ var_dump( $temp_array); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sort() :usage variations *** -- Testing sort() by supplying reference variable array, 'flag' value is defualt -- diff --git a/ext/standard/tests/array/sort_variation5.phpt b/ext/standard/tests/array/sort_variation5.phpt index 48bda9599b..f5f1987458 100644 --- a/ext/standard/tests/array/sort_variation5.phpt +++ b/ext/standard/tests/array/sort_variation5.phpt @@ -56,7 +56,7 @@ foreach ($various_arrays as $array) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sort() : usage variations *** -- Testing sort() by supplying various string arrays -- diff --git a/ext/standard/tests/array/sort_variation6.phpt b/ext/standard/tests/array/sort_variation6.phpt index 01e2106d0e..7d7fdeb410 100644 --- a/ext/standard/tests/array/sort_variation6.phpt +++ b/ext/standard/tests/array/sort_variation6.phpt @@ -37,7 +37,7 @@ var_dump($temp_array); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sort() : usage variations *** -- Testing sort() by supplying hexadecimal value array, 'flag' value is defualt -- diff --git a/ext/standard/tests/array/sort_variation7.phpt b/ext/standard/tests/array/sort_variation7.phpt index c2a36639fb..48d4a48758 100644 --- a/ext/standard/tests/array/sort_variation7.phpt +++ b/ext/standard/tests/array/sort_variation7.phpt @@ -41,7 +41,7 @@ var_dump($temp_array); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sort() : usage variations *** -- Testing sort() by supplying bool value array, 'flag' value is defualt -- diff --git a/ext/standard/tests/array/sort_variation8.phpt b/ext/standard/tests/array/sort_variation8.phpt index 077285a054..87134716ca 100644 --- a/ext/standard/tests/array/sort_variation8.phpt +++ b/ext/standard/tests/array/sort_variation8.phpt @@ -55,7 +55,7 @@ foreach ($various_arrays as $array) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sort() : usage variations *** -- Testing sort() by supplying various arrays containing sub arrays -- diff --git a/ext/standard/tests/array/sort_variation9.phpt b/ext/standard/tests/array/sort_variation9.phpt index ad3030483d..bf7d03191d 100644 --- a/ext/standard/tests/array/sort_variation9.phpt +++ b/ext/standard/tests/array/sort_variation9.phpt @@ -52,7 +52,7 @@ foreach ($various_arrays as $array) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sort() : usage variations *** -- Testing sort() by supplying various arrays with key values -- diff --git a/ext/standard/tests/array/uasort_basic1.phpt b/ext/standard/tests/array/uasort_basic1.phpt index 70179935c6..160af2c328 100644 --- a/ext/standard/tests/array/uasort_basic1.phpt +++ b/ext/standard/tests/array/uasort_basic1.phpt @@ -55,7 +55,7 @@ var_dump($string_key_arg); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing uasort() : basic functionality *** -- Numeric array with default keys -- bool(true) diff --git a/ext/standard/tests/array/uasort_basic2.phpt b/ext/standard/tests/array/uasort_basic2.phpt index 0e154dbeae..af9c624d74 100644 --- a/ext/standard/tests/array/uasort_basic2.phpt +++ b/ext/standard/tests/array/uasort_basic2.phpt @@ -49,7 +49,7 @@ var_dump($int_values3); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing uasort() : basic functionality with duplicate values *** -- Numeric array with increasing values -- bool(true) diff --git a/ext/standard/tests/array/uasort_object1.phpt b/ext/standard/tests/array/uasort_object1.phpt index b728a1ffdd..c357e07490 100644 --- a/ext/standard/tests/array/uasort_object1.phpt +++ b/ext/standard/tests/array/uasort_object1.phpt @@ -92,7 +92,7 @@ var_dump($array_arg); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing uasort() : object functionality *** bool(true) array(4) { diff --git a/ext/standard/tests/array/uasort_variation1.phpt b/ext/standard/tests/array/uasort_variation1.phpt index aae2f33167..f3a849b938 100644 --- a/ext/standard/tests/array/uasort_variation1.phpt +++ b/ext/standard/tests/array/uasort_variation1.phpt @@ -99,19 +99,19 @@ echo "Done" *** Testing uasort() : unexpected values for 'array_arg' *** -- Iteration 1 -- -Warning: uasort() expects parameter 1 to be array, integer given in %s on line %d +Warning: uasort() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 2 -- -Warning: uasort() expects parameter 1 to be array, integer given in %s on line %d +Warning: uasort() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 3 -- -Warning: uasort() expects parameter 1 to be array, integer given in %s on line %d +Warning: uasort() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 4 -- -Warning: uasort() expects parameter 1 to be array, integer given in %s on line %d +Warning: uasort() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 5 -- @@ -143,19 +143,19 @@ Warning: uasort() expects parameter 1 to be array, null given in %s on line %d NULL -- Iteration 12 -- -Warning: uasort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: uasort() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 13 -- -Warning: uasort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: uasort() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 14 -- -Warning: uasort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: uasort() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 15 -- -Warning: uasort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: uasort() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 16 -- diff --git a/ext/standard/tests/array/uasort_variation10.phpt b/ext/standard/tests/array/uasort_variation10.phpt index 2bebad7114..7b6188b420 100644 --- a/ext/standard/tests/array/uasort_variation10.phpt +++ b/ext/standard/tests/array/uasort_variation10.phpt @@ -55,7 +55,7 @@ var_dump($array_arg); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing uasort() : 'array_arg' with elements as reference *** -- Sorting 'array_arg' containing different references -- bool(true) diff --git a/ext/standard/tests/array/uasort_variation11.phpt b/ext/standard/tests/array/uasort_variation11.phpt index 6744661efe..c8d3a81d83 100644 --- a/ext/standard/tests/array/uasort_variation11.phpt +++ b/ext/standard/tests/array/uasort_variation11.phpt @@ -47,7 +47,7 @@ var_dump($array_arg); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing uasort() : sorting different associative arrays *** -- Array with duplicate keys -- bool(true) diff --git a/ext/standard/tests/array/uasort_variation3.phpt b/ext/standard/tests/array/uasort_variation3.phpt Binary files differindex 47023e44bf..bcb5d41fab 100644 --- a/ext/standard/tests/array/uasort_variation3.phpt +++ b/ext/standard/tests/array/uasort_variation3.phpt diff --git a/ext/standard/tests/array/uasort_variation4.phpt b/ext/standard/tests/array/uasort_variation4.phpt index 5d89a21702..75772442a8 100644 --- a/ext/standard/tests/array/uasort_variation4.phpt +++ b/ext/standard/tests/array/uasort_variation4.phpt @@ -67,7 +67,7 @@ var_dump($empty_array); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing uasort() : different numeric arrays as 'array_arg' *** -- Sorting Integer array -- bool(true) diff --git a/ext/standard/tests/array/uasort_variation6.phpt b/ext/standard/tests/array/uasort_variation6.phpt index bcc7138270..26eb1e1dab 100644 --- a/ext/standard/tests/array/uasort_variation6.phpt +++ b/ext/standard/tests/array/uasort_variation6.phpt @@ -50,7 +50,7 @@ var_dump( uasort($temp_array, 'cmp_function') ); // expecting: bool(true) var_dump($temp_array); ?> ---EXPECTF-- +--EXPECT-- *** Testing uasort() : sorting array having different subarrays *** bool(true) array(8) { diff --git a/ext/standard/tests/array/uasort_variation7.phpt b/ext/standard/tests/array/uasort_variation7.phpt index d6db7fcc30..72520b2eb8 100644 --- a/ext/standard/tests/array/uasort_variation7.phpt +++ b/ext/standard/tests/array/uasort_variation7.phpt @@ -39,7 +39,7 @@ var_dump($array_arg); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing uasort() : anonymous function as 'cmp_function' *** -- Anonymous 'cmp_function' with parameters passed by value -- bool(true) diff --git a/ext/standard/tests/array/uasort_variation9.phpt b/ext/standard/tests/array/uasort_variation9.phpt index 53f32b848d..38aa32b2e5 100644 --- a/ext/standard/tests/array/uasort_variation9.phpt +++ b/ext/standard/tests/array/uasort_variation9.phpt @@ -46,7 +46,7 @@ var_dump($string_values); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing uasort() : 'cmp_function' with reference arguments *** -- Passing integer values to 'cmp_function' -- bool(true) diff --git a/ext/standard/tests/array/uksort_variation1.phpt b/ext/standard/tests/array/uksort_variation1.phpt index 75bef3fdcc..21210dee7b 100644 --- a/ext/standard/tests/array/uksort_variation1.phpt +++ b/ext/standard/tests/array/uksort_variation1.phpt @@ -99,22 +99,22 @@ foreach($inputs as $key =>$value) { --int 0-- -Warning: uksort() expects parameter 1 to be array, integer given in %suksort_variation1.php on line %d +Warning: uksort() expects parameter 1 to be array, int given in %suksort_variation1.php on line %d NULL --int 1-- -Warning: uksort() expects parameter 1 to be array, integer given in %suksort_variation1.php on line %d +Warning: uksort() expects parameter 1 to be array, int given in %suksort_variation1.php on line %d NULL --int 12345-- -Warning: uksort() expects parameter 1 to be array, integer given in %suksort_variation1.php on line %d +Warning: uksort() expects parameter 1 to be array, int given in %suksort_variation1.php on line %d NULL --int -12345-- -Warning: uksort() expects parameter 1 to be array, integer given in %suksort_variation1.php on line %d +Warning: uksort() expects parameter 1 to be array, int given in %suksort_variation1.php on line %d NULL --float 10.5-- @@ -154,22 +154,22 @@ NULL --lowercase true-- -Warning: uksort() expects parameter 1 to be array, boolean given in %suksort_variation1.php on line %d +Warning: uksort() expects parameter 1 to be array, bool given in %suksort_variation1.php on line %d NULL --lowercase false-- -Warning: uksort() expects parameter 1 to be array, boolean given in %suksort_variation1.php on line %d +Warning: uksort() expects parameter 1 to be array, bool given in %suksort_variation1.php on line %d NULL --uppercase TRUE-- -Warning: uksort() expects parameter 1 to be array, boolean given in %suksort_variation1.php on line %d +Warning: uksort() expects parameter 1 to be array, bool given in %suksort_variation1.php on line %d NULL --uppercase FALSE-- -Warning: uksort() expects parameter 1 to be array, boolean given in %suksort_variation1.php on line %d +Warning: uksort() expects parameter 1 to be array, bool given in %suksort_variation1.php on line %d NULL --empty string DQ-- diff --git a/ext/standard/tests/array/usort_basic.phpt b/ext/standard/tests/array/usort_basic.phpt index c25f2a7525..f5a8e7579d 100644 --- a/ext/standard/tests/array/usort_basic.phpt +++ b/ext/standard/tests/array/usort_basic.phpt @@ -54,7 +54,7 @@ var_dump( usort($string_key_arg, 'cmp') ); var_dump($string_key_arg); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing usort() : basic functionality *** -- Numeric array with default keys -- diff --git a/ext/standard/tests/array/usort_variation1.phpt b/ext/standard/tests/array/usort_variation1.phpt index 94b44dccc8..14d740dd86 100644 --- a/ext/standard/tests/array/usort_variation1.phpt +++ b/ext/standard/tests/array/usort_variation1.phpt @@ -113,22 +113,22 @@ fclose($fp); -- Iteration 1 -- -Warning: usort() expects parameter 1 to be array, integer given in %s on line %d +Warning: usort() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 2 -- -Warning: usort() expects parameter 1 to be array, integer given in %s on line %d +Warning: usort() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 3 -- -Warning: usort() expects parameter 1 to be array, integer given in %s on line %d +Warning: usort() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 4 -- -Warning: usort() expects parameter 1 to be array, integer given in %s on line %d +Warning: usort() expects parameter 1 to be array, int given in %s on line %d NULL -- Iteration 5 -- @@ -168,22 +168,22 @@ NULL -- Iteration 12 -- -Warning: usort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: usort() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 13 -- -Warning: usort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: usort() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 14 -- -Warning: usort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: usort() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 15 -- -Warning: usort() expects parameter 1 to be array, boolean given in %s on line %d +Warning: usort() expects parameter 1 to be array, bool given in %s on line %d NULL -- Iteration 16 -- diff --git a/ext/standard/tests/array/usort_variation10.phpt b/ext/standard/tests/array/usort_variation10.phpt index d1de536b84..be5a1b0969 100644 --- a/ext/standard/tests/array/usort_variation10.phpt +++ b/ext/standard/tests/array/usort_variation10.phpt @@ -42,7 +42,7 @@ var_dump( usort($array_arg, 'cmp') ); var_dump($array_arg); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing usort() : usage variation *** -- Array with duplicate keys -- diff --git a/ext/standard/tests/array/usort_variation3.phpt b/ext/standard/tests/array/usort_variation3.phpt index d01a2fcc0e..88ae8afe4b 100644 --- a/ext/standard/tests/array/usort_variation3.phpt +++ b/ext/standard/tests/array/usort_variation3.phpt @@ -75,7 +75,7 @@ echo "\n-- Sorted array after usort() function call --\n"; var_dump($array_arg); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing usort() : usage variation *** bool(true) diff --git a/ext/standard/tests/array/usort_variation4.phpt b/ext/standard/tests/array/usort_variation4.phpt index 0c66516bf1..1335279708 100644 --- a/ext/standard/tests/array/usort_variation4.phpt +++ b/ext/standard/tests/array/usort_variation4.phpt @@ -67,7 +67,7 @@ var_dump( usort($empty_array, 'cmp_function') ); var_dump($empty_array); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing usort() : usage variation *** -- Sorting Integer array -- diff --git a/ext/standard/tests/array/usort_variation6.phpt b/ext/standard/tests/array/usort_variation6.phpt index 740da53f78..473f61a0dd 100644 --- a/ext/standard/tests/array/usort_variation6.phpt +++ b/ext/standard/tests/array/usort_variation6.phpt @@ -54,7 +54,7 @@ echo "-- Array after call to usort() --\n"; var_dump($array_args[5]); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing usort() : usage variation *** -- Pass usort() a two-dimensional array -- diff --git a/ext/standard/tests/array/usort_variation7.phpt b/ext/standard/tests/array/usort_variation7.phpt index edc9bb4f04..a493ac752c 100644 --- a/ext/standard/tests/array/usort_variation7.phpt +++ b/ext/standard/tests/array/usort_variation7.phpt @@ -38,7 +38,7 @@ var_dump( usort($array_arg, $cmp_function) ); var_dump($array_arg); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing usort() : usage variation *** -- Anonymous 'cmp_function' with parameters passed by value -- diff --git a/ext/standard/tests/array/usort_variation9.phpt b/ext/standard/tests/array/usort_variation9.phpt index 538befa902..8035c57b13 100644 --- a/ext/standard/tests/array/usort_variation9.phpt +++ b/ext/standard/tests/array/usort_variation9.phpt @@ -46,7 +46,7 @@ var_dump( usort($array_arg, 'cmp_function') ); var_dump($array_arg); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing usort() : usage variation *** -- Sorting $array_arg containing different references -- diff --git a/ext/standard/tests/array/var_export.phpt b/ext/standard/tests/array/var_export.phpt index 0b1f76094d..5c23ad267c 100644 --- a/ext/standard/tests/array/var_export.phpt +++ b/ext/standard/tests/array/var_export.phpt @@ -6,8 +6,8 @@ $a = (object) array (1, 3, "foo" => "bar"); var_export($a); ?> --EXPECT-- -stdClass::__set_state(array( +(object) array( '0' => 1, '1' => 3, 'foo' => 'bar', -)) +) diff --git a/ext/standard/tests/assert/assert04.phpt b/ext/standard/tests/assert/assert04.phpt index 705ea64c93..0100229958 100644 --- a/ext/standard/tests/assert/assert04.phpt +++ b/ext/standard/tests/assert/assert04.phpt @@ -40,7 +40,7 @@ Warning: assert() expects at most 2 parameters, 3 given in %s on line %d Warning: assert_options() expects at most 2 parameters, 3 given in %s on line %d -Warning: assert_options() expects parameter 1 to be integer, string given in %s on line %d +Warning: assert_options() expects parameter 1 to be int, string given in %s on line %d Warning: assert(): assert(0) failed in %s on line %d diff --git a/ext/standard/tests/assert/assert_basic1.phpt b/ext/standard/tests/assert/assert_basic1.phpt index 1280638416..a5bcda3316 100644 --- a/ext/standard/tests/assert/assert_basic1.phpt +++ b/ext/standard/tests/assert/assert_basic1.phpt @@ -22,7 +22,7 @@ var_dump($r2=assert($sa)); //Non string assert var_dump($r2=assert(0)); var_dump($r2=assert(1)); ---EXPECTF-- +--EXPECT-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/assert/assert_basic4.phpt b/ext/standard/tests/assert/assert_basic4.phpt index 9da8d1303b..4e78cf9ec1 100644 --- a/ext/standard/tests/assert/assert_basic4.phpt +++ b/ext/standard/tests/assert/assert_basic4.phpt @@ -23,7 +23,7 @@ echo "Initial values: ini.get(\"assert.warning\") => [".ini_get("assert.warning" echo "Initial values: ini.get(\"assert.bail\") => [".ini_get("assert.bail")."]\n"; echo "Initial values: ini.get(\"assert.quiet_eval\") => [".ini_get("assert.quiet_eval")."]\n"; echo "Initial values: ini.get(\"assert.callback\") => [".ini_get("assert.callback")."]\n\n"; ---EXPECTF-- +--EXPECT-- Initial values: assert_options(ASSERT_ACTIVE) => [0] Initial values: assert_options(ASSERT_WARNING) => [0] Initial values: assert_options(ASSERT_BAIL) => [0] diff --git a/ext/standard/tests/assert/assert_error1.phpt b/ext/standard/tests/assert/assert_error1.phpt index 191f0354aa..7c19c784d4 100644 --- a/ext/standard/tests/assert/assert_error1.phpt +++ b/ext/standard/tests/assert/assert_error1.phpt @@ -37,7 +37,7 @@ var_dump($rc = assert('aa=sd+as+safsafasfaçsafçsafç')); Warning: assert_options() expects at most 2 parameters, 3 given in %s on line %d NULL -Warning: assert_options() expects parameter 1 to be integer, string given in %s on line %d +Warning: assert_options() expects parameter 1 to be int, string given in %s on line %d NULL Warning: assert() expects at most 2 parameters, 3 given in %s on line %d diff --git a/ext/standard/tests/bug73124.phpt b/ext/standard/tests/bug73124.phpt deleted file mode 100644 index 7064d65558..0000000000 --- a/ext/standard/tests/bug73124.phpt +++ /dev/null @@ -1,24 +0,0 @@ ---TEST-- -Bug #73124 (php_ini_scanned_files relied on PHP_CONFIG_FILE_SCAN_DIR) ---SKIPIF-- -<?php -if (!empty(PHP_CONFIG_FILE_SCAN_DIR)) die("Skip: PHP_CONFIG_FILE_SCAN_DIR must not be available"); -?> ---FILE-- -<?php - $tempDir = sys_get_temp_dir(); - putenv('PHP_INI_SCAN_DIR='.$tempDir); - - $inifile = $tempDir.DIRECTORY_SEPARATOR.'scan-dir.ini'; - @unlink($inifile); - file_put_contents($inifile, "\n"); - - $php = getenv('TEST_PHP_EXECUTABLE'); - passthru('"'.$php.'" -r "print_r(php_ini_scanned_files());"'); - - putenv('PHP_INI_SCAN_DIR='); - @unlink($inifile); -?> ---EXPECTREGEX-- -.*[\/\\]scan-dir\.ini.*|.*[\/\\]scan-dir\.ini -Done diff --git a/ext/standard/tests/class_object/class_exists_basic_001.phpt b/ext/standard/tests/class_object/class_exists_basic_001.phpt index cd05a4e9c3..b95efecd65 100644 --- a/ext/standard/tests/class_object/class_exists_basic_001.phpt +++ b/ext/standard/tests/class_object/class_exists_basic_001.phpt @@ -31,7 +31,7 @@ var_dump( class_exists('stdclass') ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing class_exists() : basic functionality *** Calling class_exists() on non-existent class with autoload explicitly enabled: In autoload(C) diff --git a/ext/standard/tests/class_object/class_exists_variation_002.phpt b/ext/standard/tests/class_object/class_exists_variation_002.phpt index bd00e17d4d..4b77d032ea 100644 --- a/ext/standard/tests/class_object/class_exists_variation_002.phpt +++ b/ext/standard/tests/class_object/class_exists_variation_002.phpt @@ -128,27 +128,27 @@ bool(false) Error: 8 - Array to string conversion, %sclass_exists_variation_002.php(%d) Arg value Array -Error: 2 - class_exists() expects parameter 2 to be boolean, array given, %s(81) +Error: 2 - class_exists() expects parameter 2 to be bool, array given, %s(81) NULL Error: 8 - Array to string conversion, %sclass_exists_variation_002.php(%d) Arg value Array -Error: 2 - class_exists() expects parameter 2 to be boolean, array given, %s(81) +Error: 2 - class_exists() expects parameter 2 to be bool, array given, %s(81) NULL Error: 8 - Array to string conversion, %sclass_exists_variation_002.php(%d) Arg value Array -Error: 2 - class_exists() expects parameter 2 to be boolean, array given, %s(81) +Error: 2 - class_exists() expects parameter 2 to be bool, array given, %s(81) NULL Error: 8 - Array to string conversion, %sclass_exists_variation_002.php(%d) Arg value Array -Error: 2 - class_exists() expects parameter 2 to be boolean, array given, %s(81) +Error: 2 - class_exists() expects parameter 2 to be bool, array given, %s(81) NULL Error: 8 - Array to string conversion, %sclass_exists_variation_002.php(%d) Arg value Array -Error: 2 - class_exists() expects parameter 2 to be boolean, array given, %s(81) +Error: 2 - class_exists() expects parameter 2 to be bool, array given, %s(81) NULL Arg value @@ -187,7 +187,7 @@ bool(false) Error: 4096 - Object of class stdClass could not be converted to string, %s(80) Arg value -Error: 2 - class_exists() expects parameter 2 to be boolean, object given, %s(81) +Error: 2 - class_exists() expects parameter 2 to be bool, object given, %s(81) NULL Arg value diff --git a/ext/standard/tests/class_object/class_exists_variation_003.phpt b/ext/standard/tests/class_object/class_exists_variation_003.phpt index 3aa16e21ad..098c563c97 100644 --- a/ext/standard/tests/class_object/class_exists_variation_003.phpt +++ b/ext/standard/tests/class_object/class_exists_variation_003.phpt @@ -13,6 +13,6 @@ var_dump(class_exists('casesensitivitytest')); echo "Done" ?> ---EXPECTF-- +--EXPECT-- bool(true) Done diff --git a/ext/standard/tests/class_object/forward_static_call_001.phpt b/ext/standard/tests/class_object/forward_static_call_001.phpt index 2b3a8dd059..0fac78f4ea 100644 --- a/ext/standard/tests/class_object/forward_static_call_001.phpt +++ b/ext/standard/tests/class_object/forward_static_call_001.phpt @@ -58,7 +58,7 @@ C::test3(); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- A - B diff --git a/ext/standard/tests/class_object/forward_static_call_003.phpt b/ext/standard/tests/class_object/forward_static_call_003.phpt index 2ea102e5d2..ea56f8d2e7 100644 --- a/ext/standard/tests/class_object/forward_static_call_003.phpt +++ b/ext/standard/tests/class_object/forward_static_call_003.phpt @@ -39,7 +39,7 @@ C::test(); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- A - B diff --git a/ext/standard/tests/class_object/get_class_methods_basic_001.phpt b/ext/standard/tests/class_object/get_class_methods_basic_001.phpt index 06c124c1e2..843e9f1a53 100644 --- a/ext/standard/tests/class_object/get_class_methods_basic_001.phpt +++ b/ext/standard/tests/class_object/get_class_methods_basic_001.phpt @@ -35,7 +35,7 @@ var_dump( get_class_methods("NonExistent") ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing get_class_methods() : basic functionality *** Argument is class name: array(3) { diff --git a/ext/standard/tests/class_object/get_class_methods_basic_002.phpt b/ext/standard/tests/class_object/get_class_methods_basic_002.phpt index 34588e6a6a..8a11eba589 100644 --- a/ext/standard/tests/class_object/get_class_methods_basic_002.phpt +++ b/ext/standard/tests/class_object/get_class_methods_basic_002.phpt @@ -66,7 +66,7 @@ X::testFromX(); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- Accessing D from global scope: array(4) { [0]=> diff --git a/ext/standard/tests/class_object/get_class_methods_basic_003.phpt b/ext/standard/tests/class_object/get_class_methods_basic_003.phpt index 77b4545a62..c7662f8605 100644 --- a/ext/standard/tests/class_object/get_class_methods_basic_003.phpt +++ b/ext/standard/tests/class_object/get_class_methods_basic_003.phpt @@ -40,7 +40,7 @@ var_dump(get_class_methods("C")); C::testFromC(); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- Accessing I from global scope: array(1) { [0]=> diff --git a/ext/standard/tests/class_object/get_class_methods_variation_002.phpt b/ext/standard/tests/class_object/get_class_methods_variation_002.phpt index 4e5fb30b52..23416234f9 100644 --- a/ext/standard/tests/class_object/get_class_methods_variation_002.phpt +++ b/ext/standard/tests/class_object/get_class_methods_variation_002.phpt @@ -18,7 +18,7 @@ var_dump( get_class_methods('CasesensitivitytesT') ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing get_class_methods() : usage variations *** array(1) { [0]=> diff --git a/ext/standard/tests/class_object/get_class_variation_001.phpt b/ext/standard/tests/class_object/get_class_variation_001.phpt index ad0686b837..b142f8ace9 100644 --- a/ext/standard/tests/class_object/get_class_variation_001.phpt +++ b/ext/standard/tests/class_object/get_class_variation_001.phpt @@ -82,22 +82,22 @@ Notice: Undefined variable: unset_var in %sget_class_variation_001.php on line 6 Arg value: 0 (type: integer) -Warning: get_class() expects parameter 1 to be object, integer given in %sget_class_variation_001.php on line %d +Warning: get_class() expects parameter 1 to be object, int given in %sget_class_variation_001.php on line %d bool(false) Arg value: 1 (type: integer) -Warning: get_class() expects parameter 1 to be object, integer given in %sget_class_variation_001.php on line %d +Warning: get_class() expects parameter 1 to be object, int given in %sget_class_variation_001.php on line %d bool(false) Arg value: 12345 (type: integer) -Warning: get_class() expects parameter 1 to be object, integer given in %sget_class_variation_001.php on line %d +Warning: get_class() expects parameter 1 to be object, int given in %sget_class_variation_001.php on line %d bool(false) Arg value: -2345 (type: integer) -Warning: get_class() expects parameter 1 to be object, integer given in %sget_class_variation_001.php on line %d +Warning: get_class() expects parameter 1 to be object, int given in %sget_class_variation_001.php on line %d bool(false) Arg value: 10.5 (type: double) @@ -162,22 +162,22 @@ bool(false) Arg value: 1 (type: boolean) -Warning: get_class() expects parameter 1 to be object, boolean given in %sget_class_variation_001.php on line %d +Warning: get_class() expects parameter 1 to be object, bool given in %sget_class_variation_001.php on line %d bool(false) Arg value: (type: boolean) -Warning: get_class() expects parameter 1 to be object, boolean given in %sget_class_variation_001.php on line %d +Warning: get_class() expects parameter 1 to be object, bool given in %sget_class_variation_001.php on line %d bool(false) Arg value: 1 (type: boolean) -Warning: get_class() expects parameter 1 to be object, boolean given in %sget_class_variation_001.php on line %d +Warning: get_class() expects parameter 1 to be object, bool given in %sget_class_variation_001.php on line %d bool(false) Arg value: (type: boolean) -Warning: get_class() expects parameter 1 to be object, boolean given in %sget_class_variation_001.php on line %d +Warning: get_class() expects parameter 1 to be object, bool given in %sget_class_variation_001.php on line %d bool(false) Arg value: (type: string) diff --git a/ext/standard/tests/class_object/get_class_variation_002.phpt b/ext/standard/tests/class_object/get_class_variation_002.phpt index 77b299d3dd..89edadccc6 100644 --- a/ext/standard/tests/class_object/get_class_variation_002.phpt +++ b/ext/standard/tests/class_object/get_class_variation_002.phpt @@ -13,6 +13,6 @@ var_dump(get_class(new casesensitivitytest)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- string(19) "caseSensitivityTest" Done diff --git a/ext/standard/tests/class_object/get_class_vars_variation2.phpt b/ext/standard/tests/class_object/get_class_vars_variation2.phpt index 8f6923d600..0e54864b09 100644 --- a/ext/standard/tests/class_object/get_class_vars_variation2.phpt +++ b/ext/standard/tests/class_object/get_class_vars_variation2.phpt @@ -75,7 +75,7 @@ echo "\n-- From a child's static context --\n"; Child::testStatic(); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing get_class_vars() : testing visibility -- From global context -- diff --git a/ext/standard/tests/class_object/get_declared_classes_variation1.phpt b/ext/standard/tests/class_object/get_declared_classes_variation1.phpt index 6929d741c6..669378740a 100644 --- a/ext/standard/tests/class_object/get_declared_classes_variation1.phpt +++ b/ext/standard/tests/class_object/get_declared_classes_variation1.phpt @@ -25,7 +25,7 @@ var_dump(in_array('AutoLoaded', get_declared_classes())); echo "\nDONE\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing get_declared_classes() : testing autoloaded classes *** -- before instance is declared -- diff --git a/ext/standard/tests/class_object/get_declared_interfaces_variation1.phpt b/ext/standard/tests/class_object/get_declared_interfaces_variation1.phpt index f8d2a12418..a6978c6d30 100644 --- a/ext/standard/tests/class_object/get_declared_interfaces_variation1.phpt +++ b/ext/standard/tests/class_object/get_declared_interfaces_variation1.phpt @@ -25,7 +25,7 @@ var_dump(in_array('AutoInterface', get_declared_interfaces())); echo "\nDONE\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing get_declared_interfaces() : autoloading of interfaces *** -- before interface is used -- diff --git a/ext/standard/tests/class_object/get_declared_traits_variation1.phpt b/ext/standard/tests/class_object/get_declared_traits_variation1.phpt index a0df5d8071..9faef55241 100644 --- a/ext/standard/tests/class_object/get_declared_traits_variation1.phpt +++ b/ext/standard/tests/class_object/get_declared_traits_variation1.phpt @@ -29,7 +29,7 @@ var_dump(in_array('AutoTrait', get_declared_traits())); echo "\nDONE\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing get_declared_traits() : testing autoloaded traits *** -- before instance is declared -- diff --git a/ext/standard/tests/class_object/get_object_vars_basic_001.phpt b/ext/standard/tests/class_object/get_object_vars_basic_001.phpt index 444bf14017..253ebd2be4 100644 --- a/ext/standard/tests/class_object/get_object_vars_basic_001.phpt +++ b/ext/standard/tests/class_object/get_object_vars_basic_001.phpt @@ -58,7 +58,7 @@ A::test($b); echo "\n---( Unrelated class: )---\n"; X::test($b); ?> ---EXPECTF-- +--EXPECT-- ---( Global scope: )--- array(1) { ["pub"]=> diff --git a/ext/standard/tests/class_object/get_object_vars_basic_002.phpt b/ext/standard/tests/class_object/get_object_vars_basic_002.phpt index 67f57a37d1..41a1758baa 100644 --- a/ext/standard/tests/class_object/get_object_vars_basic_002.phpt +++ b/ext/standard/tests/class_object/get_object_vars_basic_002.phpt @@ -37,7 +37,7 @@ echo "\n---( Superclass: )---\n"; $b->testA($b); ?> ---EXPECTF-- +--EXPECT-- ---( Declaring class: )--- B::testB array(4) { diff --git a/ext/standard/tests/class_object/get_object_vars_variation_001.phpt b/ext/standard/tests/class_object/get_object_vars_variation_001.phpt index bd9d2ae984..2a310227a5 100644 --- a/ext/standard/tests/class_object/get_object_vars_variation_001.phpt +++ b/ext/standard/tests/class_object/get_object_vars_variation_001.phpt @@ -15,6 +15,6 @@ Class A { $a = new A; var_dump(get_object_vars($a)); ?> ---EXPECTF-- +--EXPECT-- array(0) { } diff --git a/ext/standard/tests/class_object/get_object_vars_variation_002.phpt b/ext/standard/tests/class_object/get_object_vars_variation_002.phpt index 0f0a37da9c..f2a05a5836 100644 --- a/ext/standard/tests/class_object/get_object_vars_variation_002.phpt +++ b/ext/standard/tests/class_object/get_object_vars_variation_002.phpt @@ -23,7 +23,7 @@ $arr['val'] = 'changed.val'; var_dump($arr, $obj, $a); ?> ---EXPECTF-- +--EXPECT-- array(0) { } array(2) { diff --git a/ext/standard/tests/class_object/get_object_vars_variation_003.phpt b/ext/standard/tests/class_object/get_object_vars_variation_003.phpt index 58114a83a1..10be39bb7f 100644 --- a/ext/standard/tests/class_object/get_object_vars_variation_003.phpt +++ b/ext/standard/tests/class_object/get_object_vars_variation_003.phpt @@ -80,22 +80,22 @@ Notice: Undefined variable: unset_var in %s on line 59 Arg value 0 -Warning: get_object_vars() expects parameter 1 to be object, integer given in %s on line %d +Warning: get_object_vars() expects parameter 1 to be object, int given in %s on line %d NULL Arg value 1 -Warning: get_object_vars() expects parameter 1 to be object, integer given in %s on line %d +Warning: get_object_vars() expects parameter 1 to be object, int given in %s on line %d NULL Arg value 12345 -Warning: get_object_vars() expects parameter 1 to be object, integer given in %s on line %d +Warning: get_object_vars() expects parameter 1 to be object, int given in %s on line %d NULL Arg value -2345 -Warning: get_object_vars() expects parameter 1 to be object, integer given in %s on line %d +Warning: get_object_vars() expects parameter 1 to be object, int given in %s on line %d NULL Arg value 10.5 @@ -160,22 +160,22 @@ NULL Arg value 1 -Warning: get_object_vars() expects parameter 1 to be object, boolean given in %s on line %d +Warning: get_object_vars() expects parameter 1 to be object, bool given in %s on line %d NULL Arg value -Warning: get_object_vars() expects parameter 1 to be object, boolean given in %s on line %d +Warning: get_object_vars() expects parameter 1 to be object, bool given in %s on line %d NULL Arg value 1 -Warning: get_object_vars() expects parameter 1 to be object, boolean given in %s on line %d +Warning: get_object_vars() expects parameter 1 to be object, bool given in %s on line %d NULL Arg value -Warning: get_object_vars() expects parameter 1 to be object, boolean given in %s on line %d +Warning: get_object_vars() expects parameter 1 to be object, bool given in %s on line %d NULL Arg value diff --git a/ext/standard/tests/class_object/get_parent_class_variation_001.phpt b/ext/standard/tests/class_object/get_parent_class_variation_001.phpt index f55806f5c0..68dec50ac4 100644 --- a/ext/standard/tests/class_object/get_parent_class_variation_001.phpt +++ b/ext/standard/tests/class_object/get_parent_class_variation_001.phpt @@ -20,7 +20,7 @@ var_dump(get_parent_class(new CasesensitivitytestCHILD)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing get_parent_class() : variation *** string(19) "caseSensitivityTest" string(19) "caseSensitivityTest" diff --git a/ext/standard/tests/class_object/interface_exists_variation2.phpt b/ext/standard/tests/class_object/interface_exists_variation2.phpt index cfdb4dee17..1f9a0af422 100644 --- a/ext/standard/tests/class_object/interface_exists_variation2.phpt +++ b/ext/standard/tests/class_object/interface_exists_variation2.phpt @@ -132,22 +132,22 @@ bool(false) --empty array-- -Warning: interface_exists() expects parameter 2 to be boolean, array given in %sinterface_exists_variation2.php on line %d +Warning: interface_exists() expects parameter 2 to be bool, array given in %sinterface_exists_variation2.php on line %d NULL --int indexed array-- -Warning: interface_exists() expects parameter 2 to be boolean, array given in %sinterface_exists_variation2.php on line %d +Warning: interface_exists() expects parameter 2 to be bool, array given in %sinterface_exists_variation2.php on line %d NULL --associative array-- -Warning: interface_exists() expects parameter 2 to be boolean, array given in %sinterface_exists_variation2.php on line %d +Warning: interface_exists() expects parameter 2 to be bool, array given in %sinterface_exists_variation2.php on line %d NULL --nested arrays-- -Warning: interface_exists() expects parameter 2 to be boolean, array given in %sinterface_exists_variation2.php on line %d +Warning: interface_exists() expects parameter 2 to be bool, array given in %sinterface_exists_variation2.php on line %d NULL --uppercase NULL-- @@ -188,12 +188,12 @@ bool(false) --instance of classWithToString-- -Warning: interface_exists() expects parameter 2 to be boolean, object given in %sinterface_exists_variation2.php on line %d +Warning: interface_exists() expects parameter 2 to be bool, object given in %sinterface_exists_variation2.php on line %d NULL --instance of classWithoutToString-- -Warning: interface_exists() expects parameter 2 to be boolean, object given in %sinterface_exists_variation2.php on line %d +Warning: interface_exists() expects parameter 2 to be bool, object given in %sinterface_exists_variation2.php on line %d NULL --undefined var-- diff --git a/ext/standard/tests/class_object/interface_exists_variation3.phpt b/ext/standard/tests/class_object/interface_exists_variation3.phpt index dd6cec3c2a..ce66ca1b41 100644 --- a/ext/standard/tests/class_object/interface_exists_variation3.phpt +++ b/ext/standard/tests/class_object/interface_exists_variation3.phpt @@ -23,7 +23,7 @@ var_dump(interface_exists("AutoInterface", true)); echo "\nDONE\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing interface_exists() : autoloaded interface *** -- no autoloading -- diff --git a/ext/standard/tests/class_object/interface_exists_variation4.phpt b/ext/standard/tests/class_object/interface_exists_variation4.phpt index 9cff2e9ccc..17ba97d85a 100644 --- a/ext/standard/tests/class_object/interface_exists_variation4.phpt +++ b/ext/standard/tests/class_object/interface_exists_variation4.phpt @@ -19,7 +19,7 @@ var_dump(interface_exists("AutoInterface")); echo "\nDONE\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing interface_exists() : test autoload default value *** bool(true) diff --git a/ext/standard/tests/class_object/is_a.phpt b/ext/standard/tests/class_object/is_a.phpt index 8e7f7a79da..92d289ba18 100644 --- a/ext/standard/tests/class_object/is_a.phpt +++ b/ext/standard/tests/class_object/is_a.phpt @@ -81,7 +81,7 @@ $t->test(); ?> ---EXPECTF-- +--EXPECT-- >>> With Defined class is_a( OBJECT:base, base) = yes is_a( STRING:base, base) = no diff --git a/ext/standard/tests/class_object/is_a_error_001.phpt b/ext/standard/tests/class_object/is_a_error_001.phpt index cbabf4c4f6..fd8f785bee 100644 --- a/ext/standard/tests/class_object/is_a_error_001.phpt +++ b/ext/standard/tests/class_object/is_a_error_001.phpt @@ -1,7 +1,5 @@ --TEST-- Test is_a() function : error conditions - wrong number of args ---INI-- -error_reporting=E_ALL | E_STRICT | E_DEPRECATED --FILE-- <?php /* Prototype : proto bool is_a(object object, string class_name, bool allow_string) @@ -43,7 +41,7 @@ NULL -- Testing is_a() function with non-boolean in last position -- -Warning: is_a() expects parameter 3 to be boolean, object given in %s on line 21 +Warning: is_a() expects parameter 3 to be bool, object given in %s on line 21 NULL -- Testing is_a() function with less than expected no. of arguments -- diff --git a/ext/standard/tests/class_object/is_a_variation_001.phpt b/ext/standard/tests/class_object/is_a_variation_001.phpt index a81fb1e2df..563195cd0c 100644 --- a/ext/standard/tests/class_object/is_a_variation_001.phpt +++ b/ext/standard/tests/class_object/is_a_variation_001.phpt @@ -1,7 +1,5 @@ --TEST-- Test is_a() function : usage variations - wrong type for arg 1 ---INI-- -error_reporting=E_ALL | E_STRICT | E_DEPRECATED --FILE-- <?php /* Prototype : proto bool is_a(object object, string class_name) diff --git a/ext/standard/tests/class_object/is_a_variation_002.phpt b/ext/standard/tests/class_object/is_a_variation_002.phpt index b4dc4631fa..615a45ba33 100644 --- a/ext/standard/tests/class_object/is_a_variation_002.phpt +++ b/ext/standard/tests/class_object/is_a_variation_002.phpt @@ -1,7 +1,5 @@ --TEST-- Test is_a() function : usage variations - wrong type for arg 2 ---INI-- -error_reporting=E_ALL | E_STRICT | E_DEPRECATED --FILE-- <?php /* Prototype : proto bool is_a(object object, string class_name) diff --git a/ext/standard/tests/class_object/is_a_variation_003.phpt b/ext/standard/tests/class_object/is_a_variation_003.phpt index af0f2a8a76..0813f28308 100644 --- a/ext/standard/tests/class_object/is_a_variation_003.phpt +++ b/ext/standard/tests/class_object/is_a_variation_003.phpt @@ -1,7 +1,5 @@ --TEST-- Test is_a() function : usage variations - case sensitivity ---INI-- -error_reporting=E_ALL | E_STRICT | E_DEPRECATED --FILE-- <?php /* Prototype : proto bool is_a(object object, string class_name) @@ -19,7 +17,7 @@ var_dump(is_a(new caseSensitivityTestChild, 'caseSensitivityTEST')); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing is_a() : usage variations *** bool(true) Done diff --git a/ext/standard/tests/class_object/is_subclass_of_error_001.phpt b/ext/standard/tests/class_object/is_subclass_of_error_001.phpt index 878a4584e3..cd5b3b44a6 100644 --- a/ext/standard/tests/class_object/is_subclass_of_error_001.phpt +++ b/ext/standard/tests/class_object/is_subclass_of_error_001.phpt @@ -48,7 +48,7 @@ bool(false) -- Testing is_subclass_of() function with more than invalid 3rd argument -- -Warning: is_subclass_of() expects parameter 3 to be boolean, object given in %s on line 26 +Warning: is_subclass_of() expects parameter 3 to be bool, object given in %s on line 26 NULL -- Testing is_subclass_of() function with less than expected no. of arguments -- diff --git a/ext/standard/tests/class_object/is_subclass_of_variation_003.phpt b/ext/standard/tests/class_object/is_subclass_of_variation_003.phpt index ce39cbed74..9f080ad699 100644 --- a/ext/standard/tests/class_object/is_subclass_of_variation_003.phpt +++ b/ext/standard/tests/class_object/is_subclass_of_variation_003.phpt @@ -19,7 +19,7 @@ var_dump(is_subclass_of('caseSensitivityTestCHILD', 'caseSensitivityTEST')); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing is_subclass_of() : usage variations *** *** Testing is_a() : usage variations *** bool(true) diff --git a/ext/standard/tests/class_object/method_exists_basic_001.phpt b/ext/standard/tests/class_object/method_exists_basic_001.phpt index 6b8cbe806c..2368d1217e 100644 --- a/ext/standard/tests/class_object/method_exists_basic_001.phpt +++ b/ext/standard/tests/class_object/method_exists_basic_001.phpt @@ -49,7 +49,7 @@ foreach ($methods as $method) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- ---(Using string class name)--- Does C::inherit_pub exist? bool(true) Does C::inherit_prot exist? bool(true) diff --git a/ext/standard/tests/class_object/method_exists_basic_002.phpt b/ext/standard/tests/class_object/method_exists_basic_002.phpt index c23bbee824..36b4a6e692 100644 --- a/ext/standard/tests/class_object/method_exists_basic_002.phpt +++ b/ext/standard/tests/class_object/method_exists_basic_002.phpt @@ -22,7 +22,7 @@ var_dump(method_exists(new stdclass, "nonexistent")); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- ---(Internal classes, using string class name)--- Does exception::getmessage exist? bool(true) Does stdclass::nonexistent exist? bool(false) diff --git a/ext/standard/tests/class_object/method_exists_basic_003.phpt b/ext/standard/tests/class_object/method_exists_basic_003.phpt index 2b3b04bb20..e92b7a9135 100644 --- a/ext/standard/tests/class_object/method_exists_basic_003.phpt +++ b/ext/standard/tests/class_object/method_exists_basic_003.phpt @@ -16,7 +16,7 @@ var_dump(method_exists('UndefC', 'func')); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- In autoload(UndefC) bool(false) Done diff --git a/ext/standard/tests/class_object/method_exists_variation_003.phpt b/ext/standard/tests/class_object/method_exists_variation_003.phpt index e6e21cfd5d..d5835b0b87 100644 --- a/ext/standard/tests/class_object/method_exists_variation_003.phpt +++ b/ext/standard/tests/class_object/method_exists_variation_003.phpt @@ -19,7 +19,7 @@ var_dump(method_exists('casesensiTivitytest', 'myMetHOD')); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing method_exists() : variation *** bool(true) bool(true) diff --git a/ext/standard/tests/class_object/property_exists_variation1.phpt b/ext/standard/tests/class_object/property_exists_variation1.phpt index 430b9dd34a..4b0ce2baff 100644 --- a/ext/standard/tests/class_object/property_exists_variation1.phpt +++ b/ext/standard/tests/class_object/property_exists_variation1.phpt @@ -22,7 +22,7 @@ var_dump(property_exists("AutoTest", "foo")); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing property_exists() : class auto loading *** testing property in autoloaded class diff --git a/ext/standard/tests/class_object/trait_class_exists_variation_003.phpt b/ext/standard/tests/class_object/trait_class_exists_variation_003.phpt index a401eb7e50..c971af9a26 100644 --- a/ext/standard/tests/class_object/trait_class_exists_variation_003.phpt +++ b/ext/standard/tests/class_object/trait_class_exists_variation_003.phpt @@ -13,6 +13,6 @@ var_dump(trait_exists('casesensitivitytest')); echo "Done" ?> ---EXPECTF-- +--EXPECT-- bool(true) Done diff --git a/ext/standard/tests/class_object/trait_exists_basic_001.phpt b/ext/standard/tests/class_object/trait_exists_basic_001.phpt index be530972fa..708c6c91e4 100644 --- a/ext/standard/tests/class_object/trait_exists_basic_001.phpt +++ b/ext/standard/tests/class_object/trait_exists_basic_001.phpt @@ -33,7 +33,7 @@ var_dump( trait_exists('MyTrait') ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing trait_exists() : basic functionality *** Calling trait_exists() on non-existent trait with autoload explicitly enabled: In autoload(C) diff --git a/ext/standard/tests/class_object/trait_exists_variation_002.phpt b/ext/standard/tests/class_object/trait_exists_variation_002.phpt index 43e68bfa13..a4a4a209ec 100644 --- a/ext/standard/tests/class_object/trait_exists_variation_002.phpt +++ b/ext/standard/tests/class_object/trait_exists_variation_002.phpt @@ -128,27 +128,27 @@ bool(false) Error: 8 - Array to string conversion, %strait_exists_variation_002.php(%d) Arg value Array -Error: 2 - trait_exists() expects parameter 2 to be boolean, array given, %s(81) +Error: 2 - trait_exists() expects parameter 2 to be bool, array given, %s(81) NULL Error: 8 - Array to string conversion, %strait_exists_variation_002.php(%d) Arg value Array -Error: 2 - trait_exists() expects parameter 2 to be boolean, array given, %s(81) +Error: 2 - trait_exists() expects parameter 2 to be bool, array given, %s(81) NULL Error: 8 - Array to string conversion, %strait_exists_variation_002.php(%d) Arg value Array -Error: 2 - trait_exists() expects parameter 2 to be boolean, array given, %s(81) +Error: 2 - trait_exists() expects parameter 2 to be bool, array given, %s(81) NULL Error: 8 - Array to string conversion, %strait_exists_variation_002.php(%d) Arg value Array -Error: 2 - trait_exists() expects parameter 2 to be boolean, array given, %s(81) +Error: 2 - trait_exists() expects parameter 2 to be bool, array given, %s(81) NULL Error: 8 - Array to string conversion, %strait_exists_variation_002.php(%d) Arg value Array -Error: 2 - trait_exists() expects parameter 2 to be boolean, array given, %s(81) +Error: 2 - trait_exists() expects parameter 2 to be bool, array given, %s(81) NULL Arg value @@ -187,7 +187,7 @@ bool(false) Error: 4096 - Object of class stdClass could not be converted to string, %s(80) Arg value -Error: 2 - trait_exists() expects parameter 2 to be boolean, object given, %s(81) +Error: 2 - trait_exists() expects parameter 2 to be bool, object given, %s(81) NULL Arg value diff --git a/ext/standard/tests/crypt/bcrypt_invalid_algorithm.phpt b/ext/standard/tests/crypt/bcrypt_invalid_algorithm.phpt index 58504e4604..b8db266b3d 100644 --- a/ext/standard/tests/crypt/bcrypt_invalid_algorithm.phpt +++ b/ext/standard/tests/crypt/bcrypt_invalid_algorithm.phpt @@ -6,7 +6,7 @@ var_dump(crypt("test", "$23$04$1234567890123456789012345")); var_dump(crypt("test", "$20$04$1234567890123456789012345")); var_dump(crypt("test", "$2g$04$1234567890123456789012345")); ?> ---EXPECTF-- +--EXPECT-- string(2) "*0" string(2) "*0" string(2) "*0" diff --git a/ext/standard/tests/crypt/bcrypt_invalid_cost.phpt b/ext/standard/tests/crypt/bcrypt_invalid_cost.phpt index a01d151959..94276a6573 100644 --- a/ext/standard/tests/crypt/bcrypt_invalid_cost.phpt +++ b/ext/standard/tests/crypt/bcrypt_invalid_cost.phpt @@ -10,7 +10,7 @@ var_dump(crypt("test", "$2a$03$1234567891234567891234567")); var_dump(crypt("test", "$2a$32$1234567891234567891234567")); var_dump(crypt("test", "$2a$40$1234567891234567891234567")); ?> ---EXPECTF-- +--EXPECT-- string(2) "*0" string(2) "*0" string(2) "*0" diff --git a/ext/standard/tests/dir/closedir_variation1.phpt b/ext/standard/tests/dir/closedir_variation1.phpt index 09f7b95c45..b80837194b 100644 --- a/ext/standard/tests/dir/closedir_variation1.phpt +++ b/ext/standard/tests/dir/closedir_variation1.phpt @@ -92,22 +92,22 @@ foreach($inputs as $input) { -- Iteration 1 -- -Warning: closedir() expects parameter 1 to be resource, integer given in %s on line %d +Warning: closedir() expects parameter 1 to be resource, int given in %s on line %d NULL -- Iteration 2 -- -Warning: closedir() expects parameter 1 to be resource, integer given in %s on line %d +Warning: closedir() expects parameter 1 to be resource, int given in %s on line %d NULL -- Iteration 3 -- -Warning: closedir() expects parameter 1 to be resource, integer given in %s on line %d +Warning: closedir() expects parameter 1 to be resource, int given in %s on line %d NULL -- Iteration 4 -- -Warning: closedir() expects parameter 1 to be resource, integer given in %s on line %d +Warning: closedir() expects parameter 1 to be resource, int given in %s on line %d NULL -- Iteration 5 -- @@ -147,22 +147,22 @@ NULL -- Iteration 12 -- -Warning: closedir() expects parameter 1 to be resource, boolean given in %s on line %d +Warning: closedir() expects parameter 1 to be resource, bool given in %s on line %d NULL -- Iteration 13 -- -Warning: closedir() expects parameter 1 to be resource, boolean given in %s on line %d +Warning: closedir() expects parameter 1 to be resource, bool given in %s on line %d NULL -- Iteration 14 -- -Warning: closedir() expects parameter 1 to be resource, boolean given in %s on line %d +Warning: closedir() expects parameter 1 to be resource, bool given in %s on line %d NULL -- Iteration 15 -- -Warning: closedir() expects parameter 1 to be resource, boolean given in %s on line %d +Warning: closedir() expects parameter 1 to be resource, bool given in %s on line %d NULL -- Iteration 16 -- diff --git a/ext/standard/tests/dir/dir_bug73971.phpt b/ext/standard/tests/dir/dir_bug73971.phpt index 86cb29ac58..3649b74329 100644 --- a/ext/standard/tests/dir/dir_bug73971.phpt +++ b/ext/standard/tests/dir/dir_bug73971.phpt @@ -39,7 +39,7 @@ $filename = $base . DIRECTORY_SEPARATOR . str_repeat('テスト', 48); rmdir($filename); rmdir($base); ?> ---EXPECTF-- +--EXPECT-- string(432) "テストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテストテスト" test dir() diff --git a/ext/standard/tests/dir/dir_variation2-win32-mb.phpt b/ext/standard/tests/dir/dir_variation2-win32-mb.phpt index 1fd6e61693..f538b92f87 100644 --- a/ext/standard/tests/dir/dir_variation2-win32-mb.phpt +++ b/ext/standard/tests/dir/dir_variation2-win32-mb.phpt @@ -116,19 +116,19 @@ rmdir($directory); *** Testing dir() : unexpected values for $context argument *** -- Iteration 1 -- -Warning: dir() expects parameter 2 to be resource, integer given in %s on line %d +Warning: dir() expects parameter 2 to be resource, int given in %s on line %d NULL -- Iteration 2 -- -Warning: dir() expects parameter 2 to be resource, integer given in %s on line %d +Warning: dir() expects parameter 2 to be resource, int given in %s on line %d NULL -- Iteration 3 -- -Warning: dir() expects parameter 2 to be resource, integer given in %s on line %d +Warning: dir() expects parameter 2 to be resource, int given in %s on line %d NULL -- Iteration 4 -- -Warning: dir() expects parameter 2 to be resource, integer given in %s on line %d +Warning: dir() expects parameter 2 to be resource, int given in %s on line %d NULL -- Iteration 5 -- @@ -180,19 +180,19 @@ Warning: dir() expects parameter 2 to be resource, null given in %s on line %d NULL -- Iteration 17 -- -Warning: dir() expects parameter 2 to be resource, boolean given in %s on line %d +Warning: dir() expects parameter 2 to be resource, bool given in %s on line %d NULL -- Iteration 18 -- -Warning: dir() expects parameter 2 to be resource, boolean given in %s on line %d +Warning: dir() expects parameter 2 to be resource, bool given in %s on line %d NULL -- Iteration 19 -- -Warning: dir() expects parameter 2 to be resource, boolean given in %s on line %d +Warning: dir() expects parameter 2 to be resource, bool given in %s on line %d NULL -- Iteration 20 -- -Warning: dir() expects parameter 2 to be resource, boolean given in %s on line %d +Warning: dir() expects parameter 2 to be resource, bool given in %s on line %d NULL -- Iteration 21 -- diff --git a/ext/standard/tests/dir/dir_variation2.phpt b/ext/standard/tests/dir/dir_variation2.phpt index 4b51490045..f38b3caeea 100644 --- a/ext/standard/tests/dir/dir_variation2.phpt +++ b/ext/standard/tests/dir/dir_variation2.phpt @@ -110,19 +110,19 @@ rmdir($directory); *** Testing dir() : unexpected values for $context argument *** -- Iteration 1 -- -Warning: dir() expects parameter 2 to be resource, integer given in %s on line %d +Warning: dir() expects parameter 2 to be resource, int given in %s on line %d NULL -- Iteration 2 -- -Warning: dir() expects parameter 2 to be resource, integer given in %s on line %d +Warning: dir() expects parameter 2 to be resource, int given in %s on line %d NULL -- Iteration 3 -- -Warning: dir() expects parameter 2 to be resource, integer given in %s on line %d +Warning: dir() expects parameter 2 to be resource, int given in %s on line %d NULL -- Iteration 4 -- -Warning: dir() expects parameter 2 to be resource, integer given in %s on line %d +Warning: dir() expects parameter 2 to be resource, int given in %s on line %d NULL -- Iteration 5 -- @@ -174,19 +174,19 @@ Warning: dir() expects parameter 2 to be resource, null given in %s on line %d NULL -- Iteration 17 -- -Warning: dir() expects parameter 2 to be resource, boolean given in %s on line %d +Warning: dir() expects parameter 2 to be resource, bool given in %s on line %d NULL -- Iteration 18 -- -Warning: dir() expects parameter 2 to be resource, boolean given in %s on line %d +Warning: dir() expects parameter 2 to be resource, bool given in %s on line %d NULL -- Iteration 19 -- -Warning: dir() expects parameter 2 to be resource, boolean given in %s on line %d +Warning: dir() expects parameter 2 to be resource, bool given in %s on line %d NULL -- Iteration 20 -- -Warning: dir() expects parameter 2 to be resource, boolean given in %s on line %d +Warning: dir() expects parameter 2 to be resource, bool given in %s on line %d NULL -- Iteration 21 -- diff --git a/ext/standard/tests/dir/opendir_variation2-win32-mb.phpt b/ext/standard/tests/dir/opendir_variation2-win32-mb.phpt index 0ba4702081..e5b891f5fa 100644 --- a/ext/standard/tests/dir/opendir_variation2-win32-mb.phpt +++ b/ext/standard/tests/dir/opendir_variation2-win32-mb.phpt @@ -120,22 +120,22 @@ rmdir($path); -- Iteration 1 -- -Warning: opendir() expects parameter 2 to be resource, integer given in %s on line %d +Warning: opendir() expects parameter 2 to be resource, int given in %s on line %d NULL -- Iteration 2 -- -Warning: opendir() expects parameter 2 to be resource, integer given in %s on line %d +Warning: opendir() expects parameter 2 to be resource, int given in %s on line %d NULL -- Iteration 3 -- -Warning: opendir() expects parameter 2 to be resource, integer given in %s on line %d +Warning: opendir() expects parameter 2 to be resource, int given in %s on line %d NULL -- Iteration 4 -- -Warning: opendir() expects parameter 2 to be resource, integer given in %s on line %d +Warning: opendir() expects parameter 2 to be resource, int given in %s on line %d NULL -- Iteration 5 -- @@ -175,22 +175,22 @@ NULL -- Iteration 12 -- -Warning: opendir() expects parameter 2 to be resource, boolean given in %s on line %d +Warning: opendir() expects parameter 2 to be resource, bool given in %s on line %d NULL -- Iteration 13 -- -Warning: opendir() expects parameter 2 to be resource, boolean given in %s on line %d +Warning: opendir() expects parameter 2 to be resource, bool given in %s on line %d NULL -- Iteration 14 -- -Warning: opendir() expects parameter 2 to be resource, boolean given in %s on line %d +Warning: opendir() expects parameter 2 to be resource, bool given in %s on line %d NULL -- Iteration 15 -- -Warning: opendir() expects parameter 2 to be resource, boolean given in %s on line %d +Warning: opendir() expects parameter 2 to be resource, bool given in %s on line %d NULL -- Iteration 16 -- diff --git a/ext/standard/tests/dir/opendir_variation2.phpt b/ext/standard/tests/dir/opendir_variation2.phpt index 7c4822a2c4..a6811eb5ef 100644 --- a/ext/standard/tests/dir/opendir_variation2.phpt +++ b/ext/standard/tests/dir/opendir_variation2.phpt @@ -114,22 +114,22 @@ rmdir($path); -- Iteration 1 -- -Warning: opendir() expects parameter 2 to be resource, integer given in %s on line %d +Warning: opendir() expects parameter 2 to be resource, int given in %s on line %d NULL -- Iteration 2 -- -Warning: opendir() expects parameter 2 to be resource, integer given in %s on line %d +Warning: opendir() expects parameter 2 to be resource, int given in %s on line %d NULL -- Iteration 3 -- -Warning: opendir() expects parameter 2 to be resource, integer given in %s on line %d +Warning: opendir() expects parameter 2 to be resource, int given in %s on line %d NULL -- Iteration 4 -- -Warning: opendir() expects parameter 2 to be resource, integer given in %s on line %d +Warning: opendir() expects parameter 2 to be resource, int given in %s on line %d NULL -- Iteration 5 -- @@ -169,22 +169,22 @@ NULL -- Iteration 12 -- -Warning: opendir() expects parameter 2 to be resource, boolean given in %s on line %d +Warning: opendir() expects parameter 2 to be resource, bool given in %s on line %d NULL -- Iteration 13 -- -Warning: opendir() expects parameter 2 to be resource, boolean given in %s on line %d +Warning: opendir() expects parameter 2 to be resource, bool given in %s on line %d NULL -- Iteration 14 -- -Warning: opendir() expects parameter 2 to be resource, boolean given in %s on line %d +Warning: opendir() expects parameter 2 to be resource, bool given in %s on line %d NULL -- Iteration 15 -- -Warning: opendir() expects parameter 2 to be resource, boolean given in %s on line %d +Warning: opendir() expects parameter 2 to be resource, bool given in %s on line %d NULL -- Iteration 16 -- diff --git a/ext/standard/tests/dir/opendir_variation6-win32-mb.phpt b/ext/standard/tests/dir/opendir_variation6-win32-mb.phpt deleted file mode 100644 index caca6a0504..0000000000 --- a/ext/standard/tests/dir/opendir_variation6-win32-mb.phpt +++ /dev/null @@ -1,75 +0,0 @@ ---TEST-- -Test opendir() function : usage variations - Different wildcards ---SKIPIF-- -<?php -if (substr(PHP_OS, 0, 3) != 'WIN') { - die("skip Valid only on Windows"); -} -?> ---FILE-- -<?php -/* Prototype : mixed opendir(string $path[, resource $context]) - * Description: Open a directory and return a dir_handle - * Source code: ext/standard/dir.c - */ - -/* - * Pass paths containing wildcards to test if opendir() recognises them - */ - -echo "*** Testing opendir() : usage variations ***\n"; -// create the temporary directories -$file_path = dirname(__FILE__); -$dir_path = $file_path . "/opendir_variation6"; -$sub_dir_path = $dir_path . "/sub_dir1"; - -mkdir($dir_path); -mkdir($sub_dir_path); - -// with different wildcard characters - -echo "\n-- Wildcard = '*' --\n"; -var_dump( opendir($file_path . "/opendir_var*") ); -var_dump( opendir($file_path . "/*") ); - -echo "\n-- Wildcard = '?' --\n"; -var_dump( opendir($dir_path . "/sub_dir?") ); -var_dump( opendir($dir_path . "/sub?dir1") ); - -?> -===DONE=== ---CLEAN-- -<?php -$dir_path = dirname(__FILE__) . "/opendir_variation6"; -$sub_dir_path = $dir_path . "/sub_dir1"; - -rmdir($sub_dir_path); -rmdir($dir_path); -?> ---EXPECTF-- -*** Testing opendir() : usage variations *** - --- Wildcard = '*' -- - -Warning: opendir(%s/opendir_var*,%s/opendir_var*): %s in %s on line %d - -Warning: opendir(%s/opendir_var*): failed to open dir: %s in %s on line %d -bool(false) - -Warning: opendir(%s/*,%s/*): %s in %s on line %d - -Warning: opendir(%s/*): failed to open dir: %s in %s on line %d -bool(false) - --- Wildcard = '?' -- - -Warning: opendir(%s/opendir_variation6/sub_dir?,%s/opendir_variation6/sub_dir?): %s in %s on line %d - -Warning: opendir(%s/opendir_variation6/sub_dir?): failed to open dir: %s in %s on line %d -bool(false) - -Warning: opendir(%s/opendir_variation6/sub?dir1,%s/opendir_variation6/sub?dir1): %s in %s on line %d - -Warning: opendir(%s/opendir_variation6/sub?dir1): failed to open dir: %s in %s on line %d -bool(false) -===DONE=== diff --git a/ext/standard/tests/dir/readdir_variation1.phpt b/ext/standard/tests/dir/readdir_variation1.phpt index d392e67114..47e00c4b76 100644 --- a/ext/standard/tests/dir/readdir_variation1.phpt +++ b/ext/standard/tests/dir/readdir_variation1.phpt @@ -90,22 +90,22 @@ foreach($inputs as $input) { -- Iteration 1 -- -Warning: readdir() expects parameter 1 to be resource, integer given in %s on line %d +Warning: readdir() expects parameter 1 to be resource, int given in %s on line %d NULL -- Iteration 2 -- -Warning: readdir() expects parameter 1 to be resource, integer given in %s on line %d +Warning: readdir() expects parameter 1 to be resource, int given in %s on line %d NULL -- Iteration 3 -- -Warning: readdir() expects parameter 1 to be resource, integer given in %s on line %d +Warning: readdir() expects parameter 1 to be resource, int given in %s on line %d NULL -- Iteration 4 -- -Warning: readdir() expects parameter 1 to be resource, integer given in %s on line %d +Warning: readdir() expects parameter 1 to be resource, int given in %s on line %d NULL -- Iteration 5 -- @@ -145,22 +145,22 @@ NULL -- Iteration 12 -- -Warning: readdir() expects parameter 1 to be resource, boolean given in %s on line %d +Warning: readdir() expects parameter 1 to be resource, bool given in %s on line %d NULL -- Iteration 13 -- -Warning: readdir() expects parameter 1 to be resource, boolean given in %s on line %d +Warning: readdir() expects parameter 1 to be resource, bool given in %s on line %d NULL -- Iteration 14 -- -Warning: readdir() expects parameter 1 to be resource, boolean given in %s on line %d +Warning: readdir() expects parameter 1 to be resource, bool given in %s on line %d NULL -- Iteration 15 -- -Warning: readdir() expects parameter 1 to be resource, boolean given in %s on line %d +Warning: readdir() expects parameter 1 to be resource, bool given in %s on line %d NULL -- Iteration 16 -- diff --git a/ext/standard/tests/dir/readdir_variation2-win32-mb.phpt b/ext/standard/tests/dir/readdir_variation2-win32-mb.phpt index a9d5d64fef..31e52c1105 100644 --- a/ext/standard/tests/dir/readdir_variation2-win32-mb.phpt +++ b/ext/standard/tests/dir/readdir_variation2-win32-mb.phpt @@ -45,7 +45,7 @@ foreach($entries as $entry) { $path = dirname(__FILE__) . '/ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™readdir_variation2'; rmdir($path); ?> ---EXPECTF-- +--EXPECT-- *** Testing readdir() : usage variations *** -- Pass an empty directory to readdir() -- diff --git a/ext/standard/tests/dir/readdir_variation2.phpt b/ext/standard/tests/dir/readdir_variation2.phpt index f35792d8a3..38965872b0 100644 --- a/ext/standard/tests/dir/readdir_variation2.phpt +++ b/ext/standard/tests/dir/readdir_variation2.phpt @@ -39,7 +39,7 @@ foreach($entries as $entry) { $path = dirname(__FILE__) . '/readdir_variation2'; rmdir($path); ?> ---EXPECTF-- +--EXPECT-- *** Testing readdir() : usage variations *** -- Pass an empty directory to readdir() -- diff --git a/ext/standard/tests/dir/readdir_variation3-win32-mb.phpt b/ext/standard/tests/dir/readdir_variation3-win32-mb.phpt index f38afb6df9..1b3114c550 100644 --- a/ext/standard/tests/dir/readdir_variation3-win32-mb.phpt +++ b/ext/standard/tests/dir/readdir_variation3-win32-mb.phpt @@ -57,7 +57,7 @@ $path_sub = $path_top . '/ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™sub_folder'; rmdir($path_sub); rmdir($path_top); ?> ---EXPECTF-- +--EXPECT-- *** Testing readdir() : usage variations *** array(5) { [0]=> diff --git a/ext/standard/tests/dir/readdir_variation3.phpt b/ext/standard/tests/dir/readdir_variation3.phpt index b304a8cf7c..1a7566c547 100644 --- a/ext/standard/tests/dir/readdir_variation3.phpt +++ b/ext/standard/tests/dir/readdir_variation3.phpt @@ -51,7 +51,7 @@ $path_sub = $path_top . '/sub_folder'; rmdir($path_sub); rmdir($path_top); ?> ---EXPECTF-- +--EXPECT-- *** Testing readdir() : usage variations *** array(5) { [0]=> diff --git a/ext/standard/tests/dir/readdir_variation6-win32-mb.phpt b/ext/standard/tests/dir/readdir_variation6-win32-mb.phpt index 8201e21f7a..fc7d0f78c5 100644 --- a/ext/standard/tests/dir/readdir_variation6-win32-mb.phpt +++ b/ext/standard/tests/dir/readdir_variation6-win32-mb.phpt @@ -67,7 +67,7 @@ closedir(); $dir_path = dirname(__FILE__) . "/ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™readdir_variation6"; rmdir($dir_path); ?> ---EXPECTF-- +--EXPECT-- *** Testing readdir() : usage variations *** -- Reading Directory Contents with Previous Handle -- diff --git a/ext/standard/tests/dir/readdir_variation6.phpt b/ext/standard/tests/dir/readdir_variation6.phpt index f1692e3bc2..889d96a387 100644 --- a/ext/standard/tests/dir/readdir_variation6.phpt +++ b/ext/standard/tests/dir/readdir_variation6.phpt @@ -61,7 +61,7 @@ closedir(); $dir_path = dirname(__FILE__) . "/readdir_variation6"; rmdir($dir_path); ?> ---EXPECTF-- +--EXPECT-- *** Testing readdir() : usage variations *** -- Reading Directory Contents with Previous Handle -- diff --git a/ext/standard/tests/dir/rewinddir_variation1.phpt b/ext/standard/tests/dir/rewinddir_variation1.phpt index 41c11a2ae7..3007e43adb 100644 --- a/ext/standard/tests/dir/rewinddir_variation1.phpt +++ b/ext/standard/tests/dir/rewinddir_variation1.phpt @@ -91,22 +91,22 @@ foreach($inputs as $input) { -- Iteration 1 -- -Warning: rewinddir() expects parameter 1 to be resource, integer given in %s on line %d +Warning: rewinddir() expects parameter 1 to be resource, int given in %s on line %d NULL -- Iteration 2 -- -Warning: rewinddir() expects parameter 1 to be resource, integer given in %s on line %d +Warning: rewinddir() expects parameter 1 to be resource, int given in %s on line %d NULL -- Iteration 3 -- -Warning: rewinddir() expects parameter 1 to be resource, integer given in %s on line %d +Warning: rewinddir() expects parameter 1 to be resource, int given in %s on line %d NULL -- Iteration 4 -- -Warning: rewinddir() expects parameter 1 to be resource, integer given in %s on line %d +Warning: rewinddir() expects parameter 1 to be resource, int given in %s on line %d NULL -- Iteration 5 -- @@ -146,22 +146,22 @@ NULL -- Iteration 12 -- -Warning: rewinddir() expects parameter 1 to be resource, boolean given in %s on line %d +Warning: rewinddir() expects parameter 1 to be resource, bool given in %s on line %d NULL -- Iteration 13 -- -Warning: rewinddir() expects parameter 1 to be resource, boolean given in %s on line %d +Warning: rewinddir() expects parameter 1 to be resource, bool given in %s on line %d NULL -- Iteration 14 -- -Warning: rewinddir() expects parameter 1 to be resource, boolean given in %s on line %d +Warning: rewinddir() expects parameter 1 to be resource, bool given in %s on line %d NULL -- Iteration 15 -- -Warning: rewinddir() expects parameter 1 to be resource, boolean given in %s on line %d +Warning: rewinddir() expects parameter 1 to be resource, bool given in %s on line %d NULL -- Iteration 16 -- diff --git a/ext/standard/tests/dir/scandir_basic-win32-mb.phpt b/ext/standard/tests/dir/scandir_basic-win32-mb.phpt index 8c81f3d45b..14e9405303 100644 --- a/ext/standard/tests/dir/scandir_basic-win32-mb.phpt +++ b/ext/standard/tests/dir/scandir_basic-win32-mb.phpt @@ -43,7 +43,7 @@ delete_files($directory, 3, "ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™file"); $directory = dirname(__FILE__) . '/ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™scandir_basic'; rmdir($directory); ?> ---EXPECTF-- +--EXPECT-- *** Testing scandir() : basic functionality *** -- scandir() with mandatory arguments -- diff --git a/ext/standard/tests/dir/scandir_basic.phpt b/ext/standard/tests/dir/scandir_basic.phpt index 75252dd85f..568ae5a5e2 100644 --- a/ext/standard/tests/dir/scandir_basic.phpt +++ b/ext/standard/tests/dir/scandir_basic.phpt @@ -37,7 +37,7 @@ delete_files($directory, 3); $directory = dirname(__FILE__) . '/scandir_basic'; rmdir($directory); ?> ---EXPECTF-- +--EXPECT-- *** Testing scandir() : basic functionality *** -- scandir() with mandatory arguments -- diff --git a/ext/standard/tests/dir/scandir_variation10-win32-mb.phpt b/ext/standard/tests/dir/scandir_variation10-win32-mb.phpt index b24c2ce550..b525e3caed 100644 --- a/ext/standard/tests/dir/scandir_variation10-win32-mb.phpt +++ b/ext/standard/tests/dir/scandir_variation10-win32-mb.phpt @@ -52,7 +52,7 @@ delete_files($dir, 2, "ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™file"); $dir = dirname(__FILE__) . '/ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™scandir_variation10'; rmdir($dir); ?> ---EXPECTF-- +--EXPECT-- SCANDIR_SORT_ASCENDING: 0 SCANDIR_SORT_DESCENDING: 1 SCANDIR_SORT_NONE: 2 diff --git a/ext/standard/tests/dir/scandir_variation10.phpt b/ext/standard/tests/dir/scandir_variation10.phpt index b182e9e992..0fade971b4 100644 --- a/ext/standard/tests/dir/scandir_variation10.phpt +++ b/ext/standard/tests/dir/scandir_variation10.phpt @@ -46,7 +46,7 @@ delete_files($dir, 2); $dir = dirname(__FILE__) . '/scandir_variation10'; rmdir($dir); ?> ---EXPECTF-- +--EXPECT-- SCANDIR_SORT_ASCENDING: 0 SCANDIR_SORT_DESCENDING: 1 SCANDIR_SORT_NONE: 2 diff --git a/ext/standard/tests/dir/scandir_variation2-mb.phpt b/ext/standard/tests/dir/scandir_variation2-mb.phpt index fd22c6ccc5..2039ef33e4 100644 --- a/ext/standard/tests/dir/scandir_variation2-mb.phpt +++ b/ext/standard/tests/dir/scandir_variation2-mb.phpt @@ -229,37 +229,37 @@ array(2) { -- Iteration 16 -- -Warning: scandir() expects parameter 2 to be integer, string given in %s on line %d +Warning: scandir() expects parameter 2 to be int, string given in %s on line %d NULL -- Iteration 17 -- -Warning: scandir() expects parameter 2 to be integer, string given in %s on line %d +Warning: scandir() expects parameter 2 to be int, string given in %s on line %d NULL -- Iteration 18 -- -Warning: scandir() expects parameter 2 to be integer, array given in %s on line %d +Warning: scandir() expects parameter 2 to be int, array given in %s on line %d NULL -- Iteration 19 -- -Warning: scandir() expects parameter 2 to be integer, string given in %s on line %d +Warning: scandir() expects parameter 2 to be int, string given in %s on line %d NULL -- Iteration 20 -- -Warning: scandir() expects parameter 2 to be integer, string given in %s on line %d +Warning: scandir() expects parameter 2 to be int, string given in %s on line %d NULL -- Iteration 21 -- -Warning: scandir() expects parameter 2 to be integer, string given in %s on line %d +Warning: scandir() expects parameter 2 to be int, string given in %s on line %d NULL -- Iteration 22 -- -Warning: scandir() expects parameter 2 to be integer, object given in %s on line %d +Warning: scandir() expects parameter 2 to be int, object given in %s on line %d NULL -- Iteration 23 -- @@ -280,6 +280,6 @@ array(2) { -- Iteration 25 -- -Warning: scandir() expects parameter 2 to be integer, resource given in %s on line %d +Warning: scandir() expects parameter 2 to be int, resource given in %s on line %d NULL ===DONE=== diff --git a/ext/standard/tests/dir/scandir_variation2.phpt b/ext/standard/tests/dir/scandir_variation2.phpt index bb4bbccbb2..5bb26f0483 100644 --- a/ext/standard/tests/dir/scandir_variation2.phpt +++ b/ext/standard/tests/dir/scandir_variation2.phpt @@ -229,37 +229,37 @@ array(2) { -- Iteration 16 -- -Warning: scandir() expects parameter 2 to be integer, string given in %s on line %d +Warning: scandir() expects parameter 2 to be int, string given in %s on line %d NULL -- Iteration 17 -- -Warning: scandir() expects parameter 2 to be integer, string given in %s on line %d +Warning: scandir() expects parameter 2 to be int, string given in %s on line %d NULL -- Iteration 18 -- -Warning: scandir() expects parameter 2 to be integer, array given in %s on line %d +Warning: scandir() expects parameter 2 to be int, array given in %s on line %d NULL -- Iteration 19 -- -Warning: scandir() expects parameter 2 to be integer, string given in %s on line %d +Warning: scandir() expects parameter 2 to be int, string given in %s on line %d NULL -- Iteration 20 -- -Warning: scandir() expects parameter 2 to be integer, string given in %s on line %d +Warning: scandir() expects parameter 2 to be int, string given in %s on line %d NULL -- Iteration 21 -- -Warning: scandir() expects parameter 2 to be integer, string given in %s on line %d +Warning: scandir() expects parameter 2 to be int, string given in %s on line %d NULL -- Iteration 22 -- -Warning: scandir() expects parameter 2 to be integer, object given in %s on line %d +Warning: scandir() expects parameter 2 to be int, object given in %s on line %d NULL -- Iteration 23 -- @@ -280,6 +280,6 @@ array(2) { -- Iteration 25 -- -Warning: scandir() expects parameter 2 to be integer, resource given in %s on line %d +Warning: scandir() expects parameter 2 to be int, resource given in %s on line %d NULL ===DONE=== diff --git a/ext/standard/tests/dir/scandir_variation3-win32-mb.phpt b/ext/standard/tests/dir/scandir_variation3-win32-mb.phpt index 64bc90c9e7..ffb0284d95 100644 --- a/ext/standard/tests/dir/scandir_variation3-win32-mb.phpt +++ b/ext/standard/tests/dir/scandir_variation3-win32-mb.phpt @@ -114,22 +114,22 @@ rmdir($dir); -- Iteration 1 -- -Warning: scandir() expects parameter 3 to be resource, integer given in %s on line %d +Warning: scandir() expects parameter 3 to be resource, int given in %s on line %d NULL -- Iteration 2 -- -Warning: scandir() expects parameter 3 to be resource, integer given in %s on line %d +Warning: scandir() expects parameter 3 to be resource, int given in %s on line %d NULL -- Iteration 3 -- -Warning: scandir() expects parameter 3 to be resource, integer given in %s on line %d +Warning: scandir() expects parameter 3 to be resource, int given in %s on line %d NULL -- Iteration 4 -- -Warning: scandir() expects parameter 3 to be resource, integer given in %s on line %d +Warning: scandir() expects parameter 3 to be resource, int given in %s on line %d NULL -- Iteration 5 -- @@ -169,22 +169,22 @@ NULL -- Iteration 12 -- -Warning: scandir() expects parameter 3 to be resource, boolean given in %s on line %d +Warning: scandir() expects parameter 3 to be resource, bool given in %s on line %d NULL -- Iteration 13 -- -Warning: scandir() expects parameter 3 to be resource, boolean given in %s on line %d +Warning: scandir() expects parameter 3 to be resource, bool given in %s on line %d NULL -- Iteration 14 -- -Warning: scandir() expects parameter 3 to be resource, boolean given in %s on line %d +Warning: scandir() expects parameter 3 to be resource, bool given in %s on line %d NULL -- Iteration 15 -- -Warning: scandir() expects parameter 3 to be resource, boolean given in %s on line %d +Warning: scandir() expects parameter 3 to be resource, bool given in %s on line %d NULL -- Iteration 16 -- diff --git a/ext/standard/tests/dir/scandir_variation3.phpt b/ext/standard/tests/dir/scandir_variation3.phpt index 1bad23871f..567bde0af7 100644 --- a/ext/standard/tests/dir/scandir_variation3.phpt +++ b/ext/standard/tests/dir/scandir_variation3.phpt @@ -108,22 +108,22 @@ rmdir($dir); -- Iteration 1 -- -Warning: scandir() expects parameter 3 to be resource, integer given in %s on line %d +Warning: scandir() expects parameter 3 to be resource, int given in %s on line %d NULL -- Iteration 2 -- -Warning: scandir() expects parameter 3 to be resource, integer given in %s on line %d +Warning: scandir() expects parameter 3 to be resource, int given in %s on line %d NULL -- Iteration 3 -- -Warning: scandir() expects parameter 3 to be resource, integer given in %s on line %d +Warning: scandir() expects parameter 3 to be resource, int given in %s on line %d NULL -- Iteration 4 -- -Warning: scandir() expects parameter 3 to be resource, integer given in %s on line %d +Warning: scandir() expects parameter 3 to be resource, int given in %s on line %d NULL -- Iteration 5 -- @@ -163,22 +163,22 @@ NULL -- Iteration 12 -- -Warning: scandir() expects parameter 3 to be resource, boolean given in %s on line %d +Warning: scandir() expects parameter 3 to be resource, bool given in %s on line %d NULL -- Iteration 13 -- -Warning: scandir() expects parameter 3 to be resource, boolean given in %s on line %d +Warning: scandir() expects parameter 3 to be resource, bool given in %s on line %d NULL -- Iteration 14 -- -Warning: scandir() expects parameter 3 to be resource, boolean given in %s on line %d +Warning: scandir() expects parameter 3 to be resource, bool given in %s on line %d NULL -- Iteration 15 -- -Warning: scandir() expects parameter 3 to be resource, boolean given in %s on line %d +Warning: scandir() expects parameter 3 to be resource, bool given in %s on line %d NULL -- Iteration 16 -- diff --git a/ext/standard/tests/dir/scandir_variation4-win32-mb.phpt b/ext/standard/tests/dir/scandir_variation4-win32-mb.phpt index b5b33e7923..f415f13ad2 100644 --- a/ext/standard/tests/dir/scandir_variation4-win32-mb.phpt +++ b/ext/standard/tests/dir/scandir_variation4-win32-mb.phpt @@ -71,7 +71,7 @@ $dir_path = dirname(__FILE__); rmdir("$dir_path/ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™level_one/ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™level_two"); rmdir("$dir_path/ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™level_one"); ?> ---EXPECTF-- +--EXPECT-- *** Testing scandir() : usage variations *** -- $path = './ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™level_one': -- diff --git a/ext/standard/tests/dir/scandir_variation4.phpt b/ext/standard/tests/dir/scandir_variation4.phpt index dd6415841a..ffffcd5069 100644 --- a/ext/standard/tests/dir/scandir_variation4.phpt +++ b/ext/standard/tests/dir/scandir_variation4.phpt @@ -65,7 +65,7 @@ $dir_path = dirname(__FILE__); rmdir("$dir_path/level_one/level_two"); rmdir("$dir_path/level_one"); ?> ---EXPECTF-- +--EXPECT-- *** Testing scandir() : usage variations *** -- $path = './level_one': -- diff --git a/ext/standard/tests/dir/scandir_variation7.phpt b/ext/standard/tests/dir/scandir_variation7.phpt index c2d8686d81..6c77f69e4d 100644 --- a/ext/standard/tests/dir/scandir_variation7.phpt +++ b/ext/standard/tests/dir/scandir_variation7.phpt @@ -74,7 +74,7 @@ foreach ($permission_values as $perm) { $dir_path = dirname(__FILE__) . "/scandir_variation7"; rmdir($dir_path); ?> ---EXPECTF-- +--EXPECT-- *** Testing scandir() : usage variations *** -- Iteration 1 -- diff --git a/ext/standard/tests/dir/scandir_variation9-win32-mb.phpt b/ext/standard/tests/dir/scandir_variation9-win32-mb.phpt index f2ec130e5d..022c1e5ba8 100644 --- a/ext/standard/tests/dir/scandir_variation9-win32-mb.phpt +++ b/ext/standard/tests/dir/scandir_variation9-win32-mb.phpt @@ -43,7 +43,7 @@ delete_files($dir, 2, "ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™file"); $dir = dirname(__FILE__) . '/ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™scandir_variation9'; rmdir($dir); ?> ---EXPECTF-- +--EXPECT-- *** Testing scandir() : usage variations *** array(4) { [0]=> diff --git a/ext/standard/tests/dir/scandir_variation9.phpt b/ext/standard/tests/dir/scandir_variation9.phpt index 21091b9684..8cabeb5e36 100644 --- a/ext/standard/tests/dir/scandir_variation9.phpt +++ b/ext/standard/tests/dir/scandir_variation9.phpt @@ -37,7 +37,7 @@ delete_files($dir, 2); $dir = dirname(__FILE__) . '/scandir_variation9'; rmdir($dir); ?> ---EXPECTF-- +--EXPECT-- *** Testing scandir() : usage variations *** array(4) { [0]=> diff --git a/ext/standard/tests/file/006_basic.phpt b/ext/standard/tests/file/006_basic.phpt index 733be71126..e8b36c2c0d 100644 --- a/ext/standard/tests/file/006_basic.phpt +++ b/ext/standard/tests/file/006_basic.phpt @@ -49,7 +49,7 @@ echo "Done\n"; unlink(dirname(__FILE__)."/perm.tmp"); rmdir(dirname(__FILE__)."/perm"); ?> ---EXPECTF-- +--EXPECT-- *** Testing fileperms(), chmod() with files and dirs *** bool(true) 100755 diff --git a/ext/standard/tests/file/006_variation1.phpt b/ext/standard/tests/file/006_variation1.phpt index e2ec2f1a22..410f923a86 100644 --- a/ext/standard/tests/file/006_variation1.phpt +++ b/ext/standard/tests/file/006_variation1.phpt @@ -61,7 +61,7 @@ chmod(dirname(__FILE__)."/006_variation1", 0777); unlink(dirname(__FILE__)."/006_variation1.tmp"); rmdir(dirname(__FILE__)."/006_variation1"); ?> ---EXPECTF-- +--EXPECT-- *** Testing fileperms() & chmod() : usage variations *** -- Testing all permission from octal 0000 to octal 0777 on file and dir -- -- Iteration 1 -- diff --git a/ext/standard/tests/file/006_variation2.phpt b/ext/standard/tests/file/006_variation2.phpt index 5219cf84c3..19bbf60fe9 100644 --- a/ext/standard/tests/file/006_variation2.phpt +++ b/ext/standard/tests/file/006_variation2.phpt @@ -149,38 +149,38 @@ bool(true) 43567 -- Iteration 12 -- -Warning: chmod() expects parameter 2 to be integer, string given in %s on line %d +Warning: chmod() expects parameter 2 to be int, string given in %s on line %d NULL 103567 -Warning: chmod() expects parameter 2 to be integer, string given in %s on line %d +Warning: chmod() expects parameter 2 to be int, string given in %s on line %d NULL 43567 -- Iteration 13 -- -Warning: chmod() expects parameter 2 to be integer, string given in %s on line %d +Warning: chmod() expects parameter 2 to be int, string given in %s on line %d NULL 103567 -Warning: chmod() expects parameter 2 to be integer, string given in %s on line %d +Warning: chmod() expects parameter 2 to be int, string given in %s on line %d NULL 43567 -- Iteration 14 -- -Warning: chmod() expects parameter 2 to be integer, string given in %s on line %d +Warning: chmod() expects parameter 2 to be int, string given in %s on line %d NULL 103567 -Warning: chmod() expects parameter 2 to be integer, string given in %s on line %d +Warning: chmod() expects parameter 2 to be int, string given in %s on line %d NULL 43567 -- Iteration 15 -- -Warning: chmod() expects parameter 2 to be integer, string given in %s on line %d +Warning: chmod() expects parameter 2 to be int, string given in %s on line %d NULL 103567 -Warning: chmod() expects parameter 2 to be integer, string given in %s on line %d +Warning: chmod() expects parameter 2 to be int, string given in %s on line %d NULL 43567 *** Done *** diff --git a/ext/standard/tests/file/007_error.phpt b/ext/standard/tests/file/007_error.phpt index 1e94e90359..93a6a23e5f 100644 --- a/ext/standard/tests/file/007_error.phpt +++ b/ext/standard/tests/file/007_error.phpt @@ -118,10 +118,10 @@ bool(false) Warning: fopen(10): failed to open stream: No such file or directory in %s on line %d bool(false) -Warning: fclose() expects parameter 1 to be resource, integer given in %s on line %d +Warning: fclose() expects parameter 1 to be resource, int given in %s on line %d bool(false) -Warning: feof() expects parameter 1 to be resource, integer given in %s on line %d +Warning: feof() expects parameter 1 to be resource, int given in %s on line %d bool(false) -- Iteration 3 -- @@ -138,10 +138,10 @@ bool(false) Warning: fopen(1): failed to open stream: No such file or directory in %s on line %d bool(false) -Warning: fclose() expects parameter 1 to be resource, boolean given in %s on line %d +Warning: fclose() expects parameter 1 to be resource, bool given in %s on line %d bool(false) -Warning: feof() expects parameter 1 to be resource, boolean given in %s on line %d +Warning: feof() expects parameter 1 to be resource, bool given in %s on line %d bool(false) -- Iteration 5 -- diff --git a/ext/standard/tests/file/007_variation15.phpt b/ext/standard/tests/file/007_variation15.phpt index e3a7e0d8b4..d17a89f64f 100644 --- a/ext/standard/tests/file/007_variation15.phpt +++ b/ext/standard/tests/file/007_variation15.phpt @@ -54,5 +54,5 @@ int(0) bool(true) string(7) "Unknown" -Warning: fopen(%s): failed to open stream: File exists in %s on line %s +Warning: fopen(%s): failed to open stream: File exists in %s on line %d *** Done *** diff --git a/ext/standard/tests/file/007_variation23.phpt b/ext/standard/tests/file/007_variation23.phpt index 5144f0765f..3c8bd2ff48 100644 --- a/ext/standard/tests/file/007_variation23.phpt +++ b/ext/standard/tests/file/007_variation23.phpt @@ -54,5 +54,5 @@ int(0) bool(true) string(7) "Unknown" -Warning: fopen(%s): failed to open stream: File exists in %s on line %s +Warning: fopen(%s): failed to open stream: File exists in %s on line %d *** Done *** diff --git a/ext/standard/tests/file/007_variation7.phpt b/ext/standard/tests/file/007_variation7.phpt index 24bf9720cd..9474041581 100644 --- a/ext/standard/tests/file/007_variation7.phpt +++ b/ext/standard/tests/file/007_variation7.phpt @@ -54,5 +54,5 @@ int(0) bool(true) string(7) "Unknown" -Warning: fopen(%s): failed to open stream: File exists in %s on line %s +Warning: fopen(%s): failed to open stream: File exists in %s on line %d *** Done *** diff --git a/ext/standard/tests/file/basename_bug66395-win32.phpt b/ext/standard/tests/file/basename_bug66395-win32.phpt index a9580dc09e..b4ad18dd28 100644 --- a/ext/standard/tests/file/basename_bug66395-win32.phpt +++ b/ext/standard/tests/file/basename_bug66395-win32.phpt @@ -10,7 +10,7 @@ echo basename("y:file.txt", ".txt") . "\n"; echo basename("notdriveletter:file.txt") . "\n"; ?> ==DONE== ---EXPECTF-- +--EXPECT-- file.txt file.txt file diff --git a/ext/standard/tests/file/basename_bug66395_variation2-win32.phpt b/ext/standard/tests/file/basename_bug66395_variation2-win32.phpt index 0ebe996cd5..4dc05dbeb1 100644 --- a/ext/standard/tests/file/basename_bug66395_variation2-win32.phpt +++ b/ext/standard/tests/file/basename_bug66395_variation2-win32.phpt @@ -20,7 +20,7 @@ echo basename("a:\\b:\\c:d:hello\\world:c:\$DATA") . "\n"; echo basename("a:\\b:\\c:d:hello\\d:world:c:\$DATA") . "\n"; ?> ==DONE== ---EXPECTF-- +--EXPECT-- y y notdriveletter:file.txt diff --git a/ext/standard/tests/file/bug22414.phpt b/ext/standard/tests/file/bug22414.phpt index abc6e47585..c6e993ac9f 100644 --- a/ext/standard/tests/file/bug22414.phpt +++ b/ext/standard/tests/file/bug22414.phpt @@ -7,7 +7,7 @@ output_handler= $php = getenv('TEST_PHP_EXECUTABLE'); $tmpfile = tempnam(__DIR__, 'phpt'); - $args = ' -n -dsafe_mode=off '; + $args = ' -n '; /* Regular Data Test */ passthru($php . $args . ' -r " echo \"HELLO\"; "'); @@ -17,7 +17,7 @@ output_handler= /* Binary Data Test */ if (substr(PHP_OS, 0, 3) != 'WIN') { - $cmd = $php . $args . ' -r \"readfile(@getenv(\'TEST_PHP_EXECUTABLE\')); \"'; + $cmd = $php . $args . ' -r \"readfile(@getenv(\'\\\'\'TEST_PHP_EXECUTABLE\'\\\'\')); \"'; $cmd = $php . $args . ' -r \' passthru("'.$cmd.'"); \' > '.$tmpfile ; } else { $cmd = $php . $args . ' -r \"readfile(@getenv(\\\\\\"TEST_PHP_EXECUTABLE\\\\\\")); \"'; diff --git a/ext/standard/tests/file/bug35781.phpt b/ext/standard/tests/file/bug35781.phpt index fc14816f40..226277b20f 100644 --- a/ext/standard/tests/file/bug35781.phpt +++ b/ext/standard/tests/file/bug35781.phpt @@ -18,7 +18,7 @@ var_dump(file_get_contents($filename)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(15) "Guvf vf n grfg " Done diff --git a/ext/standard/tests/file/bug37158.phpt b/ext/standard/tests/file/bug37158.phpt index 68a07c1539..673b4c6f3c 100644 --- a/ext/standard/tests/file/bug37158.phpt +++ b/ext/standard/tests/file/bug37158.phpt @@ -13,7 +13,6 @@ class VariableStream { stream_wrapper_register("var", "VariableStream"); -error_reporting(E_ALL | E_STRICT); $file = dirname(__FILE__) . '/footest.txt'; $x = str_repeat(1, 8192); $fp = fopen($file, 'w'); diff --git a/ext/standard/tests/file/bug38450.phpt b/ext/standard/tests/file/bug38450.phpt index 6fd653de44..eae86cf9a0 100644 --- a/ext/standard/tests/file/bug38450.phpt +++ b/ext/standard/tests/file/bug38450.phpt @@ -101,7 +101,7 @@ var_dump($myvar); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(12) "constructor!" line1 line2 diff --git a/ext/standard/tests/file/bug38450_1.phpt b/ext/standard/tests/file/bug38450_1.phpt index 5cbcba303c..9cc383171b 100644 --- a/ext/standard/tests/file/bug38450_1.phpt +++ b/ext/standard/tests/file/bug38450_1.phpt @@ -101,7 +101,7 @@ var_dump($myvar); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(12) "constructor!" line1 line2 diff --git a/ext/standard/tests/file/bug38450_2.phpt b/ext/standard/tests/file/bug38450_2.phpt index 774de66bfe..33a13da0db 100644 --- a/ext/standard/tests/file/bug38450_2.phpt +++ b/ext/standard/tests/file/bug38450_2.phpt @@ -102,8 +102,6 @@ var_dump($myvar); echo "Done\n"; ?> --EXPECTF-- -Warning: fopen(var://myvar): failed to open stream: "VariableStream::stream_open" call failed in %s on line %d - Fatal error: Uncaught Exception: constructor in %s:%d Stack trace: #0 [internal function]: VariableStream->__construct() diff --git a/ext/standard/tests/file/bug38450_3.phpt b/ext/standard/tests/file/bug38450_3.phpt index 0bcaeb2a89..8a5c696587 100644 --- a/ext/standard/tests/file/bug38450_3.phpt +++ b/ext/standard/tests/file/bug38450_3.phpt @@ -102,8 +102,6 @@ var_dump($myvar); echo "Done\n"; ?> --EXPECTF-- -Warning: fopen(var://myvar): failed to open stream: "VariableStream::stream_open" call failed in %sbug38450_3.php on line %d - Fatal error: Uncaught ArgumentCountError: Too few arguments to function VariableStream::__construct(), 0 passed and exactly 1 expected in %sbug38450_3.php:7 Stack trace: #0 [internal function]: VariableStream->__construct() diff --git a/ext/standard/tests/file/bug39551.phpt b/ext/standard/tests/file/bug39551.phpt index 8cd8ca8a67..2877c4951f 100644 --- a/ext/standard/tests/file/bug39551.phpt +++ b/ext/standard/tests/file/bug39551.phpt @@ -20,5 +20,5 @@ stream_get_contents($s); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- Done diff --git a/ext/standard/tests/file/bug39673.phpt b/ext/standard/tests/file/bug39673.phpt index f12f2e0444..71484578d0 100644 --- a/ext/standard/tests/file/bug39673.phpt +++ b/ext/standard/tests/file/bug39673.phpt @@ -28,7 +28,7 @@ foreach ($offsets as $offset) { @unlink($filename); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- int(1) int(13824) int(0) diff --git a/ext/standard/tests/file/bug41815.phpt b/ext/standard/tests/file/bug41815.phpt index 5411000fc1..040754b131 100644 --- a/ext/standard/tests/file/bug41815.phpt +++ b/ext/standard/tests/file/bug41815.phpt @@ -22,6 +22,6 @@ fclose($reader); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- OK Done diff --git a/ext/standard/tests/file/bug44034.phpt b/ext/standard/tests/file/bug44034.phpt index 863bf57e05..887b9eb08e 100644 --- a/ext/standard/tests/file/bug44034.phpt +++ b/ext/standard/tests/file/bug44034.phpt @@ -15,7 +15,7 @@ foreach($urls as $url) { var_dump(file($url, FILE_IGNORE_NEW_LINES)); } ?> ---EXPECTF-- +--EXPECT-- data://text/plain,foo\r\nbar\r\n array(2) { [0]=> diff --git a/ext/standard/tests/file/bug46347.phpt b/ext/standard/tests/file/bug46347.phpt index e942c71ba3..903a6e35cc 100644 --- a/ext/standard/tests/file/bug46347.phpt +++ b/ext/standard/tests/file/bug46347.phpt @@ -17,7 +17,7 @@ var_dump(parse_ini_file($file)); <?php unlink(__DIR__.'/parse.ini'); ?> ---EXPECTF-- +--EXPECT-- array(1) { ["part1.*.part2"]=> string(1) "1" diff --git a/ext/standard/tests/file/bug49047.phpt b/ext/standard/tests/file/bug49047.phpt index d0805a16fd..6fc8a11e23 100644 --- a/ext/standard/tests/file/bug49047.phpt +++ b/ext/standard/tests/file/bug49047.phpt @@ -13,5 +13,5 @@ if ($t2 != $t) echo "failed (got $t2, expecting $t)\n"; rmdir($testdir); echo "Ok."; ?> ---EXPECTF-- +--EXPECT-- Ok. diff --git a/ext/standard/tests/file/bug51094.phpt b/ext/standard/tests/file/bug51094.phpt index ab818408f5..fa62277bfb 100644 --- a/ext/standard/tests/file/bug51094.phpt +++ b/ext/standard/tests/file/bug51094.phpt @@ -13,7 +13,7 @@ $ini = parse_ini_string('ini=ini"raw', null, INI_SCANNER_RAW); var_dump($ini['ini']); $ini = parse_ini_string("ini=\r\niniraw", null, INI_SCANNER_RAW); var_dump($ini['ini']); ---EXPECTF-- +--EXPECT-- string(7) "ini;raw" string(4) ""ini" string(3) "ini" diff --git a/ext/standard/tests/file/bug60120.phpt b/ext/standard/tests/file/bug60120.phpt index ec5f7b3ced..150333aa62 100644 --- a/ext/standard/tests/file/bug60120.phpt +++ b/ext/standard/tests/file/bug60120.phpt @@ -24,7 +24,7 @@ $descriptors = array(array('pipe', 'r'), array('pipe', 'w'), array('pipe', 'w')) $stdin = str_repeat('*', 1024 * 16) . '!'; $stdin = str_repeat('*', 2049 ); -$options = array_merge(array('suppress_errors' => true, 'binary_pipes' => true, 'bypass_shell' => false)); +$options = array_merge(array('suppress_errors' => true, 'bypass_shell' => false)); $process = proc_open($cmd, $descriptors, $pipes, getcwd(), array(), $options); foreach ($pipes as $pipe) { diff --git a/ext/standard/tests/file/bug63512.phpt b/ext/standard/tests/file/bug63512.phpt index c86965ac5b..9277359256 100644 --- a/ext/standard/tests/file/bug63512.phpt +++ b/ext/standard/tests/file/bug63512.phpt @@ -13,7 +13,7 @@ $array = parse_ini_string(' d = INSTALL_ROOT "INSTALL_ROOT"', false, INI_SCANNER_RAW); var_dump($array); ---EXPECTF-- +--EXPECT-- array(7) { ["int"]=> string(3) "123" diff --git a/ext/standard/tests/file/bug65272.phpt b/ext/standard/tests/file/bug65272.phpt index 3a772a8037..c6c6aa136e 100644 --- a/ext/standard/tests/file/bug65272.phpt +++ b/ext/standard/tests/file/bug65272.phpt @@ -23,7 +23,7 @@ echo "Done\n"; $file = dirname(__FILE__)."/flock_bug65272.dat"; unlink($file); ?> ---EXPECTF-- +--EXPECT-- bool(true) bool(false) int(1) diff --git a/ext/standard/tests/file/bug74719.phpt b/ext/standard/tests/file/bug74719.phpt new file mode 100644 index 0000000000..57309bcf06 --- /dev/null +++ b/ext/standard/tests/file/bug74719.phpt @@ -0,0 +1,43 @@ +--TEST-- +Bug #74719 Allow NULL as context, testing fopen, rename, unlink, mkdir and rmdir +--CREDITS-- +Alexander Holman <alexander@holman.org.uk> +--FILE-- +<?php + +// fopen +$tmpFile = __DIR__ . "/bug74719.tmp"; +$h = fopen($tmpFile, "w", false, NULL); +if ($h !== false) { + echo "ok\n"; + fclose($h); +} + +$newTmpFile = __DIR__ . "/bug74719_renamed.tmp"; +if (rename($tmpFile, $newTmpFile, NULL)) { + echo "ok\n"; +} + +if (unlink($newTmpFile, NULL)) { + echo "ok\n"; +} + +$tmpDir = __DIR__ . "/bug74719_dir"; + +if (mkdir($tmpDir, 0777, false, NULL)) { + echo "ok\n"; +} + +if (rmdir($tmpDir, NULL)) { + echo "ok\n"; +} + +?> +===DONE=== +--EXPECT-- +ok +ok +ok +ok +ok +===DONE=== diff --git a/ext/standard/tests/file/chgrp.phpt b/ext/standard/tests/file/chgrp.phpt index 9c85f5c835..03ea24141b 100644 --- a/ext/standard/tests/file/chgrp.phpt +++ b/ext/standard/tests/file/chgrp.phpt @@ -11,5 +11,5 @@ chgrp("sjhgfskhagkfdgskjfhgskfsdgfkdsajf", NULL); echo "ALIVE\n"; ?> --EXPECTF-- -Warning: chgrp(): parameter 2 should be string or integer, null given in %schgrp.php on line 2 +Warning: chgrp(): parameter 2 should be string or int, null given in %schgrp.php on line 2 ALIVE diff --git a/ext/standard/tests/file/chmod_variation2-win32-mb.phpt b/ext/standard/tests/file/chmod_variation2-win32-mb.phpt index c7732a2926..525052b9d9 100644 --- a/ext/standard/tests/file/chmod_variation2-win32-mb.phpt +++ b/ext/standard/tests/file/chmod_variation2-win32-mb.phpt @@ -52,7 +52,7 @@ rmdir($test_dirname); unlink($filepath); ?> ---EXPECTF-- +--EXPECT-- chmod() on a path containing .. and . bool(true) bool(true) diff --git a/ext/standard/tests/file/chmod_variation2-win32.phpt b/ext/standard/tests/file/chmod_variation2-win32.phpt index 2298f652ce..1e6f3286f9 100644 --- a/ext/standard/tests/file/chmod_variation2-win32.phpt +++ b/ext/standard/tests/file/chmod_variation2-win32.phpt @@ -52,7 +52,7 @@ rmdir($test_dirname); unlink($filepath); ?> ---EXPECTF-- +--EXPECT-- chmod() on a path containing .. and . bool(true) bool(true) diff --git a/ext/standard/tests/file/chmod_variation4.phpt b/ext/standard/tests/file/chmod_variation4.phpt index ea9d2500a1..e0da9f66ee 100644 --- a/ext/standard/tests/file/chmod_variation4.phpt +++ b/ext/standard/tests/file/chmod_variation4.phpt @@ -129,19 +129,19 @@ bool(true) bool(true) --empty array-- -Error: 2 - chmod() expects parameter 2 to be integer, array given, %s(%d) +Error: 2 - chmod() expects parameter 2 to be int, array given, %s(%d) NULL --int indexed array-- -Error: 2 - chmod() expects parameter 2 to be integer, array given, %s(%d) +Error: 2 - chmod() expects parameter 2 to be int, array given, %s(%d) NULL --associative array-- -Error: 2 - chmod() expects parameter 2 to be integer, array given, %s(%d) +Error: 2 - chmod() expects parameter 2 to be int, array given, %s(%d) NULL --nested arrays-- -Error: 2 - chmod() expects parameter 2 to be integer, array given, %s(%d) +Error: 2 - chmod() expects parameter 2 to be int, array given, %s(%d) NULL --uppercase NULL-- @@ -163,35 +163,35 @@ bool(true) bool(true) --empty string DQ-- -Error: 2 - chmod() expects parameter 2 to be integer, string given, %s(%d) +Error: 2 - chmod() expects parameter 2 to be int, string given, %s(%d) NULL --empty string SQ-- -Error: 2 - chmod() expects parameter 2 to be integer, string given, %s(%d) +Error: 2 - chmod() expects parameter 2 to be int, string given, %s(%d) NULL --string DQ-- -Error: 2 - chmod() expects parameter 2 to be integer, string given, %s(%d) +Error: 2 - chmod() expects parameter 2 to be int, string given, %s(%d) NULL --string SQ-- -Error: 2 - chmod() expects parameter 2 to be integer, string given, %s(%d) +Error: 2 - chmod() expects parameter 2 to be int, string given, %s(%d) NULL --mixed case string-- -Error: 2 - chmod() expects parameter 2 to be integer, string given, %s(%d) +Error: 2 - chmod() expects parameter 2 to be int, string given, %s(%d) NULL --heredoc-- -Error: 2 - chmod() expects parameter 2 to be integer, string given, %s(%d) +Error: 2 - chmod() expects parameter 2 to be int, string given, %s(%d) NULL --instance of classWithToString-- -Error: 2 - chmod() expects parameter 2 to be integer, object given, %s(%d) +Error: 2 - chmod() expects parameter 2 to be int, object given, %s(%d) NULL --instance of classWithoutToString-- -Error: 2 - chmod() expects parameter 2 to be integer, object given, %s(%d) +Error: 2 - chmod() expects parameter 2 to be int, object given, %s(%d) NULL --undefined var-- diff --git a/ext/standard/tests/file/chown.phpt b/ext/standard/tests/file/chown.phpt index 9075d3dc33..049073e7a0 100644 --- a/ext/standard/tests/file/chown.phpt +++ b/ext/standard/tests/file/chown.phpt @@ -11,5 +11,5 @@ chown("sjhgfskhagkfdgskjfhgskfsdgfkdsajf", NULL); echo "ALIVE\n"; ?> --EXPECTF-- -Warning: chown(): parameter 2 should be string or integer, null given in %schown.php on line %d +Warning: chown(): parameter 2 should be string or int, null given in %schown.php on line %d ALIVE diff --git a/ext/standard/tests/file/chroot_001.phpt b/ext/standard/tests/file/chroot_001.phpt index b42b17b892..7fda0b3654 100644 --- a/ext/standard/tests/file/chroot_001.phpt +++ b/ext/standard/tests/file/chroot_001.phpt @@ -23,7 +23,7 @@ var_dump(realpath(".")); <?php rmdir("chroot_001_x"); ?> ---EXPECTF-- +--EXPECT-- bool(true) bool(true) bool(false) diff --git a/ext/standard/tests/file/copy_variation10.phpt b/ext/standard/tests/file/copy_variation10.phpt index 89cf327694..a0daa2a574 100644 --- a/ext/standard/tests/file/copy_variation10.phpt +++ b/ext/standard/tests/file/copy_variation10.phpt @@ -27,7 +27,7 @@ echo "*** Done ***\n"; <?php unlink(dirname(__FILE__)."/copy_variation10.tmp"); ?> ---EXPECTF-- +--EXPECT-- *** Test copy(): Trying to create a copy of file with the same source name *** bool(false) bool(true) diff --git a/ext/standard/tests/file/copy_variation16-win32.phpt b/ext/standard/tests/file/copy_variation16-win32.phpt index db86f3b1ec..7872a2138e 100644 --- a/ext/standard/tests/file/copy_variation16-win32.phpt +++ b/ext/standard/tests/file/copy_variation16-win32.phpt @@ -130,7 +130,7 @@ Size of destination file => int(3500) -- Iteration 7 -- Size of source file => int(3500) Copy operation => -Warning: copy(%s): failed to open stream: No such file or directory in %s on line %s +Warning: copy(%s): failed to open stream: No such file or directory in %s on line %d bool(false) Existence of destination file => bool(false) diff --git a/ext/standard/tests/file/copy_variation18.phpt b/ext/standard/tests/file/copy_variation18.phpt index 935cf2c7c3..0e39ca6c67 100644 --- a/ext/standard/tests/file/copy_variation18.phpt +++ b/ext/standard/tests/file/copy_variation18.phpt @@ -47,7 +47,7 @@ echo "*** Done ***\n"; unlink(dirname(__FILE__)."/copy_copy_variation18.tmp"); unlink(dirname(__FILE__)."/copy_variation18.tmp"); ?> ---EXPECTF-- +--EXPECT-- *** Test copy() function: stat of file before and after copy *** Copy operation => bool(true) Comparing the stats of file before and after copy operation => bool(true) diff --git a/ext/standard/tests/file/copy_variation3.phpt b/ext/standard/tests/file/copy_variation3.phpt index 439b73a181..cbbfd51ebc 100644 --- a/ext/standard/tests/file/copy_variation3.phpt +++ b/ext/standard/tests/file/copy_variation3.phpt @@ -73,7 +73,7 @@ echo "*** Done ***\n"; <?php unlink(dirname(__FILE__)."/copy_variation3.tmp"); ?> ---EXPECTF-- +--EXPECT-- *** Test copy() function: destination file names containing whitespaces *** Size of the source file before copy operation => int(1500) diff --git a/ext/standard/tests/file/copy_variation8.phpt b/ext/standard/tests/file/copy_variation8.phpt index 52ad6892ae..e67375dfb5 100644 --- a/ext/standard/tests/file/copy_variation8.phpt +++ b/ext/standard/tests/file/copy_variation8.phpt @@ -75,7 +75,7 @@ rmdir($base_dir); echo "*** Done ***\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing copy() function: copying links across different directories *** -- Iteration 1 -- diff --git a/ext/standard/tests/file/dirname_basic-win32.phpt b/ext/standard/tests/file/dirname_basic-win32.phpt index ed59582b1b..bb53255fc8 100644 --- a/ext/standard/tests/file/dirname_basic-win32.phpt +++ b/ext/standard/tests/file/dirname_basic-win32.phpt @@ -58,7 +58,7 @@ foreach ($paths as $path) { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing dirname() : basic functionality *** string(0) "" string(1) "." diff --git a/ext/standard/tests/file/dirname_basic.phpt b/ext/standard/tests/file/dirname_basic.phpt index fdafaa4e4a..74d0a14e9e 100644 --- a/ext/standard/tests/file/dirname_basic.phpt +++ b/ext/standard/tests/file/dirname_basic.phpt @@ -58,7 +58,7 @@ foreach ($paths as $path) { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing dirname() : basic functionality *** string(0) "" string(1) "." diff --git a/ext/standard/tests/file/fflush_basic.phpt b/ext/standard/tests/file/fflush_basic.phpt index 5e5e31db27..22a62ed1b0 100644 --- a/ext/standard/tests/file/fflush_basic.phpt +++ b/ext/standard/tests/file/fflush_basic.phpt @@ -42,7 +42,7 @@ $file_path = dirname(__FILE__); $filename = "$file_path/fflush_basic.tmp"; unlink($filename); ?> ---EXPECTF-- +--EXPECT-- *** Testing fflush(): writing to a file and reading the contents *** int(63) bool(true) diff --git a/ext/standard/tests/file/fflush_error.phpt b/ext/standard/tests/file/fflush_error.phpt index 111a920bdd..4bb1542962 100644 --- a/ext/standard/tests/file/fflush_error.phpt +++ b/ext/standard/tests/file/fflush_error.phpt @@ -65,7 +65,7 @@ Warning: fflush() expects parameter 1 to be resource, string given in %s on line bool(false) -- Iteration 2 -- -Warning: fflush() expects parameter 1 to be resource, integer given in %s on line %d +Warning: fflush() expects parameter 1 to be resource, int given in %s on line %d bool(false) -- Iteration 3 -- @@ -73,7 +73,7 @@ Warning: fflush() expects parameter 1 to be resource, float given in %s on line bool(false) -- Iteration 4 -- -Warning: fflush() expects parameter 1 to be resource, boolean given in %s on line %d +Warning: fflush() expects parameter 1 to be resource, bool given in %s on line %d bool(false) -- Iteration 5 -- diff --git a/ext/standard/tests/file/fflush_variation1-win32-mb.phpt b/ext/standard/tests/file/fflush_variation1-win32-mb.phpt index 2234838b1b..19349b4442 100644 --- a/ext/standard/tests/file/fflush_variation1-win32-mb.phpt +++ b/ext/standard/tests/file/fflush_variation1-win32-mb.phpt @@ -62,7 +62,7 @@ foreach( $file_types as $type ) { echo "\n*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fflush(): with various types of files *** -- Iteration 1 with file containing empty Data-- -- File opened in w mode -- diff --git a/ext/standard/tests/file/fflush_variation1-win32.phpt b/ext/standard/tests/file/fflush_variation1-win32.phpt index a615f909e4..3ebde9ef85 100644 --- a/ext/standard/tests/file/fflush_variation1-win32.phpt +++ b/ext/standard/tests/file/fflush_variation1-win32.phpt @@ -62,7 +62,7 @@ foreach( $file_types as $type ) { echo "\n*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fflush(): with various types of files *** -- Iteration 1 with file containing empty Data-- -- File opened in w mode -- diff --git a/ext/standard/tests/file/fflush_variation1.phpt b/ext/standard/tests/file/fflush_variation1.phpt index 9441118d76..caadbf2de4 100644 --- a/ext/standard/tests/file/fflush_variation1.phpt +++ b/ext/standard/tests/file/fflush_variation1.phpt @@ -63,7 +63,7 @@ foreach( $file_types as $type ) { echo "\n*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fflush(): with various types of files *** -- Iteration 1 with file containing empty Data-- -- File opened in w mode -- diff --git a/ext/standard/tests/file/fflush_variation2.phpt b/ext/standard/tests/file/fflush_variation2.phpt index 9f4a81f6e2..39d29f699c 100644 --- a/ext/standard/tests/file/fflush_variation2.phpt +++ b/ext/standard/tests/file/fflush_variation2.phpt @@ -65,7 +65,7 @@ foreach( $file_types as $type ) { echo "\n*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fflush(): with soft links to files opened in diff modes *** -- Iteration 1 with file containing empty data -- -- link opened in w mode -- diff --git a/ext/standard/tests/file/fflush_variation3.phpt b/ext/standard/tests/file/fflush_variation3.phpt index 69c49ecbd1..1f13ee5c31 100644 --- a/ext/standard/tests/file/fflush_variation3.phpt +++ b/ext/standard/tests/file/fflush_variation3.phpt @@ -65,7 +65,7 @@ foreach( $file_types as $type ) { echo "\n*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fflush(): with hard links to files opened in diff modes *** -- Iteration 1 with file containing empty data -- bool(true) diff --git a/ext/standard/tests/file/fflush_variation4.phpt b/ext/standard/tests/file/fflush_variation4.phpt index 8b8138c0d1..823de4c56a 100644 --- a/ext/standard/tests/file/fflush_variation4.phpt +++ b/ext/standard/tests/file/fflush_variation4.phpt @@ -40,7 +40,7 @@ foreach( $file_modes as $mode ) { echo "\n*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fflush(): with file handles of files opened in various read modes *** -- Iteration 1 with file opened in r mode -- bool(true) diff --git a/ext/standard/tests/file/fgetc_error.phpt b/ext/standard/tests/file/fgetc_error.phpt index 6b2f49e38c..65bcda0413 100644 --- a/ext/standard/tests/file/fgetc_error.phpt +++ b/ext/standard/tests/file/fgetc_error.phpt @@ -52,7 +52,7 @@ Warning: fgetc() expects parameter 1 to be resource, string given in %s on line bool(false) -- Iteration 2 -- -Warning: fgetc() expects parameter 1 to be resource, integer given in %s on line %d +Warning: fgetc() expects parameter 1 to be resource, int given in %s on line %d bool(false) -- Iteration 3 -- @@ -60,7 +60,7 @@ Warning: fgetc() expects parameter 1 to be resource, float given in %s on line % bool(false) -- Iteration 4 -- -Warning: fgetc() expects parameter 1 to be resource, boolean given in %s on line %d +Warning: fgetc() expects parameter 1 to be resource, bool given in %s on line %d bool(false) -- Iteration 5 -- diff --git a/ext/standard/tests/file/fgetc_variation1.phpt b/ext/standard/tests/file/fgetc_variation1.phpt index 9930f7a4e5..6635e8d554 100644 --- a/ext/standard/tests/file/fgetc_variation1.phpt +++ b/ext/standard/tests/file/fgetc_variation1.phpt @@ -46,7 +46,7 @@ echo "Done\n"; <?php unlink( dirname(__FILE__)."/fgetc_variation1.tmp"); ?> ---EXPECTF-- +--EXPECT-- *** Testing fgetc() : usage variations *** -- Testing fgetc() with file whose file pointer is pointing to EOF -- -- File opened in mode : r -- diff --git a/ext/standard/tests/file/fgetc_variation3.phpt b/ext/standard/tests/file/fgetc_variation3.phpt index 0d795688ad..aab7bbbf8f 100644 --- a/ext/standard/tests/file/fgetc_variation3.phpt +++ b/ext/standard/tests/file/fgetc_variation3.phpt @@ -49,7 +49,7 @@ foreach ($file_modes as $file_mode ) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fgetc() with file opened in write only mode *** -- File opened in mode : w -- bool(true) diff --git a/ext/standard/tests/file/fgetc_variation4.phpt b/ext/standard/tests/file/fgetc_variation4.phpt index c06f8d1cfd..1a61108f41 100644 --- a/ext/standard/tests/file/fgetc_variation4.phpt +++ b/ext/standard/tests/file/fgetc_variation4.phpt @@ -50,7 +50,7 @@ foreach ($file_modes as $file_mode ) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fgetc() : usage variations *** -- Testing fgetc() with files opened with different read modes -- -- File opened in mode : a+ -- diff --git a/ext/standard/tests/file/fgetcsv_error.phpt b/ext/standard/tests/file/fgetcsv_error.phpt index daaa733c9d..6b816bca3c 100644 --- a/ext/standard/tests/file/fgetcsv_error.phpt +++ b/ext/standard/tests/file/fgetcsv_error.phpt @@ -60,10 +60,10 @@ Warning: fgetcsv() expects parameter 1 to be resource, string given in %s on lin NULL -- Iteration 2 -- -Warning: fgetcsv() expects parameter 1 to be resource, integer given in %s on line %d +Warning: fgetcsv() expects parameter 1 to be resource, int given in %s on line %d NULL -Warning: fgetcsv() expects parameter 1 to be resource, integer given in %s on line %d +Warning: fgetcsv() expects parameter 1 to be resource, int given in %s on line %d NULL -- Iteration 3 -- @@ -74,10 +74,10 @@ Warning: fgetcsv() expects parameter 1 to be resource, float given in %s on line NULL -- Iteration 4 -- -Warning: fgetcsv() expects parameter 1 to be resource, boolean given in %s on line %d +Warning: fgetcsv() expects parameter 1 to be resource, bool given in %s on line %d NULL -Warning: fgetcsv() expects parameter 1 to be resource, boolean given in %s on line %d +Warning: fgetcsv() expects parameter 1 to be resource, bool given in %s on line %d NULL -- Iteration 5 -- diff --git a/ext/standard/tests/file/fgets_basic.phpt b/ext/standard/tests/file/fgets_basic.phpt index 387a5d1f27..a8e8249aa8 100644 --- a/ext/standard/tests/file/fgets_basic.phpt +++ b/ext/standard/tests/file/fgets_basic.phpt @@ -49,7 +49,7 @@ foreach($file_modes as $file_mode) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fgets() : basic functionality *** -- Testing fgets() with file opened using mode r -- diff --git a/ext/standard/tests/file/fgets_error.phpt b/ext/standard/tests/file/fgets_error.phpt index d6fe1f9385..919343aa87 100644 --- a/ext/standard/tests/file/fgets_error.phpt +++ b/ext/standard/tests/file/fgets_error.phpt @@ -80,7 +80,7 @@ Warning: fgets() expects parameter 1 to be resource, string given in %s on line bool(false) -- Iteration 2 -- -Warning: fgets() expects parameter 1 to be resource, integer given in %s on line %d +Warning: fgets() expects parameter 1 to be resource, int given in %s on line %d bool(false) -- Iteration 3 -- @@ -88,7 +88,7 @@ Warning: fgets() expects parameter 1 to be resource, float given in %s on line % bool(false) -- Iteration 4 -- -Warning: fgets() expects parameter 1 to be resource, boolean given in %s on line %d +Warning: fgets() expects parameter 1 to be resource, bool given in %s on line %d bool(false) -- Iteration 5 -- diff --git a/ext/standard/tests/file/fgets_variation1.phpt b/ext/standard/tests/file/fgets_variation1.phpt index 78fa390ead..3e7eba9fb1 100644 --- a/ext/standard/tests/file/fgets_variation1.phpt +++ b/ext/standard/tests/file/fgets_variation1.phpt @@ -48,7 +48,7 @@ foreach ($file_modes as $file_mode ) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fgets() with file opened in write only mode *** -- File opened in mode : w -- bool(true) diff --git a/ext/standard/tests/file/fgets_variation3.phpt b/ext/standard/tests/file/fgets_variation3.phpt index 78197bf7fe..d63ab8c268 100644 --- a/ext/standard/tests/file/fgets_variation3.phpt +++ b/ext/standard/tests/file/fgets_variation3.phpt @@ -63,7 +63,7 @@ foreach($file_modes as $file_mode) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fgets() : usage variations *** -- Testing fgets() with file opened using mode w+ -- diff --git a/ext/standard/tests/file/fgets_variation4-win32-mb.phpt b/ext/standard/tests/file/fgets_variation4-win32-mb.phpt index a172a72779..b5c3eaae8f 100644 --- a/ext/standard/tests/file/fgets_variation4-win32-mb.phpt +++ b/ext/standard/tests/file/fgets_variation4-win32-mb.phpt @@ -65,7 +65,7 @@ foreach($file_modes as $file_mode) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fgets() : usage variations *** -- Testing fgets() with file opened using mode w+ -- diff --git a/ext/standard/tests/file/fgets_variation4-win32.phpt b/ext/standard/tests/file/fgets_variation4-win32.phpt index 99620d9f02..d5b2c5a53d 100644 --- a/ext/standard/tests/file/fgets_variation4-win32.phpt +++ b/ext/standard/tests/file/fgets_variation4-win32.phpt @@ -65,7 +65,7 @@ foreach($file_modes as $file_mode) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fgets() : usage variations *** -- Testing fgets() with file opened using mode w+ -- diff --git a/ext/standard/tests/file/fgets_variation4.phpt b/ext/standard/tests/file/fgets_variation4.phpt index 0dc6fe3b9b..3a26dca477 100644 --- a/ext/standard/tests/file/fgets_variation4.phpt +++ b/ext/standard/tests/file/fgets_variation4.phpt @@ -65,7 +65,7 @@ foreach($file_modes as $file_mode) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fgets() : usage variations *** -- Testing fgets() with file opened using mode w+ -- diff --git a/ext/standard/tests/file/fgets_variation5.phpt b/ext/standard/tests/file/fgets_variation5.phpt index 74614133fc..f474e45a1d 100644 --- a/ext/standard/tests/file/fgets_variation5.phpt +++ b/ext/standard/tests/file/fgets_variation5.phpt @@ -54,7 +54,7 @@ foreach($file_modes as $file_mode) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fgets() : usage variations *** -- Testing fgets() with file opened using mode w+ -- diff --git a/ext/standard/tests/file/fgets_variation6-win32.phpt b/ext/standard/tests/file/fgets_variation6-win32.phpt index c14659a136..a402cb1073 100644 --- a/ext/standard/tests/file/fgets_variation6-win32.phpt +++ b/ext/standard/tests/file/fgets_variation6-win32.phpt @@ -61,7 +61,7 @@ foreach($file_modes as $file_mode) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fgets() : usage variations *** -- Testing fgets() with file opened using mode w+ -- diff --git a/ext/standard/tests/file/fgets_variation6.phpt b/ext/standard/tests/file/fgets_variation6.phpt index a4c91433e7..23e447db3b 100644 --- a/ext/standard/tests/file/fgets_variation6.phpt +++ b/ext/standard/tests/file/fgets_variation6.phpt @@ -61,7 +61,7 @@ foreach($file_modes as $file_mode) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fgets() : usage variations *** -- Testing fgets() with file opened using mode w+ -- diff --git a/ext/standard/tests/file/fgetss.phpt b/ext/standard/tests/file/fgetss.phpt index 907eca72db..41ac46dc92 100644 --- a/ext/standard/tests/file/fgetss.phpt +++ b/ext/standard/tests/file/fgetss.phpt @@ -39,45 +39,106 @@ var_dump(fgetss($fp, 0)); echo "Done\n"; ?> --EXPECTF-- +Deprecated: Function fgetss() is deprecated in %s on line %d string(18) "askasdfasdfaaaaaa " + +Deprecated: Function fgetss() is deprecated in %s on line %d string(6) "dddddd" + +Deprecated: Function fgetss() is deprecated in %s on line %d string(6) "asdqw " + +Deprecated: Function fgetss() is deprecated in %s on line %d string(8) "aaaaqqqq" + +Deprecated: Function fgetss() is deprecated in %s on line %d string(23) "aaafunction foo() {}qqq" + +Deprecated: Function fgetss() is deprecated in %s on line %d bool(false) + +Deprecated: Function fgetss() is deprecated in %s on line %d string(6) "asdasd" + +Deprecated: Function fgetss() is deprecated in %s on line %d string(0) "" + +Deprecated: Function fgetss() is deprecated in %s on line %d bool(false) + +Deprecated: Function fgetss() is deprecated in %s on line %d bool(false) + +Deprecated: Function fgetss() is deprecated in %s on line %d string(11) "some text " + +Deprecated: Function fgetss() is deprecated in %s on line %d string(4) "blah" + +Deprecated: Function fgetss() is deprecated in %s on line %d string(24) "some another text hoho " + +Deprecated: Function fgetss() is deprecated in %s on line %d bool(false) + +Deprecated: Function fgetss() is deprecated in %s on line %d string(9) "askasdfas" + +Deprecated: Function fgetss() is deprecated in %s on line %d string(6) "dfaaaa" + +Deprecated: Function fgetss() is deprecated in %s on line %d string(5) "asdqw" + +Deprecated: Function fgetss() is deprecated in %s on line %d string(0) "" + +Deprecated: Function fgetss() is deprecated in %s on line %d string(3) "aaa" + +Deprecated: Function fgetss() is deprecated in %s on line %d string(7) "functio" + +Deprecated: Function fgetss() is deprecated in %s on line %d string(6) "asdasd" + +Deprecated: Function fgetss() is deprecated in %s on line %d string(0) "" + +Deprecated: Function fgetss() is deprecated in %s on line %d bool(false) + +Deprecated: Function fgetss() is deprecated in %s on line %d bool(false) + +Deprecated: Function fgetss() is deprecated in %s on line %d string(9) "some text" + +Deprecated: Function fgetss() is deprecated in %s on line %d string(2) " " + +Deprecated: Function fgetss() is deprecated in %s on line %d string(9) "some anot" + +Deprecated: Function fgetss() is deprecated in %s on line %d string(9) "her text " +Deprecated: Function fgetss() is deprecated in %s on line %d + Warning: fgetss(): Length parameter must be greater than 0 in %s on line %d bool(false) +Deprecated: Function fgetss() is deprecated in %s on line %d + Warning: fgetss(): Length parameter must be greater than 0 in %s on line %d bool(false) +Deprecated: Function fgetss() is deprecated in %s on line %d + Warning: fgetss(): supplied resource is not a valid stream resource in %s on line %d bool(false) Done diff --git a/ext/standard/tests/file/fgetss1.phpt b/ext/standard/tests/file/fgetss1.phpt index 2ae3abf355..0266371865 100644 --- a/ext/standard/tests/file/fgetss1.phpt +++ b/ext/standard/tests/file/fgetss1.phpt @@ -2,6 +2,7 @@ more fgetss() tests --FILE-- <?php +error_reporting(E_ALL & ~E_DEPRECATED); $filename = dirname(__FILE__)."/fgetss1.html"; @@ -36,7 +37,7 @@ echo "Done\n"; $filename = dirname(__FILE__)."/fgetss1.html"; unlink($filename); ?> ---EXPECTF-- +--EXPECT-- string(21) "askasdfasdf<b>aaaaaa " string(6) "dddddd" diff --git a/ext/standard/tests/file/fgetss_basic1.phpt b/ext/standard/tests/file/fgetss_basic1.phpt index e7b6a5776d..b1e4a89c64 100644 --- a/ext/standard/tests/file/fgetss_basic1.phpt +++ b/ext/standard/tests/file/fgetss_basic1.phpt @@ -2,6 +2,8 @@ Test fgetss() function : Basic functionality - read modes only --FILE-- <?php +error_reporting(E_ALL & ~E_DEPRECATED); + /* Prototype: string fgetss ( resource $handle [, int $length [, string $allowable_tags]] ); Description: Gets line from file pointer and strip HTML tags diff --git a/ext/standard/tests/file/fgetss_basic2-win32-mb.phpt b/ext/standard/tests/file/fgetss_basic2-win32-mb.phpt index 3a3fbb09ab..41ebf8e1da 100644 --- a/ext/standard/tests/file/fgetss_basic2-win32-mb.phpt +++ b/ext/standard/tests/file/fgetss_basic2-win32-mb.phpt @@ -8,6 +8,8 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { ?> --FILE-- <?php +error_reporting(E_ALL & ~E_DEPRECATED); + /* Prototype: string fgetss ( resource $handle [, int $length [, string $allowable_tags]] ); Description: Gets line from file pointer and strip HTML tags @@ -76,7 +78,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fgetss() : basic operations *** -- Testing fgetss() with file opened using w+ mode -- diff --git a/ext/standard/tests/file/fgetss_basic2-win32.phpt b/ext/standard/tests/file/fgetss_basic2-win32.phpt index ff8f4d6b55..ea76bb8a8b 100644 --- a/ext/standard/tests/file/fgetss_basic2-win32.phpt +++ b/ext/standard/tests/file/fgetss_basic2-win32.phpt @@ -8,6 +8,8 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { ?> --FILE-- <?php +error_reporting(E_ALL & ~E_DEPRECATED); + /* Prototype: string fgetss ( resource $handle [, int $length [, string $allowable_tags]] ); Description: Gets line from file pointer and strip HTML tags @@ -76,7 +78,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fgetss() : basic operations *** -- Testing fgetss() with file opened using w+ mode -- diff --git a/ext/standard/tests/file/fgetss_basic2.phpt b/ext/standard/tests/file/fgetss_basic2.phpt index ccc02966b6..d77689d980 100644 --- a/ext/standard/tests/file/fgetss_basic2.phpt +++ b/ext/standard/tests/file/fgetss_basic2.phpt @@ -8,6 +8,8 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { ?> --FILE-- <?php +error_reporting(E_ALL & ~E_DEPRECATED); + /* Prototype: string fgetss ( resource $handle [, int $length [, string $allowable_tags]] ); Description: Gets line from file pointer and strip HTML tags @@ -74,7 +76,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fgetss() : basic operations *** -- Testing fgetss() with file opened using w+ mode -- diff --git a/ext/standard/tests/file/fgetss_error.phpt b/ext/standard/tests/file/fgetss_error.phpt index 7c99f73a25..13a5399406 100644 --- a/ext/standard/tests/file/fgetss_error.phpt +++ b/ext/standard/tests/file/fgetss_error.phpt @@ -2,6 +2,8 @@ Test fgetss() function : error conditions --FILE-- <?php +error_reporting(E_ALL & ~E_DEPRECATED); + /* Prototype: string fgetss ( resource $handle [, int $length [, string $allowable_tags]] ); Description: Gets line from file pointer and strip HTML tags @@ -79,7 +81,7 @@ Warning: fgetss() expects parameter 1 to be resource, string given in %s on line bool(false) -- Iteration 2 -- -Warning: fgetss() expects parameter 1 to be resource, integer given in %s on line %d +Warning: fgetss() expects parameter 1 to be resource, int given in %s on line %d bool(false) -- Iteration 3 -- @@ -87,7 +89,7 @@ Warning: fgetss() expects parameter 1 to be resource, float given in %s on line bool(false) -- Iteration 4 -- -Warning: fgetss() expects parameter 1 to be resource, boolean given in %s on line %d +Warning: fgetss() expects parameter 1 to be resource, bool given in %s on line %d bool(false) -- Iteration 5 -- diff --git a/ext/standard/tests/file/fgetss_variation1-win32.phpt b/ext/standard/tests/file/fgetss_variation1-win32.phpt index b189b1b5a1..b8ad242d9e 100644 --- a/ext/standard/tests/file/fgetss_variation1-win32.phpt +++ b/ext/standard/tests/file/fgetss_variation1-win32.phpt @@ -8,6 +8,8 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { ?> --FILE-- <?php +error_reporting(E_ALL & ~E_DEPRECATED); + /* Prototype: string fgetss ( resource $handle [, int $length [, string $allowable_tags]] ); Description: Gets line from file pointer and strip HTML tags diff --git a/ext/standard/tests/file/fgetss_variation1.phpt b/ext/standard/tests/file/fgetss_variation1.phpt index 54826fad66..6166f8468c 100644 --- a/ext/standard/tests/file/fgetss_variation1.phpt +++ b/ext/standard/tests/file/fgetss_variation1.phpt @@ -8,6 +8,8 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { ?> --FILE-- <?php +error_reporting(E_ALL & ~E_DEPRECATED); + /* Prototype: string fgetss ( resource $handle [, int $length [, string $allowable_tags]] ); Description: Gets line from file pointer and strip HTML tags @@ -73,7 +75,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fgetss() : usage variations *** -- Testing fgetss() with file opened using w mode -- diff --git a/ext/standard/tests/file/fgetss_variation2.phpt b/ext/standard/tests/file/fgetss_variation2.phpt index 43bebab6e1..228d476079 100644 --- a/ext/standard/tests/file/fgetss_variation2.phpt +++ b/ext/standard/tests/file/fgetss_variation2.phpt @@ -2,6 +2,8 @@ Test fgetss() function : usage variations - read modes --FILE-- <?php +error_reporting(E_ALL & ~E_DEPRECATED); + /* Prototype: string fgetss ( resource $handle [, int $length [, string $allowable_tags]] ); Description: Gets line from file pointer and strip HTML tags @@ -69,7 +71,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fgetss() : usage variations *** -- Testing fgetss() with file opened using r mode -- diff --git a/ext/standard/tests/file/fgetss_variation3-win32.phpt b/ext/standard/tests/file/fgetss_variation3-win32.phpt index 1987592bbc..c1777fc495 100644 --- a/ext/standard/tests/file/fgetss_variation3-win32.phpt +++ b/ext/standard/tests/file/fgetss_variation3-win32.phpt @@ -8,6 +8,8 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { ?> --FILE-- <?php +error_reporting(E_ALL & ~E_DEPRECATED); + /* Prototype: string fgetss ( resource $handle [, int $length [, string $allowable_tags]] ); Description: Gets line from file pointer and strip HTML tags diff --git a/ext/standard/tests/file/fgetss_variation3.phpt b/ext/standard/tests/file/fgetss_variation3.phpt index 4e3bc73fbe..53a2ac879c 100644 --- a/ext/standard/tests/file/fgetss_variation3.phpt +++ b/ext/standard/tests/file/fgetss_variation3.phpt @@ -8,6 +8,8 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { ?> --FILE-- <?php +error_reporting(E_ALL & ~E_DEPRECATED); + /* Prototype: string fgetss ( resource $handle [, int $length [, string $allowable_tags]] ); Description: Gets line from file pointer and strip HTML tags @@ -76,7 +78,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fgetss() : usage variations *** -- Testing fgetss() with file opened using w+ mode -- diff --git a/ext/standard/tests/file/fgetss_variation4.phpt b/ext/standard/tests/file/fgetss_variation4.phpt index f455e8b3af..91470e1d44 100644 --- a/ext/standard/tests/file/fgetss_variation4.phpt +++ b/ext/standard/tests/file/fgetss_variation4.phpt @@ -7,6 +7,8 @@ if(substr(PHP_OS, 0, 3) == "WIN") ?> --FILE-- <?php +error_reporting(E_ALL & ~E_DEPRECATED); + /* Prototype: string fgetss ( resource $handle [, int $length [, string $allowable_tags]] ); Description: Gets line from file pointer and strip HTML tags @@ -73,7 +75,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fgetss() : usage variations *** -- Testing fgetss() with file opened using r mode -- diff --git a/ext/standard/tests/file/fgetss_variation5-win32.phpt b/ext/standard/tests/file/fgetss_variation5-win32.phpt index 52eaef629a..57f1fd9059 100644 --- a/ext/standard/tests/file/fgetss_variation5-win32.phpt +++ b/ext/standard/tests/file/fgetss_variation5-win32.phpt @@ -8,6 +8,8 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { ?> --FILE-- <?php +error_reporting(E_ALL & ~E_DEPRECATED); + /* Prototype: string fgetss ( resource $handle [, int $length [, string $allowable_tags]] ); Description: Gets line from file pointer and strip HTML tags diff --git a/ext/standard/tests/file/fgetss_variation5.phpt b/ext/standard/tests/file/fgetss_variation5.phpt index 91d0b5c114..e6fc15a98c 100644 --- a/ext/standard/tests/file/fgetss_variation5.phpt +++ b/ext/standard/tests/file/fgetss_variation5.phpt @@ -8,6 +8,8 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { ?> --FILE-- <?php +error_reporting(E_ALL & ~E_DEPRECATED); + /* Prototype: string fgetss ( resource $handle [, int $length [, string $allowable_tags]] ); Description: Gets line from file pointer and strip HTML tags @@ -77,7 +79,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fgetss() : usage variations *** -- Testing fgetss() with file opened using w+ mode -- diff --git a/ext/standard/tests/file/file.inc b/ext/standard/tests/file/file.inc index afee2d20ce..a0b62bffc7 100644 --- a/ext/standard/tests/file/file.inc +++ b/ext/standard/tests/file/file.inc @@ -15,7 +15,7 @@ */ -define('file_not_found', 2, 1); +const FILE_NOT_FOUND = 2; /* Function: bool create_file(string $filename, string $mode = "w"); @@ -210,7 +210,7 @@ function change_file_perms($file_path, $permission = An octal number, This should be similar to $mode specified in chmod() call. $content_type = Specify type of the content to fill in the file. - "numeric" = fill file with numeric vlaues + "numeric" = fill file with numeric values "text" = fill file with regular text "empty" = empty file "text_with_new_line" = similar to text fill type, but writes with new line char @@ -330,7 +330,7 @@ function create_files( $file_path, $link_perms = An octal number, This should be similar to $mode specified in chmod() call. $link_file_content = Type of the content to fill in the file. - numeric = fill file with numeric vlaues + numeric = fill file with numeric values text = fill file with regular text text_with_new_line = same as text but new lines are written alphanumeric = fill with alphanumeric text @@ -432,7 +432,7 @@ function create_links($file_path, Description: delete a given file if exists Returns: true on success false on failure - file_not_found if file doesn't exist + FILE_NOT_FOUND if file doesn't exist */ function delete_file($filename) { // check if file exists @@ -442,7 +442,7 @@ function delete_file($filename) { else return false; } - return file_not_found; + return FILE_NOT_FOUND; } /* @@ -475,7 +475,7 @@ function delete_files($file_path, $status = delete_file($filename); if($status == true) { $return_value['deleted']++; - } else if($status == file_not_found) { + } else if($status == FILE_NOT_FOUND) { $return_value['notfound']++; } else { $return_value['failed']++; @@ -528,7 +528,7 @@ function delete_links($file_path, corresponding next 13 values of the same stat for equality $stat = stat array - Retuns: true when all of them match, false otherwise + Returns: true when all of them match, false otherwise */ function compare_self_stat( array $stat ) { diff --git a/ext/standard/tests/file/file_basic.phpt b/ext/standard/tests/file/file_basic.phpt index e6cecd837a..3518968110 100644 --- a/ext/standard/tests/file/file_basic.phpt +++ b/ext/standard/tests/file/file_basic.phpt @@ -28,7 +28,7 @@ foreach( $filetypes as $type ) { echo "\n--- Done ---"; ?> ---EXPECTF-- +--EXPECT-- *** Testing file() with basic types of files *** Array ( diff --git a/ext/standard/tests/file/file_error.phpt b/ext/standard/tests/file/file_error.phpt index 7dae521dbb..12148189e8 100644 --- a/ext/standard/tests/file/file_error.phpt +++ b/ext/standard/tests/file/file_error.phpt @@ -36,7 +36,7 @@ NULL Warning: file() expects at most 3 parameters, 4 given in %s on line %d NULL -Warning: file() expects parameter 2 to be integer, string given in %s on line %d +Warning: file() expects parameter 2 to be int, string given in %s on line %d NULL array(0) { } diff --git a/ext/standard/tests/file/file_exists_variation1.phpt b/ext/standard/tests/file/file_exists_variation1.phpt index 04f1453b66..c3d4184724 100644 --- a/ext/standard/tests/file/file_exists_variation1.phpt +++ b/ext/standard/tests/file/file_exists_variation1.phpt @@ -19,7 +19,7 @@ var_dump(file_exists(' ')); var_dump(file_exists('|')); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing file_exists() : usage variations *** bool(false) bool(false) diff --git a/ext/standard/tests/file/file_get_contents_basic.phpt b/ext/standard/tests/file/file_get_contents_basic.phpt index 413909b450..267f86e3f6 100644 --- a/ext/standard/tests/file/file_get_contents_basic.phpt +++ b/ext/standard/tests/file/file_get_contents_basic.phpt @@ -30,7 +30,7 @@ delete_files($file_path, 1); echo "\n*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing the basic functionality of the file_get_contents() function *** -- Testing with simple valid data file -- string(100) "text text text text text text text text text text text text text text text text text text text text " diff --git a/ext/standard/tests/file/file_get_contents_error001.phpt b/ext/standard/tests/file/file_get_contents_error001.phpt index a347d9d3d1..1437b8a8a0 100644 --- a/ext/standard/tests/file/file_get_contents_error001.phpt +++ b/ext/standard/tests/file/file_get_contents_error001.phpt @@ -8,8 +8,6 @@ display_errors=false --SKIPIF-- <?php if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); - if (!function_exists("file_get_contents")) - die ("skip file_get_contents function is not found"); if (getenv("SKIP_ONLINE_TESTS")) die("skip online test"); ?> --FILE-- diff --git a/ext/standard/tests/file/file_get_contents_error002.phpt b/ext/standard/tests/file/file_get_contents_error002.phpt index 47c7b9cd63..8ca1162672 100644 --- a/ext/standard/tests/file/file_get_contents_error002.phpt +++ b/ext/standard/tests/file/file_get_contents_error002.phpt @@ -5,11 +5,6 @@ file_get_contents() test using negative parameter for length (last parameter) "Sylvain R." <sracine@phpquebec.org> --INI-- display_errors=false ---SKIPIF-- -<?php - if (!function_exists("file_get_contents")) - die ("skip file_get_contents function is not found"); -?> --FILE-- <?php var_dump(file_get_contents("http://checkip.dyndns.com",null,null,0,-1)); diff --git a/ext/standard/tests/file/file_get_contents_file_put_contents_basic.phpt b/ext/standard/tests/file/file_get_contents_file_put_contents_basic.phpt index edfad0d945..3d5a688b9b 100644 --- a/ext/standard/tests/file/file_get_contents_file_put_contents_basic.phpt +++ b/ext/standard/tests/file/file_get_contents_file_put_contents_basic.phpt @@ -39,7 +39,7 @@ $file_path = dirname(__FILE__); unlink($file_path."/file_put_contents.tmp"); unlink($file_path."/file_put_contents1.tmp"); ?> ---EXPECTF-- +--EXPECT-- *** Testing the basic functionality of file_put_contents() and file_get_contents() functions *** -- Testing with simple valid data file -- string(100) "text text text text text text text text text text text text text text text text text text text text " diff --git a/ext/standard/tests/file/file_get_contents_file_put_contents_variation1.phpt b/ext/standard/tests/file/file_get_contents_file_put_contents_variation1.phpt index d7363e52b0..4a604fa56d 100644 --- a/ext/standard/tests/file/file_get_contents_file_put_contents_variation1.phpt +++ b/ext/standard/tests/file/file_get_contents_file_put_contents_variation1.phpt @@ -40,7 +40,7 @@ echo "--- Done ---"; $file_path = dirname(__FILE__); unlink($file_path."/file_put_contents_variation1.tmp"); ?> ---EXPECTF-- +--EXPECT-- *** Testing with variations in the arguments values *** string(100) "text text text text text text text text text text text text text text text text text text text text " string(100) "text text text text text text text text text text text text text text text text text text text text " diff --git a/ext/standard/tests/file/file_get_contents_file_put_contents_variation2.phpt b/ext/standard/tests/file/file_get_contents_file_put_contents_variation2.phpt index 9a389a8beb..aa67869597 100644 --- a/ext/standard/tests/file/file_get_contents_file_put_contents_variation2.phpt +++ b/ext/standard/tests/file/file_get_contents_file_put_contents_variation2.phpt @@ -45,7 +45,7 @@ $file_path = dirname(__FILE__); unlink($file_path."/file_get_contents_variation2/file_get_contents_variation2.tmp"); rmdir($file_path."/file_get_contents_variation2"); ?> ---EXPECTF-- +--EXPECT-- *** Testing with variation in use_include_path argument *** string(240) "text text text text text text text text text text text text text text text text text text text text 22222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222221 Data1 in an array2 Data2 in an array" string(240) "text text text text text text text text text text text text text text text text text text text text 22222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222221 Data1 in an array2 Data2 in an array" diff --git a/ext/standard/tests/file/file_get_contents_variation3.phpt b/ext/standard/tests/file/file_get_contents_variation3.phpt index a302bf3e2f..9e8de27f3f 100644 --- a/ext/standard/tests/file/file_get_contents_variation3.phpt +++ b/ext/standard/tests/file/file_get_contents_variation3.phpt @@ -151,19 +151,19 @@ string(%d) "contents read" string(%d) "contents read" --empty array-- -Error: 2 - file_get_contents() expects parameter 2 to be boolean, array given, %s(%d) +Error: 2 - file_get_contents() expects parameter 2 to be bool, array given, %s(%d) NULL --int indexed array-- -Error: 2 - file_get_contents() expects parameter 2 to be boolean, array given, %s(%d) +Error: 2 - file_get_contents() expects parameter 2 to be bool, array given, %s(%d) NULL --associative array-- -Error: 2 - file_get_contents() expects parameter 2 to be boolean, array given, %s(%d) +Error: 2 - file_get_contents() expects parameter 2 to be bool, array given, %s(%d) NULL --nested arrays-- -Error: 2 - file_get_contents() expects parameter 2 to be boolean, array given, %s(%d) +Error: 2 - file_get_contents() expects parameter 2 to be bool, array given, %s(%d) NULL --uppercase NULL-- @@ -203,11 +203,11 @@ string(%d) "contents read" string(%d) "contents read" --instance of classWithToString-- -Error: 2 - file_get_contents() expects parameter 2 to be boolean, object given, %s(%d) +Error: 2 - file_get_contents() expects parameter 2 to be bool, object given, %s(%d) NULL --instance of classWithoutToString-- -Error: 2 - file_get_contents() expects parameter 2 to be boolean, object given, %s(%d) +Error: 2 - file_get_contents() expects parameter 2 to be bool, object given, %s(%d) NULL --undefined var-- diff --git a/ext/standard/tests/file/file_get_contents_variation4.phpt b/ext/standard/tests/file/file_get_contents_variation4.phpt index 0046937643..0ca7a6bf20 100644 --- a/ext/standard/tests/file/file_get_contents_variation4.phpt +++ b/ext/standard/tests/file/file_get_contents_variation4.phpt @@ -131,19 +131,19 @@ fclose($fileRes); *** Testing file_get_contents() : usage variation *** --int 0-- -Error: 2 - file_get_contents() expects parameter 3 to be resource, integer given, %s(%d) +Error: 2 - file_get_contents() expects parameter 3 to be resource, int given, %s(%d) NULL --int 1-- -Error: 2 - file_get_contents() expects parameter 3 to be resource, integer given, %s(%d) +Error: 2 - file_get_contents() expects parameter 3 to be resource, int given, %s(%d) NULL --int 12345-- -Error: 2 - file_get_contents() expects parameter 3 to be resource, integer given, %s(%d) +Error: 2 - file_get_contents() expects parameter 3 to be resource, int given, %s(%d) NULL --int -12345-- -Error: 2 - file_get_contents() expects parameter 3 to be resource, integer given, %s(%d) +Error: 2 - file_get_contents() expects parameter 3 to be resource, int given, %s(%d) NULL --float 10.5-- @@ -189,19 +189,19 @@ string(%d) "contents read" string(%d) "contents read" --lowercase true-- -Error: 2 - file_get_contents() expects parameter 3 to be resource, boolean given, %s(%d) +Error: 2 - file_get_contents() expects parameter 3 to be resource, bool given, %s(%d) NULL --lowercase false-- -Error: 2 - file_get_contents() expects parameter 3 to be resource, boolean given, %s(%d) +Error: 2 - file_get_contents() expects parameter 3 to be resource, bool given, %s(%d) NULL --uppercase TRUE-- -Error: 2 - file_get_contents() expects parameter 3 to be resource, boolean given, %s(%d) +Error: 2 - file_get_contents() expects parameter 3 to be resource, bool given, %s(%d) NULL --uppercase FALSE-- -Error: 2 - file_get_contents() expects parameter 3 to be resource, boolean given, %s(%d) +Error: 2 - file_get_contents() expects parameter 3 to be resource, bool given, %s(%d) NULL --empty string DQ-- diff --git a/ext/standard/tests/file/file_get_contents_variation5_32bit.phpt b/ext/standard/tests/file/file_get_contents_variation5_32bit.phpt index b63c0a1183..6cc2054589 100644 --- a/ext/standard/tests/file/file_get_contents_variation5_32bit.phpt +++ b/ext/standard/tests/file/file_get_contents_variation5_32bit.phpt @@ -152,30 +152,30 @@ Error: 2 - file_get_contents(): Failed to seek to position -22 in the stream, %s bool(false) --float 12.3456789000e10-- -Error: 2 - file_get_contents() expects parameter 4 to be integer, float given, %s(%d) +Error: 2 - file_get_contents() expects parameter 4 to be int, float given, %s(%d) NULL --float -12.3456789000e10-- -Error: 2 - file_get_contents() expects parameter 4 to be integer, float given, %s(%d) +Error: 2 - file_get_contents() expects parameter 4 to be int, float given, %s(%d) NULL --float .5-- string(%d) "contents read" --empty array-- -Error: 2 - file_get_contents() expects parameter 4 to be integer, array given, %s(%d) +Error: 2 - file_get_contents() expects parameter 4 to be int, array given, %s(%d) NULL --int indexed array-- -Error: 2 - file_get_contents() expects parameter 4 to be integer, array given, %s(%d) +Error: 2 - file_get_contents() expects parameter 4 to be int, array given, %s(%d) NULL --associative array-- -Error: 2 - file_get_contents() expects parameter 4 to be integer, array given, %s(%d) +Error: 2 - file_get_contents() expects parameter 4 to be int, array given, %s(%d) NULL --nested arrays-- -Error: 2 - file_get_contents() expects parameter 4 to be integer, array given, %s(%d) +Error: 2 - file_get_contents() expects parameter 4 to be int, array given, %s(%d) NULL --uppercase NULL-- @@ -197,35 +197,35 @@ string(12) "ontents read" string(%d) "contents read" --empty string DQ-- -Error: 2 - file_get_contents() expects parameter 4 to be integer, string given, %s(%d) +Error: 2 - file_get_contents() expects parameter 4 to be int, string given, %s(%d) NULL --empty string SQ-- -Error: 2 - file_get_contents() expects parameter 4 to be integer, string given, %s(%d) +Error: 2 - file_get_contents() expects parameter 4 to be int, string given, %s(%d) NULL --string DQ-- -Error: 2 - file_get_contents() expects parameter 4 to be integer, string given, %s(%d) +Error: 2 - file_get_contents() expects parameter 4 to be int, string given, %s(%d) NULL --string SQ-- -Error: 2 - file_get_contents() expects parameter 4 to be integer, string given, %s(%d) +Error: 2 - file_get_contents() expects parameter 4 to be int, string given, %s(%d) NULL --mixed case string-- -Error: 2 - file_get_contents() expects parameter 4 to be integer, string given, %s(%d) +Error: 2 - file_get_contents() expects parameter 4 to be int, string given, %s(%d) NULL --heredoc-- -Error: 2 - file_get_contents() expects parameter 4 to be integer, string given, %s(%d) +Error: 2 - file_get_contents() expects parameter 4 to be int, string given, %s(%d) NULL --instance of classWithToString-- -Error: 2 - file_get_contents() expects parameter 4 to be integer, object given, %s(%d) +Error: 2 - file_get_contents() expects parameter 4 to be int, object given, %s(%d) NULL --instance of classWithoutToString-- -Error: 2 - file_get_contents() expects parameter 4 to be integer, object given, %s(%d) +Error: 2 - file_get_contents() expects parameter 4 to be int, object given, %s(%d) NULL --undefined var-- diff --git a/ext/standard/tests/file/file_get_contents_variation5_64bit.phpt b/ext/standard/tests/file/file_get_contents_variation5_64bit.phpt index c02acb90d5..d0b74757d2 100644 --- a/ext/standard/tests/file/file_get_contents_variation5_64bit.phpt +++ b/ext/standard/tests/file/file_get_contents_variation5_64bit.phpt @@ -162,19 +162,19 @@ bool(false) string(%d) "contents read" --empty array-- -Error: 2 - file_get_contents() expects parameter 4 to be integer, array given, %s(%d) +Error: 2 - file_get_contents() expects parameter 4 to be int, array given, %s(%d) NULL --int indexed array-- -Error: 2 - file_get_contents() expects parameter 4 to be integer, array given, %s(%d) +Error: 2 - file_get_contents() expects parameter 4 to be int, array given, %s(%d) NULL --associative array-- -Error: 2 - file_get_contents() expects parameter 4 to be integer, array given, %s(%d) +Error: 2 - file_get_contents() expects parameter 4 to be int, array given, %s(%d) NULL --nested arrays-- -Error: 2 - file_get_contents() expects parameter 4 to be integer, array given, %s(%d) +Error: 2 - file_get_contents() expects parameter 4 to be int, array given, %s(%d) NULL --uppercase NULL-- @@ -196,35 +196,35 @@ string(12) "ontents read" string(%d) "contents read" --empty string DQ-- -Error: 2 - file_get_contents() expects parameter 4 to be integer, string given, %s(%d) +Error: 2 - file_get_contents() expects parameter 4 to be int, string given, %s(%d) NULL --empty string SQ-- -Error: 2 - file_get_contents() expects parameter 4 to be integer, string given, %s(%d) +Error: 2 - file_get_contents() expects parameter 4 to be int, string given, %s(%d) NULL --string DQ-- -Error: 2 - file_get_contents() expects parameter 4 to be integer, string given, %s(%d) +Error: 2 - file_get_contents() expects parameter 4 to be int, string given, %s(%d) NULL --string SQ-- -Error: 2 - file_get_contents() expects parameter 4 to be integer, string given, %s(%d) +Error: 2 - file_get_contents() expects parameter 4 to be int, string given, %s(%d) NULL --mixed case string-- -Error: 2 - file_get_contents() expects parameter 4 to be integer, string given, %s(%d) +Error: 2 - file_get_contents() expects parameter 4 to be int, string given, %s(%d) NULL --heredoc-- -Error: 2 - file_get_contents() expects parameter 4 to be integer, string given, %s(%d) +Error: 2 - file_get_contents() expects parameter 4 to be int, string given, %s(%d) NULL --instance of classWithToString-- -Error: 2 - file_get_contents() expects parameter 4 to be integer, object given, %s(%d) +Error: 2 - file_get_contents() expects parameter 4 to be int, object given, %s(%d) NULL --instance of classWithoutToString-- -Error: 2 - file_get_contents() expects parameter 4 to be integer, object given, %s(%d) +Error: 2 - file_get_contents() expects parameter 4 to be int, object given, %s(%d) NULL --undefined var-- diff --git a/ext/standard/tests/file/file_get_contents_variation6.phpt b/ext/standard/tests/file/file_get_contents_variation6.phpt index e8baf08eeb..f30cac10d2 100644 --- a/ext/standard/tests/file/file_get_contents_variation6.phpt +++ b/ext/standard/tests/file/file_get_contents_variation6.phpt @@ -142,19 +142,19 @@ bool(false) string(%d) "" --empty array-- -Error: 2 - file_get_contents() expects parameter 5 to be integer, array given, %s(%d) +Error: 2 - file_get_contents() expects parameter 5 to be int, array given, %s(%d) NULL --int indexed array-- -Error: 2 - file_get_contents() expects parameter 5 to be integer, array given, %s(%d) +Error: 2 - file_get_contents() expects parameter 5 to be int, array given, %s(%d) NULL --associative array-- -Error: 2 - file_get_contents() expects parameter 5 to be integer, array given, %s(%d) +Error: 2 - file_get_contents() expects parameter 5 to be int, array given, %s(%d) NULL --nested arrays-- -Error: 2 - file_get_contents() expects parameter 5 to be integer, array given, %s(%d) +Error: 2 - file_get_contents() expects parameter 5 to be int, array given, %s(%d) NULL --uppercase NULL-- @@ -176,35 +176,35 @@ string(%d) "c" string(%d) "" --empty string DQ-- -Error: 2 - file_get_contents() expects parameter 5 to be integer, string given, %s(%d) +Error: 2 - file_get_contents() expects parameter 5 to be int, string given, %s(%d) NULL --empty string SQ-- -Error: 2 - file_get_contents() expects parameter 5 to be integer, string given, %s(%d) +Error: 2 - file_get_contents() expects parameter 5 to be int, string given, %s(%d) NULL --string DQ-- -Error: 2 - file_get_contents() expects parameter 5 to be integer, string given, %s(%d) +Error: 2 - file_get_contents() expects parameter 5 to be int, string given, %s(%d) NULL --string SQ-- -Error: 2 - file_get_contents() expects parameter 5 to be integer, string given, %s(%d) +Error: 2 - file_get_contents() expects parameter 5 to be int, string given, %s(%d) NULL --mixed case string-- -Error: 2 - file_get_contents() expects parameter 5 to be integer, string given, %s(%d) +Error: 2 - file_get_contents() expects parameter 5 to be int, string given, %s(%d) NULL --heredoc-- -Error: 2 - file_get_contents() expects parameter 5 to be integer, string given, %s(%d) +Error: 2 - file_get_contents() expects parameter 5 to be int, string given, %s(%d) NULL --instance of classWithToString-- -Error: 2 - file_get_contents() expects parameter 5 to be integer, object given, %s(%d) +Error: 2 - file_get_contents() expects parameter 5 to be int, object given, %s(%d) NULL --instance of classWithoutToString-- -Error: 2 - file_get_contents() expects parameter 5 to be integer, object given, %s(%d) +Error: 2 - file_get_contents() expects parameter 5 to be int, object given, %s(%d) NULL --undefined var-- diff --git a/ext/standard/tests/file/file_get_contents_variation9.phpt b/ext/standard/tests/file/file_get_contents_variation9.phpt index 2a3e847e21..74e2cb4a6e 100644 --- a/ext/standard/tests/file/file_get_contents_variation9.phpt +++ b/ext/standard/tests/file/file_get_contents_variation9.phpt @@ -46,7 +46,7 @@ unlink($filename); echo "\n*** Done ***\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing file_get_contents() : variation *** string(330) "Here is a repeated amount of dataHere is a repeated amount of dataHere is a repeated amount of dataHere is a repeated amount of dataHere is a repeated amount of dataHere is a repeated amount of dataHere is a repeated amount of dataHere is a repeated amount of dataHere is a repeated amount of dataHere is a repeated amount of data" string(330) "Here is a repeated amount of dataHere is a repeated amount of dataHere is a repeated amount of dataHere is a repeated amount of dataHere is a repeated amount of dataHere is a repeated amount of dataHere is a repeated amount of dataHere is a repeated amount of dataHere is a repeated amount of dataHere is a repeated amount of data" diff --git a/ext/standard/tests/file/file_put_contents_variation1.phpt b/ext/standard/tests/file/file_put_contents_variation1.phpt index f9a2d0e7e2..b6f8815cd0 100644 --- a/ext/standard/tests/file/file_put_contents_variation1.phpt +++ b/ext/standard/tests/file/file_put_contents_variation1.phpt @@ -32,7 +32,7 @@ unlink($filename); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing file_put_contents() : variation *** int(25) int(18) diff --git a/ext/standard/tests/file/file_put_contents_variation3.phpt b/ext/standard/tests/file/file_put_contents_variation3.phpt index 58b952147a..74130007a7 100644 --- a/ext/standard/tests/file/file_put_contents_variation3.phpt +++ b/ext/standard/tests/file/file_put_contents_variation3.phpt @@ -130,19 +130,19 @@ fclose($fileRes); *** Testing file_put_contents() : usage variation *** --int 0-- -Error: 2 - file_put_contents() expects parameter 4 to be resource, integer given, %s(%d) +Error: 2 - file_put_contents() expects parameter 4 to be resource, int given, %s(%d) NULL --int 1-- -Error: 2 - file_put_contents() expects parameter 4 to be resource, integer given, %s(%d) +Error: 2 - file_put_contents() expects parameter 4 to be resource, int given, %s(%d) NULL --int 12345-- -Error: 2 - file_put_contents() expects parameter 4 to be resource, integer given, %s(%d) +Error: 2 - file_put_contents() expects parameter 4 to be resource, int given, %s(%d) NULL --int -12345-- -Error: 2 - file_put_contents() expects parameter 4 to be resource, integer given, %s(%d) +Error: 2 - file_put_contents() expects parameter 4 to be resource, int given, %s(%d) NULL --float 10.5-- @@ -188,19 +188,19 @@ int(13) int(13) --lowercase true-- -Error: 2 - file_put_contents() expects parameter 4 to be resource, boolean given, %s(%d) +Error: 2 - file_put_contents() expects parameter 4 to be resource, bool given, %s(%d) NULL --lowercase false-- -Error: 2 - file_put_contents() expects parameter 4 to be resource, boolean given, %s(%d) +Error: 2 - file_put_contents() expects parameter 4 to be resource, bool given, %s(%d) NULL --uppercase TRUE-- -Error: 2 - file_put_contents() expects parameter 4 to be resource, boolean given, %s(%d) +Error: 2 - file_put_contents() expects parameter 4 to be resource, bool given, %s(%d) NULL --uppercase FALSE-- -Error: 2 - file_put_contents() expects parameter 4 to be resource, boolean given, %s(%d) +Error: 2 - file_put_contents() expects parameter 4 to be resource, bool given, %s(%d) NULL --empty string DQ-- diff --git a/ext/standard/tests/file/file_variation.phpt b/ext/standard/tests/file/file_variation.phpt index 050f21a071..bd4366b945 100644 --- a/ext/standard/tests/file/file_variation.phpt +++ b/ext/standard/tests/file/file_variation.phpt @@ -63,7 +63,7 @@ unlink($file_path."/file3_variation.tmp"); rmdir($file_path."/file_variation"); ?> ---EXPECTF-- +--EXPECT-- *** Using various flags values with different data in a file --Iteration 1 -- array(1) { diff --git a/ext/standard/tests/file/file_variation3.phpt b/ext/standard/tests/file/file_variation3.phpt index 9001a84318..014adec6d8 100644 --- a/ext/standard/tests/file/file_variation3.phpt +++ b/ext/standard/tests/file/file_variation3.phpt @@ -151,19 +151,19 @@ array(3) { } --empty array-- -Error: 2 - file() expects parameter 2 to be integer, array given, %s(%d) +Error: 2 - file() expects parameter 2 to be int, array given, %s(%d) NULL --int indexed array-- -Error: 2 - file() expects parameter 2 to be integer, array given, %s(%d) +Error: 2 - file() expects parameter 2 to be int, array given, %s(%d) NULL --associative array-- -Error: 2 - file() expects parameter 2 to be integer, array given, %s(%d) +Error: 2 - file() expects parameter 2 to be int, array given, %s(%d) NULL --nested arrays-- -Error: 2 - file() expects parameter 2 to be integer, array given, %s(%d) +Error: 2 - file() expects parameter 2 to be int, array given, %s(%d) NULL --uppercase NULL-- @@ -239,35 +239,35 @@ array(3) { } --empty string DQ-- -Error: 2 - file() expects parameter 2 to be integer, string given, %s(%d) +Error: 2 - file() expects parameter 2 to be int, string given, %s(%d) NULL --empty string SQ-- -Error: 2 - file() expects parameter 2 to be integer, string given, %s(%d) +Error: 2 - file() expects parameter 2 to be int, string given, %s(%d) NULL --string DQ-- -Error: 2 - file() expects parameter 2 to be integer, string given, %s(%d) +Error: 2 - file() expects parameter 2 to be int, string given, %s(%d) NULL --string SQ-- -Error: 2 - file() expects parameter 2 to be integer, string given, %s(%d) +Error: 2 - file() expects parameter 2 to be int, string given, %s(%d) NULL --mixed case string-- -Error: 2 - file() expects parameter 2 to be integer, string given, %s(%d) +Error: 2 - file() expects parameter 2 to be int, string given, %s(%d) NULL --heredoc-- -Error: 2 - file() expects parameter 2 to be integer, string given, %s(%d) +Error: 2 - file() expects parameter 2 to be int, string given, %s(%d) NULL --instance of classWithToString-- -Error: 2 - file() expects parameter 2 to be integer, object given, %s(%d) +Error: 2 - file() expects parameter 2 to be int, object given, %s(%d) NULL --instance of classWithoutToString-- -Error: 2 - file() expects parameter 2 to be integer, object given, %s(%d) +Error: 2 - file() expects parameter 2 to be int, object given, %s(%d) NULL --undefined var-- diff --git a/ext/standard/tests/file/file_variation4.phpt b/ext/standard/tests/file/file_variation4.phpt index 084fc9db56..103c2b0af6 100644 --- a/ext/standard/tests/file/file_variation4.phpt +++ b/ext/standard/tests/file/file_variation4.phpt @@ -129,19 +129,19 @@ unlink($filename); *** Testing file() : usage variation *** --int 0-- -Error: 2 - file() expects parameter 3 to be resource, integer given, %s(%d) +Error: 2 - file() expects parameter 3 to be resource, int given, %s(%d) NULL --int 1-- -Error: 2 - file() expects parameter 3 to be resource, integer given, %s(%d) +Error: 2 - file() expects parameter 3 to be resource, int given, %s(%d) NULL --int 12345-- -Error: 2 - file() expects parameter 3 to be resource, integer given, %s(%d) +Error: 2 - file() expects parameter 3 to be resource, int given, %s(%d) NULL --int -12345-- -Error: 2 - file() expects parameter 3 to be resource, integer given, %s(%d) +Error: 2 - file() expects parameter 3 to be resource, int given, %s(%d) NULL --float 10.5-- @@ -205,19 +205,19 @@ array(3) { } --lowercase true-- -Error: 2 - file() expects parameter 3 to be resource, boolean given, %s(%d) +Error: 2 - file() expects parameter 3 to be resource, bool given, %s(%d) NULL --lowercase false-- -Error: 2 - file() expects parameter 3 to be resource, boolean given, %s(%d) +Error: 2 - file() expects parameter 3 to be resource, bool given, %s(%d) NULL --uppercase TRUE-- -Error: 2 - file() expects parameter 3 to be resource, boolean given, %s(%d) +Error: 2 - file() expects parameter 3 to be resource, bool given, %s(%d) NULL --uppercase FALSE-- -Error: 2 - file() expects parameter 3 to be resource, boolean given, %s(%d) +Error: 2 - file() expects parameter 3 to be resource, bool given, %s(%d) NULL --empty string DQ-- diff --git a/ext/standard/tests/file/file_variation9.phpt b/ext/standard/tests/file/file_variation9.phpt index 7daf612fa2..dca79ff7b2 100644 --- a/ext/standard/tests/file/file_variation9.phpt +++ b/ext/standard/tests/file/file_variation9.phpt @@ -32,7 +32,7 @@ foreach ($contents as $content) { echo "\n*** Done ***\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing file() : variation *** array(2) { [0]=> diff --git a/ext/standard/tests/file/filesize_variation1-win32-mb.phpt b/ext/standard/tests/file/filesize_variation1-win32-mb.phpt index 66e193c201..888fca546b 100644 --- a/ext/standard/tests/file/filesize_variation1-win32-mb.phpt +++ b/ext/standard/tests/file/filesize_variation1-win32-mb.phpt @@ -29,7 +29,7 @@ for($size = 1; $size <10000; $size = $size+1000) echo "*** Done ***\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing filesize(): usage variations *** *** Checking filesize() with different size of files *** int(1024) diff --git a/ext/standard/tests/file/filesize_variation1-win32.phpt b/ext/standard/tests/file/filesize_variation1-win32.phpt index 18aeaddafd..30d7475fd8 100644 --- a/ext/standard/tests/file/filesize_variation1-win32.phpt +++ b/ext/standard/tests/file/filesize_variation1-win32.phpt @@ -29,7 +29,7 @@ for($size = 1; $size <10000; $size = $size+1000) echo "*** Done ***\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing filesize(): usage variations *** *** Checking filesize() with different size of files *** int(1024) diff --git a/ext/standard/tests/file/filesize_variation2-win32.phpt b/ext/standard/tests/file/filesize_variation2-win32.phpt index 71577d8301..132ecd7e9f 100644 --- a/ext/standard/tests/file/filesize_variation2-win32.phpt +++ b/ext/standard/tests/file/filesize_variation2-win32.phpt @@ -64,7 +64,7 @@ unlink($file_path."/filesize_variation2/filesize_variation2_sub/filesize_variati rmdir($file_path."/filesize_variation2/filesize_variation2_sub"); rmdir($file_path."/filesize_variation2"); ?> ---EXPECTF-- +--EXPECT-- *** Testing filesize(): usage variations *** *** Testing size of a dir, sub-dir and file with filesize() *** diff --git a/ext/standard/tests/file/filesize_variation4-win32.phpt b/ext/standard/tests/file/filesize_variation4-win32.phpt index 08e141707e..f954401891 100644 --- a/ext/standard/tests/file/filesize_variation4-win32.phpt +++ b/ext/standard/tests/file/filesize_variation4-win32.phpt @@ -83,7 +83,7 @@ $file_path = dirname(__FILE__); unlink($file_path."/filesize_variation4.tmp"); unlink($file_path."/filesize_variation4_empty.tmp"); ?> ---EXPECTF-- +--EXPECT-- *** Testing filesize(): usage variations *** *** Testing filesize() with data written using different file modes and by creating holes in file *** diff --git a/ext/standard/tests/file/filesize_variation4.phpt b/ext/standard/tests/file/filesize_variation4.phpt index 0770f1d2ba..f0baedb378 100644 --- a/ext/standard/tests/file/filesize_variation4.phpt +++ b/ext/standard/tests/file/filesize_variation4.phpt @@ -85,7 +85,7 @@ $file_path = dirname(__FILE__); unlink($file_path."/filesize_variation4.tmp"); unlink($file_path."/filesize_variation4_empty.tmp"); ?> ---EXPECTF-- +--EXPECT-- *** Testing filesize(): usage variations *** *** Testing filesize() with data written using different file modes and by creating holes in file *** diff --git a/ext/standard/tests/file/filetype_basic.phpt b/ext/standard/tests/file/filetype_basic.phpt index b8ff92f18a..b56c19065d 100644 --- a/ext/standard/tests/file/filetype_basic.phpt +++ b/ext/standard/tests/file/filetype_basic.phpt @@ -15,7 +15,7 @@ print( filetype(".") )."\n"; echo "*** Done ***\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing filetype() with files and dirs *** file dir diff --git a/ext/standard/tests/file/filetype_variation.phpt b/ext/standard/tests/file/filetype_variation.phpt index 4a96b71e1c..b6b306a37a 100644 --- a/ext/standard/tests/file/filetype_variation.phpt +++ b/ext/standard/tests/file/filetype_variation.phpt @@ -61,7 +61,7 @@ unlink($file3); echo "\n*** Done ***\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing filetype() with various types *** -- Checking with files -- file diff --git a/ext/standard/tests/file/filetype_variation2.phpt b/ext/standard/tests/file/filetype_variation2.phpt index df86f67763..1c276a2957 100644 --- a/ext/standard/tests/file/filetype_variation2.phpt +++ b/ext/standard/tests/file/filetype_variation2.phpt @@ -23,7 +23,7 @@ echo "-- Checking for char --\n"; print( filetype("/dev/null") )."\n"; ?> ===DONE=== ---EXPECTF-- +--EXPECT-- -- Checking for char -- char ===DONE=== diff --git a/ext/standard/tests/file/filetype_variation3.phpt b/ext/standard/tests/file/filetype_variation3.phpt index e02cafced8..eb82a4d149 100644 --- a/ext/standard/tests/file/filetype_variation3.phpt +++ b/ext/standard/tests/file/filetype_variation3.phpt @@ -23,7 +23,7 @@ echo "-- Checking for block --\n"; print( filetype("/dev/ram0") )."\n"; ?> ===DONE=== ---EXPECTF-- +--EXPECT-- -- Checking for block -- block ===DONE=== diff --git a/ext/standard/tests/file/flock_basic.phpt b/ext/standard/tests/file/flock_basic.phpt index 99b1ba1c59..ddfb136f64 100644 --- a/ext/standard/tests/file/flock_basic.phpt +++ b/ext/standard/tests/file/flock_basic.phpt @@ -30,7 +30,7 @@ rmdir("$file_path/dir"); echo "\n*** Done ***\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing flock() fun with file and dir *** bool(true) bool(true) diff --git a/ext/standard/tests/file/flock_error.phpt b/ext/standard/tests/file/flock_error.phpt index afb68b5337..ccb6274756 100644 --- a/ext/standard/tests/file/flock_error.phpt +++ b/ext/standard/tests/file/flock_error.phpt @@ -75,23 +75,23 @@ Warning: flock(): Illegal operation argument in %s on line %d bool(false) --- Iteration 4 --- -Warning: flock() expects parameter 2 to be integer, array given in %s on line %d +Warning: flock() expects parameter 2 to be int, array given in %s on line %d NULL --- Iteration 5 --- -Warning: flock() expects parameter 2 to be integer, array given in %s on line %d +Warning: flock() expects parameter 2 to be int, array given in %s on line %d NULL --- Iteration 6 --- -Warning: flock() expects parameter 2 to be integer, string given in %s on line %d +Warning: flock() expects parameter 2 to be int, string given in %s on line %d NULL --- Iteration 7 --- -Warning: flock() expects parameter 2 to be integer, string given in %s on line %d +Warning: flock() expects parameter 2 to be int, string given in %s on line %d NULL --- Iteration 8 --- -Warning: flock() expects parameter 2 to be integer, string given in %s on line %d +Warning: flock() expects parameter 2 to be int, string given in %s on line %d NULL Warning: flock(): supplied resource is not a valid stream resource in %s on line %d diff --git a/ext/standard/tests/file/flock_variation.phpt b/ext/standard/tests/file/flock_variation.phpt index ff0a4bbe61..0fd2be4606 100644 --- a/ext/standard/tests/file/flock_variation.phpt +++ b/ext/standard/tests/file/flock_variation.phpt @@ -64,7 +64,7 @@ fclose($fp); echo "\n*** Done ***\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing flock() fun with the various operation and wouldblock values *** --- Outer iteration 0 --- diff --git a/ext/standard/tests/file/fopen_unlink.phpt b/ext/standard/tests/file/fopen_unlink.phpt new file mode 100644 index 0000000000..c069ea1b94 --- /dev/null +++ b/ext/standard/tests/file/fopen_unlink.phpt @@ -0,0 +1,34 @@ +--TEST-- +Test fopen() function : check fopen()ed descriptor is usable after the fs object is removed +--FILE-- +<?php + +var_dump( + $p = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'tututu', + $f = fopen($p, 'w+'), + unlink($p), + file_exists($p), + fwrite($f, 'hello'), + fseek($f, 0), + fread($f, 16), + fwrite($f, 'world'), + fseek($f, 0), + fread($f, 16), + fclose($f) +); + +?> +===DONE=== +--EXPECTF-- +string(%d) "%stututu" +resource(%s) of type (Unknown) +bool(true) +bool(false) +int(5) +int(0) +string(5) "hello" +int(5) +int(0) +string(10) "helloworld" +bool(true) +===DONE=== diff --git a/ext/standard/tests/file/fopen_variation10-win32.phpt b/ext/standard/tests/file/fopen_variation10-win32.phpt index 09dec0ae30..19b2e6507e 100644 --- a/ext/standard/tests/file/fopen_variation10-win32.phpt +++ b/ext/standard/tests/file/fopen_variation10-win32.phpt @@ -98,21 +98,21 @@ file in root Warning: fopen(c\fopen_variation10.tmp): failed to open stream: No such file or directory in %s on line %d file not opened for read -Warning: fclose() expects parameter 1 to be resource, boolean given in %s on line %d +Warning: fclose() expects parameter 1 to be resource, bool given in %s on line %d --\-- Warning: fopen(\\fopen_variation10.tmp): failed to open stream: Invalid argument in %s on line %d file not opened for read -Warning: fclose() expects parameter 1 to be resource, boolean given in %s on line %d +Warning: fclose() expects parameter 1 to be resource, bool given in %s on line %d --/-- Warning: fopen(/\fopen_variation10.tmp): failed to open stream: Invalid argument in %s on line %d file not opened for read -Warning: fclose() expects parameter 1 to be resource, boolean given in %s on line %d +Warning: fclose() expects parameter 1 to be resource, bool given in %s on line %d --c:fopen10.tmpdirTwo-- file in fopen10.tmpdirTwo @@ -122,7 +122,7 @@ file in fopen10.tmpdirTwo Warning: fopen(c:adir\fopen_variation10.tmp): failed to open stream: No such file or directory in %s on line %d file not opened for read -Warning: fclose() expects parameter 1 to be resource, boolean given in %s on line %d +Warning: fclose() expects parameter 1 to be resource, bool given in %s on line %d --c:\/-- file in root @@ -144,5 +144,5 @@ file in fopen10.tmpDir Warning: fopen(/sortout\fopen_variation10.tmp): failed to open stream: No such file or directory in %s on line %d file not opened for read -Warning: fclose() expects parameter 1 to be resource, boolean given in %s on line %d +Warning: fclose() expects parameter 1 to be resource, bool given in %s on line %d ===DONE=== diff --git a/ext/standard/tests/file/fopen_variation11-win32.phpt b/ext/standard/tests/file/fopen_variation11-win32.phpt index 0e126d82b8..8d8d36fe92 100644 --- a/ext/standard/tests/file/fopen_variation11-win32.phpt +++ b/ext/standard/tests/file/fopen_variation11-win32.phpt @@ -96,21 +96,21 @@ file in root Warning: fopen(c\fopen_variation11.tmp): failed to open stream: No such file or directory in %s on line %d file not opened for read -Warning: fclose() expects parameter 1 to be resource, boolean given in %s on line %d +Warning: fclose() expects parameter 1 to be resource, bool given in %s on line %d --\-- Warning: fopen(\\FOPEN_VARIATION11.TMP): failed to open stream: Invalid argument in %s on line %d file not opened for read -Warning: fclose() expects parameter 1 to be resource, boolean given in %s on line %d +Warning: fclose() expects parameter 1 to be resource, bool given in %s on line %d --/-- Warning: fopen(\\FOPEN_VARIATION11.TMP): failed to open stream: Invalid argument in %s on line %d file not opened for read -Warning: fclose() expects parameter 1 to be resource, boolean given in %s on line %d +Warning: fclose() expects parameter 1 to be resource, bool given in %s on line %d --c:fopen11.tmpdirTwo-- file in fopen11.tmpdirTwo @@ -120,7 +120,7 @@ file in fopen11.tmpdirTwo Warning: fopen(c:adir\fopen_variation11.tmp): failed to open stream: No such file or directory in %s on line %d file not opened for read -Warning: fclose() expects parameter 1 to be resource, boolean given in %s on line %d +Warning: fclose() expects parameter 1 to be resource, bool given in %s on line %d --c:\/-- file in root @@ -142,5 +142,5 @@ file in fopen11.tmpDir Warning: fopen(/sortout\fopen_variation11.tmp): failed to open stream: No such file or directory in %s on line %d file not opened for read -Warning: fclose() expects parameter 1 to be resource, boolean given in %s on line %d +Warning: fclose() expects parameter 1 to be resource, bool given in %s on line %d ===DONE=== diff --git a/ext/standard/tests/file/fopen_variation3.phpt b/ext/standard/tests/file/fopen_variation3.phpt index 7430471623..fb00b243fc 100644 --- a/ext/standard/tests/file/fopen_variation3.phpt +++ b/ext/standard/tests/file/fopen_variation3.phpt @@ -151,19 +151,19 @@ ok ok --empty array-- -Error: 2 - fopen() expects parameter 3 to be boolean, array given, %s(%d) +Error: 2 - fopen() expects parameter 3 to be bool, array given, %s(%d) bool(false) --int indexed array-- -Error: 2 - fopen() expects parameter 3 to be boolean, array given, %s(%d) +Error: 2 - fopen() expects parameter 3 to be bool, array given, %s(%d) bool(false) --associative array-- -Error: 2 - fopen() expects parameter 3 to be boolean, array given, %s(%d) +Error: 2 - fopen() expects parameter 3 to be bool, array given, %s(%d) bool(false) --nested arrays-- -Error: 2 - fopen() expects parameter 3 to be boolean, array given, %s(%d) +Error: 2 - fopen() expects parameter 3 to be bool, array given, %s(%d) bool(false) --uppercase NULL-- @@ -203,11 +203,11 @@ ok ok --instance of classWithToString-- -Error: 2 - fopen() expects parameter 3 to be boolean, object given, %s(%d) +Error: 2 - fopen() expects parameter 3 to be bool, object given, %s(%d) bool(false) --instance of classWithoutToString-- -Error: 2 - fopen() expects parameter 3 to be boolean, object given, %s(%d) +Error: 2 - fopen() expects parameter 3 to be bool, object given, %s(%d) bool(false) --undefined var-- diff --git a/ext/standard/tests/file/fopen_variation4.phpt b/ext/standard/tests/file/fopen_variation4.phpt index c6bc089912..15f9e60c5a 100644 --- a/ext/standard/tests/file/fopen_variation4.phpt +++ b/ext/standard/tests/file/fopen_variation4.phpt @@ -130,19 +130,19 @@ fclose($fileresource); *** Testing fopen() : usage variation *** --int 0-- -Error: 2 - fopen() expects parameter 4 to be resource, integer given, %s(%d) +Error: 2 - fopen() expects parameter 4 to be resource, int given, %s(%d) bool(false) --int 1-- -Error: 2 - fopen() expects parameter 4 to be resource, integer given, %s(%d) +Error: 2 - fopen() expects parameter 4 to be resource, int given, %s(%d) bool(false) --int 12345-- -Error: 2 - fopen() expects parameter 4 to be resource, integer given, %s(%d) +Error: 2 - fopen() expects parameter 4 to be resource, int given, %s(%d) bool(false) --int -12345-- -Error: 2 - fopen() expects parameter 4 to be resource, integer given, %s(%d) +Error: 2 - fopen() expects parameter 4 to be resource, int given, %s(%d) bool(false) --float 10.5-- @@ -182,27 +182,25 @@ Error: 2 - fopen() expects parameter 4 to be resource, array given, %s(%d) bool(false) --uppercase NULL-- -Error: 2 - fopen() expects parameter 4 to be resource, null given, %s(%d) -bool(false) +ok --lowercase null-- -Error: 2 - fopen() expects parameter 4 to be resource, null given, %s(%d) -bool(false) +ok --lowercase true-- -Error: 2 - fopen() expects parameter 4 to be resource, boolean given, %s(%d) +Error: 2 - fopen() expects parameter 4 to be resource, bool given, %s(%d) bool(false) --lowercase false-- -Error: 2 - fopen() expects parameter 4 to be resource, boolean given, %s(%d) +Error: 2 - fopen() expects parameter 4 to be resource, bool given, %s(%d) bool(false) --uppercase TRUE-- -Error: 2 - fopen() expects parameter 4 to be resource, boolean given, %s(%d) +Error: 2 - fopen() expects parameter 4 to be resource, bool given, %s(%d) bool(false) --uppercase FALSE-- -Error: 2 - fopen() expects parameter 4 to be resource, boolean given, %s(%d) +Error: 2 - fopen() expects parameter 4 to be resource, bool given, %s(%d) bool(false) --empty string DQ-- @@ -238,12 +236,10 @@ Error: 2 - fopen() expects parameter 4 to be resource, object given, %s(%d) bool(false) --undefined var-- -Error: 2 - fopen() expects parameter 4 to be resource, null given, %s(%d) -bool(false) +ok --unset var-- -Error: 2 - fopen() expects parameter 4 to be resource, null given, %s(%d) -bool(false) +ok --file resource-- Error: 2 - fopen(): supplied resource is not a valid Stream-Context resource, %s(%d) diff --git a/ext/standard/tests/file/fopen_variation5.phpt b/ext/standard/tests/file/fopen_variation5.phpt index 9cc097bf80..b7e4e0a4cb 100644 --- a/ext/standard/tests/file/fopen_variation5.phpt +++ b/ext/standard/tests/file/fopen_variation5.phpt @@ -123,7 +123,7 @@ function test_fopen($mode) { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- --- testing include path --- ** testing with mode=r ** diff --git a/ext/standard/tests/file/fopen_variation6.phpt b/ext/standard/tests/file/fopen_variation6.phpt index 7bfb7c0ef5..a3ce051deb 100644 --- a/ext/standard/tests/file/fopen_variation6.phpt +++ b/ext/standard/tests/file/fopen_variation6.phpt @@ -37,7 +37,7 @@ unlink($absfile); unlink($relfile); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing fopen() : variation *** This is an absolute file This is a relative file diff --git a/ext/standard/tests/file/fopen_variation8.phpt b/ext/standard/tests/file/fopen_variation8.phpt index 408dbe61b5..221b6e62ef 100644 --- a/ext/standard/tests/file/fopen_variation8.phpt +++ b/ext/standard/tests/file/fopen_variation8.phpt @@ -122,7 +122,7 @@ function test_fopen($mode) { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- --- testing include path --- ** testing with mode=r ** diff --git a/ext/standard/tests/file/fpassthru_basic.phpt b/ext/standard/tests/file/fpassthru_basic.phpt index 8555f3782a..162c6f77ec 100644 --- a/ext/standard/tests/file/fpassthru_basic.phpt +++ b/ext/standard/tests/file/fpassthru_basic.phpt @@ -62,7 +62,7 @@ echo "*** Done ***\n"; <?php unlink(dirname(__FILE__)."/passthru.tmp"); ?> ---EXPECTF-- +--EXPECT-- *** Test basic functionality of fpassthru() function *** -- Before seek operation -- diff --git a/ext/standard/tests/file/fpassthru_error.phpt b/ext/standard/tests/file/fpassthru_error.phpt index 64d24d60b5..4ff028de6f 100644 --- a/ext/standard/tests/file/fpassthru_error.phpt +++ b/ext/standard/tests/file/fpassthru_error.phpt @@ -28,7 +28,7 @@ echo "\n*** Done ***\n"; Warning: fread() expects parameter 1 to be resource, string given in %s on line %d -Warning: fpassthru() expects parameter 1 to be resource, boolean given in %s on line %d +Warning: fpassthru() expects parameter 1 to be resource, bool given in %s on line %d bool(false) Warning: fpassthru() expects exactly 1 parameter, 0 given in %s on line %d diff --git a/ext/standard/tests/file/fpassthru_variation.phpt b/ext/standard/tests/file/fpassthru_variation.phpt index f27f959074..080549f03b 100644 --- a/ext/standard/tests/file/fpassthru_variation.phpt +++ b/ext/standard/tests/file/fpassthru_variation.phpt @@ -71,7 +71,7 @@ unlink($file_name); echo "\n*** Done ***\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fpassthru() function with files *** --- Testing with different offsets --- diff --git a/ext/standard/tests/file/fpassthru_variation1.phpt b/ext/standard/tests/file/fpassthru_variation1.phpt index 68d3bfe041..2df9b1ce20 100644 --- a/ext/standard/tests/file/fpassthru_variation1.phpt +++ b/ext/standard/tests/file/fpassthru_variation1.phpt @@ -88,22 +88,22 @@ echo "Done"; Arg value 0 -Warning: fpassthru() expects parameter 1 to be resource, integer given in %s on line %d +Warning: fpassthru() expects parameter 1 to be resource, int given in %s on line %d bool(false) Arg value 1 -Warning: fpassthru() expects parameter 1 to be resource, integer given in %s on line %d +Warning: fpassthru() expects parameter 1 to be resource, int given in %s on line %d bool(false) Arg value 12345 -Warning: fpassthru() expects parameter 1 to be resource, integer given in %s on line %d +Warning: fpassthru() expects parameter 1 to be resource, int given in %s on line %d bool(false) Arg value -2345 -Warning: fpassthru() expects parameter 1 to be resource, integer given in %s on line %d +Warning: fpassthru() expects parameter 1 to be resource, int given in %s on line %d bool(false) Arg value 10.5 @@ -168,22 +168,22 @@ bool(false) Arg value 1 -Warning: fpassthru() expects parameter 1 to be resource, boolean given in %s on line %d +Warning: fpassthru() expects parameter 1 to be resource, bool given in %s on line %d bool(false) Arg value -Warning: fpassthru() expects parameter 1 to be resource, boolean given in %s on line %d +Warning: fpassthru() expects parameter 1 to be resource, bool given in %s on line %d bool(false) Arg value 1 -Warning: fpassthru() expects parameter 1 to be resource, boolean given in %s on line %d +Warning: fpassthru() expects parameter 1 to be resource, bool given in %s on line %d bool(false) Arg value -Warning: fpassthru() expects parameter 1 to be resource, boolean given in %s on line %d +Warning: fpassthru() expects parameter 1 to be resource, bool given in %s on line %d bool(false) Arg value diff --git a/ext/standard/tests/file/fputcsv_error.phpt b/ext/standard/tests/file/fputcsv_error.phpt index 4f9fca9b95..779ffcc060 100644 --- a/ext/standard/tests/file/fputcsv_error.phpt +++ b/ext/standard/tests/file/fputcsv_error.phpt @@ -63,7 +63,7 @@ NULL Warning: fputcsv() expects at least 2 parameters, 1 given in %s on line %d NULL -Warning: fputcsv() expects parameter 1 to be resource, integer given in %s on line %d +Warning: fputcsv() expects parameter 1 to be resource, int given in %s on line %d NULL -- Iteration 3 -- @@ -77,7 +77,7 @@ NULL Warning: fputcsv() expects at least 2 parameters, 1 given in %s on line %d NULL -Warning: fputcsv() expects parameter 1 to be resource, boolean given in %s on line %d +Warning: fputcsv() expects parameter 1 to be resource, bool given in %s on line %d NULL -- Iteration 5 -- diff --git a/ext/standard/tests/file/fread_basic.phpt b/ext/standard/tests/file/fread_basic.phpt index c88491f17c..5f009f5514 100644 --- a/ext/standard/tests/file/fread_basic.phpt +++ b/ext/standard/tests/file/fread_basic.phpt @@ -99,7 +99,7 @@ $file_content_types = array("numeric","text","text_with_new_line","alphanumeric" } // end of outer foreach loop echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fread() basic operations *** -- Testing fread) with file having data of type numeric -- diff --git a/ext/standard/tests/file/fread_error.phpt b/ext/standard/tests/file/fread_error.phpt index 5fbb9bef29..1c4068cd97 100644 --- a/ext/standard/tests/file/fread_error.phpt +++ b/ext/standard/tests/file/fread_error.phpt @@ -81,7 +81,7 @@ Warning: fread() expects parameter 1 to be resource, string given in %s on line bool(false) -- Iteration 2 -- -Warning: fread() expects parameter 1 to be resource, integer given in %s on line %d +Warning: fread() expects parameter 1 to be resource, int given in %s on line %d bool(false) -- Iteration 3 -- @@ -89,7 +89,7 @@ Warning: fread() expects parameter 1 to be resource, float given in %s on line % bool(false) -- Iteration 4 -- -Warning: fread() expects parameter 1 to be resource, boolean given in %s on line %d +Warning: fread() expects parameter 1 to be resource, bool given in %s on line %d bool(false) -- Iteration 5 -- diff --git a/ext/standard/tests/file/fread_variation1.phpt b/ext/standard/tests/file/fread_variation1.phpt index 5623f771f0..143f3bd123 100644 --- a/ext/standard/tests/file/fread_variation1.phpt +++ b/ext/standard/tests/file/fread_variation1.phpt @@ -104,7 +104,7 @@ foreach($file_content_types as $file_content_type) { echo"Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fread() : usage variations *** -- Testing fread() with file having content of type numeric -- diff --git a/ext/standard/tests/file/fread_variation2.phpt b/ext/standard/tests/file/fread_variation2.phpt index 1dc87c537c..a0c9320854 100644 --- a/ext/standard/tests/file/fread_variation2.phpt +++ b/ext/standard/tests/file/fread_variation2.phpt @@ -103,7 +103,7 @@ foreach($file_content_types as $file_content_type) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fread() : usage variations *** -- Testing fread() with file having content of type numeric -- diff --git a/ext/standard/tests/file/fread_variation3-win32-mb.phpt b/ext/standard/tests/file/fread_variation3-win32-mb.phpt index 7afa2cae31..a25feef5e7 100644 --- a/ext/standard/tests/file/fread_variation3-win32-mb.phpt +++ b/ext/standard/tests/file/fread_variation3-win32-mb.phpt @@ -109,7 +109,7 @@ foreach($file_content_types as $file_content_type) { echo"Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fread() : usage variations *** -- Testing fread() with file having content of type numeric -- diff --git a/ext/standard/tests/file/fread_variation3-win32.phpt b/ext/standard/tests/file/fread_variation3-win32.phpt index 1a7a6d238e..44d6ebd697 100644 --- a/ext/standard/tests/file/fread_variation3-win32.phpt +++ b/ext/standard/tests/file/fread_variation3-win32.phpt @@ -109,7 +109,7 @@ foreach($file_content_types as $file_content_type) { echo"Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fread() : usage variations *** -- Testing fread() with file having content of type numeric -- diff --git a/ext/standard/tests/file/fread_variation3.phpt b/ext/standard/tests/file/fread_variation3.phpt index 5eef8bb604..cd03ec2197 100644 --- a/ext/standard/tests/file/fread_variation3.phpt +++ b/ext/standard/tests/file/fread_variation3.phpt @@ -109,7 +109,7 @@ foreach($file_content_types as $file_content_type) { echo"Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fread() : usage variations *** -- Testing fread() with file having content of type numeric -- diff --git a/ext/standard/tests/file/fread_variation4-win32.phpt b/ext/standard/tests/file/fread_variation4-win32.phpt index 04d20b844b..6de3bc571f 100644 --- a/ext/standard/tests/file/fread_variation4-win32.phpt +++ b/ext/standard/tests/file/fread_variation4-win32.phpt @@ -107,7 +107,7 @@ foreach($file_content_types as $file_content_type) { echo"Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fread() : usage variations *** -- Testing fread() with file having content of type numeric -- diff --git a/ext/standard/tests/file/fread_variation4.phpt b/ext/standard/tests/file/fread_variation4.phpt index 1c30c21e60..a77fc56517 100644 --- a/ext/standard/tests/file/fread_variation4.phpt +++ b/ext/standard/tests/file/fread_variation4.phpt @@ -107,7 +107,7 @@ foreach($file_content_types as $file_content_type) { echo"Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fread() : usage variations *** -- Testing fread() with file having content of type numeric -- diff --git a/ext/standard/tests/file/fscanf_variation1.phpt b/ext/standard/tests/file/fscanf_variation1.phpt index af7d601d0b..d9ccf22192 100644 --- a/ext/standard/tests/file/fscanf_variation1.phpt +++ b/ext/standard/tests/file/fscanf_variation1.phpt @@ -38,7 +38,7 @@ $file_path = dirname(__FILE__); $filename = "$file_path/fscanf_variation1.tmp"; unlink($filename); ?> ---EXPECTF-- +--EXPECT-- *** Testing fscanf(): for its return type without third argument *** bool(true) array(1) { diff --git a/ext/standard/tests/file/fscanf_variation2.phpt b/ext/standard/tests/file/fscanf_variation2.phpt index d1a8c471f9..19b60ab8e2 100644 --- a/ext/standard/tests/file/fscanf_variation2.phpt +++ b/ext/standard/tests/file/fscanf_variation2.phpt @@ -20,7 +20,7 @@ $file_handle = fopen($filename, "w"); if($file_handle == false) exit("Error:failed to open file $filename"); -// different valid integer vlaues +// different valid integer values $valid_ints = array( 0, 1, diff --git a/ext/standard/tests/file/fscanf_variation20.phpt b/ext/standard/tests/file/fscanf_variation20.phpt index 427c45ff5f..928cb34d8b 100644 --- a/ext/standard/tests/file/fscanf_variation20.phpt +++ b/ext/standard/tests/file/fscanf_variation20.phpt @@ -20,7 +20,7 @@ $file_handle = fopen($filename, "w"); if($file_handle == false) exit("Error:failed to open file $filename"); -// different valid integer vlaues +// different valid integer values $valid_ints = array( 0, 1, diff --git a/ext/standard/tests/file/fscanf_variation27.phpt b/ext/standard/tests/file/fscanf_variation27.phpt index 574978a74d..e4db0b7105 100644 --- a/ext/standard/tests/file/fscanf_variation27.phpt +++ b/ext/standard/tests/file/fscanf_variation27.phpt @@ -20,7 +20,7 @@ $file_handle = fopen($filename, "w"); if($file_handle == false) exit("Error:failed to open file $filename"); -// different valid integer vlaues +// different valid integer values $valid_ints = array( 0, 1, diff --git a/ext/standard/tests/file/fscanf_variation33.phpt b/ext/standard/tests/file/fscanf_variation33.phpt index 001e8a31fa..75379361e6 100644 --- a/ext/standard/tests/file/fscanf_variation33.phpt +++ b/ext/standard/tests/file/fscanf_variation33.phpt @@ -26,7 +26,7 @@ $file_handle = fopen($filename, "w"); if($file_handle == false) exit("Error:failed to open file $filename"); -// different valid integer vlaues +// different valid integer values $valid_ints = array( 0, 1, diff --git a/ext/standard/tests/file/fscanf_variation45.phpt b/ext/standard/tests/file/fscanf_variation45.phpt index 9ebfc47b78..faf4820160 100644 --- a/ext/standard/tests/file/fscanf_variation45.phpt +++ b/ext/standard/tests/file/fscanf_variation45.phpt @@ -20,7 +20,7 @@ $file_handle = fopen($filename, "w"); if($file_handle == false) exit("Error:failed to open file $filename"); -// different valid integer vlaues +// different valid integer values $valid_ints = array( 0, 1, diff --git a/ext/standard/tests/file/fscanf_variation55.phpt b/ext/standard/tests/file/fscanf_variation55.phpt index 820abe8704..829eba46fa 100644 --- a/ext/standard/tests/file/fscanf_variation55.phpt +++ b/ext/standard/tests/file/fscanf_variation55.phpt @@ -94,7 +94,7 @@ $file_path = dirname(__FILE__); $filename = "$file_path/fscanf_variation55.tmp"; unlink($filename); ?> ---EXPECTF-- +--EXPECT-- *** Test fscanf(): tracking file pointer along with reading data from file *** *** File opened in r mode *** diff --git a/ext/standard/tests/file/fscanf_variation8.phpt b/ext/standard/tests/file/fscanf_variation8.phpt index e714b836cd..adce2e2482 100644 --- a/ext/standard/tests/file/fscanf_variation8.phpt +++ b/ext/standard/tests/file/fscanf_variation8.phpt @@ -20,7 +20,7 @@ $file_handle = fopen($filename, "w"); if($file_handle == false) exit("Error:failed to open file $filename"); -// different valid float vlaues +// different valid float values $valid_floats = array( -2147483649, // float value 2147483648, // float value diff --git a/ext/standard/tests/file/fseek_ftell_rewind_basic1.phpt b/ext/standard/tests/file/fseek_ftell_rewind_basic1.phpt index 7167504ce8..41ce37ccf7 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_basic1.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_basic1.phpt @@ -60,7 +60,7 @@ foreach($file_content_types as $file_content_type){ echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fseek(), ftell(), rewind() : basic operations *** -- File having data of type text_with_new_line -- diff --git a/ext/standard/tests/file/fseek_ftell_rewind_basic2-win32-mb.phpt b/ext/standard/tests/file/fseek_ftell_rewind_basic2-win32-mb.phpt index 142f86f1e8..4b88ee0720 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_basic2-win32-mb.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_basic2-win32-mb.phpt @@ -70,7 +70,7 @@ foreach($file_content_types as $file_content_type){ } //end of File content type loop echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fseek(), ftell(), rewind() : basic operations *** -- File having data of type text_with_new_line -- diff --git a/ext/standard/tests/file/fseek_ftell_rewind_basic2-win32.phpt b/ext/standard/tests/file/fseek_ftell_rewind_basic2-win32.phpt index 6ef96e2f5c..278f640a6c 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_basic2-win32.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_basic2-win32.phpt @@ -70,7 +70,7 @@ foreach($file_content_types as $file_content_type){ } //end of File content type loop echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fseek(), ftell(), rewind() : basic operations *** -- File having data of type text_with_new_line -- diff --git a/ext/standard/tests/file/fseek_ftell_rewind_basic2.phpt b/ext/standard/tests/file/fseek_ftell_rewind_basic2.phpt index d3f2f44447..79bbe5b50f 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_basic2.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_basic2.phpt @@ -70,7 +70,7 @@ foreach($file_content_types as $file_content_type){ } //end of File content type loop echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fseek(), ftell(), rewind() : basic operations *** -- File having data of type text_with_new_line -- diff --git a/ext/standard/tests/file/fseek_ftell_rewind_error1.phpt b/ext/standard/tests/file/fseek_ftell_rewind_error1.phpt index 0d91f80c83..9c1b3a822d 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_error1.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_error1.phpt @@ -72,7 +72,7 @@ Warning: fseek() expects parameter 1 to be resource, string given in %s on line bool(false) -- Iteration 2 -- -Warning: fseek() expects parameter 1 to be resource, integer given in %s on line %d +Warning: fseek() expects parameter 1 to be resource, int given in %s on line %d bool(false) -- Iteration 3 -- @@ -80,7 +80,7 @@ Warning: fseek() expects parameter 1 to be resource, float given in %s on line % bool(false) -- Iteration 4 -- -Warning: fseek() expects parameter 1 to be resource, boolean given in %s on line %d +Warning: fseek() expects parameter 1 to be resource, bool given in %s on line %d bool(false) -- Iteration 5 -- diff --git a/ext/standard/tests/file/fseek_ftell_rewind_error2.phpt b/ext/standard/tests/file/fseek_ftell_rewind_error2.phpt index e83c398f4b..8835046f6c 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_error2.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_error2.phpt @@ -68,7 +68,7 @@ Warning: ftell() expects parameter 1 to be resource, string given in %s on line bool(false) -- Iteration 2 -- -Warning: ftell() expects parameter 1 to be resource, integer given in %s on line %d +Warning: ftell() expects parameter 1 to be resource, int given in %s on line %d bool(false) -- Iteration 3 -- @@ -76,7 +76,7 @@ Warning: ftell() expects parameter 1 to be resource, float given in %s on line % bool(false) -- Iteration 4 -- -Warning: ftell() expects parameter 1 to be resource, boolean given in %s on line %d +Warning: ftell() expects parameter 1 to be resource, bool given in %s on line %d bool(false) -- Iteration 5 -- diff --git a/ext/standard/tests/file/fseek_ftell_rewind_error3.phpt b/ext/standard/tests/file/fseek_ftell_rewind_error3.phpt index 6f2511d49c..0b94bcffc7 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_error3.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_error3.phpt @@ -68,7 +68,7 @@ Warning: rewind() expects parameter 1 to be resource, string given in %s on line bool(false) -- Iteration 2 -- -Warning: rewind() expects parameter 1 to be resource, integer given in %s on line %d +Warning: rewind() expects parameter 1 to be resource, int given in %s on line %d bool(false) -- Iteration 3 -- @@ -76,7 +76,7 @@ Warning: rewind() expects parameter 1 to be resource, float given in %s on line bool(false) -- Iteration 4 -- -Warning: rewind() expects parameter 1 to be resource, boolean given in %s on line %d +Warning: rewind() expects parameter 1 to be resource, bool given in %s on line %d bool(false) -- Iteration 5 -- diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation1.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation1.phpt index cffc6293bb..80228bbbec 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation1.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation1.phpt @@ -59,7 +59,7 @@ foreach($file_content_types as $file_content_type){ echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fseek(), ftell(), rewind() : default whence & all r and a modes *** -- File having data of type text_with_new_line -- diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation2-win32.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation2-win32.phpt index 92d18cfc9f..54df01e743 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation2-win32.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation2-win32.phpt @@ -68,7 +68,7 @@ foreach($file_content_types as $file_content_type){ echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fseek(), ftell(), rewind() : default whence & all w and x modes *** -- File having data of type text_with_new_line -- diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation2.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation2.phpt index 7796200877..bb3f40c220 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation2.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation2.phpt @@ -68,7 +68,7 @@ foreach($file_content_types as $file_content_type){ echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fseek(), ftell(), rewind() : default whence & all w and x modes *** -- File having data of type text_with_new_line -- diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation3.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation3.phpt index 7ba6a5ac99..d6c5951e83 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation3.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation3.phpt @@ -60,7 +60,7 @@ foreach($file_content_types as $file_content_type){ echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fseek(), ftell(), rewind() : whence = SEEK_SET & all r and a modes *** *** Testing fseek() with whence = SEEK_SET *** diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation4-win32.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation4-win32.phpt index 38844d3734..dbf579f516 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation4-win32.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation4-win32.phpt @@ -66,7 +66,7 @@ foreach($file_content_types as $file_content_type){ echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fseek(), ftell(), rewind() : whence = SEEK_SET & all w and x modes *** -- File having data of type text_with_new_line -- diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation4.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation4.phpt index 5751b2b36a..946b23e65e 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation4.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation4.phpt @@ -66,7 +66,7 @@ foreach($file_content_types as $file_content_type){ echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fseek(), ftell(), rewind() : whence = SEEK_SET & all w and x modes *** -- File having data of type text_with_new_line -- diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation5.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation5.phpt index 3f12211b1f..864e7eda49 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation5.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation5.phpt @@ -59,7 +59,7 @@ foreach($file_content_types as $file_content_type){ echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fseek(), ftell(), rewind() : whence = SEEK_CUR & all r and a modes *** -- File having data of type text_with_new_line -- -- File opened in mode r -- diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation6-win32.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation6-win32.phpt index f7850c1cf3..83c6e4dcd6 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation6-win32.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation6-win32.phpt @@ -66,7 +66,7 @@ foreach($file_content_types as $file_content_type){ echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fseek(), ftell(), rewind() : whence = SEEK_CUR & all w and x modes *** -- File having data of type text_with_new_line -- diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation6.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation6.phpt index 4fdbd51aa5..16aeb39dba 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation6.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation6.phpt @@ -66,7 +66,7 @@ foreach($file_content_types as $file_content_type){ echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fseek(), ftell(), rewind() : whence = SEEK_CUR & all w and x modes *** -- File having data of type text_with_new_line -- diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation7.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation7.phpt index 646b8b659a..3869e35166 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation7.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation7.phpt @@ -60,7 +60,7 @@ foreach($file_content_types as $file_content_type){ echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fseek(), ftell(), rewind() : whence = SEEK_END & all r and a modes *** -- File having data of type text_with_new_line -- diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation8-win32.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation8-win32.phpt index 6065abdc51..d54c46f32a 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation8-win32.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation8-win32.phpt @@ -67,7 +67,7 @@ foreach($file_content_types as $file_content_type){ echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fseek(), ftell(), rewind() : whence = SEEK_END & all r and a modes *** -- File having data of type text_with_new_line -- diff --git a/ext/standard/tests/file/fseek_ftell_rewind_variation8.phpt b/ext/standard/tests/file/fseek_ftell_rewind_variation8.phpt index 42ca9d41ef..28b52da206 100644 --- a/ext/standard/tests/file/fseek_ftell_rewind_variation8.phpt +++ b/ext/standard/tests/file/fseek_ftell_rewind_variation8.phpt @@ -67,7 +67,7 @@ foreach($file_content_types as $file_content_type){ echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fseek(), ftell(), rewind() : whence = SEEK_END & all r and a modes *** -- File having data of type text_with_new_line -- diff --git a/ext/standard/tests/file/fseek_variation1.phpt b/ext/standard/tests/file/fseek_variation1.phpt index fed25ae615..0736d232c8 100644 --- a/ext/standard/tests/file/fseek_variation1.phpt +++ b/ext/standard/tests/file/fseek_variation1.phpt @@ -105,31 +105,31 @@ int(0) Arg value Array -Warning: fseek() expects parameter 2 to be integer, array given in %s on line %d +Warning: fseek() expects parameter 2 to be int, array given in %s on line %d bool(false) int(0) Arg value Array -Warning: fseek() expects parameter 2 to be integer, array given in %s on line %d +Warning: fseek() expects parameter 2 to be int, array given in %s on line %d bool(false) int(0) Arg value Array -Warning: fseek() expects parameter 2 to be integer, array given in %s on line %d +Warning: fseek() expects parameter 2 to be int, array given in %s on line %d bool(false) int(0) Arg value Array -Warning: fseek() expects parameter 2 to be integer, array given in %s on line %d +Warning: fseek() expects parameter 2 to be int, array given in %s on line %d bool(false) int(0) Arg value Array -Warning: fseek() expects parameter 2 to be integer, array given in %s on line %d +Warning: fseek() expects parameter 2 to be int, array given in %s on line %d bool(false) int(0) @@ -159,31 +159,31 @@ int(0) Arg value -Warning: fseek() expects parameter 2 to be integer, string given in %s on line %d +Warning: fseek() expects parameter 2 to be int, string given in %s on line %d bool(false) int(0) Arg value -Warning: fseek() expects parameter 2 to be integer, string given in %s on line %d +Warning: fseek() expects parameter 2 to be int, string given in %s on line %d bool(false) int(0) Arg value string -Warning: fseek() expects parameter 2 to be integer, string given in %s on line %d +Warning: fseek() expects parameter 2 to be int, string given in %s on line %d bool(false) int(0) Arg value string -Warning: fseek() expects parameter 2 to be integer, string given in %s on line %d +Warning: fseek() expects parameter 2 to be int, string given in %s on line %d bool(false) int(0) Arg value testClass -Warning: fseek() expects parameter 2 to be integer, object given in %s on line %d +Warning: fseek() expects parameter 2 to be int, object given in %s on line %d bool(false) int(0) diff --git a/ext/standard/tests/file/fseek_variation2.phpt b/ext/standard/tests/file/fseek_variation2.phpt index 1472a7b734..38f9561394 100644 --- a/ext/standard/tests/file/fseek_variation2.phpt +++ b/ext/standard/tests/file/fseek_variation2.phpt @@ -128,25 +128,25 @@ int(3) Arg value -Warning: fseek() expects parameter 3 to be integer, string given in %s on line %d +Warning: fseek() expects parameter 3 to be int, string given in %s on line %d bool(false) int(3) Arg value -Warning: fseek() expects parameter 3 to be integer, string given in %s on line %d +Warning: fseek() expects parameter 3 to be int, string given in %s on line %d bool(false) int(3) Arg value string -Warning: fseek() expects parameter 3 to be integer, string given in %s on line %d +Warning: fseek() expects parameter 3 to be int, string given in %s on line %d bool(false) int(3) Arg value string -Warning: fseek() expects parameter 3 to be integer, string given in %s on line %d +Warning: fseek() expects parameter 3 to be int, string given in %s on line %d bool(false) int(3) diff --git a/ext/standard/tests/file/fseek_variation3.phpt b/ext/standard/tests/file/fseek_variation3.phpt index 2050753986..b40a08cc9a 100644 --- a/ext/standard/tests/file/fseek_variation3.phpt +++ b/ext/standard/tests/file/fseek_variation3.phpt @@ -39,7 +39,7 @@ unlink($outputfile); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fseek() : variation - beyond file boundaries *** --- fseek beyond start of file --- int(-1) diff --git a/ext/standard/tests/file/fstat_variation2.phpt b/ext/standard/tests/file/fstat_variation2.phpt index 7e9a399b51..75e50589b3 100644 --- a/ext/standard/tests/file/fstat_variation2.phpt +++ b/ext/standard/tests/file/fstat_variation2.phpt @@ -16,15 +16,15 @@ foreach ( $variation_array as $var ) { ?> ===DONE=== --EXPECTF-- -Warning: fstat() expects parameter 1 to be resource, boolean given in %s on line %d +Warning: fstat() expects parameter 1 to be resource, bool given in %s on line %d bool(false) -Warning: fstat() expects parameter 1 to be resource, boolean given in %s on line %d +Warning: fstat() expects parameter 1 to be resource, bool given in %s on line %d bool(false) -Warning: fstat() expects parameter 1 to be resource, boolean given in %s on line %d +Warning: fstat() expects parameter 1 to be resource, bool given in %s on line %d bool(false) -Warning: fstat() expects parameter 1 to be resource, boolean given in %s on line %d +Warning: fstat() expects parameter 1 to be resource, bool given in %s on line %d bool(false) ===DONE=== diff --git a/ext/standard/tests/file/fstat_variation5.phpt b/ext/standard/tests/file/fstat_variation5.phpt index 7fab19cce3..208109fe21 100644 --- a/ext/standard/tests/file/fstat_variation5.phpt +++ b/ext/standard/tests/file/fstat_variation5.phpt @@ -16,15 +16,15 @@ foreach ( $variation_array as $var ) { ?> ===DONE=== --EXPECTF-- -Warning: fstat() expects parameter 1 to be resource, integer given in %s on line %d +Warning: fstat() expects parameter 1 to be resource, int given in %s on line %d bool(false) -Warning: fstat() expects parameter 1 to be resource, integer given in %s on line %d +Warning: fstat() expects parameter 1 to be resource, int given in %s on line %d bool(false) -Warning: fstat() expects parameter 1 to be resource, integer given in %s on line %d +Warning: fstat() expects parameter 1 to be resource, int given in %s on line %d bool(false) -Warning: fstat() expects parameter 1 to be resource, integer given in %s on line %d +Warning: fstat() expects parameter 1 to be resource, int given in %s on line %d bool(false) ===DONE=== diff --git a/ext/standard/tests/file/ftruncate_bug76422.phpt b/ext/standard/tests/file/ftruncate_bug76422.phpt new file mode 100644 index 0000000000..b149f02c64 --- /dev/null +++ b/ext/standard/tests/file/ftruncate_bug76422.phpt @@ -0,0 +1,36 @@ +--TEST-- +Bug #76422 ftruncate fails on files > 2GB +--SKIPIF-- +<?php +if (PHP_INT_SIZE < 8) { + die('skip.. only valid for 64-bit'); +} +?> +--FILE-- +<?php + +$fn = dirname(__FILE__) . DIRECTORY_SEPARATOR . "test76422"; + +$file_handle = fopen($fn,'cb'); + +if (false === $file_handle) { + die('Cannot open test file :/'); +} + +$truncate_offset = 4 * 1024 * 1024 * 1024 + 1; +$ftruncate_result = ftruncate($file_handle, $truncate_offset); + +if (false === $ftruncate_result) { + die('Truncate has failed :/'); +} + +fclose($file_handle); +var_dump(filesize($fn) >= $truncate_offset); +?> +--CLEAN-- +<?php +$fn = dirname(__FILE__) . "/test76422"; +unlink($fn); +?> +--EXPECT-- +bool(true) diff --git a/ext/standard/tests/file/ftruncate_bug76803.phpt b/ext/standard/tests/file/ftruncate_bug76803.phpt new file mode 100644 index 0000000000..fe261e8861 --- /dev/null +++ b/ext/standard/tests/file/ftruncate_bug76803.phpt @@ -0,0 +1,38 @@ +--TEST-- +Bug #76803 ftruncate changes file pointer +--FILE-- +<?php + +$fn = dirname(__FILE__) . DIRECTORY_SEPARATOR . "test76803"; + +$f = fopen($fn, "w"); +fwrite($f, "Hello"); +ftruncate($f, 2); +fwrite($f, "World"); +fclose($f); +var_dump(addslashes(file_get_contents($fn))); + +$f = fopen($fn, "w"); +fwrite($f, "Hello"); +ftruncate($f, 2); +fclose($f); +var_dump(addslashes(file_get_contents($fn))); + +$f = fopen('php://memory', 'w+'); +fwrite($f, 'Hello'); +ftruncate($f, 2); // in 7.3 changes file pointer to 2 +fwrite($f, 'World'); +rewind($f); +var_dump(addslashes(stream_get_contents($f))); +fclose($f); + +?> +--CLEAN-- +<?php +$fn = dirname(__FILE__) . DIRECTORY_SEPARATOR . "test76803"; +unlink($fn); +?> +--EXPECT-- +string(13) "He\0\0\0World" +string(2) "He" +string(7) "HeWorld" diff --git a/ext/standard/tests/file/ftruncate_bug77081.phpt b/ext/standard/tests/file/ftruncate_bug77081.phpt new file mode 100644 index 0000000000..7a9aa691fb --- /dev/null +++ b/ext/standard/tests/file/ftruncate_bug77081.phpt @@ -0,0 +1,24 @@ +--TEST-- +Bug #77081 ftruncate() changes seek pointer in c mode +--FILE-- +<?php + +$filename = dirname(__FILE__) . DIRECTORY_SEPARATOR . "test77081"; + +file_put_contents($filename, 'foo'); +$stream = fopen($filename, 'c'); +ftruncate($stream, 0); +var_dump(ftell($stream)); +fwrite($stream, 'bar'); +fclose($stream); +var_dump(file_get_contents($filename)); + +?> +--CLEAN-- +<?php +$fn = dirname(__FILE__) . DIRECTORY_SEPARATOR . "test77081"; +unlink($fn); +?> +--EXPECT-- +int(0) +string(3) "bar" diff --git a/ext/standard/tests/file/ftruncate_error.phpt b/ext/standard/tests/file/ftruncate_error.phpt index 112a1ce6e8..3cb6db27f8 100644 --- a/ext/standard/tests/file/ftruncate_error.phpt +++ b/ext/standard/tests/file/ftruncate_error.phpt @@ -94,7 +94,7 @@ Warning: ftruncate() expects parameter 1 to be resource, string given in %s on l bool(false) -- Iteration 2 -- -Warning: ftruncate() expects parameter 1 to be resource, integer given in %s on line %d +Warning: ftruncate() expects parameter 1 to be resource, int given in %s on line %d bool(false) -- Iteration 3 -- @@ -102,7 +102,7 @@ Warning: ftruncate() expects parameter 1 to be resource, float given in %s on li bool(false) -- Iteration 4 -- -Warning: ftruncate() expects parameter 1 to be resource, boolean given in %s on line %d +Warning: ftruncate() expects parameter 1 to be resource, bool given in %s on line %d bool(false) -- Iteration 5 -- diff --git a/ext/standard/tests/file/ftruncate_variation1-win32-mb.phpt b/ext/standard/tests/file/ftruncate_variation1-win32-mb.phpt index 6e7d0d7e60..abfb8e6888 100644 --- a/ext/standard/tests/file/ftruncate_variation1-win32-mb.phpt +++ b/ext/standard/tests/file/ftruncate_variation1-win32-mb.phpt @@ -68,7 +68,7 @@ foreach($file_content_types as $file_content_type) { }//end of outer foreach loop echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing ftruncate() : usage variations *** -- Testing ftruncate() with file having data of type numeric -- diff --git a/ext/standard/tests/file/ftruncate_variation1-win32.phpt b/ext/standard/tests/file/ftruncate_variation1-win32.phpt index 7b99f4b252..bc512aa5c8 100644 --- a/ext/standard/tests/file/ftruncate_variation1-win32.phpt +++ b/ext/standard/tests/file/ftruncate_variation1-win32.phpt @@ -68,7 +68,7 @@ foreach($file_content_types as $file_content_type) { }//end of outer foreach loop echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing ftruncate() : usage variations *** -- Testing ftruncate() with file having data of type numeric -- diff --git a/ext/standard/tests/file/ftruncate_variation1.phpt b/ext/standard/tests/file/ftruncate_variation1.phpt index ddcbd92534..426746de8b 100644 --- a/ext/standard/tests/file/ftruncate_variation1.phpt +++ b/ext/standard/tests/file/ftruncate_variation1.phpt @@ -68,7 +68,7 @@ foreach($file_content_types as $file_content_type) { }//end of outer foreach loop echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing ftruncate() : usage variations *** -- Testing ftruncate() with file having data of type numeric -- diff --git a/ext/standard/tests/file/ftruncate_variation2-win32.phpt b/ext/standard/tests/file/ftruncate_variation2-win32.phpt index 65a0b85b40..de7b088320 100644 --- a/ext/standard/tests/file/ftruncate_variation2-win32.phpt +++ b/ext/standard/tests/file/ftruncate_variation2-win32.phpt @@ -69,7 +69,7 @@ foreach($file_content_types as $file_content_type) { }//end of outer foreach loop echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing ftruncate() : usage variations *** -- Testing ftruncate() with file having data of type numeric -- @@ -77,7 +77,7 @@ echo "Done\n"; -- Testing ftruncate(): truncate file to size = current size -- int(1024) int(0) -bool(true) +bool(false) int(0) bool(false) int(1024) @@ -85,7 +85,7 @@ int(1024) -- Testing ftruncate(): truncate file to size = current size -- int(1024) int(0) -bool(true) +bool(false) int(0) bool(false) int(1024) @@ -93,7 +93,7 @@ int(1024) -- Testing ftruncate(): truncate file to size = current size -- int(1024) int(0) -bool(true) +bool(false) int(0) bool(false) int(1024) @@ -271,7 +271,7 @@ int(1024) -- Testing ftruncate(): truncate file to size = current size -- int(1024) int(0) -bool(true) +bool(false) int(0) bool(false) int(1024) @@ -279,7 +279,7 @@ int(1024) -- Testing ftruncate(): truncate file to size = current size -- int(1024) int(0) -bool(true) +bool(false) int(0) bool(false) int(1024) @@ -287,7 +287,7 @@ int(1024) -- Testing ftruncate(): truncate file to size = current size -- int(1024) int(0) -bool(true) +bool(false) int(0) bool(false) int(1024) diff --git a/ext/standard/tests/file/ftruncate_variation2.phpt b/ext/standard/tests/file/ftruncate_variation2.phpt index 821ed151bd..ac5a2316cd 100644 --- a/ext/standard/tests/file/ftruncate_variation2.phpt +++ b/ext/standard/tests/file/ftruncate_variation2.phpt @@ -69,7 +69,7 @@ foreach($file_content_types as $file_content_type) { }//end of outer foreach loop echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing ftruncate() : usage variations *** -- Testing ftruncate() with file having data of type numeric -- diff --git a/ext/standard/tests/file/ftruncate_variation3-win32.phpt b/ext/standard/tests/file/ftruncate_variation3-win32.phpt index 885a8b35a5..b275d5f462 100644 --- a/ext/standard/tests/file/ftruncate_variation3-win32.phpt +++ b/ext/standard/tests/file/ftruncate_variation3-win32.phpt @@ -68,7 +68,7 @@ foreach($file_content_types as $file_content_type) { }//end of outer foreach loop echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing ftruncate() : usage variations *** -- Testing ftruncate() with file having data of type numeric -- diff --git a/ext/standard/tests/file/ftruncate_variation3.phpt b/ext/standard/tests/file/ftruncate_variation3.phpt index 219fba16c5..70ea90d18a 100644 --- a/ext/standard/tests/file/ftruncate_variation3.phpt +++ b/ext/standard/tests/file/ftruncate_variation3.phpt @@ -68,7 +68,7 @@ foreach($file_content_types as $file_content_type) { }//end of outer foreach loop echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing ftruncate() : usage variations *** -- Testing ftruncate() with file having data of type numeric -- diff --git a/ext/standard/tests/file/ftruncate_variation5-win32.phpt b/ext/standard/tests/file/ftruncate_variation5-win32.phpt index 4415cf54e8..9bec15dca3 100644 --- a/ext/standard/tests/file/ftruncate_variation5-win32.phpt +++ b/ext/standard/tests/file/ftruncate_variation5-win32.phpt @@ -70,7 +70,7 @@ foreach($file_content_types as $file_content_type) { }//end of outer foreach loop echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing ftruncate() : usage variations *** -- Testing ftruncate() with file having data of type numeric -- diff --git a/ext/standard/tests/file/ftruncate_variation5.phpt b/ext/standard/tests/file/ftruncate_variation5.phpt index 11083df58b..7df84c9b17 100644 --- a/ext/standard/tests/file/ftruncate_variation5.phpt +++ b/ext/standard/tests/file/ftruncate_variation5.phpt @@ -70,7 +70,7 @@ foreach($file_content_types as $file_content_type) { }//end of outer foreach loop echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing ftruncate() : usage variations *** -- Testing ftruncate() with file having data of type numeric -- diff --git a/ext/standard/tests/file/ftruncate_variation6-win32.phpt b/ext/standard/tests/file/ftruncate_variation6-win32.phpt index d231ed18a4..6686c80944 100644 --- a/ext/standard/tests/file/ftruncate_variation6-win32.phpt +++ b/ext/standard/tests/file/ftruncate_variation6-win32.phpt @@ -74,7 +74,7 @@ foreach($file_content_types as $file_content_type) { }//end of outer foreach loop echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing ftruncate() : usage variations *** -- Testing ftruncate() with file having data of type numeric -- diff --git a/ext/standard/tests/file/ftruncate_variation6.phpt b/ext/standard/tests/file/ftruncate_variation6.phpt index 9f72333b3a..a8bce476e0 100644 --- a/ext/standard/tests/file/ftruncate_variation6.phpt +++ b/ext/standard/tests/file/ftruncate_variation6.phpt @@ -74,7 +74,7 @@ foreach($file_content_types as $file_content_type) { }//end of outer foreach loop echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing ftruncate() : usage variations *** -- Testing ftruncate() with file having data of type numeric -- diff --git a/ext/standard/tests/file/ftruncate_variation7-win32.phpt b/ext/standard/tests/file/ftruncate_variation7-win32.phpt index 84e13a9b97..cdb77673b7 100644 --- a/ext/standard/tests/file/ftruncate_variation7-win32.phpt +++ b/ext/standard/tests/file/ftruncate_variation7-win32.phpt @@ -70,7 +70,7 @@ foreach($file_content_types as $file_content_type) { }//end of outer foreach loop echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing ftruncate() : usage variations *** -- Testing ftruncate() with file having data of type numeric -- diff --git a/ext/standard/tests/file/ftruncate_variation7.phpt b/ext/standard/tests/file/ftruncate_variation7.phpt index 90181723a5..38f70cb227 100644 --- a/ext/standard/tests/file/ftruncate_variation7.phpt +++ b/ext/standard/tests/file/ftruncate_variation7.phpt @@ -70,7 +70,7 @@ foreach($file_content_types as $file_content_type) { }//end of outer foreach loop echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing ftruncate() : usage variations *** -- Testing ftruncate() with file having data of type numeric -- diff --git a/ext/standard/tests/file/fwrite_basic-win32-mb.phpt b/ext/standard/tests/file/fwrite_basic-win32-mb.phpt index ca71f7cec4..fa20f3c870 100644 --- a/ext/standard/tests/file/fwrite_basic-win32-mb.phpt +++ b/ext/standard/tests/file/fwrite_basic-win32-mb.phpt @@ -75,7 +75,7 @@ foreach($file_content_types as $file_content_type) { } // end of outer foreach loop echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fwrite() basic operations *** -- Testing fwrite() with file having data of type numeric -- diff --git a/ext/standard/tests/file/fwrite_basic-win32.phpt b/ext/standard/tests/file/fwrite_basic-win32.phpt index ac48323285..c922159327 100644 --- a/ext/standard/tests/file/fwrite_basic-win32.phpt +++ b/ext/standard/tests/file/fwrite_basic-win32.phpt @@ -75,7 +75,7 @@ foreach($file_content_types as $file_content_type) { } // end of outer foreach loop echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fwrite() basic operations *** -- Testing fwrite() with file having data of type numeric -- diff --git a/ext/standard/tests/file/fwrite_basic.phpt b/ext/standard/tests/file/fwrite_basic.phpt index 790cbdfebc..e41d08c424 100644 --- a/ext/standard/tests/file/fwrite_basic.phpt +++ b/ext/standard/tests/file/fwrite_basic.phpt @@ -75,7 +75,7 @@ foreach($file_content_types as $file_content_type) { } // end of outer foreach loop echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fwrite() basic operations *** -- Testing fwrite() with file having data of type numeric -- diff --git a/ext/standard/tests/file/fwrite_error.phpt b/ext/standard/tests/file/fwrite_error.phpt index 2f579dc2e7..f4f691be35 100644 --- a/ext/standard/tests/file/fwrite_error.phpt +++ b/ext/standard/tests/file/fwrite_error.phpt @@ -92,7 +92,7 @@ Warning: fwrite() expects parameter 1 to be resource, string given in %s on line bool(false) -- Iteration 2 -- -Warning: fwrite() expects parameter 1 to be resource, integer given in %s on line %d +Warning: fwrite() expects parameter 1 to be resource, int given in %s on line %d bool(false) -- Iteration 3 -- @@ -100,7 +100,7 @@ Warning: fwrite() expects parameter 1 to be resource, float given in %s on line bool(false) -- Iteration 4 -- -Warning: fwrite() expects parameter 1 to be resource, boolean given in %s on line %d +Warning: fwrite() expects parameter 1 to be resource, bool given in %s on line %d bool(false) -- Iteration 5 -- diff --git a/ext/standard/tests/file/fwrite_variation1-win32-mb.phpt b/ext/standard/tests/file/fwrite_variation1-win32-mb.phpt index c109aeef0f..f368513d10 100644 --- a/ext/standard/tests/file/fwrite_variation1-win32-mb.phpt +++ b/ext/standard/tests/file/fwrite_variation1-win32-mb.phpt @@ -78,7 +78,7 @@ foreach($file_content_types as $file_content_type) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fwrite() various operations *** -- Testing fwrite() with file having content of type numeric -- diff --git a/ext/standard/tests/file/fwrite_variation1-win32.phpt b/ext/standard/tests/file/fwrite_variation1-win32.phpt index 38d35e3612..28559af0c9 100644 --- a/ext/standard/tests/file/fwrite_variation1-win32.phpt +++ b/ext/standard/tests/file/fwrite_variation1-win32.phpt @@ -78,7 +78,7 @@ foreach($file_content_types as $file_content_type) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fwrite() various operations *** -- Testing fwrite() with file having content of type numeric -- diff --git a/ext/standard/tests/file/fwrite_variation1.phpt b/ext/standard/tests/file/fwrite_variation1.phpt index 133405a5f1..5e2c0472c7 100644 --- a/ext/standard/tests/file/fwrite_variation1.phpt +++ b/ext/standard/tests/file/fwrite_variation1.phpt @@ -76,7 +76,7 @@ foreach($file_content_types as $file_content_type) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fwrite() various operations *** -- Testing fwrite() with file having content of type numeric -- diff --git a/ext/standard/tests/file/fwrite_variation2-win32.phpt b/ext/standard/tests/file/fwrite_variation2-win32.phpt index d8a6afdfd1..f2d67c19fc 100644 --- a/ext/standard/tests/file/fwrite_variation2-win32.phpt +++ b/ext/standard/tests/file/fwrite_variation2-win32.phpt @@ -87,7 +87,7 @@ foreach($file_content_types as $file_content_type) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fwrite() various operations *** -- Testing fwrite() with file having content of type numeric -- diff --git a/ext/standard/tests/file/fwrite_variation2.phpt b/ext/standard/tests/file/fwrite_variation2.phpt index ee445448f4..82061a019c 100644 --- a/ext/standard/tests/file/fwrite_variation2.phpt +++ b/ext/standard/tests/file/fwrite_variation2.phpt @@ -86,7 +86,7 @@ foreach($file_content_types as $file_content_type) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fwrite() various operations *** -- Testing fwrite() with file having content of type numeric -- diff --git a/ext/standard/tests/file/fwrite_variation3-win32.phpt b/ext/standard/tests/file/fwrite_variation3-win32.phpt index 47cfd18e0a..3edd3d6a5a 100644 --- a/ext/standard/tests/file/fwrite_variation3-win32.phpt +++ b/ext/standard/tests/file/fwrite_variation3-win32.phpt @@ -79,7 +79,7 @@ foreach($file_content_types as $file_content_type) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fwrite() various operations *** -- Testing fwrite() with file having content of type numeric -- diff --git a/ext/standard/tests/file/fwrite_variation3.phpt b/ext/standard/tests/file/fwrite_variation3.phpt index a3c8a76964..9d1c16af2b 100644 --- a/ext/standard/tests/file/fwrite_variation3.phpt +++ b/ext/standard/tests/file/fwrite_variation3.phpt @@ -80,7 +80,7 @@ foreach($file_content_types as $file_content_type) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fwrite() various operations *** -- Testing fwrite() with file having content of type numeric -- diff --git a/ext/standard/tests/file/fwrite_variation4-win32.phpt b/ext/standard/tests/file/fwrite_variation4-win32.phpt index 76d1385bab..bf50c4f9c7 100644 --- a/ext/standard/tests/file/fwrite_variation4-win32.phpt +++ b/ext/standard/tests/file/fwrite_variation4-win32.phpt @@ -70,7 +70,7 @@ foreach($file_content_types as $file_content_type) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fwrite() various operations *** -- Testing fwrite() with file having content of type numeric -- diff --git a/ext/standard/tests/file/fwrite_variation4.phpt b/ext/standard/tests/file/fwrite_variation4.phpt index 39eeae13fc..65268afdd4 100644 --- a/ext/standard/tests/file/fwrite_variation4.phpt +++ b/ext/standard/tests/file/fwrite_variation4.phpt @@ -70,7 +70,7 @@ foreach($file_content_types as $file_content_type) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing fwrite() various operations *** -- Testing fwrite() with file having content of type numeric -- diff --git a/ext/standard/tests/file/glob_error.phpt b/ext/standard/tests/file/glob_error.phpt index b65c5fe528..527b70e069 100644 --- a/ext/standard/tests/file/glob_error.phpt +++ b/ext/standard/tests/file/glob_error.phpt @@ -45,9 +45,9 @@ NULL -- Testing glob() with invalid arguments -- -Warning: glob() expects parameter 2 to be integer, string given in %s on line %d +Warning: glob() expects parameter 2 to be int, string given in %s on line %d NULL -Warning: glob() expects parameter 2 to be integer, string given in %s on line %d +Warning: glob() expects parameter 2 to be int, string given in %s on line %d NULL Done diff --git a/ext/standard/tests/file/glob_error_002-win32-mb.phpt b/ext/standard/tests/file/glob_error_002-win32-mb.phpt deleted file mode 100644 index a61efd108c..0000000000 --- a/ext/standard/tests/file/glob_error_002-win32-mb.phpt +++ /dev/null @@ -1,27 +0,0 @@ ---TEST-- -Test glob() function: error condition - pattern too long. ---CREDITS-- -Dave Kelsey <d_kelsey@uk.ibm.com> ---SKIPIF-- -<?php -if(substr(PHP_OS, 0, 3) != "WIN") - die("skip Only valid for Windows"); -?> ---FILE-- -<?php -/* Prototype: array glob ( string $pattern [, int $flags] ); - Description: Find pathnames matching a pattern -*/ - -echo "*** Testing glob() : error condition - pattern too long. ***\n"; - -var_dump(glob(str_repeat('x', 3000))); - -echo "Done"; -?> ---EXPECTF-- -*** Testing glob() : error condition - pattern too long. *** - -Warning: glob(): Pattern exceeds the maximum allowed length of %d characters in %s on line %d -bool(false) -Done diff --git a/ext/standard/tests/file/is_dir_basic.phpt b/ext/standard/tests/file/is_dir_basic.phpt index 2617d0f4f3..7582a502a7 100644 --- a/ext/standard/tests/file/is_dir_basic.phpt +++ b/ext/standard/tests/file/is_dir_basic.phpt @@ -30,7 +30,7 @@ $file_path = dirname(__FILE__); $dir_name = $file_path."/is_dir_basic"; rmdir($dir_name); ?> ---EXPECTF-- +--EXPECT-- *** Testing is_dir(): basic functionality *** bool(true) bool(true) diff --git a/ext/standard/tests/file/is_dir_variation1.phpt b/ext/standard/tests/file/is_dir_variation1.phpt index 1a0b55669f..96bafacfda 100644 --- a/ext/standard/tests/file/is_dir_variation1.phpt +++ b/ext/standard/tests/file/is_dir_variation1.phpt @@ -32,7 +32,7 @@ $dir_name = $file_path."/is_dir_variation1"; rmdir($dir_name."/is_dir_variation1_sub"); rmdir($dir_name); ?> ---EXPECTF-- +--EXPECT-- -- Testing is_dir() with an empty dir -- bool(true) -- Testing is_dir() with a subdir in base dir -- diff --git a/ext/standard/tests/file/is_executable_basic-win32-mb.phpt b/ext/standard/tests/file/is_executable_basic-win32-mb.phpt index eb71c63bd3..e681ad6324 100644 --- a/ext/standard/tests/file/is_executable_basic-win32-mb.phpt +++ b/ext/standard/tests/file/is_executable_basic-win32-mb.phpt @@ -35,7 +35,7 @@ delete_file($filename); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing is_executable(): basic functionality *** -- Changing mode of file to 0 -- bool(false) diff --git a/ext/standard/tests/file/is_executable_basic-win32.phpt b/ext/standard/tests/file/is_executable_basic-win32.phpt index 1462368b8a..7096285ef1 100644 --- a/ext/standard/tests/file/is_executable_basic-win32.phpt +++ b/ext/standard/tests/file/is_executable_basic-win32.phpt @@ -35,7 +35,7 @@ delete_file($filename); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing is_executable(): basic functionality *** -- Changing mode of file to 0 -- bool(false) diff --git a/ext/standard/tests/file/is_executable_basic.phpt b/ext/standard/tests/file/is_executable_basic.phpt index b5ee664566..2e6d60593e 100644 --- a/ext/standard/tests/file/is_executable_basic.phpt +++ b/ext/standard/tests/file/is_executable_basic.phpt @@ -47,7 +47,7 @@ delete_file($filename); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing is_executable(): basic functionality *** -- Changing mode of file to 0 -- bool(false) diff --git a/ext/standard/tests/file/is_executable_variation2.phpt b/ext/standard/tests/file/is_executable_variation2.phpt index fe9cb8f366..36399e189e 100644 --- a/ext/standard/tests/file/is_executable_variation2.phpt +++ b/ext/standard/tests/file/is_executable_variation2.phpt @@ -80,7 +80,7 @@ echo "Done\n"; <?php rmdir(dirname(__FILE__)."/is_executable_variation2/"); ?> ---EXPECTF-- +--EXPECT-- *** Testing is_executable(): usage variations *** *** Testing is_executable() on directory without execute permission *** diff --git a/ext/standard/tests/file/is_file_basic.phpt b/ext/standard/tests/file/is_file_basic.phpt index f8c06a0f04..7b8e778a7f 100644 --- a/ext/standard/tests/file/is_file_basic.phpt +++ b/ext/standard/tests/file/is_file_basic.phpt @@ -35,7 +35,7 @@ $file_path = dirname(__FILE__); $file_name = $file_path."/is_file_basic.tmp"; unlink($file_name); ?> ---EXPECTF-- +--EXPECT-- *** Testing is_file(): basic functionality *** bool(true) bool(false) diff --git a/ext/standard/tests/file/is_file_variation1.phpt b/ext/standard/tests/file/is_file_variation1.phpt index 8f09e93aa6..148b89a674 100644 --- a/ext/standard/tests/file/is_file_variation1.phpt +++ b/ext/standard/tests/file/is_file_variation1.phpt @@ -43,7 +43,7 @@ unlink($file_path."/is_file_variation1.tmp"); echo "\n*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- -- Testing is_file() with file containing data -- bool(true) diff --git a/ext/standard/tests/file/is_file_variation2.phpt b/ext/standard/tests/file/is_file_variation2.phpt index ef6cec9516..de5c52b05c 100644 --- a/ext/standard/tests/file/is_file_variation2.phpt +++ b/ext/standard/tests/file/is_file_variation2.phpt @@ -37,7 +37,7 @@ unlink($file_path."/is_file_variation2_symlink.tmp"); unlink($file_path."/is_file_variation2_link.tmp"); unlink($file_path."/is_file_variation2.tmp"); ?> ---EXPECTF-- +--EXPECT-- *** Testing is_file() with links *** bool(true) bool(true) diff --git a/ext/standard/tests/file/is_readable_basic-win32-mb.phpt b/ext/standard/tests/file/is_readable_basic-win32-mb.phpt index 2950dfa590..d10342b5e3 100644 --- a/ext/standard/tests/file/is_readable_basic-win32-mb.phpt +++ b/ext/standard/tests/file/is_readable_basic-win32-mb.phpt @@ -37,7 +37,7 @@ delete_file($filename); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing is_readable(): basic functionality *** -- Changing mode of file to 0 -- bool(true) diff --git a/ext/standard/tests/file/is_readable_basic-win32.phpt b/ext/standard/tests/file/is_readable_basic-win32.phpt index 67f57686fc..d4e0538d79 100644 --- a/ext/standard/tests/file/is_readable_basic-win32.phpt +++ b/ext/standard/tests/file/is_readable_basic-win32.phpt @@ -37,7 +37,7 @@ delete_file($filename); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing is_readable(): basic functionality *** -- Changing mode of file to 0 -- bool(true) diff --git a/ext/standard/tests/file/is_readable_basic.phpt b/ext/standard/tests/file/is_readable_basic.phpt index 4d5febfb3d..2bca150744 100644 --- a/ext/standard/tests/file/is_readable_basic.phpt +++ b/ext/standard/tests/file/is_readable_basic.phpt @@ -47,7 +47,7 @@ delete_file($filename); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing is_readable(): basic functionality *** -- Changing mode of file to 0 -- bool(false) diff --git a/ext/standard/tests/file/is_readable_variation2.phpt b/ext/standard/tests/file/is_readable_variation2.phpt index e1faf55997..ac54735b19 100644 --- a/ext/standard/tests/file/is_readable_variation2.phpt +++ b/ext/standard/tests/file/is_readable_variation2.phpt @@ -79,7 +79,7 @@ echo "Done\n"; <?php rmdir(dirname(__FILE__)."/is_readable_variation2/"); ?> ---EXPECTF-- +--EXPECT-- *** Testing is_readable(): usage variations *** *** Testing is_readable() on directory without read permission *** diff --git a/ext/standard/tests/file/is_writable_basic.phpt b/ext/standard/tests/file/is_writable_basic.phpt index 86599b473b..6c447f4256 100644 --- a/ext/standard/tests/file/is_writable_basic.phpt +++ b/ext/standard/tests/file/is_writable_basic.phpt @@ -47,7 +47,7 @@ delete_file($filename); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing is_writable(): basic functionality *** -- Changing mode of file to 0 -- bool(false) diff --git a/ext/standard/tests/file/is_writable_variation2.phpt b/ext/standard/tests/file/is_writable_variation2.phpt index f56219ce40..efe35a0335 100644 --- a/ext/standard/tests/file/is_writable_variation2.phpt +++ b/ext/standard/tests/file/is_writable_variation2.phpt @@ -85,7 +85,7 @@ echo "Done\n"; <?php rmdir(dirname(__FILE__)."/is_writable_variation2/"); ?> ---EXPECTF-- +--EXPECT-- *** Testing is_writable(): usage variations *** *** Testing is_writable() on directory without write permission *** diff --git a/ext/standard/tests/file/lchgrp_basic.phpt b/ext/standard/tests/file/lchgrp_basic.phpt index 1713bef9b4..c844471240 100644 --- a/ext/standard/tests/file/lchgrp_basic.phpt +++ b/ext/standard/tests/file/lchgrp_basic.phpt @@ -28,7 +28,7 @@ unlink($filename); unlink($symlink); ?> ---EXPECTF-- +--EXPECT-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/lchown_basic.phpt b/ext/standard/tests/file/lchown_basic.phpt index ed8f96dde4..329f4b94df 100644 --- a/ext/standard/tests/file/lchown_basic.phpt +++ b/ext/standard/tests/file/lchown_basic.phpt @@ -35,7 +35,7 @@ unlink($filename); unlink($symlink); ?> ---EXPECTF-- +--EXPECT-- *** Testing lchown() : basic functionality *** bool(true) bool(true) diff --git a/ext/standard/tests/file/lstat_stat_variation1.phpt b/ext/standard/tests/file/lstat_stat_variation1.phpt index cfaabd26c4..68f526b5d0 100644 --- a/ext/standard/tests/file/lstat_stat_variation1.phpt +++ b/ext/standard/tests/file/lstat_stat_variation1.phpt @@ -50,7 +50,7 @@ echo "\n--- Done ---"; $file_path = dirname(__FILE__); unlink("$file_path/lstat_stat_variation1a.tmp"); ?> ---EXPECTF-- +--EXPECT-- *** Testing stat() for files after being renamed *** bool(true) bool(true) diff --git a/ext/standard/tests/file/lstat_stat_variation10.phpt b/ext/standard/tests/file/lstat_stat_variation10.phpt index 9de854b275..3a7c692881 100644 --- a/ext/standard/tests/file/lstat_stat_variation10.phpt +++ b/ext/standard/tests/file/lstat_stat_variation10.phpt @@ -48,7 +48,7 @@ echo "\n--- Done ---"; $file_path = dirname(__FILE__); rmdir("$file_path/lstat_stat_variation10"); ?> ---EXPECTF-- +--EXPECT-- *** Testing stat() on directory after using is_dir() on it *** bool(true) bool(true) diff --git a/ext/standard/tests/file/lstat_stat_variation11.phpt b/ext/standard/tests/file/lstat_stat_variation11.phpt index d40bd63cc8..975b1be55c 100644 --- a/ext/standard/tests/file/lstat_stat_variation11.phpt +++ b/ext/standard/tests/file/lstat_stat_variation11.phpt @@ -49,7 +49,7 @@ echo "\n--- Done ---"; $file_path = dirname(__FILE__); unlink("$file_path/lstat_stat_variation11.tmp"); ?> ---EXPECTF-- +--EXPECT-- *** Testing stat() on a file after using is_file() on it *** bool(true) bool(true) diff --git a/ext/standard/tests/file/lstat_stat_variation12.phpt b/ext/standard/tests/file/lstat_stat_variation12.phpt index e0e0c7d5e0..8ad7893286 100644 --- a/ext/standard/tests/file/lstat_stat_variation12.phpt +++ b/ext/standard/tests/file/lstat_stat_variation12.phpt @@ -55,7 +55,7 @@ $file_path = dirname(__FILE__); unlink("$file_path/lstat_stat_variation12_link.tmp"); unlink("$file_path/lstat_stat_variation12.tmp"); ?> ---EXPECTF-- +--EXPECT-- *** Testing stat() on a link after using is_link() on it *** bool(true) bool(true) diff --git a/ext/standard/tests/file/lstat_stat_variation13.phpt b/ext/standard/tests/file/lstat_stat_variation13.phpt index 8f63c6be8a..476c091ca1 100644 --- a/ext/standard/tests/file/lstat_stat_variation13.phpt +++ b/ext/standard/tests/file/lstat_stat_variation13.phpt @@ -48,7 +48,7 @@ echo "\n--- Done ---"; $file_path = dirname(__FILE__); unlink("$file_path/lstat_stat_variation13.tmp"); ?> ---EXPECTF-- +--EXPECT-- *** Checking stat() on a file opened using read/write mode *** bool(true) bool(true) diff --git a/ext/standard/tests/file/lstat_stat_variation14.phpt b/ext/standard/tests/file/lstat_stat_variation14.phpt index dabb6c5888..6ddd7497e4 100644 --- a/ext/standard/tests/file/lstat_stat_variation14.phpt +++ b/ext/standard/tests/file/lstat_stat_variation14.phpt @@ -51,7 +51,7 @@ $file_path = dirname(__FILE__); unlink("$file_path/lstat_stat_variation14_hard.tmp"); unlink("$file_path/lstat_stat_variation14.tmp"); ?> ---EXPECTF-- +--EXPECT-- *** Checking lstat() and stat() on hard link *** bool(true) bool(true) diff --git a/ext/standard/tests/file/lstat_stat_variation15.phpt b/ext/standard/tests/file/lstat_stat_variation15.phpt index 54f68788cd..903531db08 100644 --- a/ext/standard/tests/file/lstat_stat_variation15.phpt +++ b/ext/standard/tests/file/lstat_stat_variation15.phpt @@ -53,7 +53,7 @@ $file_path = dirname(__FILE__); unlink("$file_path/lstat_stat_variation15_link.tmp"); unlink("$file_path/lstat_stat_variation15.tmp"); ?> ---EXPECTF-- +--EXPECT-- *** Testing lstat() on a link after changing its access permission *** bool(true) bool(true) diff --git a/ext/standard/tests/file/lstat_stat_variation16.phpt b/ext/standard/tests/file/lstat_stat_variation16.phpt index 024a47fea7..056cec1c7d 100644 --- a/ext/standard/tests/file/lstat_stat_variation16.phpt +++ b/ext/standard/tests/file/lstat_stat_variation16.phpt @@ -47,7 +47,7 @@ echo "\n--- Done ---"; $file_path = dirname(__FILE__); unlink("$file_path/lstat_stat_variation16.tmp"); ?> ---EXPECTF-- +--EXPECT-- *** Testing lstat() on a file after changing its access permission *** bool(true) bool(true) diff --git a/ext/standard/tests/file/lstat_stat_variation17.phpt b/ext/standard/tests/file/lstat_stat_variation17.phpt index ef92aa427c..51349f6a93 100644 --- a/ext/standard/tests/file/lstat_stat_variation17.phpt +++ b/ext/standard/tests/file/lstat_stat_variation17.phpt @@ -46,7 +46,7 @@ echo "\n--- Done ---"; $file_path = dirname(__FILE__); rmdir("$file_path/lstat_stat_variation17"); ?> ---EXPECTF-- +--EXPECT-- *** Testing lstat() on a dir after changing its access permission *** bool(true) bool(true) diff --git a/ext/standard/tests/file/lstat_stat_variation2.phpt b/ext/standard/tests/file/lstat_stat_variation2.phpt index 259b2f183c..52b817e5d0 100644 --- a/ext/standard/tests/file/lstat_stat_variation2.phpt +++ b/ext/standard/tests/file/lstat_stat_variation2.phpt @@ -51,7 +51,7 @@ echo "\n--- Done ---"; $file_path = dirname(__FILE__); rmdir("$file_path/lstat_stat_variation1a"); ?> ---EXPECTF-- +--EXPECT-- *** Testing stat() for directory after being renamed *** bool(true) bool(true) diff --git a/ext/standard/tests/file/lstat_stat_variation21.phpt b/ext/standard/tests/file/lstat_stat_variation21.phpt index a9461da4f8..d339a988a8 100644 --- a/ext/standard/tests/file/lstat_stat_variation21.phpt +++ b/ext/standard/tests/file/lstat_stat_variation21.phpt @@ -54,7 +54,7 @@ echo "\n--- Done ---"; $file_path = dirname(__FILE__); unlink("$file_path/lstat_stat_variation21.tmp"); ?> ---EXPECTF-- +--EXPECT-- *** Testing stat() on file by truncating it to given size *** bool(true) bool(true) diff --git a/ext/standard/tests/file/lstat_stat_variation4.phpt b/ext/standard/tests/file/lstat_stat_variation4.phpt index 752a07e98e..5046f70086 100644 --- a/ext/standard/tests/file/lstat_stat_variation4.phpt +++ b/ext/standard/tests/file/lstat_stat_variation4.phpt @@ -54,7 +54,7 @@ echo "\n--- Done ---"; $file_path = dirname(__FILE__); unlink("$file_path/lstat_stat_variation4.tmp"); ?> ---EXPECTF-- +--EXPECT-- *** Testing stat() for file after using touch() on the file *** bool(true) bool(true) diff --git a/ext/standard/tests/file/lstat_stat_variation5.phpt b/ext/standard/tests/file/lstat_stat_variation5.phpt index 4a215e3298..33aee9f31a 100644 --- a/ext/standard/tests/file/lstat_stat_variation5.phpt +++ b/ext/standard/tests/file/lstat_stat_variation5.phpt @@ -55,7 +55,7 @@ echo "\n--- Done ---"; $file_path = dirname(__FILE__); rmdir("$file_path/lstat_stat_variation5"); ?> ---EXPECTF-- +--EXPECT-- *** Testing stat() for directory after using touch() on the directory *** bool(true) bool(true) diff --git a/ext/standard/tests/file/lstat_stat_variation6.phpt b/ext/standard/tests/file/lstat_stat_variation6.phpt index 7432e647ab..239a82927f 100644 --- a/ext/standard/tests/file/lstat_stat_variation6.phpt +++ b/ext/standard/tests/file/lstat_stat_variation6.phpt @@ -68,7 +68,7 @@ $file_path = dirname(__FILE__); unlink("$file_path/lstat_stat_variation6.tmp"); unlink("$file_path/lstat_stat_variation_link6.tmp"); ?> ---EXPECTF-- +--EXPECT-- *** Testing lstat() for link after using touch() on the link *** bool(true) bool(true) diff --git a/ext/standard/tests/file/lstat_stat_variation7.phpt b/ext/standard/tests/file/lstat_stat_variation7.phpt index d6169f13be..f849e8254a 100644 --- a/ext/standard/tests/file/lstat_stat_variation7.phpt +++ b/ext/standard/tests/file/lstat_stat_variation7.phpt @@ -47,7 +47,7 @@ echo "\n--- Done ---"; $file_path = dirname(__FILE__); unlink("$file_path/lstat_stat_variation7.tmp"); ?> ---EXPECTF-- +--EXPECT-- *** Testing stat() on file after data is written in it *** bool(true) bool(true) diff --git a/ext/standard/tests/file/lstat_stat_variation8.phpt b/ext/standard/tests/file/lstat_stat_variation8.phpt index 8cf15a2fee..cbd5c1a45d 100644 --- a/ext/standard/tests/file/lstat_stat_variation8.phpt +++ b/ext/standard/tests/file/lstat_stat_variation8.phpt @@ -53,7 +53,7 @@ unlink("$file_path/lstat_stat_variation8/lstat_stat_variation8a.tmp"); rmdir("$file_path/lstat_stat_variation8/lstat_stat_variation8_subdir/"); rmdir("$file_path/lstat_stat_variation8"); ?> ---EXPECTF-- +--EXPECT-- *** Testing stat() on dir after subdir and file is created in it *** bool(true) bool(true) diff --git a/ext/standard/tests/file/lstat_stat_variation9.phpt b/ext/standard/tests/file/lstat_stat_variation9.phpt index ff6c413128..84b051304d 100644 --- a/ext/standard/tests/file/lstat_stat_variation9.phpt +++ b/ext/standard/tests/file/lstat_stat_variation9.phpt @@ -58,7 +58,7 @@ $file_path = dirname(__FILE__); $dirname = "$file_path/lstat_stat_variation9"; rmdir($dirname); ?> ---EXPECTF-- +--EXPECT-- *** Testing stat() for comparing stats after the deletion of subdir and file *** bool(true) bool(true) diff --git a/ext/standard/tests/file/mkdir-001.phpt b/ext/standard/tests/file/mkdir-001.phpt index 5a758bb612..bad32c37ab 100644 --- a/ext/standard/tests/file/mkdir-001.phpt +++ b/ext/standard/tests/file/mkdir-001.phpt @@ -20,7 +20,7 @@ var_dump(rmdir(dirname(__FILE__)."/mkdir-001")); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/mkdir-003.phpt b/ext/standard/tests/file/mkdir-003.phpt index dde6b35550..b3141c5970 100644 --- a/ext/standard/tests/file/mkdir-003.phpt +++ b/ext/standard/tests/file/mkdir-003.phpt @@ -17,7 +17,7 @@ var_dump(rmdir(dirname(__FILE__)."/mkdir-003")); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/mkdir-004.phpt b/ext/standard/tests/file/mkdir-004.phpt index eb6c55ac1d..46db531082 100644 --- a/ext/standard/tests/file/mkdir-004.phpt +++ b/ext/standard/tests/file/mkdir-004.phpt @@ -17,7 +17,7 @@ var_dump(rmdir("/testdir")); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/mkdir-005.phpt b/ext/standard/tests/file/mkdir-005.phpt index b8f104fb79..621c9922e5 100644 --- a/ext/standard/tests/file/mkdir-005.phpt +++ b/ext/standard/tests/file/mkdir-005.phpt @@ -18,7 +18,7 @@ var_dump(rmdir("./testdir")); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/mkdir_rmdir_variation1.phpt b/ext/standard/tests/file/mkdir_rmdir_variation1.phpt index 5dc7a7a4d3..7a1a5c7583 100644 --- a/ext/standard/tests/file/mkdir_rmdir_variation1.phpt +++ b/ext/standard/tests/file/mkdir_rmdir_variation1.phpt @@ -38,7 +38,7 @@ for($mode = 0000; $mode <= 0777; $mode++) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing mkdir() and rmdir() for different permissions *** -- Changing mode of directory to 0 -- bool(true) diff --git a/ext/standard/tests/file/mkdir_variation2.phpt b/ext/standard/tests/file/mkdir_variation2.phpt index 430c36ec99..51a1c39c17 100644 --- a/ext/standard/tests/file/mkdir_variation2.phpt +++ b/ext/standard/tests/file/mkdir_variation2.phpt @@ -130,16 +130,16 @@ Directory created Directory created --empty array-- -Error: 2 - mkdir() expects parameter 2 to be integer, array given, %s(%d) +Error: 2 - mkdir() expects parameter 2 to be int, array given, %s(%d) --int indexed array-- -Error: 2 - mkdir() expects parameter 2 to be integer, array given, %s(%d) +Error: 2 - mkdir() expects parameter 2 to be int, array given, %s(%d) --associative array-- -Error: 2 - mkdir() expects parameter 2 to be integer, array given, %s(%d) +Error: 2 - mkdir() expects parameter 2 to be int, array given, %s(%d) --nested arrays-- -Error: 2 - mkdir() expects parameter 2 to be integer, array given, %s(%d) +Error: 2 - mkdir() expects parameter 2 to be int, array given, %s(%d) --uppercase NULL-- Directory created @@ -160,28 +160,28 @@ Directory created Directory created --empty string DQ-- -Error: 2 - mkdir() expects parameter 2 to be integer, string given, %s(%d) +Error: 2 - mkdir() expects parameter 2 to be int, string given, %s(%d) --empty string SQ-- -Error: 2 - mkdir() expects parameter 2 to be integer, string given, %s(%d) +Error: 2 - mkdir() expects parameter 2 to be int, string given, %s(%d) --string DQ-- -Error: 2 - mkdir() expects parameter 2 to be integer, string given, %s(%d) +Error: 2 - mkdir() expects parameter 2 to be int, string given, %s(%d) --string SQ-- -Error: 2 - mkdir() expects parameter 2 to be integer, string given, %s(%d) +Error: 2 - mkdir() expects parameter 2 to be int, string given, %s(%d) --mixed case string-- -Error: 2 - mkdir() expects parameter 2 to be integer, string given, %s(%d) +Error: 2 - mkdir() expects parameter 2 to be int, string given, %s(%d) --heredoc-- -Error: 2 - mkdir() expects parameter 2 to be integer, string given, %s(%d) +Error: 2 - mkdir() expects parameter 2 to be int, string given, %s(%d) --instance of classWithToString-- -Error: 2 - mkdir() expects parameter 2 to be integer, object given, %s(%d) +Error: 2 - mkdir() expects parameter 2 to be int, object given, %s(%d) --instance of classWithoutToString-- -Error: 2 - mkdir() expects parameter 2 to be integer, object given, %s(%d) +Error: 2 - mkdir() expects parameter 2 to be int, object given, %s(%d) --undefined var-- Directory created diff --git a/ext/standard/tests/file/mkdir_variation3.phpt b/ext/standard/tests/file/mkdir_variation3.phpt index 482c3c0206..4c037b6bca 100644 --- a/ext/standard/tests/file/mkdir_variation3.phpt +++ b/ext/standard/tests/file/mkdir_variation3.phpt @@ -147,16 +147,16 @@ Directory created Directory created --empty array-- -Error: 2 - mkdir() expects parameter 3 to be boolean, array given, %s(%d) +Error: 2 - mkdir() expects parameter 3 to be bool, array given, %s(%d) --int indexed array-- -Error: 2 - mkdir() expects parameter 3 to be boolean, array given, %s(%d) +Error: 2 - mkdir() expects parameter 3 to be bool, array given, %s(%d) --associative array-- -Error: 2 - mkdir() expects parameter 3 to be boolean, array given, %s(%d) +Error: 2 - mkdir() expects parameter 3 to be bool, array given, %s(%d) --nested arrays-- -Error: 2 - mkdir() expects parameter 3 to be boolean, array given, %s(%d) +Error: 2 - mkdir() expects parameter 3 to be bool, array given, %s(%d) --uppercase NULL-- Directory created @@ -195,10 +195,10 @@ Directory created Directory created --instance of classWithToString-- -Error: 2 - mkdir() expects parameter 3 to be boolean, object given, %s(%d) +Error: 2 - mkdir() expects parameter 3 to be bool, object given, %s(%d) --instance of classWithoutToString-- -Error: 2 - mkdir() expects parameter 3 to be boolean, object given, %s(%d) +Error: 2 - mkdir() expects parameter 3 to be bool, object given, %s(%d) --undefined var-- Directory created diff --git a/ext/standard/tests/file/mkdir_variation4.phpt b/ext/standard/tests/file/mkdir_variation4.phpt index 3c5baffa21..a31ae722c6 100644 --- a/ext/standard/tests/file/mkdir_variation4.phpt +++ b/ext/standard/tests/file/mkdir_variation4.phpt @@ -128,16 +128,16 @@ fclose($fileRes); *** Testing mkdir() : usage variation *** --int 0-- -Error: 2 - mkdir() expects parameter 4 to be resource, integer given, %s(%d) +Error: 2 - mkdir() expects parameter 4 to be resource, int given, %s(%d) --int 1-- -Error: 2 - mkdir() expects parameter 4 to be resource, integer given, %s(%d) +Error: 2 - mkdir() expects parameter 4 to be resource, int given, %s(%d) --int 12345-- -Error: 2 - mkdir() expects parameter 4 to be resource, integer given, %s(%d) +Error: 2 - mkdir() expects parameter 4 to be resource, int given, %s(%d) --int -12345-- -Error: 2 - mkdir() expects parameter 4 to be resource, integer given, %s(%d) +Error: 2 - mkdir() expects parameter 4 to be resource, int given, %s(%d) --float 10.5-- Error: 2 - mkdir() expects parameter 4 to be resource, float given, %s(%d) @@ -167,22 +167,22 @@ Error: 2 - mkdir() expects parameter 4 to be resource, array given, %s(%d) Error: 2 - mkdir() expects parameter 4 to be resource, array given, %s(%d) --uppercase NULL-- -Error: 2 - mkdir() expects parameter 4 to be resource, null given, %s(%d) +Directory created --lowercase null-- -Error: 2 - mkdir() expects parameter 4 to be resource, null given, %s(%d) +Directory created --lowercase true-- -Error: 2 - mkdir() expects parameter 4 to be resource, boolean given, %s(%d) +Error: 2 - mkdir() expects parameter 4 to be resource, bool given, %s(%d) --lowercase false-- -Error: 2 - mkdir() expects parameter 4 to be resource, boolean given, %s(%d) +Error: 2 - mkdir() expects parameter 4 to be resource, bool given, %s(%d) --uppercase TRUE-- -Error: 2 - mkdir() expects parameter 4 to be resource, boolean given, %s(%d) +Error: 2 - mkdir() expects parameter 4 to be resource, bool given, %s(%d) --uppercase FALSE-- -Error: 2 - mkdir() expects parameter 4 to be resource, boolean given, %s(%d) +Error: 2 - mkdir() expects parameter 4 to be resource, bool given, %s(%d) --empty string DQ-- Error: 2 - mkdir() expects parameter 4 to be resource, string given, %s(%d) @@ -209,10 +209,10 @@ Error: 2 - mkdir() expects parameter 4 to be resource, object given, %s(%d) Error: 2 - mkdir() expects parameter 4 to be resource, object given, %s(%d) --undefined var-- -Error: 2 - mkdir() expects parameter 4 to be resource, null given, %s(%d) +Directory created --unset var-- -Error: 2 - mkdir() expects parameter 4 to be resource, null given, %s(%d) +Directory created --file resource-- Error: 2 - mkdir(): supplied resource is not a valid Stream-Context resource, %s(%d) diff --git a/ext/standard/tests/file/parse_ini_file.phpt b/ext/standard/tests/file/parse_ini_file.phpt index a79951e013..1a30d45616 100644 --- a/ext/standard/tests/file/parse_ini_file.phpt +++ b/ext/standard/tests/file/parse_ini_file.phpt @@ -217,7 +217,7 @@ echo "*** Done **\n"; <?php unlink(dirname(__FILE__)."/parse.ini"); ?> ---EXPECTF-- +--EXPECT-- *** Test parse_ini_file() function: with various keys and values given in parse.ini file *** -- ini file without process_sections optional arg -- Array diff --git a/ext/standard/tests/file/parse_ini_file_variation5.phpt b/ext/standard/tests/file/parse_ini_file_variation5.phpt index 297c2e93f1..4cfc2a661f 100644 --- a/ext/standard/tests/file/parse_ini_file_variation5.phpt +++ b/ext/standard/tests/file/parse_ini_file_variation5.phpt @@ -168,19 +168,19 @@ array(1) { } --empty array-- -Error: 2 - parse_ini_file() expects parameter 2 to be boolean, array given, %s(%d) +Error: 2 - parse_ini_file() expects parameter 2 to be bool, array given, %s(%d) bool(false) --int indexed array-- -Error: 2 - parse_ini_file() expects parameter 2 to be boolean, array given, %s(%d) +Error: 2 - parse_ini_file() expects parameter 2 to be bool, array given, %s(%d) bool(false) --associative array-- -Error: 2 - parse_ini_file() expects parameter 2 to be boolean, array given, %s(%d) +Error: 2 - parse_ini_file() expects parameter 2 to be bool, array given, %s(%d) bool(false) --nested arrays-- -Error: 2 - parse_ini_file() expects parameter 2 to be boolean, array given, %s(%d) +Error: 2 - parse_ini_file() expects parameter 2 to be bool, array given, %s(%d) bool(false) --uppercase NULL-- @@ -232,11 +232,11 @@ array(1) { } --instance of classWithToString-- -Error: 2 - parse_ini_file() expects parameter 2 to be boolean, object given, %s(%d) +Error: 2 - parse_ini_file() expects parameter 2 to be bool, object given, %s(%d) bool(false) --instance of classWithoutToString-- -Error: 2 - parse_ini_file() expects parameter 2 to be boolean, object given, %s(%d) +Error: 2 - parse_ini_file() expects parameter 2 to be bool, object given, %s(%d) bool(false) --undefined var-- diff --git a/ext/standard/tests/file/pathinfo_basic1-win32.phpt b/ext/standard/tests/file/pathinfo_basic1-win32.phpt index ea95ed1e2b..acca647a97 100644 --- a/ext/standard/tests/file/pathinfo_basic1-win32.phpt +++ b/ext/standard/tests/file/pathinfo_basic1-win32.phpt @@ -71,7 +71,7 @@ foreach($paths as $path) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing basic functions of pathinfo() *** -- Iteration 1 -- string(0) "" diff --git a/ext/standard/tests/file/pathinfo_basic1.phpt b/ext/standard/tests/file/pathinfo_basic1.phpt index e57b21cc0a..c9e84522a8 100644 --- a/ext/standard/tests/file/pathinfo_basic1.phpt +++ b/ext/standard/tests/file/pathinfo_basic1.phpt @@ -71,7 +71,7 @@ foreach($paths as $path) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing basic functions of pathinfo() *** -- Iteration 1 -- string(0) "" diff --git a/ext/standard/tests/file/pathinfo_basic2.phpt b/ext/standard/tests/file/pathinfo_basic2.phpt index 7f6db0b96d..51de45d33d 100644 --- a/ext/standard/tests/file/pathinfo_basic2.phpt +++ b/ext/standard/tests/file/pathinfo_basic2.phpt @@ -48,7 +48,7 @@ foreach($paths as $path) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing basic functions of pathinfo() *** -- Iteration 1 -- string(1) "." diff --git a/ext/standard/tests/file/pathinfo_variation2.phpt b/ext/standard/tests/file/pathinfo_variation2.phpt index d0c1b37a52..a39543b18f 100644 --- a/ext/standard/tests/file/pathinfo_variation2.phpt +++ b/ext/standard/tests/file/pathinfo_variation2.phpt @@ -126,19 +126,19 @@ string(%d) %s string(%d) %s --empty array-- -Error: 2 - pathinfo() expects parameter 2 to be integer, array given, %s(%d) +Error: 2 - pathinfo() expects parameter 2 to be int, array given, %s(%d) NULL --int indexed array-- -Error: 2 - pathinfo() expects parameter 2 to be integer, array given, %s(%d) +Error: 2 - pathinfo() expects parameter 2 to be int, array given, %s(%d) NULL --associative array-- -Error: 2 - pathinfo() expects parameter 2 to be integer, array given, %s(%d) +Error: 2 - pathinfo() expects parameter 2 to be int, array given, %s(%d) NULL --nested arrays-- -Error: 2 - pathinfo() expects parameter 2 to be integer, array given, %s(%d) +Error: 2 - pathinfo() expects parameter 2 to be int, array given, %s(%d) NULL --uppercase NULL-- @@ -160,35 +160,35 @@ string(17) "/usr/include/arpa" string(0) "" --empty string DQ-- -Error: 2 - pathinfo() expects parameter 2 to be integer, string given, %s(%d) +Error: 2 - pathinfo() expects parameter 2 to be int, string given, %s(%d) NULL --empty string SQ-- -Error: 2 - pathinfo() expects parameter 2 to be integer, string given, %s(%d) +Error: 2 - pathinfo() expects parameter 2 to be int, string given, %s(%d) NULL --string DQ-- -Error: 2 - pathinfo() expects parameter 2 to be integer, string given, %s(%d) +Error: 2 - pathinfo() expects parameter 2 to be int, string given, %s(%d) NULL --string SQ-- -Error: 2 - pathinfo() expects parameter 2 to be integer, string given, %s(%d) +Error: 2 - pathinfo() expects parameter 2 to be int, string given, %s(%d) NULL --mixed case string-- -Error: 2 - pathinfo() expects parameter 2 to be integer, string given, %s(%d) +Error: 2 - pathinfo() expects parameter 2 to be int, string given, %s(%d) NULL --heredoc-- -Error: 2 - pathinfo() expects parameter 2 to be integer, string given, %s(%d) +Error: 2 - pathinfo() expects parameter 2 to be int, string given, %s(%d) NULL --instance of classWithToString-- -Error: 2 - pathinfo() expects parameter 2 to be integer, object given, %s(%d) +Error: 2 - pathinfo() expects parameter 2 to be int, object given, %s(%d) NULL --instance of classWithoutToString-- -Error: 2 - pathinfo() expects parameter 2 to be integer, object given, %s(%d) +Error: 2 - pathinfo() expects parameter 2 to be int, object given, %s(%d) NULL --undefined var-- diff --git a/ext/standard/tests/file/pclose_variation1.phpt b/ext/standard/tests/file/pclose_variation1.phpt index 9f3cf04d07..7c22389646 100644 --- a/ext/standard/tests/file/pclose_variation1.phpt +++ b/ext/standard/tests/file/pclose_variation1.phpt @@ -114,19 +114,19 @@ foreach($inputs as $key =>$value) { *** Testing pclose() : usage variation *** --int 0-- -Error: 2 - pclose() expects parameter 1 to be resource, integer given, %s(%d) +Error: 2 - pclose() expects parameter 1 to be resource, int given, %s(%d) bool(false) --int 1-- -Error: 2 - pclose() expects parameter 1 to be resource, integer given, %s(%d) +Error: 2 - pclose() expects parameter 1 to be resource, int given, %s(%d) bool(false) --int 12345-- -Error: 2 - pclose() expects parameter 1 to be resource, integer given, %s(%d) +Error: 2 - pclose() expects parameter 1 to be resource, int given, %s(%d) bool(false) --int -12345-- -Error: 2 - pclose() expects parameter 1 to be resource, integer given, %s(%d) +Error: 2 - pclose() expects parameter 1 to be resource, int given, %s(%d) bool(false) --float 10.5-- @@ -174,19 +174,19 @@ Error: 2 - pclose() expects parameter 1 to be resource, null given, %s(%d) bool(false) --lowercase true-- -Error: 2 - pclose() expects parameter 1 to be resource, boolean given, %s(%d) +Error: 2 - pclose() expects parameter 1 to be resource, bool given, %s(%d) bool(false) --lowercase false-- -Error: 2 - pclose() expects parameter 1 to be resource, boolean given, %s(%d) +Error: 2 - pclose() expects parameter 1 to be resource, bool given, %s(%d) bool(false) --uppercase TRUE-- -Error: 2 - pclose() expects parameter 1 to be resource, boolean given, %s(%d) +Error: 2 - pclose() expects parameter 1 to be resource, bool given, %s(%d) bool(false) --uppercase FALSE-- -Error: 2 - pclose() expects parameter 1 to be resource, boolean given, %s(%d) +Error: 2 - pclose() expects parameter 1 to be resource, bool given, %s(%d) bool(false) --empty string DQ-- diff --git a/ext/standard/tests/file/popen_pclose_basic-win32-mb.phpt b/ext/standard/tests/file/popen_pclose_basic-win32-mb.phpt index 24e61e5d79..de5510bb81 100644 --- a/ext/standard/tests/file/popen_pclose_basic-win32-mb.phpt +++ b/ext/standard/tests/file/popen_pclose_basic-win32-mb.phpt @@ -57,7 +57,7 @@ var_dump( is_int($return_value_pclose) ); echo "\n--- Done ---"; ?> ---EXPECTF-- +--EXPECT-- *** Testing popen(): reading from the pipe *** Sample String ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™ *** Testing popen(): writing to the pipe *** diff --git a/ext/standard/tests/file/popen_pclose_basic-win32.phpt b/ext/standard/tests/file/popen_pclose_basic-win32.phpt index 34ae934de6..829a095ab1 100644 --- a/ext/standard/tests/file/popen_pclose_basic-win32.phpt +++ b/ext/standard/tests/file/popen_pclose_basic-win32.phpt @@ -57,7 +57,7 @@ var_dump( is_int($return_value_pclose) ); echo "\n--- Done ---"; ?> ---EXPECTF-- +--EXPECT-- *** Testing popen(): reading from the pipe *** Sample String *** Testing popen(): writing to the pipe *** diff --git a/ext/standard/tests/file/popen_pclose_basic.phpt b/ext/standard/tests/file/popen_pclose_basic.phpt index 42f27a084c..c53db26db0 100644 --- a/ext/standard/tests/file/popen_pclose_basic.phpt +++ b/ext/standard/tests/file/popen_pclose_basic.phpt @@ -70,7 +70,7 @@ unlink($dirpath."/popen_basic.tmp"); unlink($dirpath."/popen_basic1.tmp"); rmdir($dirpath); ?> ---EXPECTF-- +--EXPECT-- *** Testing popen() and pclose() with different processes *** -- Testing popen(): reading from the pipe -- popen_basic.tmp diff --git a/ext/standard/tests/file/popen_pclose_error-win32-debug.phpt b/ext/standard/tests/file/popen_pclose_error-win32-debug.phpt index ca49c26f2c..f786021231 100644 --- a/ext/standard/tests/file/popen_pclose_error-win32-debug.phpt +++ b/ext/standard/tests/file/popen_pclose_error-win32-debug.phpt @@ -54,7 +54,7 @@ bool(false) Warning: pclose() expects exactly 1 parameter, 2 given in %s on line %d bool(false) -Warning: pclose() expects parameter 1 to be resource, integer given in %s on line %d +Warning: pclose() expects parameter 1 to be resource, int given in %s on line %d bool(false) --- Done ---'abc.txt' is not recognized as an internal or external command, diff --git a/ext/standard/tests/file/popen_pclose_error-win32.phpt b/ext/standard/tests/file/popen_pclose_error-win32.phpt index e4bc7d0e86..0b29f9eefb 100644 --- a/ext/standard/tests/file/popen_pclose_error-win32.phpt +++ b/ext/standard/tests/file/popen_pclose_error-win32.phpt @@ -49,7 +49,7 @@ bool(false) Warning: pclose() expects exactly 1 parameter, 2 given in %s on line %d bool(false) -Warning: pclose() expects parameter 1 to be resource, integer given in %s on line %d +Warning: pclose() expects parameter 1 to be resource, int given in %s on line %d bool(false) diff --git a/ext/standard/tests/file/popen_pclose_error.phpt b/ext/standard/tests/file/popen_pclose_error.phpt index 45c2ef8db1..280e93427a 100644 --- a/ext/standard/tests/file/popen_pclose_error.phpt +++ b/ext/standard/tests/file/popen_pclose_error.phpt @@ -49,7 +49,7 @@ bool(false) Warning: pclose() expects exactly 1 parameter, 2 given in %s on line %d bool(false) -Warning: pclose() expects parameter 1 to be resource, integer given in %s on line %d +Warning: pclose() expects parameter 1 to be resource, int given in %s on line %d bool(false) --- Done --- diff --git a/ext/standard/tests/file/proc_open01.phpt b/ext/standard/tests/file/proc_open01.phpt index b03e2786df..66c601fb91 100644 --- a/ext/standard/tests/file/proc_open01.phpt +++ b/ext/standard/tests/file/proc_open01.phpt @@ -11,7 +11,7 @@ if ($php === false) { $proc = proc_open( "$php -n", array(0 => array('pipe', 'r'), 1 => array('pipe', 'w')), - $pipes, getcwd(), array(), array('binary_pipes' => true) + $pipes, getcwd(), array(), array() ); if ($proc === false) { print "something went wrong.\n"; diff --git a/ext/standard/tests/file/readfile_error.phpt b/ext/standard/tests/file/readfile_error.phpt index 2d5d377dea..fcaa7f3946 100644 --- a/ext/standard/tests/file/readfile_error.phpt +++ b/ext/standard/tests/file/readfile_error.phpt @@ -51,7 +51,7 @@ bool(false) Warning: readfile() expects parameter 3 to be resource, string given in %s on line %d bool(false) -Warning: readfile() expects parameter 3 to be resource, boolean given in %s on line %d +Warning: readfile() expects parameter 3 to be resource, bool given in %s on line %d bool(false) -- Testing readfile() with non-existent file -- diff --git a/ext/standard/tests/file/readfile_variation2.phpt b/ext/standard/tests/file/readfile_variation2.phpt index 0c43bf5661..2fe1475501 100644 --- a/ext/standard/tests/file/readfile_variation2.phpt +++ b/ext/standard/tests/file/readfile_variation2.phpt @@ -64,7 +64,7 @@ echo "Done\n"; $file_path = dirname(__FILE__); unlink("$file_path/readfile_variation2.tmp"); ?> ---EXPECTF-- +--EXPECT-- *** Testing readfile() on soft link *** bool(true) line diff --git a/ext/standard/tests/file/readfile_variation4.phpt b/ext/standard/tests/file/readfile_variation4.phpt index 1df3690849..99ee79e40b 100644 --- a/ext/standard/tests/file/readfile_variation4.phpt +++ b/ext/standard/tests/file/readfile_variation4.phpt @@ -134,19 +134,19 @@ fclose($fileRes); *** Testing readfile() : usage variation *** --int 0-- -Error: 2 - readfile() expects parameter 3 to be resource, integer given, %s(%d) +Error: 2 - readfile() expects parameter 3 to be resource, int given, %s(%d) file not read --int 1-- -Error: 2 - readfile() expects parameter 3 to be resource, integer given, %s(%d) +Error: 2 - readfile() expects parameter 3 to be resource, int given, %s(%d) file not read --int 12345-- -Error: 2 - readfile() expects parameter 3 to be resource, integer given, %s(%d) +Error: 2 - readfile() expects parameter 3 to be resource, int given, %s(%d) file not read --int -12345-- -Error: 2 - readfile() expects parameter 3 to be resource, integer given, %s(%d) +Error: 2 - readfile() expects parameter 3 to be resource, int given, %s(%d) file not read --float 10.5-- @@ -192,19 +192,19 @@ testing readfile testing readfile --lowercase true-- -Error: 2 - readfile() expects parameter 3 to be resource, boolean given, %s(%d) +Error: 2 - readfile() expects parameter 3 to be resource, bool given, %s(%d) file not read --lowercase false-- -Error: 2 - readfile() expects parameter 3 to be resource, boolean given, %s(%d) +Error: 2 - readfile() expects parameter 3 to be resource, bool given, %s(%d) file not read --uppercase TRUE-- -Error: 2 - readfile() expects parameter 3 to be resource, boolean given, %s(%d) +Error: 2 - readfile() expects parameter 3 to be resource, bool given, %s(%d) file not read --uppercase FALSE-- -Error: 2 - readfile() expects parameter 3 to be resource, boolean given, %s(%d) +Error: 2 - readfile() expects parameter 3 to be resource, bool given, %s(%d) file not read --empty string DQ-- diff --git a/ext/standard/tests/file/readfile_variation5.phpt b/ext/standard/tests/file/readfile_variation5.phpt index 04b0477154..bc9c064055 100644 --- a/ext/standard/tests/file/readfile_variation5.phpt +++ b/ext/standard/tests/file/readfile_variation5.phpt @@ -154,19 +154,19 @@ testing readfile testing readfile --empty array-- -Error: 2 - readfile() expects parameter 2 to be boolean, array given, %s(%d) +Error: 2 - readfile() expects parameter 2 to be bool, array given, %s(%d) File not read --int indexed array-- -Error: 2 - readfile() expects parameter 2 to be boolean, array given, %s(%d) +Error: 2 - readfile() expects parameter 2 to be bool, array given, %s(%d) File not read --associative array-- -Error: 2 - readfile() expects parameter 2 to be boolean, array given, %s(%d) +Error: 2 - readfile() expects parameter 2 to be bool, array given, %s(%d) File not read --nested arrays-- -Error: 2 - readfile() expects parameter 2 to be boolean, array given, %s(%d) +Error: 2 - readfile() expects parameter 2 to be bool, array given, %s(%d) File not read --uppercase NULL-- @@ -206,11 +206,11 @@ testing readfile testing readfile --instance of classWithToString-- -Error: 2 - readfile() expects parameter 2 to be boolean, object given, %s(%d) +Error: 2 - readfile() expects parameter 2 to be bool, object given, %s(%d) File not read --instance of classWithoutToString-- -Error: 2 - readfile() expects parameter 2 to be boolean, object given, %s(%d) +Error: 2 - readfile() expects parameter 2 to be bool, object given, %s(%d) File not read --undefined var-- diff --git a/ext/standard/tests/file/realpath_bug77484.phpt b/ext/standard/tests/file/realpath_bug77484.phpt new file mode 100644 index 0000000000..85595d09e3 --- /dev/null +++ b/ext/standard/tests/file/realpath_bug77484.phpt @@ -0,0 +1,39 @@ +--TEST-- +Bug #77484 Zend engine crashes when calling realpath in invalid working dir +--SKIPIF-- +<?php +if (substr(PHP_OS, 0, 3) == 'WIN') { + die("skip can't remove CWD on Windows"); +} +if (PHP_ZTS) { + /* TODO eliminate difference in TS build. */ + die("skip Not for ZTS"); +} +?> +--FILE-- +<?php + +$old_cwd = getcwd(); + +mkdir(__DIR__ . "/foo"); +chdir(__DIR__ . "/foo"); +rmdir(__DIR__ . "/foo"); + +// Outputs: / (incorrect) +$new_cwd = getcwd(); + +// Outputs: false (correct) +$rp0 = realpath(''); + +// Crash +$rp1 = realpath('.'); +$rp2 = realpath('./'); + +var_dump($old_cwd, $new_cwd, $rp0, $rp1, $rp2); +?> +--EXPECTF-- +string(%d) "%s" +bool(false) +bool(false) +string(1) "." +string(1) "." diff --git a/ext/standard/tests/file/realpath_cache_win32.phpt b/ext/standard/tests/file/realpath_cache_win32.phpt index bb8016875a..a5103b20ef 100644 --- a/ext/standard/tests/file/realpath_cache_win32.phpt +++ b/ext/standard/tests/file/realpath_cache_win32.phpt @@ -11,7 +11,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { var_dump(realpath_cache_size()); $data = realpath_cache_get(); -var_dump($data[__DIR__]); +var_dump($data[__FILE__]); echo "Done\n"; ?> @@ -21,9 +21,9 @@ array(8) { ["key"]=> %s(%d%s) ["is_dir"]=> - bool(true) + bool(false) ["realpath"]=> - string(%d) "%sfile" + string(%d) "%sphp" ["expires"]=> int(%d) ["is_rvalid"]=> diff --git a/ext/standard/tests/file/rename_variation1-win32.phpt b/ext/standard/tests/file/rename_variation1-win32.phpt index b58e8128eb..764ba1cac4 100644 --- a/ext/standard/tests/file/rename_variation1-win32.phpt +++ b/ext/standard/tests/file/rename_variation1-win32.phpt @@ -63,7 +63,7 @@ unlink($file_path."/rename_variation_link.tmp"); unlink($file_path."/rename_variation.tmp"); rmdir($file_path."/rename_variation_dir"); ?> ---EXPECTF-- +--EXPECT-- *** Testing rename() : renaming directory across directories *** -- Iteration 1 -- bool(true) diff --git a/ext/standard/tests/file/rename_variation1.phpt b/ext/standard/tests/file/rename_variation1.phpt index f37bba0108..2998189bf2 100644 --- a/ext/standard/tests/file/rename_variation1.phpt +++ b/ext/standard/tests/file/rename_variation1.phpt @@ -54,7 +54,7 @@ echo "Done\n"; $file_path = dirname(__FILE__); rmdir($file_path."/rename_variation1_dir"); ?> ---EXPECTF-- +--EXPECT-- *** Testing rename() : renaming directory across directories *** -- Iteration 1 -- bool(true) diff --git a/ext/standard/tests/file/rename_variation10.phpt b/ext/standard/tests/file/rename_variation10.phpt index 52efd78348..8ee59168b1 100644 --- a/ext/standard/tests/file/rename_variation10.phpt +++ b/ext/standard/tests/file/rename_variation10.phpt @@ -132,19 +132,19 @@ fclose($fileRes); *** Testing rename() : usage variation *** --int 0-- -Error: 2 - rename() expects parameter 3 to be resource, integer given, %s(%d) +Error: 2 - rename() expects parameter 3 to be resource, int given, %s(%d) bool(false) --int 1-- -Error: 2 - rename() expects parameter 3 to be resource, integer given, %s(%d) +Error: 2 - rename() expects parameter 3 to be resource, int given, %s(%d) bool(false) --int 12345-- -Error: 2 - rename() expects parameter 3 to be resource, integer given, %s(%d) +Error: 2 - rename() expects parameter 3 to be resource, int given, %s(%d) bool(false) --int -12345-- -Error: 2 - rename() expects parameter 3 to be resource, integer given, %s(%d) +Error: 2 - rename() expects parameter 3 to be resource, int given, %s(%d) bool(false) --float 10.5-- @@ -184,27 +184,25 @@ Error: 2 - rename() expects parameter 3 to be resource, array given, %s(%d) bool(false) --uppercase NULL-- -Error: 2 - rename() expects parameter 3 to be resource, null given, %s(%d) -bool(false) +bool(true) --lowercase null-- -Error: 2 - rename() expects parameter 3 to be resource, null given, %s(%d) -bool(false) +bool(true) --lowercase true-- -Error: 2 - rename() expects parameter 3 to be resource, boolean given, %s(%d) +Error: 2 - rename() expects parameter 3 to be resource, bool given, %s(%d) bool(false) --lowercase false-- -Error: 2 - rename() expects parameter 3 to be resource, boolean given, %s(%d) +Error: 2 - rename() expects parameter 3 to be resource, bool given, %s(%d) bool(false) --uppercase TRUE-- -Error: 2 - rename() expects parameter 3 to be resource, boolean given, %s(%d) +Error: 2 - rename() expects parameter 3 to be resource, bool given, %s(%d) bool(false) --uppercase FALSE-- -Error: 2 - rename() expects parameter 3 to be resource, boolean given, %s(%d) +Error: 2 - rename() expects parameter 3 to be resource, bool given, %s(%d) bool(false) --empty string DQ-- @@ -240,12 +238,10 @@ Error: 2 - rename() expects parameter 3 to be resource, object given, %s(%d) bool(false) --undefined var-- -Error: 2 - rename() expects parameter 3 to be resource, null given, %s(%d) -bool(false) +bool(true) --unset var-- -Error: 2 - rename() expects parameter 3 to be resource, null given, %s(%d) -bool(false) +bool(true) --file resource-- Error: 2 - rename(): supplied resource is not a valid Stream-Context resource, %s(%d) diff --git a/ext/standard/tests/file/rename_variation2-win32.phpt b/ext/standard/tests/file/rename_variation2-win32.phpt index 4c9faaa529..cc01b928e5 100644 --- a/ext/standard/tests/file/rename_variation2-win32.phpt +++ b/ext/standard/tests/file/rename_variation2-win32.phpt @@ -49,7 +49,7 @@ unlink($file_path."/rename_variation2_link.tmp"); unlink($file_path."/rename_variation2.tmp"); rmdir($file_path."/rename_variation2_dir"); ?> ---EXPECTF-- +--EXPECT-- *** Testing rename() by renaming a file and directory to numeric name *** bool(true) bool(false) diff --git a/ext/standard/tests/file/rename_variation2.phpt b/ext/standard/tests/file/rename_variation2.phpt index 5b0591b0ce..d80a939b33 100644 --- a/ext/standard/tests/file/rename_variation2.phpt +++ b/ext/standard/tests/file/rename_variation2.phpt @@ -52,7 +52,7 @@ $file_path = dirname(__FILE__); unlink($file_path."/rename_variation2.tmp"); rmdir($file_path."/rename_variation2_dir"); ?> ---EXPECTF-- +--EXPECT-- *** Testing rename() on soft links *** bool(true) bool(true) diff --git a/ext/standard/tests/file/rename_variation3.phpt b/ext/standard/tests/file/rename_variation3.phpt index 7c47040729..d76cdd09ef 100644 --- a/ext/standard/tests/file/rename_variation3.phpt +++ b/ext/standard/tests/file/rename_variation3.phpt @@ -47,7 +47,7 @@ $file_path = dirname(__FILE__); unlink($file_path."/rename_variation3_hard_link1.tmp"); rmdir($file_path."/rename_variation3_dir"); ?> ---EXPECTF-- +--EXPECT-- *** Testing rename() on hard links *** bool(true) bool(true) diff --git a/ext/standard/tests/file/rename_variation4.phpt b/ext/standard/tests/file/rename_variation4.phpt index 69753bc322..b6cab73d60 100644 --- a/ext/standard/tests/file/rename_variation4.phpt +++ b/ext/standard/tests/file/rename_variation4.phpt @@ -40,7 +40,7 @@ echo "Done\n"; $file_path = dirname(__FILE__); rmdir($file_path."/12345"); ?> ---EXPECTF-- +--EXPECT-- *** Testing rename() by renaming a file, link and directory to numeric name *** bool(true) bool(false) diff --git a/ext/standard/tests/file/rmdir_variation2.phpt b/ext/standard/tests/file/rmdir_variation2.phpt index 2b4f607ade..7555200344 100644 --- a/ext/standard/tests/file/rmdir_variation2.phpt +++ b/ext/standard/tests/file/rmdir_variation2.phpt @@ -123,19 +123,19 @@ fclose($fileres); *** Testing rmdir() : usage variation *** --int 0-- -Error: 2 - rmdir() expects parameter 2 to be resource, integer given, %s(%d) +Error: 2 - rmdir() expects parameter 2 to be resource, int given, %s(%d) bool(false) --int 1-- -Error: 2 - rmdir() expects parameter 2 to be resource, integer given, %s(%d) +Error: 2 - rmdir() expects parameter 2 to be resource, int given, %s(%d) bool(false) --int 12345-- -Error: 2 - rmdir() expects parameter 2 to be resource, integer given, %s(%d) +Error: 2 - rmdir() expects parameter 2 to be resource, int given, %s(%d) bool(false) --int -12345-- -Error: 2 - rmdir() expects parameter 2 to be resource, integer given, %s(%d) +Error: 2 - rmdir() expects parameter 2 to be resource, int given, %s(%d) bool(false) --float 10.5-- @@ -175,27 +175,25 @@ Error: 2 - rmdir() expects parameter 2 to be resource, array given, %s(%d) bool(false) --uppercase NULL-- -Error: 2 - rmdir() expects parameter 2 to be resource, null given, %s(%d) -bool(false) +bool(true) --lowercase null-- -Error: 2 - rmdir() expects parameter 2 to be resource, null given, %s(%d) -bool(false) +bool(true) --lowercase true-- -Error: 2 - rmdir() expects parameter 2 to be resource, boolean given, %s(%d) +Error: 2 - rmdir() expects parameter 2 to be resource, bool given, %s(%d) bool(false) --lowercase false-- -Error: 2 - rmdir() expects parameter 2 to be resource, boolean given, %s(%d) +Error: 2 - rmdir() expects parameter 2 to be resource, bool given, %s(%d) bool(false) --uppercase TRUE-- -Error: 2 - rmdir() expects parameter 2 to be resource, boolean given, %s(%d) +Error: 2 - rmdir() expects parameter 2 to be resource, bool given, %s(%d) bool(false) --uppercase FALSE-- -Error: 2 - rmdir() expects parameter 2 to be resource, boolean given, %s(%d) +Error: 2 - rmdir() expects parameter 2 to be resource, bool given, %s(%d) bool(false) --empty string DQ-- @@ -231,12 +229,10 @@ Error: 2 - rmdir() expects parameter 2 to be resource, object given, %s(%d) bool(false) --undefined var-- -Error: 2 - rmdir() expects parameter 2 to be resource, null given, %s(%d) -bool(false) +bool(true) --unset var-- -Error: 2 - rmdir() expects parameter 2 to be resource, null given, %s(%d) -bool(false) +bool(true) --0-- Error: 2 - rmdir(): supplied resource is not a valid Stream-Context resource, %s(%d) diff --git a/ext/standard/tests/file/stat_variation1-win32-mb.phpt b/ext/standard/tests/file/stat_variation1-win32-mb.phpt index 50335359d6..36ce34dea6 100644 --- a/ext/standard/tests/file/stat_variation1-win32-mb.phpt +++ b/ext/standard/tests/file/stat_variation1-win32-mb.phpt @@ -76,7 +76,7 @@ $file_path = dirname(__FILE__); unlink("$file_path/stat_variation1a_ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™.tmp"); rmdir("$file_path/stat_variation1a_ç§ã¯ã‚¬ãƒ©ã‚¹ã‚’食ã¹ã‚‰ã‚Œã¾ã™"); ?> ---EXPECTF-- +--EXPECT-- *** Testing stat(): on file and directory ater renaming them *** -- Testing stat() for files after being renamed -- bool(true) diff --git a/ext/standard/tests/file/stat_variation1-win32.phpt b/ext/standard/tests/file/stat_variation1-win32.phpt index faec4785ab..eae08fcb28 100644 --- a/ext/standard/tests/file/stat_variation1-win32.phpt +++ b/ext/standard/tests/file/stat_variation1-win32.phpt @@ -76,7 +76,7 @@ $file_path = dirname(__FILE__); unlink("$file_path/stat_variation1a.tmp"); rmdir("$file_path/stat_variation1a"); ?> ---EXPECTF-- +--EXPECT-- *** Testing stat(): on file and directory ater renaming them *** -- Testing stat() for files after being renamed -- bool(true) diff --git a/ext/standard/tests/file/stat_variation2-win32.phpt b/ext/standard/tests/file/stat_variation2-win32.phpt index 166510fce1..7877188833 100644 --- a/ext/standard/tests/file/stat_variation2-win32.phpt +++ b/ext/standard/tests/file/stat_variation2-win32.phpt @@ -53,7 +53,7 @@ echo "\n*** Done ***"; $file_path = dirname(__FILE__); unlink("$file_path/stat_variation2.tmp"); ?> ---EXPECTF-- +--EXPECT-- *** Testing stat(): writing to a file *** -- Testing stat() on file after data is written in it -- bool(true) diff --git a/ext/standard/tests/file/stat_variation3-win32.phpt b/ext/standard/tests/file/stat_variation3-win32.phpt index 3762710276..46537c6d0f 100644 --- a/ext/standard/tests/file/stat_variation3-win32.phpt +++ b/ext/standard/tests/file/stat_variation3-win32.phpt @@ -64,7 +64,7 @@ echo "\n*** Done ***"; $file_path = dirname(__FILE__); rmdir("$file_path/stat_variation3"); ?> ---EXPECTF-- +--EXPECT-- *** Testing stat(): with creating & deleting subdir/file *** -- Testing stat() on dir after subdir and file is created in it -- bool(true) diff --git a/ext/standard/tests/file/stat_variation4-win32.phpt b/ext/standard/tests/file/stat_variation4-win32.phpt index 961cb0b95f..5f52f8b8e5 100644 --- a/ext/standard/tests/file/stat_variation4-win32.phpt +++ b/ext/standard/tests/file/stat_variation4-win32.phpt @@ -74,7 +74,7 @@ $file_path = dirname(__FILE__); unlink("$file_path/stat_variation4.tmp"); rmdir("$file_path/stat_variation4"); ?> ---EXPECTF-- +--EXPECT-- *** Testing stat(): on file and directory after accessing it with is_dir() and is_file() functions *** -- Testing on Directory -- diff --git a/ext/standard/tests/file/stat_variation5-win32.phpt b/ext/standard/tests/file/stat_variation5-win32.phpt index 0a9e166433..4edca599d1 100644 --- a/ext/standard/tests/file/stat_variation5-win32.phpt +++ b/ext/standard/tests/file/stat_variation5-win32.phpt @@ -54,7 +54,7 @@ echo "\n*** Done ***"; $file_path = dirname(__FILE__); unlink("$file_path/stat_variation5.tmp"); ?> ---EXPECTF-- +--EXPECT-- *** Testing stat(): on a file with read/write permission *** bool(true) bool(true) diff --git a/ext/standard/tests/file/stat_variation6-win32.phpt b/ext/standard/tests/file/stat_variation6-win32.phpt index 144cbe2fe4..496ccac768 100644 --- a/ext/standard/tests/file/stat_variation6-win32.phpt +++ b/ext/standard/tests/file/stat_variation6-win32.phpt @@ -73,7 +73,7 @@ $file_path = dirname(__FILE__); unlink("$file_path/stat_variation6.tmp"); rmdir("$file_path/stat_variation6"); ?> ---EXPECTF-- +--EXPECT-- *** Testing stat() on file with miscelleneous file permission and content *** bool(true) bool(true) diff --git a/ext/standard/tests/file/stat_variation8-win32.phpt b/ext/standard/tests/file/stat_variation8-win32.phpt index e0ab210aaa..0ecd956594 100644 --- a/ext/standard/tests/file/stat_variation8-win32.phpt +++ b/ext/standard/tests/file/stat_variation8-win32.phpt @@ -65,7 +65,7 @@ echo "\n*** Done ***"; $file_path = dirname(__FILE__); unlink("$file_path/stat_variation8.tmp"); ?> ---EXPECTF-- +--EXPECT-- *** Testing stat(): on file by truncating it to given size *** bool(true) bool(true) diff --git a/ext/standard/tests/file/stream_rfc2397_003.phpt b/ext/standard/tests/file/stream_rfc2397_003.phpt index 7cc31fe599..c92142d22a 100644 --- a/ext/standard/tests/file/stream_rfc2397_003.phpt +++ b/ext/standard/tests/file/stream_rfc2397_003.phpt @@ -30,7 +30,7 @@ foreach($streams as $original => $stream) ?> ===DONE=== <?php exit(0); ?> ---EXPECTF-- +--EXPECT-- string(12) "A brief note" string(40) "select_vcount,fcol_from_fieldtable/local" string(13) "foobar foobar" diff --git a/ext/standard/tests/file/stream_rfc2397_004.phpt b/ext/standard/tests/file/stream_rfc2397_004.phpt index 9d3ca4e944..4c13a5f9cd 100644 --- a/ext/standard/tests/file/stream_rfc2397_004.phpt +++ b/ext/standard/tests/file/stream_rfc2397_004.phpt @@ -22,7 +22,7 @@ foreach($streams as $stream) ?> ===DONE=== <?php exit(0); ?> ---EXPECTF-- +--EXPECT-- string(5) ";test" string(4) "test" string(4) "test" diff --git a/ext/standard/tests/file/stream_rfc2397_005.phpt b/ext/standard/tests/file/stream_rfc2397_005.phpt index 14d52f5a60..ab03f399f3 100644 --- a/ext/standard/tests/file/stream_rfc2397_005.phpt +++ b/ext/standard/tests/file/stream_rfc2397_005.phpt @@ -25,7 +25,7 @@ foreach($streams as $stream) ?> ===DONE=== <?php exit(0); ?> ---EXPECTF-- +--EXPECT-- string(12) "A brief note" string(40) "select_vcount,fcol_from_fieldtable/local" string(13) "foobar foobar" diff --git a/ext/standard/tests/file/stream_rfc2397_007.phpt b/ext/standard/tests/file/stream_rfc2397_007.phpt index 87e519de88..447b0246ae 100644 --- a/ext/standard/tests/file/stream_rfc2397_007.phpt +++ b/ext/standard/tests/file/stream_rfc2397_007.phpt @@ -81,7 +81,7 @@ foreach($streams as $stream) ?> ===DONE=== <?php exit(0); ?> ---EXPECTF-- +--EXPECT-- ===data:,012345=== int(0) bool(false) diff --git a/ext/standard/tests/file/symlink_link_linkinfo_is_link_error1.phpt b/ext/standard/tests/file/symlink_link_linkinfo_is_link_error1.phpt index 8aae9b3bca..7e8b5b24cf 100644 --- a/ext/standard/tests/file/symlink_link_linkinfo_is_link_error1.phpt +++ b/ext/standard/tests/file/symlink_link_linkinfo_is_link_error1.phpt @@ -8,9 +8,6 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { if (substr(PHP_OS, 0, 3) == 'SUN') { die('skip Not valid for Sun Solaris'); } -if (PHP_INT_SIZE != 4) { - die("skip this test is for 32bit platform only"); -} ?> --FILE-- <?php diff --git a/ext/standard/tests/file/symlink_link_linkinfo_is_link_error2.phpt b/ext/standard/tests/file/symlink_link_linkinfo_is_link_error2.phpt index a1cb797f22..fc891fde7b 100644 --- a/ext/standard/tests/file/symlink_link_linkinfo_is_link_error2.phpt +++ b/ext/standard/tests/file/symlink_link_linkinfo_is_link_error2.phpt @@ -5,9 +5,6 @@ Test symlink(), linkinfo(), link() and is_link() functions : error conditions - if (substr(PHP_OS, 0, 3) == 'WIN') { die('skip no symlinks on Windows'); } -if (PHP_INT_SIZE != 4) { - die("skip this test is for 32bit platform only"); -} ?> --FILE-- <?php diff --git a/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation3.phpt b/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation3.phpt index cbe4785ed0..edb2889d41 100644 --- a/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation3.phpt +++ b/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation3.phpt @@ -113,7 +113,7 @@ unlink($filename); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Accessing and updating data of file through soft link *** bool(true) diff --git a/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation4.phpt b/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation4.phpt index 9d57c41f7e..c69d2d2b04 100644 --- a/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation4.phpt +++ b/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation4.phpt @@ -91,7 +91,7 @@ unlink($filename); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Accessing and updating data of file through hard link *** -- Access data of the file through the hard link -- diff --git a/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation6.phpt b/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation6.phpt index fe4f40a2b2..d738373856 100644 --- a/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation6.phpt +++ b/ext/standard/tests/file/symlink_link_linkinfo_is_link_variation6.phpt @@ -8,9 +8,6 @@ if ( substr(PHP_OS, 0, 3) == 'WIN' ) { if ( substr(PHP_OS, 0, 3) == 'MAC' ) { die('skip Not valid for MacOS'); } -if (PHP_INT_SIZE != 4) { - die("skip this test is for 32bit platform only"); -} // Skip if being run by root (files are always readable, writeable and executable) $filename = dirname(__FILE__)."/symlink_link_linkinfo_is_link6_check_root.tmp"; diff --git a/ext/standard/tests/file/touch_variation1.phpt b/ext/standard/tests/file/touch_variation1.phpt index 40be788a12..eaf4c46b1d 100644 --- a/ext/standard/tests/file/touch_variation1.phpt +++ b/ext/standard/tests/file/touch_variation1.phpt @@ -29,7 +29,7 @@ var_dump(fileatime($filename)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- bool(true) int(101) int(101) diff --git a/ext/standard/tests/file/touch_variation3-win32-mb.phpt b/ext/standard/tests/file/touch_variation3-win32-mb.phpt index c4a383c446..cebf6f6c95 100644 --- a/ext/standard/tests/file/touch_variation3-win32-mb.phpt +++ b/ext/standard/tests/file/touch_variation3-win32-mb.phpt @@ -126,19 +126,19 @@ bool(true) bool(true) --empty array-- -Error: 2 - touch() expects parameter 2 to be integer, array given, %s(%d) +Error: 2 - touch() expects parameter 2 to be int, array given, %s(%d) NULL --int indexed array-- -Error: 2 - touch() expects parameter 2 to be integer, array given, %s(%d) +Error: 2 - touch() expects parameter 2 to be int, array given, %s(%d) NULL --associative array-- -Error: 2 - touch() expects parameter 2 to be integer, array given, %s(%d) +Error: 2 - touch() expects parameter 2 to be int, array given, %s(%d) NULL --nested arrays-- -Error: 2 - touch() expects parameter 2 to be integer, array given, %s(%d) +Error: 2 - touch() expects parameter 2 to be int, array given, %s(%d) NULL --uppercase NULL-- @@ -160,35 +160,35 @@ bool(true) bool(true) --empty string DQ-- -Error: 2 - touch() expects parameter 2 to be integer, string given, %s(%d) +Error: 2 - touch() expects parameter 2 to be int, string given, %s(%d) NULL --empty string SQ-- -Error: 2 - touch() expects parameter 2 to be integer, string given, %s(%d) +Error: 2 - touch() expects parameter 2 to be int, string given, %s(%d) NULL --string DQ-- -Error: 2 - touch() expects parameter 2 to be integer, string given, %s(%d) +Error: 2 - touch() expects parameter 2 to be int, string given, %s(%d) NULL --string SQ-- -Error: 2 - touch() expects parameter 2 to be integer, string given, %s(%d) +Error: 2 - touch() expects parameter 2 to be int, string given, %s(%d) NULL --mixed case string-- -Error: 2 - touch() expects parameter 2 to be integer, string given, %s(%d) +Error: 2 - touch() expects parameter 2 to be int, string given, %s(%d) NULL --heredoc-- -Error: 2 - touch() expects parameter 2 to be integer, string given, %s(%d) +Error: 2 - touch() expects parameter 2 to be int, string given, %s(%d) NULL --instance of classWithToString-- -Error: 2 - touch() expects parameter 2 to be integer, object given, %s(%d) +Error: 2 - touch() expects parameter 2 to be int, object given, %s(%d) NULL --instance of classWithoutToString-- -Error: 2 - touch() expects parameter 2 to be integer, object given, %s(%d) +Error: 2 - touch() expects parameter 2 to be int, object given, %s(%d) NULL --undefined var-- diff --git a/ext/standard/tests/file/touch_variation3-win32.phpt b/ext/standard/tests/file/touch_variation3-win32.phpt index e59400e21c..a781ffae2f 100644 --- a/ext/standard/tests/file/touch_variation3-win32.phpt +++ b/ext/standard/tests/file/touch_variation3-win32.phpt @@ -126,19 +126,19 @@ bool(true) bool(true) --empty array-- -Error: 2 - touch() expects parameter 2 to be integer, array given, %s(%d) +Error: 2 - touch() expects parameter 2 to be int, array given, %s(%d) NULL --int indexed array-- -Error: 2 - touch() expects parameter 2 to be integer, array given, %s(%d) +Error: 2 - touch() expects parameter 2 to be int, array given, %s(%d) NULL --associative array-- -Error: 2 - touch() expects parameter 2 to be integer, array given, %s(%d) +Error: 2 - touch() expects parameter 2 to be int, array given, %s(%d) NULL --nested arrays-- -Error: 2 - touch() expects parameter 2 to be integer, array given, %s(%d) +Error: 2 - touch() expects parameter 2 to be int, array given, %s(%d) NULL --uppercase NULL-- @@ -160,35 +160,35 @@ bool(true) bool(true) --empty string DQ-- -Error: 2 - touch() expects parameter 2 to be integer, string given, %s(%d) +Error: 2 - touch() expects parameter 2 to be int, string given, %s(%d) NULL --empty string SQ-- -Error: 2 - touch() expects parameter 2 to be integer, string given, %s(%d) +Error: 2 - touch() expects parameter 2 to be int, string given, %s(%d) NULL --string DQ-- -Error: 2 - touch() expects parameter 2 to be integer, string given, %s(%d) +Error: 2 - touch() expects parameter 2 to be int, string given, %s(%d) NULL --string SQ-- -Error: 2 - touch() expects parameter 2 to be integer, string given, %s(%d) +Error: 2 - touch() expects parameter 2 to be int, string given, %s(%d) NULL --mixed case string-- -Error: 2 - touch() expects parameter 2 to be integer, string given, %s(%d) +Error: 2 - touch() expects parameter 2 to be int, string given, %s(%d) NULL --heredoc-- -Error: 2 - touch() expects parameter 2 to be integer, string given, %s(%d) +Error: 2 - touch() expects parameter 2 to be int, string given, %s(%d) NULL --instance of classWithToString-- -Error: 2 - touch() expects parameter 2 to be integer, object given, %s(%d) +Error: 2 - touch() expects parameter 2 to be int, object given, %s(%d) NULL --instance of classWithoutToString-- -Error: 2 - touch() expects parameter 2 to be integer, object given, %s(%d) +Error: 2 - touch() expects parameter 2 to be int, object given, %s(%d) NULL --undefined var-- diff --git a/ext/standard/tests/file/touch_variation3.phpt b/ext/standard/tests/file/touch_variation3.phpt index 5e8fb2d841..5eb6ad315e 100644 --- a/ext/standard/tests/file/touch_variation3.phpt +++ b/ext/standard/tests/file/touch_variation3.phpt @@ -126,19 +126,19 @@ bool(true) bool(true) --empty array-- -Error: 2 - touch() expects parameter 2 to be integer, array given, %s(%d) +Error: 2 - touch() expects parameter 2 to be int, array given, %s(%d) NULL --int indexed array-- -Error: 2 - touch() expects parameter 2 to be integer, array given, %s(%d) +Error: 2 - touch() expects parameter 2 to be int, array given, %s(%d) NULL --associative array-- -Error: 2 - touch() expects parameter 2 to be integer, array given, %s(%d) +Error: 2 - touch() expects parameter 2 to be int, array given, %s(%d) NULL --nested arrays-- -Error: 2 - touch() expects parameter 2 to be integer, array given, %s(%d) +Error: 2 - touch() expects parameter 2 to be int, array given, %s(%d) NULL --uppercase NULL-- @@ -160,35 +160,35 @@ bool(true) bool(true) --empty string DQ-- -Error: 2 - touch() expects parameter 2 to be integer, string given, %s(%d) +Error: 2 - touch() expects parameter 2 to be int, string given, %s(%d) NULL --empty string SQ-- -Error: 2 - touch() expects parameter 2 to be integer, string given, %s(%d) +Error: 2 - touch() expects parameter 2 to be int, string given, %s(%d) NULL --string DQ-- -Error: 2 - touch() expects parameter 2 to be integer, string given, %s(%d) +Error: 2 - touch() expects parameter 2 to be int, string given, %s(%d) NULL --string SQ-- -Error: 2 - touch() expects parameter 2 to be integer, string given, %s(%d) +Error: 2 - touch() expects parameter 2 to be int, string given, %s(%d) NULL --mixed case string-- -Error: 2 - touch() expects parameter 2 to be integer, string given, %s(%d) +Error: 2 - touch() expects parameter 2 to be int, string given, %s(%d) NULL --heredoc-- -Error: 2 - touch() expects parameter 2 to be integer, string given, %s(%d) +Error: 2 - touch() expects parameter 2 to be int, string given, %s(%d) NULL --instance of classWithToString-- -Error: 2 - touch() expects parameter 2 to be integer, object given, %s(%d) +Error: 2 - touch() expects parameter 2 to be int, object given, %s(%d) NULL --instance of classWithoutToString-- -Error: 2 - touch() expects parameter 2 to be integer, object given, %s(%d) +Error: 2 - touch() expects parameter 2 to be int, object given, %s(%d) NULL --undefined var-- diff --git a/ext/standard/tests/file/touch_variation4-win32.phpt b/ext/standard/tests/file/touch_variation4-win32.phpt index d5d2134b44..62816e1ec6 100644 --- a/ext/standard/tests/file/touch_variation4-win32.phpt +++ b/ext/standard/tests/file/touch_variation4-win32.phpt @@ -126,19 +126,19 @@ bool(true) bool(true) --empty array-- -Error: 2 - touch() expects parameter 3 to be integer, array given, %s(%d) +Error: 2 - touch() expects parameter 3 to be int, array given, %s(%d) NULL --int indexed array-- -Error: 2 - touch() expects parameter 3 to be integer, array given, %s(%d) +Error: 2 - touch() expects parameter 3 to be int, array given, %s(%d) NULL --associative array-- -Error: 2 - touch() expects parameter 3 to be integer, array given, %s(%d) +Error: 2 - touch() expects parameter 3 to be int, array given, %s(%d) NULL --nested arrays-- -Error: 2 - touch() expects parameter 3 to be integer, array given, %s(%d) +Error: 2 - touch() expects parameter 3 to be int, array given, %s(%d) NULL --uppercase NULL-- @@ -160,35 +160,35 @@ bool(true) bool(true) --empty string DQ-- -Error: 2 - touch() expects parameter 3 to be integer, string given, %s(%d) +Error: 2 - touch() expects parameter 3 to be int, string given, %s(%d) NULL --empty string SQ-- -Error: 2 - touch() expects parameter 3 to be integer, string given, %s(%d) +Error: 2 - touch() expects parameter 3 to be int, string given, %s(%d) NULL --string DQ-- -Error: 2 - touch() expects parameter 3 to be integer, string given, %s(%d) +Error: 2 - touch() expects parameter 3 to be int, string given, %s(%d) NULL --string SQ-- -Error: 2 - touch() expects parameter 3 to be integer, string given, %s(%d) +Error: 2 - touch() expects parameter 3 to be int, string given, %s(%d) NULL --mixed case string-- -Error: 2 - touch() expects parameter 3 to be integer, string given, %s(%d) +Error: 2 - touch() expects parameter 3 to be int, string given, %s(%d) NULL --heredoc-- -Error: 2 - touch() expects parameter 3 to be integer, string given, %s(%d) +Error: 2 - touch() expects parameter 3 to be int, string given, %s(%d) NULL --instance of classWithToString-- -Error: 2 - touch() expects parameter 3 to be integer, object given, %s(%d) +Error: 2 - touch() expects parameter 3 to be int, object given, %s(%d) NULL --instance of classWithoutToString-- -Error: 2 - touch() expects parameter 3 to be integer, object given, %s(%d) +Error: 2 - touch() expects parameter 3 to be int, object given, %s(%d) NULL --undefined var-- diff --git a/ext/standard/tests/file/touch_variation4.phpt b/ext/standard/tests/file/touch_variation4.phpt index 24cf95b5b0..190d0f4b1a 100644 --- a/ext/standard/tests/file/touch_variation4.phpt +++ b/ext/standard/tests/file/touch_variation4.phpt @@ -126,19 +126,19 @@ bool(true) bool(true) --empty array-- -Error: 2 - touch() expects parameter 3 to be integer, array given, %s(%d) +Error: 2 - touch() expects parameter 3 to be int, array given, %s(%d) NULL --int indexed array-- -Error: 2 - touch() expects parameter 3 to be integer, array given, %s(%d) +Error: 2 - touch() expects parameter 3 to be int, array given, %s(%d) NULL --associative array-- -Error: 2 - touch() expects parameter 3 to be integer, array given, %s(%d) +Error: 2 - touch() expects parameter 3 to be int, array given, %s(%d) NULL --nested arrays-- -Error: 2 - touch() expects parameter 3 to be integer, array given, %s(%d) +Error: 2 - touch() expects parameter 3 to be int, array given, %s(%d) NULL --uppercase NULL-- @@ -160,35 +160,35 @@ bool(true) bool(true) --empty string DQ-- -Error: 2 - touch() expects parameter 3 to be integer, string given, %s(%d) +Error: 2 - touch() expects parameter 3 to be int, string given, %s(%d) NULL --empty string SQ-- -Error: 2 - touch() expects parameter 3 to be integer, string given, %s(%d) +Error: 2 - touch() expects parameter 3 to be int, string given, %s(%d) NULL --string DQ-- -Error: 2 - touch() expects parameter 3 to be integer, string given, %s(%d) +Error: 2 - touch() expects parameter 3 to be int, string given, %s(%d) NULL --string SQ-- -Error: 2 - touch() expects parameter 3 to be integer, string given, %s(%d) +Error: 2 - touch() expects parameter 3 to be int, string given, %s(%d) NULL --mixed case string-- -Error: 2 - touch() expects parameter 3 to be integer, string given, %s(%d) +Error: 2 - touch() expects parameter 3 to be int, string given, %s(%d) NULL --heredoc-- -Error: 2 - touch() expects parameter 3 to be integer, string given, %s(%d) +Error: 2 - touch() expects parameter 3 to be int, string given, %s(%d) NULL --instance of classWithToString-- -Error: 2 - touch() expects parameter 3 to be integer, object given, %s(%d) +Error: 2 - touch() expects parameter 3 to be int, object given, %s(%d) NULL --instance of classWithoutToString-- -Error: 2 - touch() expects parameter 3 to be integer, object given, %s(%d) +Error: 2 - touch() expects parameter 3 to be int, object given, %s(%d) NULL --undefined var-- diff --git a/ext/standard/tests/file/touch_variation5-win32.phpt b/ext/standard/tests/file/touch_variation5-win32.phpt index 7d0f012663..5761824ef3 100644 --- a/ext/standard/tests/file/touch_variation5-win32.phpt +++ b/ext/standard/tests/file/touch_variation5-win32.phpt @@ -178,10 +178,10 @@ PASSED: %s/touchVar5.tmp/../touchVar5.tmp/aSubDirOrFile - created Warning: touch(): Unable to create file %s/BADDIR/aSubDirOrFile because %s in %s on line %d --- testing touchVar5.tmp/aSubDirOrFile/ --- -Warning: touch(): Unable to create file touchVar5.tmp/aSubDirOrFile/ because Invalid argument in %s on line %d +Warning: touch(): Unable to create file touchVar5.tmp/aSubDirOrFile/ because %s in %s on line %d --- testing %s/touchVar5.tmp/aSubDirOrFile/ --- -Warning: touch(): Unable to create file %s/touchVar5.tmp/aSubDirOrFile/ because Invalid argument in %s on line %d +Warning: touch(): Unable to create file %s/touchVar5.tmp/aSubDirOrFile/ because %s in %s on line %d --- testing touchVar5.tmp//aSubDirOrFile --- PASSED: touchVar5.tmp//aSubDirOrFile - created --- testing %s//touchVar5.tmp//aSubDirOrFile --- diff --git a/ext/standard/tests/file/touch_variation6-win32.phpt b/ext/standard/tests/file/touch_variation6-win32.phpt index fc9f7b9a58..197078db3b 100644 --- a/ext/standard/tests/file/touch_variation6-win32.phpt +++ b/ext/standard/tests/file/touch_variation6-win32.phpt @@ -184,10 +184,10 @@ PASSED: %s\touchVar5.tmp\..\touchVar5.tmp\aSubDirOrFile - created Warning: touch(): Unable to create file %s\BADDIR\aSubDirOrFile because %s in %s on line %d --- testing touchVar5.tmp\aSubDirOrFile\ --- -Warning: touch(): Unable to create file touchVar5.tmp\aSubDirOrFile\ because Invalid argument in %s on line %d +Warning: touch(): Unable to create file touchVar5.tmp\aSubDirOrFile\ because %s in %s on line %d --- testing %s\touchVar5.tmp\aSubDirOrFile\ --- -Warning: touch(): Unable to create file %s\touchVar5.tmp\aSubDirOrFile\ because Invalid argument in %s on line %d +Warning: touch(): Unable to create file %s\touchVar5.tmp\aSubDirOrFile\ because %s in %s on line %d --- testing touchVar5.tmp\\aSubDirOrFile --- PASSED: touchVar5.tmp\\aSubDirOrFile - created --- testing %s\\touchVar5.tmp\\aSubDirOrFile --- diff --git a/ext/standard/tests/file/umask_variation1.phpt b/ext/standard/tests/file/umask_variation1.phpt index fdcc27ceb9..6f5bdc4480 100644 --- a/ext/standard/tests/file/umask_variation1.phpt +++ b/ext/standard/tests/file/umask_variation1.phpt @@ -57,7 +57,7 @@ for($mask = 0000; $mask <= 0350; $mask++) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing umask() on file and directory *** -- Setting umask to 000 -- File permission : 666 diff --git a/ext/standard/tests/file/umask_variation2.phpt b/ext/standard/tests/file/umask_variation2.phpt index 4feb42137f..b302bea969 100644 --- a/ext/standard/tests/file/umask_variation2.phpt +++ b/ext/standard/tests/file/umask_variation2.phpt @@ -57,7 +57,7 @@ for($mask = 0351; $mask <= 0777; $mask++) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing umask() on file and directory *** -- Setting umask to 351 -- File permission : 426 diff --git a/ext/standard/tests/file/umask_variation3.phpt b/ext/standard/tests/file/umask_variation3.phpt index 1abc49d445..68996ab692 100644 --- a/ext/standard/tests/file/umask_variation3.phpt +++ b/ext/standard/tests/file/umask_variation3.phpt @@ -144,22 +144,22 @@ int(0) int(0) --empty array-- -Error: 2 - umask() expects parameter 1 to be integer, array given, %s(%d) +Error: 2 - umask() expects parameter 1 to be int, array given, %s(%d) bool(false) int(63) --int indexed array-- -Error: 2 - umask() expects parameter 1 to be integer, array given, %s(%d) +Error: 2 - umask() expects parameter 1 to be int, array given, %s(%d) bool(false) int(63) --associative array-- -Error: 2 - umask() expects parameter 1 to be integer, array given, %s(%d) +Error: 2 - umask() expects parameter 1 to be int, array given, %s(%d) bool(false) int(63) --nested arrays-- -Error: 2 - umask() expects parameter 1 to be integer, array given, %s(%d) +Error: 2 - umask() expects parameter 1 to be int, array given, %s(%d) bool(false) int(63) @@ -188,42 +188,42 @@ int(0) int(0) --empty string DQ-- -Error: 2 - umask() expects parameter 1 to be integer, string given, %s(%d) +Error: 2 - umask() expects parameter 1 to be int, string given, %s(%d) bool(false) int(63) --empty string SQ-- -Error: 2 - umask() expects parameter 1 to be integer, string given, %s(%d) +Error: 2 - umask() expects parameter 1 to be int, string given, %s(%d) bool(false) int(63) --string DQ-- -Error: 2 - umask() expects parameter 1 to be integer, string given, %s(%d) +Error: 2 - umask() expects parameter 1 to be int, string given, %s(%d) bool(false) int(63) --string SQ-- -Error: 2 - umask() expects parameter 1 to be integer, string given, %s(%d) +Error: 2 - umask() expects parameter 1 to be int, string given, %s(%d) bool(false) int(63) --mixed case string-- -Error: 2 - umask() expects parameter 1 to be integer, string given, %s(%d) +Error: 2 - umask() expects parameter 1 to be int, string given, %s(%d) bool(false) int(63) --heredoc-- -Error: 2 - umask() expects parameter 1 to be integer, string given, %s(%d) +Error: 2 - umask() expects parameter 1 to be int, string given, %s(%d) bool(false) int(63) --instance of classWithToString-- -Error: 2 - umask() expects parameter 1 to be integer, object given, %s(%d) +Error: 2 - umask() expects parameter 1 to be int, object given, %s(%d) bool(false) int(63) --instance of classWithoutToString-- -Error: 2 - umask() expects parameter 1 to be integer, object given, %s(%d) +Error: 2 - umask() expects parameter 1 to be int, object given, %s(%d) bool(false) int(63) diff --git a/ext/standard/tests/file/unlink_basic.phpt b/ext/standard/tests/file/unlink_basic.phpt index 97e6aa6dfd..172ad0551a 100644 --- a/ext/standard/tests/file/unlink_basic.phpt +++ b/ext/standard/tests/file/unlink_basic.phpt @@ -32,7 +32,7 @@ var_dump( file_exists($filename) ); // confirm file doesnt exist echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing unlink() on a file *** bool(true) bool(false) diff --git a/ext/standard/tests/file/unlink_error-win32-mb.phpt b/ext/standard/tests/file/unlink_error-win32-mb.phpt index 5111f34b76..efd6ee8323 100644 --- a/ext/standard/tests/file/unlink_error-win32-mb.phpt +++ b/ext/standard/tests/file/unlink_error-win32-mb.phpt @@ -45,7 +45,6 @@ var_dump( file_exists(false) ); // confirm file doesnt exist var_dump( unlink($filename, '') ); // $context as empty string var_dump( unlink($filename, false) ); // $context as boolean false -var_dump( unlink($filename, NULL) ); // $context as NULL echo "\n-- Testing unlink() on non-existent file --\n"; @@ -95,10 +94,7 @@ bool(false) Warning: unlink() expects parameter 2 to be resource, string given in %s on line %d bool(false) -Warning: unlink() expects parameter 2 to be resource, boolean given in %s on line %d -bool(false) - -Warning: unlink() expects parameter 2 to be resource, null given in %s on line %d +Warning: unlink() expects parameter 2 to be resource, bool given in %s on line %d bool(false) -- Testing unlink() on non-existent file -- @@ -108,6 +104,6 @@ bool(false) -- Testing unlink() on directory -- -Warning: unlink(%s/unlink_error): Permission denied in %s on line %d +Warning: unlink(%s/unlink_error): Is a directory in %s on line %d bool(false) Done diff --git a/ext/standard/tests/file/unlink_error-win32.phpt b/ext/standard/tests/file/unlink_error-win32.phpt index e55f6ed5cd..8dde64cff0 100644 --- a/ext/standard/tests/file/unlink_error-win32.phpt +++ b/ext/standard/tests/file/unlink_error-win32.phpt @@ -43,7 +43,6 @@ var_dump( file_exists(false) ); // confirm file doesnt exist var_dump( unlink($filename, '') ); // $context as empty string var_dump( unlink($filename, false) ); // $context as boolean false -var_dump( unlink($filename, NULL) ); // $context as NULL echo "\n-- Testing unlink() on non-existent file --\n"; @@ -92,10 +91,7 @@ bool(false) Warning: unlink() expects parameter 2 to be resource, string given in %s on line %d bool(false) -Warning: unlink() expects parameter 2 to be resource, boolean given in %s on line %d -bool(false) - -Warning: unlink() expects parameter 2 to be resource, null given in %s on line %d +Warning: unlink() expects parameter 2 to be resource, bool given in %s on line %d bool(false) -- Testing unlink() on non-existent file -- @@ -105,6 +101,6 @@ bool(false) -- Testing unlink() on directory -- -Warning: unlink(%s/unlink_error): Permission denied in %s on line %d +Warning: unlink(%s/unlink_error): Is a directory in %s on line %d bool(false) Done diff --git a/ext/standard/tests/file/unlink_error.phpt b/ext/standard/tests/file/unlink_error.phpt index ae888bce4a..f7f8f00847 100644 --- a/ext/standard/tests/file/unlink_error.phpt +++ b/ext/standard/tests/file/unlink_error.phpt @@ -43,7 +43,6 @@ var_dump( file_exists(false) ); // confirm file doesnt exist var_dump( unlink($filename, '') ); // $context as empty string var_dump( unlink($filename, false) ); // $context as boolean false -var_dump( unlink($filename, NULL) ); // $context as NULL echo "\n-- Testing unlink() on non-existent file --\n"; @@ -92,10 +91,7 @@ bool(false) Warning: unlink() expects parameter 2 to be resource, string given in %s on line %d bool(false) -Warning: unlink() expects parameter 2 to be resource, boolean given in %s on line %d -bool(false) - -Warning: unlink() expects parameter 2 to be resource, null given in %s on line %d +Warning: unlink() expects parameter 2 to be resource, bool given in %s on line %d bool(false) -- Testing unlink() on non-existent file -- diff --git a/ext/standard/tests/file/unlink_variation2-win32.phpt b/ext/standard/tests/file/unlink_variation2-win32.phpt deleted file mode 100644 index af7b381547..0000000000 --- a/ext/standard/tests/file/unlink_variation2-win32.phpt +++ /dev/null @@ -1,43 +0,0 @@ ---TEST-- -Test unlink() function : usage variations - unlink file in use ---SKIPIF-- -<?php -if (substr(PHP_OS, 0, 3) != 'WIN') { - die('skip only on Windows'); -} -?> ---FILE-- -<?php -/* Prototype : bool unlink ( string $filename [, resource $context] ); - Description : Deletes filename -*/ - -/* Try to unlink file when file handle is still in use */ - -$file_path = dirname(__FILE__); - -echo "*** Testing unlink() on a file when file handle is open ***\n"; -// temp file name used here -$filename = "$file_path/unlink_variation2-win32.tmp"; - -// create file -$fp = fopen($filename, "w"); -// try unlink() on $filename -var_dump( unlink($filename) ); // expected: false as file handle is still open -// now close file handle -fclose($fp); - -// now unlink file -var_dump( unlink($filename) ); // expected: true -var_dump( file_exists($filename) ); // confirm file is deleted - -echo "Done\n"; -?> ---EXPECTF-- -*** Testing unlink() on a file when file handle is open *** - -Warning: unlink(%s): %s in %s on line %d -bool(false) -bool(true) -bool(false) -Done diff --git a/ext/standard/tests/file/unlink_variation2.phpt b/ext/standard/tests/file/unlink_variation2.phpt index 071a65780c..0044cbe303 100644 --- a/ext/standard/tests/file/unlink_variation2.phpt +++ b/ext/standard/tests/file/unlink_variation2.phpt @@ -1,11 +1,5 @@ --TEST-- Test unlink() function : usage variations - unlink file in use ---SKIPIF-- -<?php -if (substr(PHP_OS, 0, 3) == 'WIN') { - die('skip only on Linux'); -} -?> --FILE-- <?php /* Prototype : bool unlink ( string $filename [, resource $context] ); @@ -30,7 +24,7 @@ fclose($fp); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing unlink() on a file which is in use *** bool(true) bool(false) diff --git a/ext/standard/tests/file/unlink_variation3.phpt b/ext/standard/tests/file/unlink_variation3.phpt index 96f21b2cc7..b332ab7b27 100644 --- a/ext/standard/tests/file/unlink_variation3.phpt +++ b/ext/standard/tests/file/unlink_variation3.phpt @@ -45,7 +45,7 @@ var_dump( file_exists($filename) ); // confirm file is deleted echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing unlink() on soft and hard links *** -- Testing unlink() on soft link -- bool(true) diff --git a/ext/standard/tests/file/unlink_variation5.phpt b/ext/standard/tests/file/unlink_variation5.phpt index 51bb2c7b93..071b14086a 100644 --- a/ext/standard/tests/file/unlink_variation5.phpt +++ b/ext/standard/tests/file/unlink_variation5.phpt @@ -34,7 +34,7 @@ for($mode = 0000; $mode <= 0777; $mode++ ) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing unlink() on a file *** File permission : 0 bool(true) diff --git a/ext/standard/tests/file/unlink_variation6.phpt b/ext/standard/tests/file/unlink_variation6.phpt index 3eab968348..64c009bf91 100644 --- a/ext/standard/tests/file/unlink_variation6.phpt +++ b/ext/standard/tests/file/unlink_variation6.phpt @@ -33,7 +33,7 @@ function f_exists($file) { } ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing unlink() : variation: contexts and relative files *** subdir/testfile.txt exists bool(true) diff --git a/ext/standard/tests/file/unlink_variation7.phpt b/ext/standard/tests/file/unlink_variation7.phpt index ce0b5f77f3..b4a6bd5a1f 100644 --- a/ext/standard/tests/file/unlink_variation7.phpt +++ b/ext/standard/tests/file/unlink_variation7.phpt @@ -125,19 +125,19 @@ fclose($fileRes); *** Testing unlink() : usage variation different types for context *** --int 0-- -Error: 2 - unlink() expects parameter 2 to be resource, integer given, %s(%d) +Error: 2 - unlink() expects parameter 2 to be resource, int given, %s(%d) bool(false) --int 1-- -Error: 2 - unlink() expects parameter 2 to be resource, integer given, %s(%d) +Error: 2 - unlink() expects parameter 2 to be resource, int given, %s(%d) bool(false) --int 12345-- -Error: 2 - unlink() expects parameter 2 to be resource, integer given, %s(%d) +Error: 2 - unlink() expects parameter 2 to be resource, int given, %s(%d) bool(false) --int -12345-- -Error: 2 - unlink() expects parameter 2 to be resource, integer given, %s(%d) +Error: 2 - unlink() expects parameter 2 to be resource, int given, %s(%d) bool(false) --float 10.5-- @@ -177,27 +177,25 @@ Error: 2 - unlink() expects parameter 2 to be resource, array given, %s(%d) bool(false) --uppercase NULL-- -Error: 2 - unlink() expects parameter 2 to be resource, null given, %s(%d) -bool(false) +bool(true) --lowercase null-- -Error: 2 - unlink() expects parameter 2 to be resource, null given, %s(%d) -bool(false) +bool(true) --lowercase true-- -Error: 2 - unlink() expects parameter 2 to be resource, boolean given, %s(%d) +Error: 2 - unlink() expects parameter 2 to be resource, bool given, %s(%d) bool(false) --lowercase false-- -Error: 2 - unlink() expects parameter 2 to be resource, boolean given, %s(%d) +Error: 2 - unlink() expects parameter 2 to be resource, bool given, %s(%d) bool(false) --uppercase TRUE-- -Error: 2 - unlink() expects parameter 2 to be resource, boolean given, %s(%d) +Error: 2 - unlink() expects parameter 2 to be resource, bool given, %s(%d) bool(false) --uppercase FALSE-- -Error: 2 - unlink() expects parameter 2 to be resource, boolean given, %s(%d) +Error: 2 - unlink() expects parameter 2 to be resource, bool given, %s(%d) bool(false) --empty string DQ-- @@ -233,12 +231,10 @@ Error: 2 - unlink() expects parameter 2 to be resource, object given, %s(%d) bool(false) --undefined var-- -Error: 2 - unlink() expects parameter 2 to be resource, null given, %s(%d) -bool(false) +bool(true) --unset var-- -Error: 2 - unlink() expects parameter 2 to be resource, null given, %s(%d) -bool(false) +bool(true) --file resource-- Error: 2 - unlink(): supplied resource is not a valid Stream-Context resource, %s(%d) diff --git a/ext/standard/tests/file/windows_mb_path/test_long_path_bug30730.phpt b/ext/standard/tests/file/windows_mb_path/test_long_path_bug30730.phpt index d9ce1b6993..e897aaa07d 100644 --- a/ext/standard/tests/file/windows_mb_path/test_long_path_bug30730.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_long_path_bug30730.phpt @@ -35,7 +35,7 @@ var_dump(rmdir($dest_dir)); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/file/windows_mb_path/test_long_path_bug70943.phpt b/ext/standard/tests/file/windows_mb_path/test_long_path_bug70943.phpt index c3d2de3f4b..bb50ffdebe 100644 --- a/ext/standard/tests/file/windows_mb_path/test_long_path_bug70943.phpt +++ b/ext/standard/tests/file/windows_mb_path/test_long_path_bug70943.phpt @@ -25,7 +25,7 @@ unlink($testFile); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- Generating a file with a path length of 259 characters... Opening file... OK ===DONE=== diff --git a/ext/standard/tests/filters/bug50363.phpt b/ext/standard/tests/filters/bug50363.phpt index 3395edebc4..c6fd0dc079 100644 --- a/ext/standard/tests/filters/bug50363.phpt +++ b/ext/standard/tests/filters/bug50363.phpt @@ -12,6 +12,6 @@ rewind($b); fpassthru($b); ?> ---EXPECTF-- +--EXPECT-- Sauvegarderéussi(e) não NÃO Sauvegarderéussi(e) não NÃO diff --git a/ext/standard/tests/filters/object_init_failure_2.phpt b/ext/standard/tests/filters/object_init_failure_2.phpt new file mode 100644 index 0000000000..6a1458ff6a --- /dev/null +++ b/ext/standard/tests/filters/object_init_failure_2.phpt @@ -0,0 +1,21 @@ +--TEST-- +Creating the stream filter object may fail (include variation) +--FILE-- +<?php +class SampleFilter extends php_user_filter { + private $data = \FOO; +} +stream_filter_register('sample.filter', SampleFilter::class); +try { + include 'php://filter/read=sample.filter/resource='. __FILE__; +} catch (Error $e) { + echo $e->getMessage(), "\n"; +} +?> +--EXPECTF-- +Warning: main(): unable to create or locate filter "sample.filter" in %s on line %d + +Warning: main(): Unable to create filter (sample.filter) in %s on line %d + +Warning: main(): Failed opening '%s' for inclusion (include_path='%s') in %s on line %d +Undefined constant 'FOO' diff --git a/ext/standard/tests/filters/stream_filter_remove_basic.phpt b/ext/standard/tests/filters/stream_filter_remove_basic.phpt index 75b6829582..fd2a4bd4ca 100644 --- a/ext/standard/tests/filters/stream_filter_remove_basic.phpt +++ b/ext/standard/tests/filters/stream_filter_remove_basic.phpt @@ -39,7 +39,7 @@ $file = dirname( __FILE__ ) . DIRECTORY_SEPARATOR . 'streamfilterTest.txt'; unlink( $file ); ?> ---EXPECTF-- +--EXPECT-- *** Testing stream_filter_remove() : basic functionality *** bool(true) Grfgvat gur ebg13 svygre juvpu fuvsgf fbzr guvatf nebhaq. diff --git a/ext/standard/tests/filters/strip_tags_filter.phpt b/ext/standard/tests/filters/strip_tags_filter.phpt index 038545ae6d..f353e79a9a 100644 --- a/ext/standard/tests/filters/strip_tags_filter.phpt +++ b/ext/standard/tests/filters/strip_tags_filter.phpt @@ -18,7 +18,12 @@ fwrite($fp, "test <b>bold</b> <i>italic</i> test\n"); fclose($fp); ?> ---EXPECT-- +--EXPECTF-- +Deprecated: stream_filter_append(): The string.strip_tags filter is deprecated in %s on line %d test bold italic test + +Deprecated: stream_filter_append(): The string.strip_tags filter is deprecated in %s on line %d test <b>bold</b> italic test + +Deprecated: stream_filter_append(): The string.strip_tags filter is deprecated in %s on line %d test <b>bold</b> italic test diff --git a/ext/standard/tests/forward_static_call_array.phpt b/ext/standard/tests/forward_static_call_array.phpt index a135a712fc..fe063824e1 100644 --- a/ext/standard/tests/forward_static_call_array.phpt +++ b/ext/standard/tests/forward_static_call_array.phpt @@ -2,12 +2,6 @@ mixed forward_static_call_array ( callable $function , array $parameters ); --CREDITS-- marcosptf - <marcosptf@yahoo.com.br> - @phpsp - sao paulo - br ---SKIPIF-- -<?php -if (phpversion() < "5.3.0") { - die('SKIP php version so lower.'); -} -?> --FILE-- <?php diff --git a/ext/standard/tests/general_functions/boolval.phpt b/ext/standard/tests/general_functions/boolval.phpt index 9d0eac4ebd..3c998520ff 100644 --- a/ext/standard/tests/general_functions/boolval.phpt +++ b/ext/standard/tests/general_functions/boolval.phpt @@ -15,7 +15,7 @@ Testing boolval() var_dump(boolval(new stdClass())); var_dump(boolval(STDIN)); ?> ---EXPECTF-- +--EXPECT-- bool(false) bool(false) bool(false) diff --git a/ext/standard/tests/general_functions/bug34794.phpt b/ext/standard/tests/general_functions/bug34794.phpt index 1b25bc28c4..fb95a6267f 100644 --- a/ext/standard/tests/general_functions/bug34794.phpt +++ b/ext/standard/tests/general_functions/bug34794.phpt @@ -26,7 +26,7 @@ proc_close($process2); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- Opening process 1 Opening process 2 Closing process 1 diff --git a/ext/standard/tests/general_functions/bug36011.phpt b/ext/standard/tests/general_functions/bug36011.phpt index b0dd2b8b1f..00530bf846 100644 --- a/ext/standard/tests/general_functions/bug36011.phpt +++ b/ext/standard/tests/general_functions/bug36011.phpt @@ -37,7 +37,7 @@ TestClass::whee5(); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- TestClass::test() TestClass::test() TestClass::test() diff --git a/ext/standard/tests/general_functions/bug40398.phpt b/ext/standard/tests/general_functions/bug40398.phpt index 11fdde2c51..e92be5bedc 100644 --- a/ext/standard/tests/general_functions/bug40398.phpt +++ b/ext/standard/tests/general_functions/bug40398.phpt @@ -74,7 +74,7 @@ new Derived_6('6'); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- Base::__construct(1) Base::__construct(2) Base::__construct(3) diff --git a/ext/standard/tests/general_functions/bug40752.phpt b/ext/standard/tests/general_functions/bug40752.phpt index c0526f31cf..9bf524029c 100644 --- a/ext/standard/tests/general_functions/bug40752.phpt +++ b/ext/standard/tests/general_functions/bug40752.phpt @@ -22,7 +22,7 @@ unlink($file); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- array(1) { ["foo"]=> array(1) { diff --git a/ext/standard/tests/general_functions/bug41445.phpt b/ext/standard/tests/general_functions/bug41445.phpt index a9ead940c1..f46dc9093c 100644 --- a/ext/standard/tests/general_functions/bug41445.phpt +++ b/ext/standard/tests/general_functions/bug41445.phpt @@ -35,7 +35,7 @@ var_dump(parse_ini_file($file)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- array(2) { ["001099030277"]=> array(1) { diff --git a/ext/standard/tests/general_functions/bug41445_1.phpt b/ext/standard/tests/general_functions/bug41445_1.phpt index 99aa76a69c..378001623c 100644 --- a/ext/standard/tests/general_functions/bug41445_1.phpt +++ b/ext/standard/tests/general_functions/bug41445_1.phpt @@ -25,7 +25,7 @@ var_dump(parse_ini_file($file)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- array(3) { ["2454.33"]=> array(1) { diff --git a/ext/standard/tests/general_functions/bug44667.phpt b/ext/standard/tests/general_functions/bug44667.phpt index 290de2b1b1..d4d7b94b4b 100644 --- a/ext/standard/tests/general_functions/bug44667.phpt +++ b/ext/standard/tests/general_functions/bug44667.phpt @@ -28,6 +28,6 @@ echo "Result is: ", $result, "\n"; echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- Result is: Hello Done diff --git a/ext/standard/tests/general_functions/bug48660.phpt b/ext/standard/tests/general_functions/bug48660.phpt index 4c1492a18d..d92958fc42 100644 --- a/ext/standard/tests/general_functions/bug48660.phpt +++ b/ext/standard/tests/general_functions/bug48660.phpt @@ -25,7 +25,7 @@ var_dump(parse_ini_file($ini_location, true, INI_SCANNER_NORMAL)); ?> --CLEAN-- <?php @unlink(dirname(__FILE__) . '/bug48660.tmp'); ?> ---EXPECTF-- +--EXPECT-- array(1) { ["cases"]=> array(5) { diff --git a/ext/standard/tests/general_functions/bug49692.phpt b/ext/standard/tests/general_functions/bug49692.phpt index 80a1612d9e..4512732caf 100644 --- a/ext/standard/tests/general_functions/bug49692.phpt +++ b/ext/standard/tests/general_functions/bug49692.phpt @@ -8,7 +8,7 @@ Rafael Dohms <rdohms [at] gmail [dot] com> var_dump(parse_ini_file('bug49692.ini', true)); ?> ---EXPECTF-- +--EXPECT-- array(1) { ["sitemap"]=> array(2) { diff --git a/ext/standard/tests/general_functions/bug55371.phpt b/ext/standard/tests/general_functions/bug55371.phpt index 179da01f39..e28a6e5009 100644 --- a/ext/standard/tests/general_functions/bug55371.phpt +++ b/ext/standard/tests/general_functions/bug55371.phpt @@ -6,5 +6,8 @@ Bug #55371 (get_magic_quotes_gpc() and get_magic_quotes_runtime() throw deprecat get_magic_quotes_gpc(); get_magic_quotes_runtime(); +echo 'done'; + ?> --EXPECT-- +done diff --git a/ext/standard/tests/general_functions/bug66094.phpt b/ext/standard/tests/general_functions/bug66094.phpt index 89dae71f4a..d218e70efa 100644 --- a/ext/standard/tests/general_functions/bug66094.phpt +++ b/ext/standard/tests/general_functions/bug66094.phpt @@ -7,6 +7,6 @@ register_tick_function($closure = function () { echo "Tick!\n"; }); unregister_tick_function($closure); echo "done"; ?> ---EXPECTF-- +--EXPECT-- Tick! done diff --git a/ext/standard/tests/general_functions/call_user_func_array_variation_003.phpt b/ext/standard/tests/general_functions/call_user_func_array_variation_003.phpt index 677ec53581..c8c8ce6604 100644 --- a/ext/standard/tests/general_functions/call_user_func_array_variation_003.phpt +++ b/ext/standard/tests/general_functions/call_user_func_array_variation_003.phpt @@ -109,19 +109,19 @@ foreach($inputs as $key =>$value) { *** Testing call_user_func_array() : usage variation *** --int 0-- -Error: 2 - call_user_func_array() expects parameter 2 to be array, integer given, %s(%d) +Error: 2 - call_user_func_array() expects parameter 2 to be array, int given, %s(%d) NULL --int 1-- -Error: 2 - call_user_func_array() expects parameter 2 to be array, integer given, %s(%d) +Error: 2 - call_user_func_array() expects parameter 2 to be array, int given, %s(%d) NULL --int 12345-- -Error: 2 - call_user_func_array() expects parameter 2 to be array, integer given, %s(%d) +Error: 2 - call_user_func_array() expects parameter 2 to be array, int given, %s(%d) NULL --int -12345-- -Error: 2 - call_user_func_array() expects parameter 2 to be array, integer given, %s(%d) +Error: 2 - call_user_func_array() expects parameter 2 to be array, int given, %s(%d) NULL --float 10.5-- @@ -153,19 +153,19 @@ Error: 2 - call_user_func_array() expects parameter 2 to be array, null given, % NULL --lowercase true-- -Error: 2 - call_user_func_array() expects parameter 2 to be array, boolean given, %s(%d) +Error: 2 - call_user_func_array() expects parameter 2 to be array, bool given, %s(%d) NULL --lowercase false-- -Error: 2 - call_user_func_array() expects parameter 2 to be array, boolean given, %s(%d) +Error: 2 - call_user_func_array() expects parameter 2 to be array, bool given, %s(%d) NULL --uppercase TRUE-- -Error: 2 - call_user_func_array() expects parameter 2 to be array, boolean given, %s(%d) +Error: 2 - call_user_func_array() expects parameter 2 to be array, bool given, %s(%d) NULL --uppercase FALSE-- -Error: 2 - call_user_func_array() expects parameter 2 to be array, boolean given, %s(%d) +Error: 2 - call_user_func_array() expects parameter 2 to be array, bool given, %s(%d) NULL --empty string DQ-- diff --git a/ext/standard/tests/general_functions/closures_001.phpt b/ext/standard/tests/general_functions/closures_001.phpt index 7f9be50a77..0e81f912cf 100644 --- a/ext/standard/tests/general_functions/closures_001.phpt +++ b/ext/standard/tests/general_functions/closures_001.phpt @@ -6,6 +6,6 @@ register_shutdown_function(function () { echo "Hello World!\n"; }); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- Done Hello World! diff --git a/ext/standard/tests/general_functions/connection_aborted.phpt b/ext/standard/tests/general_functions/connection_aborted.phpt index 79618c2aa1..5932095f09 100644 --- a/ext/standard/tests/general_functions/connection_aborted.phpt +++ b/ext/standard/tests/general_functions/connection_aborted.phpt @@ -6,5 +6,5 @@ marcosptf - <marcosptf@yahoo.com.br> - #phparty7 - @phpsp - novatec/2015 - sao p <?php var_dump(connection_aborted()); ?> ---EXPECTF-- +--EXPECT-- int(0) diff --git a/ext/standard/tests/general_functions/connection_status.phpt b/ext/standard/tests/general_functions/connection_status.phpt index 5e0677fe27..97e0f05684 100644 --- a/ext/standard/tests/general_functions/connection_status.phpt +++ b/ext/standard/tests/general_functions/connection_status.phpt @@ -6,5 +6,5 @@ marcosptf - <marcosptf@yahoo.com.br> - #phparty7 - @phpsp - novatec/2015 - sao p <?php var_dump(connection_status() == CONNECTION_NORMAL); ?> ---EXPECTF-- +--EXPECT-- bool(true) diff --git a/ext/standard/tests/general_functions/debug_zval_dump_b.phpt b/ext/standard/tests/general_functions/debug_zval_dump_b.phpt Binary files differindex 968c4a3eb6..803cc8ce0c 100644 --- a/ext/standard/tests/general_functions/debug_zval_dump_b.phpt +++ b/ext/standard/tests/general_functions/debug_zval_dump_b.phpt diff --git a/ext/standard/tests/general_functions/debug_zval_dump_o.phpt b/ext/standard/tests/general_functions/debug_zval_dump_o.phpt index d2a604ef4b..64352105db 100644 --- a/ext/standard/tests/general_functions/debug_zval_dump_o.phpt +++ b/ext/standard/tests/general_functions/debug_zval_dump_o.phpt @@ -135,25 +135,7 @@ object(object_class)#%d (6) refcount(%d){ int(3) } ["object_class1"]=> - object(object_class)#%d (6) refcount(%d){ - ["value1"]=> - int(5) - ["value2":"object_class":private]=> - int(10) - ["value3":protected]=> - int(20) - ["value4"]=> - int(30) - ["array_var"]=> - array(2) refcount(%d){ - ["key1"]=> - int(1) - ["key2 "]=> - int(3) - } - ["object_class1"]=> - *RECURSION* - } + *RECURSION* } -- Iteration 2 -- object(no_member_class)#%d (0) refcount(%d){ @@ -184,25 +166,7 @@ object(contains_object_class)#%d (9) refcount(%d){ int(3) } ["object_class1"]=> - object(object_class)#%d (6) refcount(%d){ - ["value1"]=> - int(5) - ["value2":"object_class":private]=> - int(10) - ["value3":protected]=> - int(20) - ["value4"]=> - int(30) - ["array_var"]=> - array(2) refcount(%d){ - ["key1"]=> - int(1) - ["key2 "]=> - int(3) - } - ["object_class1"]=> - *RECURSION* - } + *RECURSION* } ["class_object2"]=> object(object_class)#%d (6) refcount(%d){ @@ -222,25 +186,7 @@ object(contains_object_class)#%d (9) refcount(%d){ int(3) } ["object_class1"]=> - object(object_class)#%d (6) refcount(%d){ - ["value1"]=> - int(5) - ["value2":"object_class":private]=> - int(10) - ["value3":protected]=> - int(20) - ["value4"]=> - int(30) - ["array_var"]=> - array(2) refcount(%d){ - ["key1"]=> - int(1) - ["key2 "]=> - int(3) - } - ["object_class1"]=> - *RECURSION* - } + *RECURSION* } ["class_object3":"contains_object_class":private]=> object(object_class)#%d (6) refcount(%d){ @@ -260,25 +206,7 @@ object(contains_object_class)#%d (9) refcount(%d){ int(3) } ["object_class1"]=> - object(object_class)#%d (6) refcount(%d){ - ["value1"]=> - int(5) - ["value2":"object_class":private]=> - int(10) - ["value3":protected]=> - int(20) - ["value4"]=> - int(30) - ["array_var"]=> - array(2) refcount(%d){ - ["key1"]=> - int(1) - ["key2 "]=> - int(3) - } - ["object_class1"]=> - *RECURSION* - } + *RECURSION* } ["class_object4":protected]=> object(object_class)#%d (6) refcount(%d){ @@ -298,195 +226,13 @@ object(contains_object_class)#%d (9) refcount(%d){ int(3) } ["object_class1"]=> - object(object_class)#%d (6) refcount(%d){ - ["value1"]=> - int(5) - ["value2":"object_class":private]=> - int(10) - ["value3":protected]=> - int(20) - ["value4"]=> - int(30) - ["array_var"]=> - array(2) refcount(%d){ - ["key1"]=> - int(1) - ["key2 "]=> - int(3) - } - ["object_class1"]=> - *RECURSION* - } + *RECURSION* } ["no_member_class_object"]=> object(no_member_class)#%d (0) refcount(%d){ } ["class_object5"]=> - object(contains_object_class)#%d (9) refcount(%d){ - ["p"]=> - int(30) - ["p1":protected]=> - int(40) - ["p2":"contains_object_class":private]=> - int(50) - ["class_object1"]=> - object(object_class)#%d (6) refcount(%d){ - ["value1"]=> - int(5) - ["value2":"object_class":private]=> - int(10) - ["value3":protected]=> - int(20) - ["value4"]=> - int(30) - ["array_var"]=> - array(2) refcount(%d){ - ["key1"]=> - int(1) - ["key2 "]=> - int(3) - } - ["object_class1"]=> - object(object_class)#%d (6) refcount(%d){ - ["value1"]=> - int(5) - ["value2":"object_class":private]=> - int(10) - ["value3":protected]=> - int(20) - ["value4"]=> - int(30) - ["array_var"]=> - array(2) refcount(%d){ - ["key1"]=> - int(1) - ["key2 "]=> - int(3) - } - ["object_class1"]=> - *RECURSION* - } - } - ["class_object2"]=> - object(object_class)#%d (6) refcount(%d){ - ["value1"]=> - int(5) - ["value2":"object_class":private]=> - int(10) - ["value3":protected]=> - int(20) - ["value4"]=> - int(30) - ["array_var"]=> - array(2) refcount(%d){ - ["key1"]=> - int(1) - ["key2 "]=> - int(3) - } - ["object_class1"]=> - object(object_class)#%d (6) refcount(%d){ - ["value1"]=> - int(5) - ["value2":"object_class":private]=> - int(10) - ["value3":protected]=> - int(20) - ["value4"]=> - int(30) - ["array_var"]=> - array(2) refcount(%d){ - ["key1"]=> - int(1) - ["key2 "]=> - int(3) - } - ["object_class1"]=> - *RECURSION* - } - } - ["class_object3":"contains_object_class":private]=> - object(object_class)#%d (6) refcount(%d){ - ["value1"]=> - int(5) - ["value2":"object_class":private]=> - int(10) - ["value3":protected]=> - int(20) - ["value4"]=> - int(30) - ["array_var"]=> - array(2) refcount(%d){ - ["key1"]=> - int(1) - ["key2 "]=> - int(3) - } - ["object_class1"]=> - object(object_class)#%d (6) refcount(%d){ - ["value1"]=> - int(5) - ["value2":"object_class":private]=> - int(10) - ["value3":protected]=> - int(20) - ["value4"]=> - int(30) - ["array_var"]=> - array(2) refcount(%d){ - ["key1"]=> - int(1) - ["key2 "]=> - int(3) - } - ["object_class1"]=> - *RECURSION* - } - } - ["class_object4":protected]=> - object(object_class)#%d (6) refcount(%d){ - ["value1"]=> - int(5) - ["value2":"object_class":private]=> - int(10) - ["value3":protected]=> - int(20) - ["value4"]=> - int(30) - ["array_var"]=> - array(2) refcount(%d){ - ["key1"]=> - int(1) - ["key2 "]=> - int(3) - } - ["object_class1"]=> - object(object_class)#%d (6) refcount(%d){ - ["value1"]=> - int(5) - ["value2":"object_class":private]=> - int(10) - ["value3":protected]=> - int(20) - ["value4"]=> - int(30) - ["array_var"]=> - array(2) refcount(%d){ - ["key1"]=> - int(1) - ["key2 "]=> - int(3) - } - ["object_class1"]=> - *RECURSION* - } - } - ["no_member_class_object"]=> - object(no_member_class)#%d (0) refcount(%d){ - } - ["class_object5"]=> - *RECURSION* - } + *RECURSION* } -- Iteration 4 -- object(object_class)#%d (6) refcount(%d){ @@ -506,25 +252,7 @@ object(object_class)#%d (6) refcount(%d){ int(3) } ["object_class1"]=> - object(object_class)#%d (6) refcount(%d){ - ["value1"]=> - int(5) - ["value2":"object_class":private]=> - int(10) - ["value3":protected]=> - int(20) - ["value4"]=> - int(30) - ["array_var"]=> - array(2) refcount(%d){ - ["key1"]=> - int(1) - ["key2 "]=> - int(3) - } - ["object_class1"]=> - *RECURSION* - } + *RECURSION* } -- Iteration 5 -- object(object_class)#%d (6) refcount(%d){ @@ -544,25 +272,7 @@ object(object_class)#%d (6) refcount(%d){ int(3) } ["object_class1"]=> - object(object_class)#%d (6) refcount(%d){ - ["value1"]=> - int(5) - ["value2":"object_class":private]=> - int(10) - ["value3":protected]=> - int(20) - ["value4"]=> - int(30) - ["array_var"]=> - array(2) refcount(%d){ - ["key1"]=> - int(1) - ["key2 "]=> - int(3) - } - ["object_class1"]=> - *RECURSION* - } + *RECURSION* } -- Iteration 6 -- object(no_member_class)#%d (0) refcount(%d){ @@ -587,25 +297,7 @@ object(object_class)#%d (6) refcount(%d){ int(3) } ["object_class1"]=> - object(object_class)#%d (6) refcount(%d){ - ["value1"]=> - int(5) - ["value2":"object_class":private]=> - int(10) - ["value3":protected]=> - int(20) - ["value4"]=> - int(30) - ["array_var"]=> - array(2) refcount(%d){ - ["key1"]=> - int(1) - ["key2 "]=> - int(3) - } - ["object_class1"]=> - *RECURSION* - } + *RECURSION* } -- Iteration 9 -- object(object_class)#%d (6) refcount(%d){ @@ -625,25 +317,7 @@ object(object_class)#%d (6) refcount(%d){ int(3) } ["object_class1"]=> - object(object_class)#%d (6) refcount(%d){ - ["value1"]=> - int(5) - ["value2":"object_class":private]=> - int(10) - ["value3":protected]=> - int(20) - ["value4"]=> - int(30) - ["array_var"]=> - array(2) refcount(%d){ - ["key1"]=> - int(1) - ["key2 "]=> - int(3) - } - ["object_class1"]=> - *RECURSION* - } + *RECURSION* } -- Iteration 10 -- int(30) @@ -674,67 +348,7 @@ object(object_class)#%d (7) refcount(%d){ int(3) } ["object_class1"]=> - object(object_class)#%d (7) refcount(%d){ - ["value1"]=> - int(5) - ["value2":"object_class":private]=> - int(10) - ["value3":protected]=> - int(20) - ["value4"]=> - int(30) - ["array_var"]=> - array(2) refcount(%d){ - ["key1"]=> - int(1) - ["key2 "]=> - int(3) - } - ["object_class1"]=> - *RECURSION* - ["obj"]=> - &object(object_class)#%d (7) refcount(%d){ - ["value1"]=> - int(5) - ["value2":"object_class":private]=> - int(10) - ["value3":protected]=> - int(20) - ["value4"]=> - int(30) - ["array_var"]=> - array(2) refcount(%d){ - ["key1"]=> - int(1) - ["key2 "]=> - int(3) - } - ["object_class1"]=> - object(object_class)#%d (7) refcount(%d){ - ["value1"]=> - int(5) - ["value2":"object_class":private]=> - int(10) - ["value3":protected]=> - int(20) - ["value4"]=> - int(30) - ["array_var"]=> - array(2) refcount(%d){ - ["key1"]=> - int(1) - ["key2 "]=> - int(3) - } - ["object_class1"]=> - *RECURSION* - ["obj"]=> - *RECURSION* - } - ["obj"]=> - *RECURSION* - } - } + *RECURSION* ["obj"]=> &object(object_class)#%d (7) refcount(%d){ ["value1"]=> @@ -753,89 +367,9 @@ object(object_class)#%d (7) refcount(%d){ int(3) } ["object_class1"]=> - object(object_class)#%d (7) refcount(%d){ - ["value1"]=> - int(5) - ["value2":"object_class":private]=> - int(10) - ["value3":protected]=> - int(20) - ["value4"]=> - int(30) - ["array_var"]=> - array(2) refcount(%d){ - ["key1"]=> - int(1) - ["key2 "]=> - int(3) - } - ["object_class1"]=> - *RECURSION* - ["obj"]=> - &object(object_class)#%d (7) refcount(%d){ - ["value1"]=> - int(5) - ["value2":"object_class":private]=> - int(10) - ["value3":protected]=> - int(20) - ["value4"]=> - int(30) - ["array_var"]=> - array(2) refcount(%d){ - ["key1"]=> - int(1) - ["key2 "]=> - int(3) - } - ["object_class1"]=> - *RECURSION* - ["obj"]=> - *RECURSION* - } - } + *RECURSION* ["obj"]=> - &object(object_class)#%d (7) refcount(%d){ - ["value1"]=> - int(5) - ["value2":"object_class":private]=> - int(10) - ["value3":protected]=> - int(20) - ["value4"]=> - int(30) - ["array_var"]=> - array(2) refcount(%d){ - ["key1"]=> - int(1) - ["key2 "]=> - int(3) - } - ["object_class1"]=> - *RECURSION* - ["obj"]=> - &object(object_class)#%d (7) refcount(%d){ - ["value1"]=> - int(5) - ["value2":"object_class":private]=> - int(10) - ["value3":protected]=> - int(20) - ["value4"]=> - int(30) - ["array_var"]=> - array(2) refcount(%d){ - ["key1"]=> - int(1) - ["key2 "]=> - int(3) - } - ["object_class1"]=> - *RECURSION* - ["obj"]=> - *RECURSION* - } - } + *RECURSION* } } Done diff --git a/ext/standard/tests/general_functions/debug_zval_dump_v.phpt b/ext/standard/tests/general_functions/debug_zval_dump_v.phpt index b1dce294ab..6cb413dc26 100644 --- a/ext/standard/tests/general_functions/debug_zval_dump_v.phpt +++ b/ext/standard/tests/general_functions/debug_zval_dump_v.phpt @@ -102,7 +102,7 @@ $misc_values = array ( @$undef_var, /* mixed types */ - @TRUE123, + "TRUE123", "123string", "string123", "NULLstring" diff --git a/ext/standard/tests/general_functions/escapeshellcmd-win32.phpt b/ext/standard/tests/general_functions/escapeshellcmd-win32.phpt index 7d2a029b47..5254e5d57a 100644 --- a/ext/standard/tests/general_functions/escapeshellcmd-win32.phpt +++ b/ext/standard/tests/general_functions/escapeshellcmd-win32.phpt @@ -29,7 +29,7 @@ foreach ($data AS $value) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing escapeshellcmd() basic operations *** -- Test 1 -- string(5) "^"abc" diff --git a/ext/standard/tests/general_functions/get_cfg_var_basic.phpt b/ext/standard/tests/general_functions/get_cfg_var_basic.phpt index 3fb0056553..541865a7b3 100644 --- a/ext/standard/tests/general_functions/get_cfg_var_basic.phpt +++ b/ext/standard/tests/general_functions/get_cfg_var_basic.phpt @@ -17,7 +17,7 @@ var_dump(get_cfg_var( 'session.serialize_handler' ) ); var_dump(get_cfg_var( 'session.save_handler' ) ); ?> ---EXPECTF-- +--EXPECT-- *** Test by calling method or function with its expected arguments *** string(1) "0" string(3) "php" diff --git a/ext/standard/tests/general_functions/get_cfg_var_variation2.phpt b/ext/standard/tests/general_functions/get_cfg_var_variation2.phpt index 68495a13d9..195affe4fc 100644 --- a/ext/standard/tests/general_functions/get_cfg_var_variation2.phpt +++ b/ext/standard/tests/general_functions/get_cfg_var_variation2.phpt @@ -27,7 +27,7 @@ foreach ( $variation_array as $var ) { var_dump(get_cfg_var( $var ) ); } ?> ---EXPECTF-- +--EXPECT-- *** Test substituting argument 1 with boolean values *** bool(false) bool(false) diff --git a/ext/standard/tests/general_functions/get_cfg_var_variation3.phpt b/ext/standard/tests/general_functions/get_cfg_var_variation3.phpt index d1fb5e7dda..1a99242ba6 100644 --- a/ext/standard/tests/general_functions/get_cfg_var_variation3.phpt +++ b/ext/standard/tests/general_functions/get_cfg_var_variation3.phpt @@ -32,7 +32,7 @@ foreach ( $variation_array as $var ) { var_dump(get_cfg_var( $var ) ); } ?> ---EXPECTF-- +--EXPECT-- *** Test substituting argument 1 with emptyUnsetUndefNull values *** bool(false) bool(false) diff --git a/ext/standard/tests/general_functions/get_cfg_var_variation4.phpt b/ext/standard/tests/general_functions/get_cfg_var_variation4.phpt index 8dac4f8a40..03270ce3f4 100644 --- a/ext/standard/tests/general_functions/get_cfg_var_variation4.phpt +++ b/ext/standard/tests/general_functions/get_cfg_var_variation4.phpt @@ -28,7 +28,7 @@ foreach ( $variation_array as $var ) { var_dump(get_cfg_var( $var ) ); } ?> ---EXPECTF-- +--EXPECT-- *** Test substituting argument 1 with float values *** bool(false) bool(false) diff --git a/ext/standard/tests/general_functions/get_cfg_var_variation5.phpt b/ext/standard/tests/general_functions/get_cfg_var_variation5.phpt index 392abb32c5..d2a90bce05 100644 --- a/ext/standard/tests/general_functions/get_cfg_var_variation5.phpt +++ b/ext/standard/tests/general_functions/get_cfg_var_variation5.phpt @@ -27,7 +27,7 @@ foreach ( $variation_array as $var ) { var_dump(get_cfg_var( $var ) ); } ?> ---EXPECTF-- +--EXPECT-- *** Test substituting argument 1 with int values *** bool(false) bool(false) diff --git a/ext/standard/tests/general_functions/get_cfg_var_variation7.phpt b/ext/standard/tests/general_functions/get_cfg_var_variation7.phpt index 3b5b08c6d5..d6bdf693e8 100644 --- a/ext/standard/tests/general_functions/get_cfg_var_variation7.phpt +++ b/ext/standard/tests/general_functions/get_cfg_var_variation7.phpt @@ -31,7 +31,7 @@ foreach ( $variation_array as $var ) { var_dump(get_cfg_var( $var ) ); } ?> ---EXPECTF-- +--EXPECT-- *** Test substituting argument 1 with unknown string values *** bool(false) bool(false) diff --git a/ext/standard/tests/general_functions/get_cfg_var_variation8.phpt b/ext/standard/tests/general_functions/get_cfg_var_variation8.phpt index f743e7456c..b273e512d0 100644 --- a/ext/standard/tests/general_functions/get_cfg_var_variation8.phpt +++ b/ext/standard/tests/general_functions/get_cfg_var_variation8.phpt @@ -11,5 +11,5 @@ echo "*** Test by calling method or function with deprecated option ***\n"; var_dump(get_cfg_var( 'magic_quotes_gpc' ) ); ?> ---EXPECTF-- +--EXPECT-- Fatal error: Directive 'magic_quotes_gpc' is no longer available in PHP in Unknown on line 0 diff --git a/ext/standard/tests/general_functions/get_cfg_var_variation9.phpt b/ext/standard/tests/general_functions/get_cfg_var_variation9.phpt index 3bb08fc24f..6e4b304018 100644 --- a/ext/standard/tests/general_functions/get_cfg_var_variation9.phpt +++ b/ext/standard/tests/general_functions/get_cfg_var_variation9.phpt @@ -30,7 +30,7 @@ foreach ( $variation_array as $var ) { var_dump(get_cfg_var( $var ) ); } ?> ---EXPECTF-- +--EXPECT-- *** Test substituting argument with array of valid parameters *** string(1) "0" string(3) "php" diff --git a/ext/standard/tests/general_functions/get_defined_constants_basic.phpt b/ext/standard/tests/general_functions/get_defined_constants_basic.phpt index 001ee72624..1d9ca4a277 100644 --- a/ext/standard/tests/general_functions/get_defined_constants_basic.phpt +++ b/ext/standard/tests/general_functions/get_defined_constants_basic.phpt @@ -29,7 +29,7 @@ if ($n2 == $n1 + 1 && array_key_exists("USER_CONSTANT", $arr2)) { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing get_defined_constants() : basic functionality *** string(5) "array" string(5) "array" diff --git a/ext/standard/tests/general_functions/get_extension_funcs_basic.phpt b/ext/standard/tests/general_functions/get_extension_funcs_basic.phpt index 1b7ead428c..33d4af03d2 100644 --- a/ext/standard/tests/general_functions/get_extension_funcs_basic.phpt +++ b/ext/standard/tests/general_functions/get_extension_funcs_basic.phpt @@ -16,7 +16,7 @@ var_dump(in_array("cos", $result)); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- Simple testcase for get_extension_funcs() function string(5) "array" bool(true) diff --git a/ext/standard/tests/general_functions/get_resource_type_variation1.phpt b/ext/standard/tests/general_functions/get_resource_type_variation1.phpt index f39e72b82a..b5f33e1830 100644 --- a/ext/standard/tests/general_functions/get_resource_type_variation1.phpt +++ b/ext/standard/tests/general_functions/get_resource_type_variation1.phpt @@ -39,12 +39,12 @@ foreach($vars as $variation =>$object) { -- bool -- -Warning: get_resource_type() expects parameter 1 to be resource, boolean given in %s on line %d +Warning: get_resource_type() expects parameter 1 to be resource, bool given in %s on line %d NULL -- int 10 -- -Warning: get_resource_type() expects parameter 1 to be resource, integer given in %s on line %d +Warning: get_resource_type() expects parameter 1 to be resource, int given in %s on line %d NULL -- float 10.5 -- diff --git a/ext/standard/tests/general_functions/getenv.phpt b/ext/standard/tests/general_functions/getenv.phpt index 006378a337..bba12a905a 100644 --- a/ext/standard/tests/general_functions/getenv.phpt +++ b/ext/standard/tests/general_functions/getenv.phpt @@ -10,7 +10,7 @@ var_dump(getenv()["FOO"]); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(3) "bar" string(3) "bar" Done diff --git a/ext/standard/tests/general_functions/getrusage.phpt b/ext/standard/tests/general_functions/getrusage.phpt index e716414eb3..4caca88e1b 100644 --- a/ext/standard/tests/general_functions/getrusage.phpt +++ b/ext/standard/tests/general_functions/getrusage.phpt @@ -18,6 +18,6 @@ string(5) "array" string(5) "array" string(5) "array" -Warning: getrusage() expects parameter 1 to be integer, array given in %s on line %d +Warning: getrusage() expects parameter 1 to be int, array given in %s on line %d NULL Done diff --git a/ext/standard/tests/general_functions/getrusage_error.phpt b/ext/standard/tests/general_functions/getrusage_error.phpt index ce2bbc815e..66deb91a31 100644 --- a/ext/standard/tests/general_functions/getrusage_error.phpt +++ b/ext/standard/tests/general_functions/getrusage_error.phpt @@ -54,17 +54,17 @@ Warning: getrusage() expects at most 1 parameter, 2 given in %s on line %d -- Testing getrusage() function with invalid argument - non-numeric STRING-- -Warning: getrusage() expects parameter 1 to be integer, string given in %s on line %d +Warning: getrusage() expects parameter 1 to be int, string given in %s on line %d -- Testing getrusage() function with invalid argument - ARRAY-- -Warning: getrusage() expects parameter 1 to be integer, array given in %s on line %d +Warning: getrusage() expects parameter 1 to be int, array given in %s on line %d -- Testing getrusage() function with invalid argument - OBJECT -- -Warning: getrusage() expects parameter 1 to be integer, object given in %s on line %d +Warning: getrusage() expects parameter 1 to be int, object given in %s on line %d -- Testing getrusage() function with invalid argument - RESOURCE -- -Warning: getrusage() expects parameter 1 to be integer, resource given in %s on line %d +Warning: getrusage() expects parameter 1 to be int, resource given in %s on line %d ===DONE=== diff --git a/ext/standard/tests/general_functions/getservbyname_variation10.phpt b/ext/standard/tests/general_functions/getservbyname_variation10.phpt index c7ed144f10..4779efdcaf 100644 --- a/ext/standard/tests/general_functions/getservbyname_variation10.phpt +++ b/ext/standard/tests/general_functions/getservbyname_variation10.phpt @@ -32,7 +32,7 @@ foreach ( $variation_array as $var ) { var_dump(getservbyname( $service, $var ) ); } ?> ---EXPECTF-- +--EXPECT-- *** Test substituting argument 2 with emptyUnsetUndefNull values *** bool(false) bool(false) diff --git a/ext/standard/tests/general_functions/getservbyname_variation11.phpt b/ext/standard/tests/general_functions/getservbyname_variation11.phpt index 3c410c55b6..3478c36eb6 100644 --- a/ext/standard/tests/general_functions/getservbyname_variation11.phpt +++ b/ext/standard/tests/general_functions/getservbyname_variation11.phpt @@ -21,7 +21,7 @@ foreach ( $variation_array as $var ) { var_dump(getservbyname( $service, $var ) ); } ?> ---EXPECTF-- +--EXPECT-- *** Test substituting argument 2 with float values *** bool(false) bool(false) diff --git a/ext/standard/tests/general_functions/getservbyname_variation12.phpt b/ext/standard/tests/general_functions/getservbyname_variation12.phpt index 7e5323cca8..37a54ce32a 100644 --- a/ext/standard/tests/general_functions/getservbyname_variation12.phpt +++ b/ext/standard/tests/general_functions/getservbyname_variation12.phpt @@ -21,7 +21,7 @@ foreach ( $variation_array as $var ) { var_dump(getservbyname( $service, $var ) ); } ?> ---EXPECTF-- +--EXPECT-- *** Test substituting argument 2 with int values *** bool(false) bool(false) diff --git a/ext/standard/tests/general_functions/getservbyname_variation14.phpt b/ext/standard/tests/general_functions/getservbyname_variation14.phpt index 1e52b075f2..8e94bb9557 100644 --- a/ext/standard/tests/general_functions/getservbyname_variation14.phpt +++ b/ext/standard/tests/general_functions/getservbyname_variation14.phpt @@ -25,7 +25,7 @@ foreach ( $variation_array as $var ) { var_dump(getservbyname( $service, $var ) ); } ?> ---EXPECTF-- +--EXPECT-- *** Test substituting argument 2 with string values *** bool(false) bool(false) diff --git a/ext/standard/tests/general_functions/getservbyname_variation2.phpt b/ext/standard/tests/general_functions/getservbyname_variation2.phpt index 66aebcdc00..a659ba4cce 100644 --- a/ext/standard/tests/general_functions/getservbyname_variation2.phpt +++ b/ext/standard/tests/general_functions/getservbyname_variation2.phpt @@ -21,7 +21,7 @@ foreach ( $variation_array as $var ) { var_dump(getservbyname( $var , $protocol ) ); } ?> ---EXPECTF-- +--EXPECT-- *** Test substituting argument 1 with boolean values *** bool(false) bool(false) diff --git a/ext/standard/tests/general_functions/getservbyname_variation3.phpt b/ext/standard/tests/general_functions/getservbyname_variation3.phpt index d34259d2a2..6602ce0bfc 100644 --- a/ext/standard/tests/general_functions/getservbyname_variation3.phpt +++ b/ext/standard/tests/general_functions/getservbyname_variation3.phpt @@ -26,7 +26,7 @@ foreach ( $variation_array as $var ) { var_dump(getservbyname( $var , $protocol ) ); } ?> ---EXPECTF-- +--EXPECT-- *** Test substituting argument 1 with emptyUnsetUndefNull values *** bool(false) bool(false) diff --git a/ext/standard/tests/general_functions/getservbyname_variation4.phpt b/ext/standard/tests/general_functions/getservbyname_variation4.phpt index 6033c94363..6c8de4b875 100644 --- a/ext/standard/tests/general_functions/getservbyname_variation4.phpt +++ b/ext/standard/tests/general_functions/getservbyname_variation4.phpt @@ -22,7 +22,7 @@ foreach ( $variation_array as $var ) { var_dump(getservbyname( $var , $protocol ) ); } ?> ---EXPECTF-- +--EXPECT-- *** Test substituting argument 1 with float values *** bool(false) bool(false) diff --git a/ext/standard/tests/general_functions/getservbyname_variation5.phpt b/ext/standard/tests/general_functions/getservbyname_variation5.phpt index f35abdf270..2ee334a0ba 100644 --- a/ext/standard/tests/general_functions/getservbyname_variation5.phpt +++ b/ext/standard/tests/general_functions/getservbyname_variation5.phpt @@ -21,7 +21,7 @@ foreach ( $variation_array as $var ) { var_dump(getservbyname( $var , $protocol ) ); } ?> ---EXPECTF-- +--EXPECT-- *** Test substituting argument 1 with int values *** bool(false) bool(false) diff --git a/ext/standard/tests/general_functions/getservbyname_variation7.phpt b/ext/standard/tests/general_functions/getservbyname_variation7.phpt index a0e223c50d..5fb67cb84e 100644 --- a/ext/standard/tests/general_functions/getservbyname_variation7.phpt +++ b/ext/standard/tests/general_functions/getservbyname_variation7.phpt @@ -25,7 +25,7 @@ foreach ( $variation_array as $var ) { var_dump(getservbyname( $var , $protocol ) ); } ?> ---EXPECTF-- +--EXPECT-- *** Test substituting argument 1 with string values *** bool(false) bool(false) diff --git a/ext/standard/tests/general_functions/getservbyname_variation9.phpt b/ext/standard/tests/general_functions/getservbyname_variation9.phpt index eef2744c26..720dbf0fbc 100644 --- a/ext/standard/tests/general_functions/getservbyname_variation9.phpt +++ b/ext/standard/tests/general_functions/getservbyname_variation9.phpt @@ -26,7 +26,7 @@ foreach ( $variation_array as $var ) { var_dump(getservbyname( $service, $var ) ); } ?> ---EXPECTF-- +--EXPECT-- *** Test substituting argument 2 with boolean values *** bool(false) bool(false) diff --git a/ext/standard/tests/general_functions/getservbyport_variation1.phpt b/ext/standard/tests/general_functions/getservbyport_variation1.phpt index cc4a9afb26..a876ac1fea 100644 --- a/ext/standard/tests/general_functions/getservbyport_variation1.phpt +++ b/ext/standard/tests/general_functions/getservbyport_variation1.phpt @@ -25,16 +25,16 @@ bool(false) bool(false) bool(false) -Warning: getservbyport() expects parameter 1 to be integer, array given in %s on line %d +Warning: getservbyport() expects parameter 1 to be int, array given in %s on line %d NULL -Warning: getservbyport() expects parameter 1 to be integer, array given in %s on line %d +Warning: getservbyport() expects parameter 1 to be int, array given in %s on line %d NULL -Warning: getservbyport() expects parameter 1 to be integer, array given in %s on line %d +Warning: getservbyport() expects parameter 1 to be int, array given in %s on line %d NULL bool(false) string(%d) "%s" -Warning: getservbyport() expects parameter 1 to be integer, object given in %s on line %d +Warning: getservbyport() expects parameter 1 to be int, object given in %s on line %d NULL diff --git a/ext/standard/tests/general_functions/gettype_settype_variation1.phpt b/ext/standard/tests/general_functions/gettype_settype_variation1.phpt index ada73f0159..7fb8789ff3 100644 --- a/ext/standard/tests/general_functions/gettype_settype_variation1.phpt +++ b/ext/standard/tests/general_functions/gettype_settype_variation1.phpt @@ -179,7 +179,7 @@ foreach ($var_values as $var) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- 8: Undefined variable: unset_var 8: Undefined variable: undef_var diff --git a/ext/standard/tests/general_functions/gettype_settype_variation2.phpt b/ext/standard/tests/general_functions/gettype_settype_variation2.phpt index ff30821380..99ab02a60d 100644 --- a/ext/standard/tests/general_functions/gettype_settype_variation2.phpt +++ b/ext/standard/tests/general_functions/gettype_settype_variation2.phpt @@ -187,7 +187,7 @@ foreach ($types as $type) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- 8: Undefined variable: unset_var 8: Undefined variable: undef_var diff --git a/ext/standard/tests/general_functions/gettype_settype_variation3.phpt b/ext/standard/tests/general_functions/gettype_settype_variation3.phpt index f0fdd34d14..71b03461eb 100644 --- a/ext/standard/tests/general_functions/gettype_settype_variation3.phpt +++ b/ext/standard/tests/general_functions/gettype_settype_variation3.phpt @@ -184,7 +184,7 @@ foreach ($types as $type) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- 8: Undefined variable: unset_var 8: Undefined variable: undef_var diff --git a/ext/standard/tests/general_functions/gettype_settype_variation4.phpt b/ext/standard/tests/general_functions/gettype_settype_variation4.phpt index a0a7064698..a14cb73dbb 100644 --- a/ext/standard/tests/general_functions/gettype_settype_variation4.phpt +++ b/ext/standard/tests/general_functions/gettype_settype_variation4.phpt @@ -209,7 +209,7 @@ foreach ($types as $type) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- 8: Undefined variable: unset_var 8: Undefined variable: undef_var diff --git a/ext/standard/tests/general_functions/gettype_settype_variation5.phpt b/ext/standard/tests/general_functions/gettype_settype_variation5.phpt index 0885af1a3d..c5e2640f9c 100644 --- a/ext/standard/tests/general_functions/gettype_settype_variation5.phpt +++ b/ext/standard/tests/general_functions/gettype_settype_variation5.phpt @@ -179,7 +179,7 @@ foreach ($var_values as $var) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- 8: Undefined variable: unset_var 8: Undefined variable: undef_var diff --git a/ext/standard/tests/general_functions/gettype_settype_variation6.phpt b/ext/standard/tests/general_functions/gettype_settype_variation6.phpt index 3854deac0f..27beaa0744 100644 --- a/ext/standard/tests/general_functions/gettype_settype_variation6.phpt +++ b/ext/standard/tests/general_functions/gettype_settype_variation6.phpt @@ -181,7 +181,7 @@ foreach ($var_values as $var) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- 8: Undefined variable: unset_var 8: Undefined variable: undef_var diff --git a/ext/standard/tests/general_functions/gettype_settype_variation7.phpt b/ext/standard/tests/general_functions/gettype_settype_variation7.phpt index 8d7333edfc..dae20a1856 100644 --- a/ext/standard/tests/general_functions/gettype_settype_variation7.phpt +++ b/ext/standard/tests/general_functions/gettype_settype_variation7.phpt @@ -179,7 +179,7 @@ foreach ($var_values as $var) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- 8: Undefined variable: unset_var 8: Undefined variable: undef_var diff --git a/ext/standard/tests/general_functions/gettype_settype_variation8.phpt b/ext/standard/tests/general_functions/gettype_settype_variation8.phpt index 25371faa19..97f550e446 100644 --- a/ext/standard/tests/general_functions/gettype_settype_variation8.phpt +++ b/ext/standard/tests/general_functions/gettype_settype_variation8.phpt @@ -179,7 +179,7 @@ foreach ($var_values as $var) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- 8: Undefined variable: unset_var 8: Undefined variable: undef_var diff --git a/ext/standard/tests/general_functions/header_redirection_004.phpt b/ext/standard/tests/general_functions/header_redirection_004.phpt deleted file mode 100644 index 678e3143ac..0000000000 --- a/ext/standard/tests/general_functions/header_redirection_004.phpt +++ /dev/null @@ -1,11 +0,0 @@ ---TEST-- -Location: headers respect the header() response code parameter ---CGI-- ---FILE-- -<?php -header('Location: http://example.com/', true, 404); -?> ---EXPECTHEADERS-- -Status: 404 Not Found -Location: http://example.com/ ---EXPECT-- diff --git a/ext/standard/tests/general_functions/http_response_code.phpt b/ext/standard/tests/general_functions/http_response_code.phpt new file mode 100644 index 0000000000..bc2775f3d3 --- /dev/null +++ b/ext/standard/tests/general_functions/http_response_code.phpt @@ -0,0 +1,19 @@ +--TEST-- +Test http_response_code basic functionality +--CREDITS-- +Gabriel Caruso (carusogabriel@php.net) +--FILE-- +<?php +var_dump( + // Get the current default response code + http_response_code(), + // Set a response code + http_response_code(201), + // Get the new response code + http_response_code() +); +?> +--EXPECT-- +bool(false) +bool(true) +int(201) diff --git a/ext/standard/tests/general_functions/ini_get_all.phpt b/ext/standard/tests/general_functions/ini_get_all.phpt index 72ce86deaa..ca450f1bc4 100644 --- a/ext/standard/tests/general_functions/ini_get_all.phpt +++ b/ext/standard/tests/general_functions/ini_get_all.phpt @@ -5,12 +5,7 @@ pcre.jit=1 pcre.backtrack_limit=1000000 pcre.recursion_limit=100000 --SKIPIF-- -<?php if (!extension_loaded("reflection")) die("skip"); ?> -<?php -if (ini_get("pcre.jit") === FALSE) { - die("skip no jit built"); -} -?> +<?php if (!PCRE_JIT_SUPPORT) die("skip no pcre jit support"); ?> --FILE-- <?php diff --git a/ext/standard/tests/general_functions/intval.phpt b/ext/standard/tests/general_functions/intval.phpt index 322b407aa4..7f3d895fbe 100644 --- a/ext/standard/tests/general_functions/intval.phpt +++ b/ext/standard/tests/general_functions/intval.phpt @@ -11,7 +11,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); */ echo "*** Testing intval() with valid integer values ***\n"; -// different valid integer vlaues +// different valid integer values $valid_ints = array( '0', '1', @@ -297,10 +297,10 @@ int(0) *** Testing error conditions *** -Warning: Wrong parameter count for intval() in %s on line %d +Warning: intval() expects at least 1 parameter, 0 given in %s on line %d NULL -Warning: Wrong parameter count for intval() in %s on line %d +Warning: intval() expects at most 2 parameters, 3 given in %s on line %d NULL --- Done --- diff --git a/ext/standard/tests/general_functions/intval_binary_prefix.phpt b/ext/standard/tests/general_functions/intval_binary_prefix.phpt index af49515396..47b8d05386 100644 --- a/ext/standard/tests/general_functions/intval_binary_prefix.phpt +++ b/ext/standard/tests/general_functions/intval_binary_prefix.phpt @@ -1,6 +1,5 @@ --TEST-- Test intval() function with "0b" string prefix ---SKIPIF-- --FILE-- <?php @@ -66,7 +65,7 @@ foreach ($badInputs as $input) { print '--- Done ---'; ?> ---EXPECTF-- +--EXPECT-- --- Good Inputs - Base = 0 --- int(2147483647) int(2147483647) diff --git a/ext/standard/tests/general_functions/intval_variation2.phpt b/ext/standard/tests/general_functions/intval_variation2.phpt index 0b38236373..6a295308af 100644 --- a/ext/standard/tests/general_functions/intval_variation2.phpt +++ b/ext/standard/tests/general_functions/intval_variation2.phpt @@ -115,30 +115,30 @@ int(1) int(1) --float 12.3456789000e10-- -Error: 2 - intval() expects parameter 2 to be integer, float given, %s(%d) +Error: 2 - intval() expects parameter 2 to be int, float given, %s(%d) NULL --float -12.3456789000e10-- -Error: 2 - intval() expects parameter 2 to be integer, float given, %s(%d) +Error: 2 - intval() expects parameter 2 to be int, float given, %s(%d) NULL --float .5-- int(1) --empty array-- -Error: 2 - intval() expects parameter 2 to be integer, array given, %s(%d) +Error: 2 - intval() expects parameter 2 to be int, array given, %s(%d) NULL --int indexed array-- -Error: 2 - intval() expects parameter 2 to be integer, array given, %s(%d) +Error: 2 - intval() expects parameter 2 to be int, array given, %s(%d) NULL --associative array-- -Error: 2 - intval() expects parameter 2 to be integer, array given, %s(%d) +Error: 2 - intval() expects parameter 2 to be int, array given, %s(%d) NULL --nested arrays-- -Error: 2 - intval() expects parameter 2 to be integer, array given, %s(%d) +Error: 2 - intval() expects parameter 2 to be int, array given, %s(%d) NULL --uppercase NULL-- @@ -160,35 +160,35 @@ int(1) int(1) --empty string DQ-- -Error: 2 - intval() expects parameter 2 to be integer, string given, %s(%d) +Error: 2 - intval() expects parameter 2 to be int, string given, %s(%d) NULL --empty string SQ-- -Error: 2 - intval() expects parameter 2 to be integer, string given, %s(%d) +Error: 2 - intval() expects parameter 2 to be int, string given, %s(%d) NULL --string DQ-- -Error: 2 - intval() expects parameter 2 to be integer, string given, %s(%d) +Error: 2 - intval() expects parameter 2 to be int, string given, %s(%d) NULL --string SQ-- -Error: 2 - intval() expects parameter 2 to be integer, string given, %s(%d) +Error: 2 - intval() expects parameter 2 to be int, string given, %s(%d) NULL --mixed case string-- -Error: 2 - intval() expects parameter 2 to be integer, string given, %s(%d) +Error: 2 - intval() expects parameter 2 to be int, string given, %s(%d) NULL --heredoc-- -Error: 2 - intval() expects parameter 2 to be integer, string given, %s(%d) +Error: 2 - intval() expects parameter 2 to be int, string given, %s(%d) NULL --instance of classWithToString-- -Error: 2 - intval() expects parameter 2 to be integer, object given, %s(%d) +Error: 2 - intval() expects parameter 2 to be int, object given, %s(%d) NULL --instance of classWithoutToString-- -Error: 2 - intval() expects parameter 2 to be integer, object given, %s(%d) +Error: 2 - intval() expects parameter 2 to be int, object given, %s(%d) NULL --undefined var-- diff --git a/ext/standard/tests/general_functions/is_bool.phpt b/ext/standard/tests/general_functions/is_bool.phpt index de1c0430ee..a6c6111fa1 100644 --- a/ext/standard/tests/general_functions/is_bool.phpt +++ b/ext/standard/tests/general_functions/is_bool.phpt @@ -7,7 +7,7 @@ Test is_bool() function */ echo "*** Testing is_bool() with valid boolean values ***\n"; -// different valid boolean vlaues +// different valid boolean values $valid_bools = array( TRUE, FALSE, diff --git a/ext/standard/tests/general_functions/is_callable_basic1.phpt b/ext/standard/tests/general_functions/is_callable_basic1.phpt index fe4d6e26e3..aa4c9aee23 100644 --- a/ext/standard/tests/general_functions/is_callable_basic1.phpt +++ b/ext/standard/tests/general_functions/is_callable_basic1.phpt @@ -1,8 +1,5 @@ --TEST-- Test is_callable() function : usage variations - defined functions ---INI-- -precision=14 -error_reporting = E_ALL & ~E_NOTICE | E_STRICT --FILE-- <?php /* Prototype: bool is_callable ( mixed $var [, bool $syntax_only [, string &$callable_name]] ); diff --git a/ext/standard/tests/general_functions/is_callable_basic2.phpt b/ext/standard/tests/general_functions/is_callable_basic2.phpt index 379defc3a8..7657875311 100644 --- a/ext/standard/tests/general_functions/is_callable_basic2.phpt +++ b/ext/standard/tests/general_functions/is_callable_basic2.phpt @@ -1,8 +1,5 @@ --TEST-- Test is_callable() function : usage variations - on objects ---INI-- -precision=14 -error_reporting = E_ALL & ~E_NOTICE | E_STRICT --FILE-- <?php /* Prototype: bool is_callable ( mixed $var [, bool $syntax_only [, string &$callable_name]] ); @@ -128,7 +125,7 @@ foreach($objects as $object) { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing is_callable() on objects *** ** Testing behavior of is_callable() on static methods ** diff --git a/ext/standard/tests/general_functions/is_callable_error.phpt b/ext/standard/tests/general_functions/is_callable_error.phpt index 33eae1cc42..1e9e3b7fde 100644 --- a/ext/standard/tests/general_functions/is_callable_error.phpt +++ b/ext/standard/tests/general_functions/is_callable_error.phpt @@ -1,8 +1,5 @@ --TEST-- Test is_callable() function ---INI-- -precision=14 -error_reporting = E_ALL & ~E_NOTICE | E_STRICT --FILE-- <?php /* Prototype: bool is_callable ( mixed $var [, bool $syntax_only [, string &$callable_name]] ); diff --git a/ext/standard/tests/general_functions/is_callable_variation1.phpt b/ext/standard/tests/general_functions/is_callable_variation1.phpt index 1fea871803..022c5a4549 100644 --- a/ext/standard/tests/general_functions/is_callable_variation1.phpt +++ b/ext/standard/tests/general_functions/is_callable_variation1.phpt @@ -4,9 +4,6 @@ Test is_callable() function : usage variations - undefined functions <?php if (!extension_loaded('json')) die("skip requires ext/json"); ?> ---INI-- -precision=14 -error_reporting = E_ALL & ~E_NOTICE | E_STRICT --FILE-- <?php /* Prototype: bool is_callable ( mixed $var [, bool $syntax_only [, string &$callable_name]] ); @@ -63,7 +60,7 @@ check_iscallable($undef_functions); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing is_callable() on undefined functions *** -- Iteration 1 -- bool(false) diff --git a/ext/standard/tests/general_functions/is_callable_variation2.phpt b/ext/standard/tests/general_functions/is_callable_variation2.phpt index cb05860627..af562d4ef1 100644 --- a/ext/standard/tests/general_functions/is_callable_variation2.phpt +++ b/ext/standard/tests/general_functions/is_callable_variation2.phpt @@ -1,8 +1,5 @@ --TEST-- Test is_callable() function : usage variations - on invalid function names ---INI-- -precision=14 -error_reporting = E_ALL & ~E_NOTICE | E_STRICT --FILE-- <?php /* Prototype: bool is_callable ( mixed $var [, bool $syntax_only [, string &$callable_name]] ); diff --git a/ext/standard/tests/general_functions/is_countable_with_classes.phpt b/ext/standard/tests/general_functions/is_countable_with_classes.phpt new file mode 100644 index 0000000000..ebf7ac5dc9 --- /dev/null +++ b/ext/standard/tests/general_functions/is_countable_with_classes.phpt @@ -0,0 +1,19 @@ +--TEST-- +Test is_countable() function +--CREDITS-- +Gabriel Caruso (carusogabriel34@gmail.com) +--FILE-- +<?php +var_dump(is_countable(new class extends ArrayIterator {})); +var_dump(is_countable((array) new stdClass())); +var_dump(is_countable(new class implements Countable { + public function count() + { + return count(1, 'foo'); + } +})); +?> +--EXPECT-- +bool(true) +bool(true) +bool(true) diff --git a/ext/standard/tests/general_functions/is_countable_with_variables.phpt b/ext/standard/tests/general_functions/is_countable_with_variables.phpt new file mode 100644 index 0000000000..700077ef17 --- /dev/null +++ b/ext/standard/tests/general_functions/is_countable_with_variables.phpt @@ -0,0 +1,32 @@ +--TEST-- +Test is_countable() function +--CREDITS-- +Gabriel Caruso (carusogabriel34@gmail.com) +--FILE-- +<?php +var_dump(is_countable([1, 2, 3])); +var_dump(is_countable((array) 1)); +var_dump(is_countable((object) ['foo', 'bar', 'baz'])); +var_dump(is_countable()); + +$foo = ['', []]; + +if (is_countable($foo)) { + var_dump(count($foo)); +} + +$bar = null; +if (!is_countable($bar)) { + count($bar); +} +?> +--EXPECTF-- +bool(true) +bool(true) +bool(false) + +Warning: is_countable() expects exactly 1 parameter, 0 given in %s on line %d +NULL +int(2) + +Warning: count(): Parameter must be an array or an object that implements Countable in %s on line %d diff --git a/ext/standard/tests/general_functions/is_float.phpt b/ext/standard/tests/general_functions/is_float.phpt index 07bcc9da9e..b71a5283db 100644 --- a/ext/standard/tests/general_functions/is_float.phpt +++ b/ext/standard/tests/general_functions/is_float.phpt @@ -11,7 +11,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); */ echo "*** Testing is_float(), is_double() and is_real() with float values***\n"; -// different valid float vlaues +// different valid float values $floats = array( -2147483649, // float value 2147483648, // float value diff --git a/ext/standard/tests/general_functions/is_float_64bit.phpt b/ext/standard/tests/general_functions/is_float_64bit.phpt index 13ebb67a79..9410a21fe2 100644 --- a/ext/standard/tests/general_functions/is_float_64bit.phpt +++ b/ext/standard/tests/general_functions/is_float_64bit.phpt @@ -13,7 +13,7 @@ precision=14 */ echo "*** Testing is_float(), is_double() and is_real() with float values***\n"; -// different valid float vlaues +// different valid float values $floats = array( -2147483649, // float value 2147483648, // float value diff --git a/ext/standard/tests/general_functions/is_int.phpt b/ext/standard/tests/general_functions/is_int.phpt index 9867410e40..d154b30748 100644 --- a/ext/standard/tests/general_functions/is_int.phpt +++ b/ext/standard/tests/general_functions/is_int.phpt @@ -11,7 +11,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); */ echo "*** Testing is_int(), is_integer() & is_long() with valid integer values ***\n"; -// different valid integer vlaues +// different valid integer values $valid_ints = array( 0, 1, diff --git a/ext/standard/tests/general_functions/is_int_64bit.phpt b/ext/standard/tests/general_functions/is_int_64bit.phpt index 228a11690d..68ef75b35b 100644 --- a/ext/standard/tests/general_functions/is_int_64bit.phpt +++ b/ext/standard/tests/general_functions/is_int_64bit.phpt @@ -13,7 +13,7 @@ precision=14 */ echo "*** Testing is_int(), is_integer() & is_long() with valid integer values ***\n"; -// different valid integer vlaues +// different valid integer values $valid_ints = array( 0, 1, diff --git a/ext/standard/tests/general_functions/is_null.phpt b/ext/standard/tests/general_functions/is_null.phpt index ad0435b7c8..fa7c87f791 100644 --- a/ext/standard/tests/general_functions/is_null.phpt +++ b/ext/standard/tests/general_functions/is_null.phpt @@ -7,7 +7,7 @@ Test is_null() function */ echo "*** Testing is_null() with valid null values ***\n"; -// different valid null vlaues +// different valid null values $unset_array = array(); $unset_int = 10; $unset_float = 10.5; diff --git a/ext/standard/tests/general_functions/is_numeric.phpt b/ext/standard/tests/general_functions/is_numeric.phpt index 32fb8f3094..0019cf18d2 100644 --- a/ext/standard/tests/general_functions/is_numeric.phpt +++ b/ext/standard/tests/general_functions/is_numeric.phpt @@ -7,7 +7,7 @@ Test is_numeric() function */ echo "*** Testing is_numeric() with valid numeric values ***\n"; -// different valid numeric vlaues +// different valid numeric values $numerics = array( 0, 1, diff --git a/ext/standard/tests/general_functions/parse_ini_basic.phpt b/ext/standard/tests/general_functions/parse_ini_basic.phpt index 023b311fe3..8d7b2f8a22 100644 --- a/ext/standard/tests/general_functions/parse_ini_basic.phpt +++ b/ext/standard/tests/general_functions/parse_ini_basic.phpt @@ -14,7 +14,7 @@ var_dump(parse_ini_file($ini_file, 1)); echo "Done.\n"; ?> ---EXPECTF-- +--EXPECT-- array(26) { ["basic"]=> array(15) { diff --git a/ext/standard/tests/general_functions/parse_ini_booleans.phpt b/ext/standard/tests/general_functions/parse_ini_booleans.phpt index d18eb24caf..5b854c3f41 100644 --- a/ext/standard/tests/general_functions/parse_ini_booleans.phpt +++ b/ext/standard/tests/general_functions/parse_ini_booleans.phpt @@ -10,7 +10,7 @@ var_dump(parse_ini_file($ini_file, 1)); echo "Done.\n"; ?> ---EXPECTF-- +--EXPECT-- array(3) { ["error_reporting values"]=> array(6) { diff --git a/ext/standard/tests/general_functions/parse_ini_string_001.phpt b/ext/standard/tests/general_functions/parse_ini_string_001.phpt index d774eeaf80..e435442b7a 100644 --- a/ext/standard/tests/general_functions/parse_ini_string_001.phpt +++ b/ext/standard/tests/general_functions/parse_ini_string_001.phpt @@ -207,7 +207,7 @@ print_r($ini_array); echo "*** Done **\n"; ?> ---EXPECTF-- +--EXPECT-- *** Test parse_ini_string() function: with various keys and values given in string *** -- ini string without process_sections optional arg -- Array diff --git a/ext/standard/tests/general_functions/parse_ini_string_003.phpt b/ext/standard/tests/general_functions/parse_ini_string_003.phpt index 570570dbfe..9c0b1308d1 100644 --- a/ext/standard/tests/general_functions/parse_ini_string_003.phpt +++ b/ext/standard/tests/general_functions/parse_ini_string_003.phpt @@ -17,7 +17,7 @@ var_dump(parse_ini_string($contents, false, INI_SCANNER_TYPED)); ?> Done ---EXPECTF-- +--EXPECT-- array(4) { ["foo"]=> int(1) diff --git a/ext/standard/tests/general_functions/phpcredits.phpt b/ext/standard/tests/general_functions/phpcredits.phpt index 01dd160033..044232570e 100644 --- a/ext/standard/tests/general_functions/phpcredits.phpt +++ b/ext/standard/tests/general_functions/phpcredits.phpt @@ -41,7 +41,7 @@ PHP Quality Assurance Team %a bool(true) -Warning: phpcredits() expects parameter 1 to be integer, array given in %sphpcredits.php on line 4 +Warning: phpcredits() expects parameter 1 to be int, array given in %sphpcredits.php on line 4 NULL -- PHP Credits diff --git a/ext/standard/tests/general_functions/phpcredits2.phpt b/ext/standard/tests/general_functions/phpcredits2.phpt index d32784b4e9..9966f23a96 100644 --- a/ext/standard/tests/general_functions/phpcredits2.phpt +++ b/ext/standard/tests/general_functions/phpcredits2.phpt @@ -19,7 +19,7 @@ var_dump(phpcredits(CREDITS_GROUP)); <!DOCTYPE %a>%s</html> bool(true) -Warning: phpcredits() expects parameter 1 to be integer, array given in %sphpcredits2.php on line 4 +Warning: phpcredits() expects parameter 1 to be int, array given in %sphpcredits2.php on line 4 NULL -- <h1>PHP Credits</h1> diff --git a/ext/standard/tests/general_functions/phpinfo.phpt b/ext/standard/tests/general_functions/phpinfo.phpt index 4b0c2060ce..a805876aab 100644 --- a/ext/standard/tests/general_functions/phpinfo.phpt +++ b/ext/standard/tests/general_functions/phpinfo.phpt @@ -33,7 +33,7 @@ Zend Extension => %d Zend Extension Build => API%s PHP Extension Build => API%s Debug Build => %s -Thread Safety => %s +Thread Safety => %s%A Zend Signal Handling => %s Zend Memory Manager => %s Zend Multibyte Support => %s @@ -63,7 +63,7 @@ PHP License bool(true) -- -Warning: phpinfo() expects parameter 1 to be integer, array given in %sphpinfo.php on line 5 +Warning: phpinfo() expects parameter 1 to be int, array given in %sphpinfo.php on line 5 NULL -- phpinfo() diff --git a/ext/standard/tests/general_functions/phpinfo2.phpt b/ext/standard/tests/general_functions/phpinfo2.phpt index 50353d5e80..f422f923d9 100644 --- a/ext/standard/tests/general_functions/phpinfo2.phpt +++ b/ext/standard/tests/general_functions/phpinfo2.phpt @@ -21,7 +21,7 @@ var_dump(phpinfo(INFO_LICENSE)); %a</html>bool(true) -- -Warning: phpinfo() expects parameter 1 to be integer, array given in %sphpinfo2.php on line 5 +Warning: phpinfo() expects parameter 1 to be int, array given in %sphpinfo2.php on line 5 NULL -- <!DOCTYPE %s> diff --git a/ext/standard/tests/general_functions/print_r.phpt b/ext/standard/tests/general_functions/print_r.phpt index cfeaca7bad..fe02a97c18 100644 --- a/ext/standard/tests/general_functions/print_r.phpt +++ b/ext/standard/tests/general_functions/print_r.phpt @@ -1,9 +1,5 @@ --TEST-- Test print_r() function ---SKIPIF-- -<?php -if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); -?> --INI-- precision=14 --FILE-- diff --git a/ext/standard/tests/general_functions/proc_nice_basic-win.phpt b/ext/standard/tests/general_functions/proc_nice_basic-win.phpt index 5ff409e10d..87a4545501 100644 --- a/ext/standard/tests/general_functions/proc_nice_basic-win.phpt +++ b/ext/standard/tests/general_functions/proc_nice_basic-win.phpt @@ -86,7 +86,7 @@ foreach ($p as $test => $data) { print (($wp = get_priority_from_wmic()) === $data[0] ? 'Passed' : 'Failed (' . $wp . ')') . PHP_EOL; } ?> ---EXPECTF-- +--EXPECT-- Testing 'Idle' (10): Passed Testing 'Below normal' (5): Passed Testing 'Normal' (0): Passed diff --git a/ext/standard/tests/general_functions/proc_nice_basic.phpt b/ext/standard/tests/general_functions/proc_nice_basic.phpt index 12469bf4eb..d14a5f62a9 100644 --- a/ext/standard/tests/general_functions/proc_nice_basic.phpt +++ b/ext/standard/tests/general_functions/proc_nice_basic.phpt @@ -28,5 +28,5 @@ if(substr(strtoupper(PHP_OS), 0, 3) == 'WIN') die('skip. not for Windows'); $niceAfter = getNice($pid); var_dump($niceBefore == ($niceAfter - $delta)); ?> ---EXPECTF-- +--EXPECT-- bool(true) diff --git a/ext/standard/tests/general_functions/proc_nice_variation1.phpt b/ext/standard/tests/general_functions/proc_nice_variation1.phpt index 5ab2e89339..4aa4b47801 100644 --- a/ext/standard/tests/general_functions/proc_nice_variation1.phpt +++ b/ext/standard/tests/general_functions/proc_nice_variation1.phpt @@ -35,14 +35,14 @@ foreach ( $variation_array as $var ) { --EXPECTF-- *** Test substituting argument 1 with array values *** -Warning: proc_nice() expects parameter 1 to be integer, array given in %s on line %d +Warning: proc_nice() expects parameter 1 to be int, array given in %s on line %d bool(false) -Warning: proc_nice() expects parameter 1 to be integer, array given in %s on line %d +Warning: proc_nice() expects parameter 1 to be int, array given in %s on line %d bool(false) -Warning: proc_nice() expects parameter 1 to be integer, array given in %s on line %d +Warning: proc_nice() expects parameter 1 to be int, array given in %s on line %d bool(false) -Warning: proc_nice() expects parameter 1 to be integer, array given in %s on line %d +Warning: proc_nice() expects parameter 1 to be int, array given in %s on line %d bool(false) diff --git a/ext/standard/tests/general_functions/proc_nice_variation2.phpt b/ext/standard/tests/general_functions/proc_nice_variation2.phpt index 42cbf9e00f..f1f93be221 100644 --- a/ext/standard/tests/general_functions/proc_nice_variation2.phpt +++ b/ext/standard/tests/general_functions/proc_nice_variation2.phpt @@ -29,7 +29,7 @@ foreach ( $variation_array as $var ) { var_dump(proc_nice( $var ) ); } ?> ---EXPECTF-- +--EXPECT-- *** Test substituting argument 1 with boolean values *** bool(true) bool(true) diff --git a/ext/standard/tests/general_functions/proc_nice_variation3.phpt b/ext/standard/tests/general_functions/proc_nice_variation3.phpt index 5ac7e366df..c5626dd50f 100644 --- a/ext/standard/tests/general_functions/proc_nice_variation3.phpt +++ b/ext/standard/tests/general_functions/proc_nice_variation3.phpt @@ -39,10 +39,10 @@ foreach ( $variation_array as $var ) { bool(true) bool(true) -Warning: proc_nice() expects parameter 1 to be integer, string given in %s on line %d +Warning: proc_nice() expects parameter 1 to be int, string given in %s on line %d bool(false) -Warning: proc_nice() expects parameter 1 to be integer, string given in %s on line %d +Warning: proc_nice() expects parameter 1 to be int, string given in %s on line %d bool(false) bool(true) bool(true) diff --git a/ext/standard/tests/general_functions/proc_nice_variation6.phpt b/ext/standard/tests/general_functions/proc_nice_variation6.phpt index 593cf10b4d..a3aff167ed 100644 --- a/ext/standard/tests/general_functions/proc_nice_variation6.phpt +++ b/ext/standard/tests/general_functions/proc_nice_variation6.phpt @@ -50,7 +50,7 @@ foreach ( $variation_array as $var ) { ?> --EXPECTF-- *** Test substituting argument 1 with object values *** -Error: 2 - proc_nice() expects parameter 1 to be integer, object given, %s(%d) +Error: 2 - proc_nice() expects parameter 1 to be int, object given, %s(%d) bool(false) -Error: 2 - proc_nice() expects parameter 1 to be integer, object given, %s(%d) +Error: 2 - proc_nice() expects parameter 1 to be int, object given, %s(%d) bool(false) diff --git a/ext/standard/tests/general_functions/proc_nice_variation7.phpt b/ext/standard/tests/general_functions/proc_nice_variation7.phpt index b6c7096519..368d2b1079 100644 --- a/ext/standard/tests/general_functions/proc_nice_variation7.phpt +++ b/ext/standard/tests/general_functions/proc_nice_variation7.phpt @@ -36,14 +36,14 @@ foreach ( $variation_array as $var ) { --EXPECTF-- *** Test substituting argument 1 with string values *** -Warning: proc_nice() expects parameter 1 to be integer, string given in %s on line %d +Warning: proc_nice() expects parameter 1 to be int, string given in %s on line %d bool(false) -Warning: proc_nice() expects parameter 1 to be integer, string given in %s on line %d +Warning: proc_nice() expects parameter 1 to be int, string given in %s on line %d bool(false) -Warning: proc_nice() expects parameter 1 to be integer, string given in %s on line %d +Warning: proc_nice() expects parameter 1 to be int, string given in %s on line %d bool(false) -Warning: proc_nice() expects parameter 1 to be integer, string given in %s on line %d +Warning: proc_nice() expects parameter 1 to be int, string given in %s on line %d bool(false) diff --git a/ext/standard/tests/general_functions/proc_open_pipes2.phpt b/ext/standard/tests/general_functions/proc_open_pipes2.phpt index 29eca464e1..21734773a3 100644 --- a/ext/standard/tests/general_functions/proc_open_pipes2.phpt +++ b/ext/standard/tests/general_functions/proc_open_pipes2.phpt @@ -22,7 +22,7 @@ include dirname(__FILE__) . "/proc_open_pipes.inc"; unlink_sleep_script(); ?> ---EXPECTF-- +--EXPECT-- int(0) array(0) { } diff --git a/ext/standard/tests/general_functions/putenv_bug75574_cp936_win.phpt b/ext/standard/tests/general_functions/putenv_bug75574_cp936_win.phpt index ccb1eea884..69c455d076 100644 --- a/ext/standard/tests/general_functions/putenv_bug75574_cp936_win.phpt +++ b/ext/standard/tests/general_functions/putenv_bug75574_cp936_win.phpt @@ -35,7 +35,7 @@ var_dump(putenv('FOO=°¡a°¡°¡°¡°¡'), getenv("FOO")); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- bool(true) string(2) "°¡" bool(true) diff --git a/ext/standard/tests/general_functions/putenv_bug75574_utf8.phpt b/ext/standard/tests/general_functions/putenv_bug75574_utf8.phpt index 8760927835..ea8a0ab119 100644 --- a/ext/standard/tests/general_functions/putenv_bug75574_utf8.phpt +++ b/ext/standard/tests/general_functions/putenv_bug75574_utf8.phpt @@ -24,7 +24,7 @@ var_dump(putenv('FOO=å•Šaå•Šå•Šå•Šå•Š'), getenv("FOO")); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- bool(true) string(3) "å•Š" bool(true) diff --git a/ext/standard/tests/general_functions/rand.phpt b/ext/standard/tests/general_functions/rand.phpt index e722ff5813..e6639a71c7 100644 --- a/ext/standard/tests/general_functions/rand.phpt +++ b/ext/standard/tests/general_functions/rand.phpt @@ -45,12 +45,12 @@ int(%d) NULL NULL -Warning: srand() expects parameter 1 to be integer, array given in %s on line %d +Warning: srand() expects parameter 1 to be int, array given in %s on line %d NULL NULL NULL -Warning: mt_srand() expects parameter 1 to be integer, array given in %s on line %d +Warning: mt_srand() expects parameter 1 to be int, array given in %s on line %d NULL int(%d) diff --git a/ext/standard/tests/general_functions/sleep_basic.phpt b/ext/standard/tests/general_functions/sleep_basic.phpt index 98ab348ecb..0ef0e7c213 100644 --- a/ext/standard/tests/general_functions/sleep_basic.phpt +++ b/ext/standard/tests/general_functions/sleep_basic.phpt @@ -13,7 +13,7 @@ if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); echo "*** Testing sleep() : basic functionality ***\n"; -$sleeptime = 5; // sleep for 5 seconds +$sleeptime = 1; // sleep for 1 seconds set_time_limit(20); diff --git a/ext/standard/tests/general_functions/strval.phpt b/ext/standard/tests/general_functions/strval.phpt index b2c5cd8b76..b814733dd0 100644 --- a/ext/standard/tests/general_functions/strval.phpt +++ b/ext/standard/tests/general_functions/strval.phpt @@ -26,7 +26,7 @@ $heredoc_NULL_string = <<<EOD NULL EOD; -// different valid scalar vlaues +// different valid scalar values $scalars = array( /* integers */ 0, @@ -96,7 +96,7 @@ $scalars = array( $heredoc_empty_string ); /* loop to check that strval() recognizes different - scalar values and retuns the string conversion of same */ + scalar values and returns the string conversion of same */ $loop_counter = 1; foreach ($scalars as $scalar ) { echo "-- Iteration $loop_counter --\n"; $loop_counter++; diff --git a/ext/standard/tests/general_functions/usleep_basic.phpt b/ext/standard/tests/general_functions/usleep_basic.phpt index 8c724d79ee..17822376ad 100644 --- a/ext/standard/tests/general_functions/usleep_basic.phpt +++ b/ext/standard/tests/general_functions/usleep_basic.phpt @@ -15,7 +15,7 @@ set_time_limit(20); echo "*** Testing usleep() : basic functionality ***\n"; -$sleeptime = 5000000; // == 5 seconds +$sleeptime = 1000000; // == 1 seconds // Test passes if sleeps for at least 98% of specified time $sleeplow = $sleeptime - ($sleeptime * 2 /100); diff --git a/ext/standard/tests/general_functions/var_export-locale.phpt b/ext/standard/tests/general_functions/var_export-locale.phpt index 37625f4201..61d94f83f4 100644 --- a/ext/standard/tests/general_functions/var_export-locale.phpt +++ b/ext/standard/tests/general_functions/var_export-locale.phpt @@ -20,7 +20,7 @@ setlocale(LC_ALL, "german", "de","de_DE","de_DE.ISO8859-1","de_DE.ISO_8859-1","d */ echo "*** Testing var_export() with integer values ***\n"; -// different integer vlaues +// different integer values $valid_ints = array( '0', '1', @@ -56,7 +56,7 @@ $counter++; } echo "*** Testing var_export() with valid boolean values ***\n"; -// different valid boolean vlaues +// different valid boolean values $valid_bool = array( 1, TRUE, @@ -80,7 +80,7 @@ $counter++; } echo "*** Testing var_export() with valid float values ***\n"; -// different valid float vlaues +// different valid float values $valid_floats = array( (float)-2147483649, // float value (float)2147483648, // float value @@ -279,7 +279,7 @@ $counter++; } echo "*** Testing var_export() with valid null values ***\n"; -// different valid null vlaues +// different valid null values $unset_var = array(); unset ($unset_var); // now a null $null_var = NULL; @@ -917,12 +917,12 @@ string(41) "array ( *** Output for objects *** Iteration 1 -stdClass::__set_state(array( -)) -stdClass::__set_state(array( -)) -string(31) "stdClass::__set_state(array( -))" +(object) array( +) +(object) array( +) +string(17) "(object) array( +)" Iteration 2 diff --git a/ext/standard/tests/general_functions/var_export-locale_32.phpt b/ext/standard/tests/general_functions/var_export-locale_32.phpt index 39efdec7df..af9efd9e24 100644 --- a/ext/standard/tests/general_functions/var_export-locale_32.phpt +++ b/ext/standard/tests/general_functions/var_export-locale_32.phpt @@ -917,12 +917,12 @@ string(41) "array ( *** Output for objects *** Iteration 1 -stdClass::__set_state(array( -)) -stdClass::__set_state(array( -)) -string(31) "stdClass::__set_state(array( -))" +(object) array( +) +(object) array( +) +string(17) "(object) array( +)" Iteration 2 diff --git a/ext/standard/tests/general_functions/var_export_basic1.phpt b/ext/standard/tests/general_functions/var_export_basic1.phpt index a7d3142ddc..18fa404c29 100644 --- a/ext/standard/tests/general_functions/var_export_basic1.phpt +++ b/ext/standard/tests/general_functions/var_export_basic1.phpt @@ -15,7 +15,7 @@ if (PHP_INT_SIZE < 8) { */ echo "*** Testing var_export() with integer values ***\n"; -// different integer vlaues +// different integer values $valid_ints = array( '0' => '0', '1' => '1', diff --git a/ext/standard/tests/general_functions/var_export_basic2.phpt b/ext/standard/tests/general_functions/var_export_basic2.phpt index 8598bac9c3..29c3a138f9 100644 --- a/ext/standard/tests/general_functions/var_export_basic2.phpt +++ b/ext/standard/tests/general_functions/var_export_basic2.phpt @@ -10,7 +10,7 @@ Test var_export() function with valid boolean values */ echo "*** Testing var_export() with valid boolean values ***\n"; -// different valid boolean vlaues +// different valid boolean values $valid_bool = array( "1" => 1, "TRUE" => TRUE, diff --git a/ext/standard/tests/general_functions/var_export_basic3.phpt b/ext/standard/tests/general_functions/var_export_basic3.phpt index c85a4782ae..b66d2c4584 100644 --- a/ext/standard/tests/general_functions/var_export_basic3.phpt +++ b/ext/standard/tests/general_functions/var_export_basic3.phpt @@ -11,7 +11,7 @@ serialize_precision=17 */ echo "*** Testing var_export() with valid float values ***\n"; -// different valid float vlaues +// different valid float values $valid_floats = array( "-2147483649" => (float)-2147483649, // float value "2147483648" => (float)2147483648, // float value diff --git a/ext/standard/tests/general_functions/var_export_basic6.phpt b/ext/standard/tests/general_functions/var_export_basic6.phpt index ea3707d0bc..6eff478d70 100644 --- a/ext/standard/tests/general_functions/var_export_basic6.phpt +++ b/ext/standard/tests/general_functions/var_export_basic6.phpt @@ -108,12 +108,12 @@ foreach($valid_objects as $key => $obj) { *** Output for objects *** -- Iteration: new stdclass -- -stdClass::__set_state(array( -)) -stdClass::__set_state(array( -)) -string(31) "stdClass::__set_state(array( -))" +(object) array( +) +(object) array( +) +string(17) "(object) array( +)" -- Iteration: new foo -- diff --git a/ext/standard/tests/general_functions/var_export_basic7.phpt b/ext/standard/tests/general_functions/var_export_basic7.phpt index b652b456e0..817ffc91f0 100644 --- a/ext/standard/tests/general_functions/var_export_basic7.phpt +++ b/ext/standard/tests/general_functions/var_export_basic7.phpt @@ -10,7 +10,7 @@ Test var_export() function with valid null values echo "*** Testing var_export() with valid null values ***\n"; -// different valid null vlaues +// different valid null values $unset_var = array(); unset ($unset_var); // now a null $null_var = NULL; diff --git a/ext/standard/tests/general_functions/var_export_basic8.phpt b/ext/standard/tests/general_functions/var_export_basic8.phpt index 11cf06e6ee..a52bf430d2 100644 --- a/ext/standard/tests/general_functions/var_export_basic8.phpt +++ b/ext/standard/tests/general_functions/var_export_basic8.phpt @@ -28,19 +28,19 @@ var_export($b); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- -- Var export on a simple object -- -stdClass::__set_state(array( +(object) array( 'a' => 1, 'b' => array ( 'k' => 2, ), 'x' => - stdClass::__set_state(array( + (object) array( 'p' => '22', - )), -)) + ), +) -- Var export on an simple array -- array ( @@ -57,15 +57,15 @@ array ( 'one' => 'first', ), 'bar' => - stdClass::__set_state(array( + (object) array( 'a' => 1, 'b' => array ( 'k' => 2, ), 'x' => - stdClass::__set_state(array( + (object) array( 'p' => '22', - )), - )), + ), + ), )===DONE=== diff --git a/ext/standard/tests/general_functions/var_export_basic9.phpt b/ext/standard/tests/general_functions/var_export_basic9.phpt index 3c9706edfd..fd78c18c8e 100644 --- a/ext/standard/tests/general_functions/var_export_basic9.phpt +++ b/ext/standard/tests/general_functions/var_export_basic9.phpt @@ -6,6 +6,6 @@ Bug #55082: var_export() doesn't escape properties properly $x->{'\'\\'} = 7; echo var_export($x); --EXPECT-- -stdClass::__set_state(array( +(object) array( '\'\\' => 7, -)) +) diff --git a/ext/standard/tests/general_functions/var_export_bug66179.phpt b/ext/standard/tests/general_functions/var_export_bug66179.phpt index 15952199e5..07ca3c5571 100644 --- a/ext/standard/tests/general_functions/var_export_bug66179.phpt +++ b/ext/standard/tests/general_functions/var_export_bug66179.phpt @@ -19,7 +19,7 @@ var_export(10000000000000000.0); echo PHP_EOL; ?> ---EXPECTF-- +--EXPECT-- 1.0 123.0 -1.0 diff --git a/ext/standard/tests/hrtime/hrtime.phpt b/ext/standard/tests/hrtime/hrtime.phpt new file mode 100644 index 0000000000..bac127bf44 --- /dev/null +++ b/ext/standard/tests/hrtime/hrtime.phpt @@ -0,0 +1,26 @@ +--TEST-- +Test hrtime() aligns with microtime() +--FILE-- +<?php + +$m0 = microtime(true); +$h0 = hrtime(true); +for ($i = 0; $i < 1024*1024; $i++); +$h1 = hrtime(true); +$m1 = microtime(true); + +$d0 = ($m1 - $m0)*1000000000.0; +$d1 = $h1 - $h0; + +/* Relative uncertainty. */ +$d = abs($d0 - $d1)/$d1; + +if ($d > 0.05) { + print "FAIL, $d"; +} else { + print "OK, $d"; +} + +?> +--EXPECTF-- +OK, %f diff --git a/ext/standard/tests/hrtime/hrtime_array.phpt b/ext/standard/tests/hrtime/hrtime_array.phpt new file mode 100644 index 0000000000..c3b4b61258 --- /dev/null +++ b/ext/standard/tests/hrtime/hrtime_array.phpt @@ -0,0 +1,15 @@ +--TEST-- +Test hrtime() return array +--FILE-- +<?php + +var_dump(hrtime()); + +?> +--EXPECTF-- +array(2) { + [0]=> + int(%d) + [1]=> + int(%d) +} diff --git a/ext/standard/tests/image/bug72278.phpt b/ext/standard/tests/image/bug72278.phpt index b3bd68a6f0..6c5dfa8777 100644 --- a/ext/standard/tests/image/bug72278.phpt +++ b/ext/standard/tests/image/bug72278.phpt @@ -1,9 +1,5 @@ --TEST-- Bug #72278 (getimagesize returning FALSE on valid jpg) ---SKIPIF-- -<?php -if (!defined('IMAGETYPE_JPEG')) die('skip images of type JPEG not supported'); -?> --FILE-- <?php define('FILENAME', __DIR__ . DIRECTORY_SEPARATOR . 'bug72278.jpg'); diff --git a/ext/standard/tests/image/getimagesize.phpt b/ext/standard/tests/image/getimagesize.phpt index eefa331ea5..1164f10c3e 100644 --- a/ext/standard/tests/image/getimagesize.phpt +++ b/ext/standard/tests/image/getimagesize.phpt @@ -37,7 +37,7 @@ array(16) { ["bits"]=> int(24) ["mime"]=> - string(14) "image/x-ms-bmp" + string(9) "image/bmp" } ["test12pix.webp"]=> array(6) { @@ -67,7 +67,7 @@ array(16) { ["bits"]=> int(32) ["mime"]=> - string(14) "image/x-ms-bmp" + string(9) "image/bmp" } ["test1pix.bmp"]=> array(6) { @@ -82,7 +82,7 @@ array(16) { ["bits"]=> int(24) ["mime"]=> - string(14) "image/x-ms-bmp" + string(9) "image/bmp" } ["test1pix.jp2"]=> array(7) { diff --git a/ext/standard/tests/image/getimagesize_basic.phpt b/ext/standard/tests/image/getimagesize_basic.phpt index 8ee29f60f6..dc2ec5e2e7 100644 --- a/ext/standard/tests/image/getimagesize_basic.phpt +++ b/ext/standard/tests/image/getimagesize_basic.phpt @@ -138,7 +138,7 @@ array(6) { ["bits"]=> int(24) ["mime"]=> - string(14) "image/x-ms-bmp" + string(9) "image/bmp" } array(0) { } diff --git a/ext/standard/tests/image/getimagesize_jpgapp.phpt b/ext/standard/tests/image/getimagesize_jpgapp.phpt index f75f3826c5..000cef0555 100644 --- a/ext/standard/tests/image/getimagesize_jpgapp.phpt +++ b/ext/standard/tests/image/getimagesize_jpgapp.phpt @@ -1,11 +1,5 @@ --TEST-- Test getimagesize() function : basic functionality - load APP info from jpeg. ---SKIPIF-- -<?php - if (!defined("IMAGETYPE_JPEG")) { - die("skip jpeg format is not available"); - } -?> --FILE-- <?php /* Prototype : proto array getimagesize(string imagefile [, array info]) @@ -30,7 +24,7 @@ foreach ($arr as $key => $value) { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- APP1 - length: 1717; md5: 02cbf4ba6640c131422483138c968516 APP2 - length: 7275; md5: f5036ccca2031e8bf932bcbd4aca4355 APP13 - length: 42; md5: 2202998bd05e78bcb419f08c070d6f61 diff --git a/ext/standard/tests/image/getimagesize_tif_mm.phpt b/ext/standard/tests/image/getimagesize_tif_mm.phpt index 69a447f121..3e044e12be 100644 --- a/ext/standard/tests/image/getimagesize_tif_mm.phpt +++ b/ext/standard/tests/image/getimagesize_tif_mm.phpt @@ -1,11 +1,5 @@ --TEST-- GetImageSize() for tiff format with big-endian (aka Motorola, aka MM) ordering ---SKIPIF-- -<?php - if (!defined("IMAGETYPE_TIFF_MM")) { - die("skip tiff_mm file format is not available"); - } -?> --FILE-- <?php /* Prototype : proto array getimagesize(string imagefile [, array info]) diff --git a/ext/standard/tests/image/getimagesize_variation2.phpt b/ext/standard/tests/image/getimagesize_variation2.phpt index 003c3988a5..eec2301c40 100644 --- a/ext/standard/tests/image/getimagesize_variation2.phpt +++ b/ext/standard/tests/image/getimagesize_variation2.phpt @@ -1,11 +1,5 @@ --TEST-- Test getimagesize() function : usage variations - unexpected type for arg 2 ---SKIPIF-- -<?php - if (!defined("IMAGETYPE_JPEG")) { - die("skip jpeg format is not available"); - } -?> --FILE-- <?php /* Prototype : proto array getimagesize(string imagefile [, array info]) diff --git a/ext/standard/tests/image/getimagesize_variation4.phpt b/ext/standard/tests/image/getimagesize_variation4.phpt index 87c86edf5d..ae73e27921 100644 --- a/ext/standard/tests/image/getimagesize_variation4.phpt +++ b/ext/standard/tests/image/getimagesize_variation4.phpt @@ -19,7 +19,7 @@ var_dump( getimagesize(dirname(__FILE__)."/test13pix.swf", $info) ); var_dump( $info ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing getimagesize() : variation *** array(5) { [0]=> diff --git a/ext/standard/tests/image/getimagesize_variation_005.phpt b/ext/standard/tests/image/getimagesize_variation_005.phpt index 47189ccae0..ea7b813d77 100644 --- a/ext/standard/tests/image/getimagesize_variation_005.phpt +++ b/ext/standard/tests/image/getimagesize_variation_005.phpt @@ -19,7 +19,7 @@ var_dump( getimagesize(dirname(__FILE__)."/test13pix.swf", $info) ); var_dump( $info ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing getimagesize() : basic functionality *** array(5) { [0]=> diff --git a/ext/standard/tests/image/getimagesize_wbmp.phpt b/ext/standard/tests/image/getimagesize_wbmp.phpt index f1b68d1893..e09eab40af 100644 --- a/ext/standard/tests/image/getimagesize_wbmp.phpt +++ b/ext/standard/tests/image/getimagesize_wbmp.phpt @@ -1,11 +1,5 @@ --TEST-- GetImageSize() for wbmp format ---SKIPIF-- -<?php - if (!defined("IMAGETYPE_WBMP")) { - die("skip wbmp file format is not available"); - } -?> --FILE-- <?php /* Prototype : proto array getimagesize(string imagefile [, array info]) diff --git a/ext/standard/tests/image/getimagesize_xbm.phpt b/ext/standard/tests/image/getimagesize_xbm.phpt index 2a1aeb637f..635750c51c 100644 --- a/ext/standard/tests/image/getimagesize_xbm.phpt +++ b/ext/standard/tests/image/getimagesize_xbm.phpt @@ -1,11 +1,5 @@ --TEST-- GetImageSize() for xbm format ---SKIPIF-- -<?php - if (!defined("IMAGETYPE_XBM")) { - die("skip xbm file format is not available"); - } -?> --FILE-- <?php /* Prototype : proto array getimagesize(string imagefile [, array info]) diff --git a/ext/standard/tests/image/image_type_to_extension.phpt b/ext/standard/tests/image/image_type_to_extension.phpt index 98a92a6c40..8418a4b8c7 100644 --- a/ext/standard/tests/image/image_type_to_extension.phpt +++ b/ext/standard/tests/image/image_type_to_extension.phpt @@ -2,7 +2,6 @@ image_type_to_extension() --SKIPIF-- <?php - if (!function_exists('image_type_to_extension')) die('skip image_type_to_extension() not available'); require_once('skipif_imagetype.inc'); ?> --FILE-- @@ -91,10 +90,10 @@ Constant: IMAGETYPE_WEBP With dot: .webp Without dot: webp -Warning: image_type_to_extension() expects parameter 2 to be boolean, array given in %s on line %d +Warning: image_type_to_extension() expects parameter 2 to be bool, array given in %s on line %d bool(false) -Warning: image_type_to_extension() expects parameter 1 to be integer, object given in %s on line %d +Warning: image_type_to_extension() expects parameter 1 to be int, object given in %s on line %d bool(false) bool(false) diff --git a/ext/standard/tests/image/image_type_to_mime_type.phpt b/ext/standard/tests/image/image_type_to_mime_type.phpt index 4ae5680238..199d2c4b58 100644 --- a/ext/standard/tests/image/image_type_to_mime_type.phpt +++ b/ext/standard/tests/image/image_type_to_mime_type.phpt @@ -2,7 +2,6 @@ image_type_to_mime_type() --SKIPIF-- <?php - if (!function_exists('image_type_to_mime_type')) die('skip image_type_to_mime_type() not available'); require_once('skipif_imagetype.inc'); ?> --FILE-- @@ -27,13 +26,13 @@ image_type_to_mime_type() --EXPECT-- array(16) { ["test-1pix.bmp"]=> - string(14) "image/x-ms-bmp" + string(9) "image/bmp" ["test12pix.webp"]=> string(10) "image/webp" ["test1bpix.bmp"]=> - string(14) "image/x-ms-bmp" + string(9) "image/bmp" ["test1pix.bmp"]=> - string(14) "image/x-ms-bmp" + string(9) "image/bmp" ["test1pix.jp2"]=> string(9) "image/jp2" ["test1pix.jpc"]=> diff --git a/ext/standard/tests/image/image_type_to_mime_type_basic.phpt b/ext/standard/tests/image/image_type_to_mime_type_basic.phpt index 34b167b6e0..40b5a07725 100644 --- a/ext/standard/tests/image/image_type_to_mime_type_basic.phpt +++ b/ext/standard/tests/image/image_type_to_mime_type_basic.phpt @@ -1,9 +1,5 @@ --TEST-- image_type_to_mime_type() ---SKIPIF-- -<?php - if (!function_exists('image_type_to_mime_type')) die('skip image_type_to_mime_type() not available'); -?> --FILE-- <?php @@ -49,7 +45,7 @@ string(10) "image/jpeg" string(9) "image/png" string(29) "application/x-shockwave-flash" string(9) "image/psd" -string(14) "image/x-ms-bmp" +string(9) "image/bmp" string(10) "image/tiff" string(10) "image/tiff" string(24) "application/octet-stream" diff --git a/ext/standard/tests/image/image_type_to_mime_type_variation1.phpt b/ext/standard/tests/image/image_type_to_mime_type_variation1.phpt index 236b698725..d6276cf559 100644 --- a/ext/standard/tests/image/image_type_to_mime_type_variation1.phpt +++ b/ext/standard/tests/image/image_type_to_mime_type_variation1.phpt @@ -95,12 +95,12 @@ string(24) "application/octet-stream" -- Iteration 6 -- -Warning: image_type_to_mime_type() expects parameter 1 to be integer, array given in %s on line %d +Warning: image_type_to_mime_type() expects parameter 1 to be int, array given in %s on line %d NULL -- Iteration 7 -- -Warning: image_type_to_mime_type() expects parameter 1 to be integer, array given in %s on line %d +Warning: image_type_to_mime_type() expects parameter 1 to be int, array given in %s on line %d NULL -- Iteration 8 -- @@ -123,27 +123,27 @@ string(24) "application/octet-stream" -- Iteration 14 -- -Warning: image_type_to_mime_type() expects parameter 1 to be integer, string given in %s on line %d +Warning: image_type_to_mime_type() expects parameter 1 to be int, string given in %s on line %d NULL -- Iteration 15 -- -Warning: image_type_to_mime_type() expects parameter 1 to be integer, string given in %s on line %d +Warning: image_type_to_mime_type() expects parameter 1 to be int, string given in %s on line %d NULL -- Iteration 16 -- -Warning: image_type_to_mime_type() expects parameter 1 to be integer, string given in %s on line %d +Warning: image_type_to_mime_type() expects parameter 1 to be int, string given in %s on line %d NULL -- Iteration 17 -- -Warning: image_type_to_mime_type() expects parameter 1 to be integer, string given in %s on line %d +Warning: image_type_to_mime_type() expects parameter 1 to be int, string given in %s on line %d NULL -- Iteration 18 -- -Warning: image_type_to_mime_type() expects parameter 1 to be integer, object given in %s on line %d +Warning: image_type_to_mime_type() expects parameter 1 to be int, object given in %s on line %d NULL -- Iteration 19 -- diff --git a/ext/standard/tests/image/image_type_to_mime_type_variation3.phpt b/ext/standard/tests/image/image_type_to_mime_type_variation3.phpt index 0b2c90263f..d8366c15e3 100644 --- a/ext/standard/tests/image/image_type_to_mime_type_variation3.phpt +++ b/ext/standard/tests/image/image_type_to_mime_type_variation3.phpt @@ -39,7 +39,7 @@ string\(29\) "application\/x-shockwave-flash" string\(9\) "image\/psd" -- Iteration 6 -- -string\(14\) "image\/x-ms-bmp" +string\(9\) "image\/bmp" -- Iteration 7 -- string\(10\) "image\/tiff" diff --git a/ext/standard/tests/image/image_type_to_mime_type_variation4.phpt b/ext/standard/tests/image/image_type_to_mime_type_variation4.phpt index 3ab3842eeb..8ec2e37ae1 100644 --- a/ext/standard/tests/image/image_type_to_mime_type_variation4.phpt +++ b/ext/standard/tests/image/image_type_to_mime_type_variation4.phpt @@ -2,8 +2,8 @@ Test image_type_to_mime_type() function : usage variations - Passing IMAGETYPE_ICO and IMAGETYPE_SWC --SKIPIF-- <?php - if (!defined("IMAGETYPE_SWC") || !defined("IMAGETYPE_ICO") || !extension_loaded('zlib')) { - die("skip zlib extension is not available or IMAGETYPE_SWC/IMAGETYPE_ICO is not defined "); + if (!defined("IMAGETYPE_SWC") || !extension_loaded('zlib')) { + die("skip zlib extension is not available or IMAGETYPE_SWC is not defined "); } ?> --FILE-- diff --git a/ext/standard/tests/image/iptcembed_001.phpt b/ext/standard/tests/image/iptcembed_001.phpt index feadddea1b..a8ca381ce8 100644 --- a/ext/standard/tests/image/iptcembed_001.phpt +++ b/ext/standard/tests/image/iptcembed_001.phpt @@ -13,6 +13,6 @@ unlink($file); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- bool(false) Done diff --git a/ext/standard/tests/image/iptcembed_002.phpt b/ext/standard/tests/image/iptcembed_002.phpt new file mode 100644 index 0000000000..ad0446cf62 --- /dev/null +++ b/ext/standard/tests/image/iptcembed_002.phpt @@ -0,0 +1,110 @@ +--TEST-- +iptcembed() valid jpg stream +--FILE-- +<?php +/* +# source code to generate base64 use behind as $base64_1x1_jpeg +# we don't want to be gd library dependant for this test +$file="1x1.jpg"; +$ret=imagejpeg(imagecreatetruecolor(1, 1), $file, 100); +echo md5(file_get_contents($file)).PHP_EOL; +echo base64_encode(file_get_contents($file)).PHP_EOL; +unlink($file); +*/ + +/* +test description : +1) create local file 1x1 jpeg (without iptc) (use base64 content to create file) +2) generate iptcdata string with function iptc_make_tag describe behind +3) use iptcembed php function with our 1x1 jpeg file and our iptcdata string +4) write local file2 with iptcembed return content +5) various check on file2 to verify that's a valid jpeg file with our tags +*/ + + +#iptc_make_tag function from http://php.net/iptcembed +function iptc_make_tag($rec, $data, $value) + { + $length = strlen($value); + $retval = chr(0x1C) . chr($rec) . chr($data); + if($length < 0x8000) { $retval .= chr($length >> 8) . chr($length & 0xFF); } + else { $retval .= chr(0x80) . chr(0x04) . chr(($length >> 24) & 0xFF) . chr(($length >> 16) & 0xFF) . chr(($length >> 8) & 0xFF) . chr($length & 0xFF); } + return $retval . $value; + } + + +$file="1x1.jpg"; +$file2="1x1_with_iptc_tags.jpg"; +$base64_1x1_jpeg="/9j/4AAQSkZJRgABAQEAYABgAAD//gA8Q1JFQVRPUjogZ2QtanBlZyB2MS4wICh1c2luZyBJSkcgSlBFRyB2ODApLCBxdWFsaXR5ID0gMTAwCv/bAEMAAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAf/bAEMBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAf/AABEIAAEAAQMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/AP8AP/oA/9k="; +#write file +$fd=fopen($file,"wb"); +if ($fd) { fputs($fd,base64_decode($base64_1x1_jpeg)); fclose($fd); } +else { echo "error cant write $file".PHP_EOL;exit(1); } +#check file md5 +$md5=md5_file($file); +if ($md5!="07dd8594450e8c18ab8a79d7cb4573c7") { echo "md5 error".PHP_EOL;exit(1); } +#check jpeg properties +list($width, $height, $type, $attr) = getimagesize($file,$info); +if ($width!=1) { echo "width error".PHP_EOL;exit(1); } +if ($height!=1) { echo "height error".PHP_EOL;exit(1); } +if ($type!=2) { echo "type error".PHP_EOL;exit(1); } +if (!isset($info["APP0"])) { echo "APP0 error".PHP_EOL;exit(1); } + +#our iptc tags +$tags=array(); +$tags["2#105"]= "Tauren"; +$tags["2#120"]= "Tauren with Trunk"; +$tags["2#110"]= "Copyright 2004-2016, Blizzard"; +$tags["2#025"]= "Tauren, Chaman, Blizzard"; +$tags["2#090"]= "Thunder Bluffs"; +#feed iptc string for iptcembed +$iptc=''; +foreach ($tags as $tag => $string) { $rec=$tag[0]; $tag = substr($tag, 2); $iptc .= iptc_make_tag($rec, $tag, $string); } +#check iptc string md5 +if (md5(base64_encode($iptc))!="7056c4b3060f92a4f9e5b7d0caa61859") { echo "iptc md5 error".PHP_EOL;exit(1); } + +#use iptcembed to get jpeg stream content with iptc tags +$content = iptcembed($iptc, $file,0); + +#write new image with iptc tags +if ($content === false) {echo "iptcembed error".PHP_EOL;exit(1); } +$fd=fopen($file2,"wb"); +if ($fd) { fputs($fd,$content); fclose($fd); } +else { echo "error cant write $file2".PHP_EOL;exit(1); } + + +#check jpeg properties for new image with iptc tags +echo "new generated image with itpc tags : $file2".PHP_EOL; +$ret = getimagesize($file2,$info); +if ($ret===false) { echo "getimagesize error".PHP_EOL;exit(1); } +list($width, $height, $type, $attr) = $ret; +if ($width!=1) { echo "width error".PHP_EOL;exit(1); } +if ($height!=1) { echo "height error".PHP_EOL;exit(1); } +if ($type!=2) { echo "type error".PHP_EOL;exit(1); } +if (!isset($info["APP0"])) { echo "APP0 error".PHP_EOL;exit(1); } +if (!isset($info["APP13"])) { echo "APP13 error".PHP_EOL;exit(1); } + +$error=0; +$iptc_data_from_created_image = iptcparse($info['APP13']); +foreach ($tags as $tag => $string) { + #check if tag exists + if (!isset($iptc_data_from_created_image[$tag])) { + echo "error iptc tag $tag not found".PHP_EOL; + $error++; + } else { + #check value + if ($iptc_data_from_created_image[$tag][0]!=$string) { + echo "error tag $tag : bad value ($string != ".$iptc_data_from_created_image[$tag][0].")".PHP_EOL; + $error++; + } + } +} +#clean before exit +@unlink($file); +@unlink($file2); +if ($error==0) { echo "OK".PHP_EOL;exit(0);} +echo "something wrong: $error errors".PHP_EOL; +?> +--EXPECT-- +new generated image with itpc tags : 1x1_with_iptc_tags.jpg +OK diff --git a/ext/standard/tests/ini_info/loaded.ini b/ext/standard/tests/ini_info/loaded.ini new file mode 100644 index 0000000000..c3d7967943 --- /dev/null +++ b/ext/standard/tests/ini_info/loaded.ini @@ -0,0 +1 @@ +date.timezone = UTC diff --git a/ext/standard/tests/ini_info/php_ini_loaded_file.phpt b/ext/standard/tests/ini_info/php_ini_loaded_file.phpt new file mode 100644 index 0000000000..b4ad617f9f --- /dev/null +++ b/ext/standard/tests/ini_info/php_ini_loaded_file.phpt @@ -0,0 +1,17 @@ +--TEST-- +php_ini_loaded_file() function +--FILE-- +<?php + $inifile = __DIR__.DIRECTORY_SEPARATOR.'loaded.ini'; + $php = '"'.getenv('TEST_PHP_EXECUTABLE').'"'; + $code = '"var_dump(php_ini_loaded_file());"'; + + // No ini file + passthru($php.' -n -r '.$code); + + // Specified ini file + passthru($php.' -c "'.$inifile.'" -r '.$code); +?> +--EXPECTREGEX-- +bool\(false\) +string\(\d+\) ".*[\/\\]loaded\.ini" diff --git a/ext/standard/tests/ini_info/php_ini_scanned_files.phpt b/ext/standard/tests/ini_info/php_ini_scanned_files.phpt new file mode 100644 index 0000000000..27d2bebadf --- /dev/null +++ b/ext/standard/tests/ini_info/php_ini_scanned_files.phpt @@ -0,0 +1,24 @@ +--TEST-- +php_ini_scanned_files() function +--FILE-- +<?php + $inifile = __DIR__.DIRECTORY_SEPARATOR.'loaded.ini'; + $php = sprintf('"%s" -c "%s"', getenv('TEST_PHP_EXECUTABLE'), $inifile); + $scandir = __DIR__.DIRECTORY_SEPARATOR.'scandir'; + + // Empty env value disables any config option + putenv('PHP_INI_SCAN_DIR='); + passthru($php.' -r "var_dump(php_ini_scanned_files());"'); + + // Env value without path separator overrides any config option + putenv('PHP_INI_SCAN_DIR='.$scandir); + passthru($php.' -r "var_dump(php_ini_scanned_files());"'); + + // Scanned ini values override previously loaded values + passthru($php.' -r "var_dump(ini_get(\'date.timezone\'));"'); +?> +--EXPECTREGEX-- +bool\(false\) +string\(\d+\) ".*[\/\\]0\.ini +" +string\(\d+\) "Antarctica\/McMurdo" diff --git a/ext/standard/tests/ini_info/scandir/0.ini b/ext/standard/tests/ini_info/scandir/0.ini new file mode 100644 index 0000000000..fac6473265 --- /dev/null +++ b/ext/standard/tests/ini_info/scandir/0.ini @@ -0,0 +1,4 @@ +; This file is named 0.ini so it should be the first line of +; any scanned ini output + +date.timezone = Antarctica/McMurdo diff --git a/ext/standard/tests/mail/bug69874.phpt b/ext/standard/tests/mail/bug69874.phpt index a952a73bdc..14a4b452df 100644 --- a/ext/standard/tests/mail/bug69874.phpt +++ b/ext/standard/tests/mail/bug69874.phpt @@ -32,7 +32,7 @@ unlink($outFile); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing mail() : send email without additional headers *** bool(true) To: user@company.com diff --git a/ext/standard/tests/mail/ezmlm_hash_basic.phpt b/ext/standard/tests/mail/ezmlm_hash_basic.phpt index b6ed463edc..da629e9e12 100644 --- a/ext/standard/tests/mail/ezmlm_hash_basic.phpt +++ b/ext/standard/tests/mail/ezmlm_hash_basic.phpt @@ -1,9 +1,5 @@ --TEST-- Test ezmlm_hash() function : basic functionality ---SKIPIF-- -<?php -if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); -?> --FILE-- <?php /* Prototype : int ezmlm_hash ( string $addr ) diff --git a/ext/standard/tests/mail/mail_basic6.phpt b/ext/standard/tests/mail/mail_basic6.phpt index d0d45b78f3..01d315ae06 100644 --- a/ext/standard/tests/mail/mail_basic6.phpt +++ b/ext/standard/tests/mail/mail_basic6.phpt @@ -59,7 +59,7 @@ echo @file_get_contents($outFile); $additional_headers = "\nHEAD1: a\nHEAD2: b\n"; @unlink($outFile); -echo "-- Invalid Header - preceeding newline--\n"; +echo "-- Invalid Header - preceding newline--\n"; // Calling mail() with all additional headers var_dump( mail($to, $subject, $message, $additional_headers) ); echo @file_get_contents($outFile); @@ -69,7 +69,7 @@ echo @file_get_contents($outFile); $additional_headers = "\rHEAD1: a\nHEAD2: b\r"; @unlink($outFile); -echo "-- Invalid Header - preceeding newline--\n"; +echo "-- Invalid Header - preceding newline--\n"; // Calling mail() with all additional headers var_dump( mail($to, $subject, $message, $additional_headers) ); echo @file_get_contents($outFile); @@ -79,7 +79,7 @@ echo @file_get_contents($outFile); $additional_headers = "\r\nHEAD1: a\r\nHEAD2: b\r\n"; @unlink($outFile); -echo "-- Invalid Header - preceeding newline--\n"; +echo "-- Invalid Header - preceding newline--\n"; // Calling mail() with all additional headers var_dump( mail($to, $subject, $message, $additional_headers) ); echo @file_get_contents($outFile); @@ -89,7 +89,7 @@ echo @file_get_contents($outFile); $additional_headers = "\r\n\r\nHEAD1: a\r\nHEAD2: b\r\n"; @unlink($outFile); -echo "-- Invalid Header - preceeding newline--\n"; +echo "-- Invalid Header - preceding newline--\n"; // Calling mail() with all additional headers var_dump( mail($to, $subject, $message, $additional_headers) ); echo @file_get_contents($outFile); @@ -99,7 +99,7 @@ echo @file_get_contents($outFile); $additional_headers = "\n\nHEAD1: a\r\nHEAD2: b\r\n"; @unlink($outFile); -echo "-- Invalid Header - preceeding newline--\n"; +echo "-- Invalid Header - preceding newline--\n"; // Calling mail() with all additional headers var_dump( mail($to, $subject, $message, $additional_headers) ); echo @file_get_contents($outFile); @@ -109,7 +109,7 @@ echo @file_get_contents($outFile); $additional_headers = "\r\rHEAD1: a\r\nHEAD2: b\r\n"; @unlink($outFile); -echo "-- Invalid Header - preceeding newline--\n"; +echo "-- Invalid Header - preceding newline--\n"; // Calling mail() with all additional headers var_dump( mail($to, $subject, $message, $additional_headers) ); echo @file_get_contents($outFile); @@ -246,27 +246,27 @@ Subject: Test Subject HEAD1: a
HEAD2: b A Message --- Invalid Header - preceeding newline-- +-- Invalid Header - preceding newline-- Warning: mail(): Multiple or malformed newlines found in additional_header in %s/mail_basic6.php on line %d bool(false) --- Invalid Header - preceeding newline-- +-- Invalid Header - preceding newline-- Warning: mail(): Multiple or malformed newlines found in additional_header in %s/mail_basic6.php on line %d bool(false) --- Invalid Header - preceeding newline-- +-- Invalid Header - preceding newline-- Warning: mail(): Multiple or malformed newlines found in additional_header in %s/mail_basic6.php on line %d bool(false) --- Invalid Header - preceeding newline-- +-- Invalid Header - preceding newline-- Warning: mail(): Multiple or malformed newlines found in additional_header in %s/mail_basic6.php on line %d bool(false) --- Invalid Header - preceeding newline-- +-- Invalid Header - preceding newline-- Warning: mail(): Multiple or malformed newlines found in additional_header in %s/mail_basic6.php on line %d bool(false) --- Invalid Header - preceeding newline-- +-- Invalid Header - preceding newline-- Warning: mail(): Multiple or malformed newlines found in additional_header in %s/mail_basic6.php on line %d bool(false) diff --git a/ext/standard/tests/math/abs.phpt b/ext/standard/tests/math/abs.phpt index f5c26c3037..9350fc71fb 100644 --- a/ext/standard/tests/math/abs.phpt +++ b/ext/standard/tests/math/abs.phpt @@ -1,7 +1,7 @@ --TEST-- Simple math tests --FILE-- -<?php // $Id$ +<?php define('LONG_MAX', is_int(5000000000)? 9223372036854775807 : 0x7FFFFFFF); define('LONG_MIN', -LONG_MAX - 1); diff --git a/ext/standard/tests/math/abs_basic.phpt b/ext/standard/tests/math/abs_basic.phpt index 79546b7a7b..5c3f8ff8ea 100644 --- a/ext/standard/tests/math/abs_basic.phpt +++ b/ext/standard/tests/math/abs_basic.phpt @@ -32,7 +32,7 @@ for ($i = 0; $i < count($values); $i++) { } ?> ===Done=== ---EXPECTF-- +--EXPECT-- *** Testing abs() : basic functionality *** int(23) int(23) diff --git a/ext/standard/tests/math/abs_variation.phpt b/ext/standard/tests/math/abs_variation.phpt index e8cdbc943e..fd671855e1 100644 --- a/ext/standard/tests/math/abs_variation.phpt +++ b/ext/standard/tests/math/abs_variation.phpt @@ -121,7 +121,7 @@ int(0) -- Iteration 13 -- -Notice: Object of class classA could not be converted to int in %s on line %d +Notice: Object of class classA could not be converted to number in %s on line %d int(1) -- Iteration 14 -- diff --git a/ext/standard/tests/math/atan2_basic.phpt b/ext/standard/tests/math/atan2_basic.phpt index c387cad439..f6dae62900 100644 --- a/ext/standard/tests/math/atan2_basic.phpt +++ b/ext/standard/tests/math/atan2_basic.phpt @@ -38,7 +38,7 @@ for ($i = 0; $i < count($valuesy); $i++) { } } ?> ---EXPECTF-- +--EXPECT-- Y:23 X:23 float(0.78539816339745) Y:23 X:-23 float(2.3561944901923) Y:23 X:23.45 float(0.77571063007847) diff --git a/ext/standard/tests/math/base_convert_basic.phpt b/ext/standard/tests/math/base_convert_basic.phpt index 41d09a6aef..b5e34dfb8b 100644 --- a/ext/standard/tests/math/base_convert_basic.phpt +++ b/ext/standard/tests/math/base_convert_basic.phpt @@ -28,7 +28,7 @@ for ($f= 0; $f < count($frombase); $f++) { } } ?> ---EXPECTF-- +--EXPECT-- ...from base is 2 ......to base is 2 .........value= 10 res = 10 diff --git a/ext/standard/tests/math/base_convert_error.phpt b/ext/standard/tests/math/base_convert_error.phpt index abd41b6f03..f27d0a66cf 100644 --- a/ext/standard/tests/math/base_convert_error.phpt +++ b/ext/standard/tests/math/base_convert_error.phpt @@ -37,7 +37,7 @@ Warning: base_convert() expects exactly 3 parameters, 2 given in %s on line %d Warning: base_convert(): Invalid `from base' (1) in %s on line %d -Warning: base_convert(): Invalid `to base' (37) in %s on line %s +Warning: base_convert(): Invalid `to base' (37) in %s on line %d Incorrect input Recoverable fatal error: Object of class classA could not be converted to string in %s on line %d diff --git a/ext/standard/tests/math/base_convert_variation2.phpt b/ext/standard/tests/math/base_convert_variation2.phpt index 993936c576..23e74c621d 100644 --- a/ext/standard/tests/math/base_convert_variation2.phpt +++ b/ext/standard/tests/math/base_convert_variation2.phpt @@ -153,32 +153,32 @@ bool(false) -- Iteration 17 -- -Warning: base_convert() expects parameter 2 to be integer, string given in %s on line %d +Warning: base_convert() expects parameter 2 to be int, string given in %s on line %d NULL -- Iteration 18 -- -Warning: base_convert() expects parameter 2 to be integer, string given in %s on line %d +Warning: base_convert() expects parameter 2 to be int, string given in %s on line %d NULL -- Iteration 19 -- -Warning: base_convert() expects parameter 2 to be integer, array given in %s on line %d +Warning: base_convert() expects parameter 2 to be int, array given in %s on line %d NULL -- Iteration 20 -- -Warning: base_convert() expects parameter 2 to be integer, string given in %s on line %d +Warning: base_convert() expects parameter 2 to be int, string given in %s on line %d NULL -- Iteration 21 -- -Warning: base_convert() expects parameter 2 to be integer, string given in %s on line %d +Warning: base_convert() expects parameter 2 to be int, string given in %s on line %d NULL -- Iteration 22 -- -Warning: base_convert() expects parameter 2 to be integer, string given in %s on line %d +Warning: base_convert() expects parameter 2 to be int, string given in %s on line %d NULL -- Iteration 23 -- diff --git a/ext/standard/tests/math/base_convert_variation3.phpt b/ext/standard/tests/math/base_convert_variation3.phpt index f0702ba160..d4b96fb1f2 100644 --- a/ext/standard/tests/math/base_convert_variation3.phpt +++ b/ext/standard/tests/math/base_convert_variation3.phpt @@ -153,32 +153,32 @@ bool(false) -- Iteration 17 -- -Warning: base_convert() expects parameter 3 to be integer, string given in %s on line %d +Warning: base_convert() expects parameter 3 to be int, string given in %s on line %d NULL -- Iteration 18 -- -Warning: base_convert() expects parameter 3 to be integer, string given in %s on line %d +Warning: base_convert() expects parameter 3 to be int, string given in %s on line %d NULL -- Iteration 19 -- -Warning: base_convert() expects parameter 3 to be integer, array given in %s on line %d +Warning: base_convert() expects parameter 3 to be int, array given in %s on line %d NULL -- Iteration 20 -- -Warning: base_convert() expects parameter 3 to be integer, string given in %s on line %d +Warning: base_convert() expects parameter 3 to be int, string given in %s on line %d NULL -- Iteration 21 -- -Warning: base_convert() expects parameter 3 to be integer, string given in %s on line %d +Warning: base_convert() expects parameter 3 to be int, string given in %s on line %d NULL -- Iteration 22 -- -Warning: base_convert() expects parameter 3 to be integer, string given in %s on line %d +Warning: base_convert() expects parameter 3 to be int, string given in %s on line %d NULL -- Iteration 23 -- diff --git a/ext/standard/tests/math/bindec_basic.phpt b/ext/standard/tests/math/bindec_basic.phpt index d0db2a37ea..cf7c50a09e 100644 --- a/ext/standard/tests/math/bindec_basic.phpt +++ b/ext/standard/tests/math/bindec_basic.phpt @@ -33,7 +33,7 @@ for ($i = 0; $i < count($values); $i++) { var_dump($res); } ?> ---EXPECTF-- +--EXPECT-- int(455) int(0) int(32766) diff --git a/ext/standard/tests/math/bindec_basic_64bit.phpt b/ext/standard/tests/math/bindec_basic_64bit.phpt index f6483e0807..0a8bb0587d 100644 --- a/ext/standard/tests/math/bindec_basic_64bit.phpt +++ b/ext/standard/tests/math/bindec_basic_64bit.phpt @@ -33,7 +33,7 @@ for ($i = 0; $i < count($values); $i++) { var_dump($res); } ?> ---EXPECTF-- +--EXPECT-- int(455) int(0) int(32766) diff --git a/ext/standard/tests/math/bug21523.phpt b/ext/standard/tests/math/bug21523.phpt index 9fc441fba4..7589c401e3 100644 --- a/ext/standard/tests/math/bug21523.phpt +++ b/ext/standard/tests/math/bug21523.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #21523 (number_format tries to allocate negative amount of memory) --FILE-- -<?php // $Id$ vim600:syn=php +<?php // vim600:syn=php set_time_limit(5); var_dump(number_format(-2000, 2768)); diff --git a/ext/standard/tests/math/bug24142.phpt b/ext/standard/tests/math/bug24142.phpt index 244952369d..169932b49b 100644 --- a/ext/standard/tests/math/bug24142.phpt +++ b/ext/standard/tests/math/bug24142.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #24142 (round() problems) --FILE-- -<?php // $Id$ vim600:syn=php +<?php // vim600:syn=php $v = 0.005; for ($i = 1; $i < 10; $i++) { echo "round({$v}, 2) -> ".round($v, 2)."\n"; diff --git a/ext/standard/tests/math/ceil_basic.phpt b/ext/standard/tests/math/ceil_basic.phpt index 3a4bb0c293..9e06267d22 100644 --- a/ext/standard/tests/math/ceil_basic.phpt +++ b/ext/standard/tests/math/ceil_basic.phpt @@ -43,7 +43,7 @@ for ($i = 0; $i < count($values); $i++) { ?> ===Done=== ---EXPECTF-- +--EXPECT-- *** Testing ceil() : basic functionality *** float(0) float(0) diff --git a/ext/standard/tests/math/ceil_variation1.phpt b/ext/standard/tests/math/ceil_variation1.phpt index e68dd8b878..05f308a4a0 100644 --- a/ext/standard/tests/math/ceil_variation1.phpt +++ b/ext/standard/tests/math/ceil_variation1.phpt @@ -114,7 +114,7 @@ float(0) -- Iteration 13 -- -Notice: Object of class classA could not be converted to int in %s on line %d +Notice: Object of class classA could not be converted to number in %s on line %d float(1) -- Iteration 14 -- diff --git a/ext/standard/tests/math/decbin_basic.phpt b/ext/standard/tests/math/decbin_basic.phpt index 7fc4529896..b067030a48 100644 --- a/ext/standard/tests/math/decbin_basic.phpt +++ b/ext/standard/tests/math/decbin_basic.phpt @@ -22,7 +22,7 @@ for ($i = 0; $i < count($values); $i++) { var_dump($res); } ?> ---EXPECTF-- +--EXPECT-- string(4) "1010" string(12) "111101101110" string(12) "111101101110" diff --git a/ext/standard/tests/math/decbin_error.phpt b/ext/standard/tests/math/decbin_error.phpt index d69100f196..4406c7a40a 100644 --- a/ext/standard/tests/math/decbin_error.phpt +++ b/ext/standard/tests/math/decbin_error.phpt @@ -2,10 +2,6 @@ Test expm1() - Error conditions --INI-- precision=14 ---SKIPIF-- -<?php - function_exists('expm1') or die('skip expm1() is not supported in this build.'); -?> --FILE-- <?php /* Prototype : float expm1 ( float $arg ) diff --git a/ext/standard/tests/math/dechex_basic.phpt b/ext/standard/tests/math/dechex_basic.phpt index 439beea3ef..9f6328c24a 100644 --- a/ext/standard/tests/math/dechex_basic.phpt +++ b/ext/standard/tests/math/dechex_basic.phpt @@ -22,7 +22,7 @@ for ($i = 0; $i < count($values); $i++) { var_dump($res); } ?> ---EXPECTF-- +--EXPECT-- string(1) "a" string(3) "f6e" string(3) "f6e" diff --git a/ext/standard/tests/math/decoct_basic.phpt b/ext/standard/tests/math/decoct_basic.phpt index b9d9ebc060..19bda37bff 100644 --- a/ext/standard/tests/math/decoct_basic.phpt +++ b/ext/standard/tests/math/decoct_basic.phpt @@ -22,7 +22,7 @@ for ($i = 0; $i < count($values); $i++) { var_dump($res); } ?> ---EXPECTF-- +--EXPECT-- string(2) "12" string(4) "7556" string(4) "7556" diff --git a/ext/standard/tests/math/exp_basic.phpt b/ext/standard/tests/math/exp_basic.phpt index 0962302ea7..6d90c9d8a8 100644 --- a/ext/standard/tests/math/exp_basic.phpt +++ b/ext/standard/tests/math/exp_basic.phpt @@ -27,7 +27,7 @@ foreach($values as $value) { ?> ===Done=== ---EXPECTF-- +--EXPECT-- -- Iteration 1 -- float(22026.465794807) diff --git a/ext/standard/tests/math/expm1_basic.phpt b/ext/standard/tests/math/expm1_basic.phpt index 00f8762ad5..5690f4cf6f 100644 --- a/ext/standard/tests/math/expm1_basic.phpt +++ b/ext/standard/tests/math/expm1_basic.phpt @@ -34,7 +34,7 @@ foreach($values as $value) { }; ?> ===Done=== ---EXPECTF-- +--EXPECT-- *** Testing expm1() : basic functionality *** -- Iteration 1 -- diff --git a/ext/standard/tests/math/floor_basic.phpt b/ext/standard/tests/math/floor_basic.phpt index e21e893ab3..986ee26924 100644 --- a/ext/standard/tests/math/floor_basic.phpt +++ b/ext/standard/tests/math/floor_basic.phpt @@ -39,7 +39,7 @@ foreach($values as $value) { ?> ===Done=== ---EXPECTF-- +--EXPECT-- *** Testing floor() : basic functionality *** -- floor 0 -- diff --git a/ext/standard/tests/math/floor_variation1.phpt b/ext/standard/tests/math/floor_variation1.phpt index adf12551f4..aef4c742b9 100644 --- a/ext/standard/tests/math/floor_variation1.phpt +++ b/ext/standard/tests/math/floor_variation1.phpt @@ -114,7 +114,7 @@ float(0) -- Iteration 13 -- -Notice: Object of class classA could not be converted to int in %s on line %d +Notice: Object of class classA could not be converted to number in %s on line %d float(1) -- Iteration 14 -- diff --git a/ext/standard/tests/math/fmod_basic.phpt b/ext/standard/tests/math/fmod_basic.phpt index c04f3e2a1a..875ae8dd05 100644 --- a/ext/standard/tests/math/fmod_basic.phpt +++ b/ext/standard/tests/math/fmod_basic.phpt @@ -38,7 +38,7 @@ for ($i = 0; $i < count($values1); $i++) { } } ?> ---EXPECTF-- +--EXPECT-- iteration 0 float(0) float(0) diff --git a/ext/standard/tests/math/hexdec_basic.phpt b/ext/standard/tests/math/hexdec_basic.phpt index 08303ad20c..a8f2e9fcca 100644 --- a/ext/standard/tests/math/hexdec_basic.phpt +++ b/ext/standard/tests/math/hexdec_basic.phpt @@ -29,7 +29,7 @@ for ($i = 0; $i < count($values); $i++) { var_dump($res); } ?> ---EXPECTF-- +--EXPECT-- int(18433668) int(126895953) float(142929835591) diff --git a/ext/standard/tests/math/hexdec_basic_64bit.phpt b/ext/standard/tests/math/hexdec_basic_64bit.phpt index 6ed5dc61f7..2168a31038 100644 --- a/ext/standard/tests/math/hexdec_basic_64bit.phpt +++ b/ext/standard/tests/math/hexdec_basic_64bit.phpt @@ -34,7 +34,7 @@ foreach($values as $value) { ?> ===Done=== ---EXPECTF-- +--EXPECT-- *** Testing hexdec() : basic functionality *** -- hexdec 1194684 -- diff --git a/ext/standard/tests/math/intdiv_64bit.phpt b/ext/standard/tests/math/intdiv_64bit.phpt index d0883fb212..df8367bdbb 100644 --- a/ext/standard/tests/math/intdiv_64bit.phpt +++ b/ext/standard/tests/math/intdiv_64bit.phpt @@ -11,5 +11,5 @@ if (PHP_INT_SIZE !== 8) { // (int)(PHP_INT_MAX / 3) gives a different result var_dump(intdiv(PHP_INT_MAX, 3)); ?> ---EXPECTF-- +--EXPECT-- int(3074457345618258602) diff --git a/ext/standard/tests/math/is_finite_basic.phpt b/ext/standard/tests/math/is_finite_basic.phpt index 8d3d7c49ad..11db785ae4 100644 --- a/ext/standard/tests/math/is_finite_basic.phpt +++ b/ext/standard/tests/math/is_finite_basic.phpt @@ -22,7 +22,7 @@ for ($i = 0; $i < count($values); $i++) { var_dump($res); } ?> ---EXPECTF-- +--EXPECT-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/math/is_infinite_basic.phpt b/ext/standard/tests/math/is_infinite_basic.phpt index 272a02ea25..4f90340311 100644 --- a/ext/standard/tests/math/is_infinite_basic.phpt +++ b/ext/standard/tests/math/is_infinite_basic.phpt @@ -22,7 +22,7 @@ for ($i = 0; $i < count($values); $i++) { var_dump($res); } ?> ---EXPECTF-- +--EXPECT-- bool(false) bool(false) bool(false) diff --git a/ext/standard/tests/math/is_nan_basic.phpt b/ext/standard/tests/math/is_nan_basic.phpt index bd36329c75..49d2ce4ccf 100644 --- a/ext/standard/tests/math/is_nan_basic.phpt +++ b/ext/standard/tests/math/is_nan_basic.phpt @@ -24,7 +24,7 @@ for ($i = 0; $i < count($values); $i++) { } ?> ---EXPECTF-- +--EXPECT-- bool(false) bool(false) bool(false) diff --git a/ext/standard/tests/math/lcg_value_basic.phpt b/ext/standard/tests/math/lcg_value_basic.phpt index d2fcad9a79..44304f2475 100644 --- a/ext/standard/tests/math/lcg_value_basic.phpt +++ b/ext/standard/tests/math/lcg_value_basic.phpt @@ -21,32 +21,36 @@ if ($i != 100) { echo "PASSED\n"; } -echo "\n lcg_value error cases..spurious args get ignored\n"; +echo "\n lcg_value error cases..\n"; $res = lcg_value(23); -if (!is_float($res) || $res < 0 || $res > 1) { - echo "FAILED\n"; -} else { +if (is_null($res)) { echo "PASSED\n"; +} else { + echo "FAILED\n"; } $res = lcg_value(10,false); -if (!is_float($res) || $res < 0 || $res > 1) { - echo "FAILED\n"; -} else { +if (is_null($res)) { echo "PASSED\n"; +} else { + echo "FAILED\n"; } echo "MATHS test script completed\n"; ?> ---EXPECT-- +--EXPECTF-- MATHS test script started lcg_value tests... PASSED - lcg_value error cases..spurious args get ignored + lcg_value error cases.. + +Warning: lcg_value() expects exactly 0 parameters, 1 given in %slcg_value_basic.php on line %d PASSED + +Warning: lcg_value() expects exactly 0 parameters, 2 given in %slcg_value_basic.php on line %d PASSED MATHS test script completed diff --git a/ext/standard/tests/math/log.phpt b/ext/standard/tests/math/log.phpt index 53034b3688..4df77e643c 100644 --- a/ext/standard/tests/math/log.phpt +++ b/ext/standard/tests/math/log.phpt @@ -1,7 +1,7 @@ --TEST-- log() tests --FILE-- -<?php // $Id$ +<?php echo "On failure, please mail result to php-dev@lists.php.net\n"; for ($x = 0, $count= 0; $x < 200; $x++) { $x2 = (int) exp(log($x)); diff --git a/ext/standard/tests/math/log1p_basic.phpt b/ext/standard/tests/math/log1p_basic.phpt index 76d51b0d9b..61a0c3d839 100644 --- a/ext/standard/tests/math/log1p_basic.phpt +++ b/ext/standard/tests/math/log1p_basic.phpt @@ -35,7 +35,7 @@ foreach($values as $value) { ?> ===Done=== ---EXPECTF-- +--EXPECT-- *** Testing log1p() : basic functionality *** LOG1p tests diff --git a/ext/standard/tests/math/log_basic.phpt b/ext/standard/tests/math/log_basic.phpt index bcd8747798..de97ee264b 100644 --- a/ext/standard/tests/math/log_basic.phpt +++ b/ext/standard/tests/math/log_basic.phpt @@ -29,7 +29,7 @@ for ($i = 0; $i < count($values); $i++) { var_dump($res); } ?> ---EXPECTF-- +--EXPECT-- LOG tests...no base float(3.1354942159291) float(NAN) diff --git a/ext/standard/tests/math/mt_rand_basic.phpt b/ext/standard/tests/math/mt_rand_basic.phpt index 2661c767d5..3a1e4406eb 100644 --- a/ext/standard/tests/math/mt_rand_basic.phpt +++ b/ext/standard/tests/math/mt_rand_basic.phpt @@ -79,7 +79,7 @@ for ($x = 0; $x < count($min); $x++) { } } ?> ---EXPECTF-- +--EXPECT-- mt_rand() tests with default min and max value (i.e 0 thru 2147483647) PASSED: range min = 0 max = 2147483647 diff --git a/ext/standard/tests/math/mt_rand_error.phpt b/ext/standard/tests/math/mt_rand_error.phpt index 9ae6b39b46..625f3092c5 100644 --- a/ext/standard/tests/math/mt_rand_error.phpt +++ b/ext/standard/tests/math/mt_rand_error.phpt @@ -12,6 +12,6 @@ Warning: mt_rand() expects exactly 2 parameters, 1 given in %s on line 2 Warning: mt_rand() expects exactly 2 parameters, 3 given in %s on line 3 -Warning: mt_rand() expects parameter 1 to be integer, string given in %s on line 4 +Warning: mt_rand() expects parameter 1 to be int, string given in %s on line 4 -Warning: mt_rand() expects parameter 2 to be integer, string given in %s on line 5 +Warning: mt_rand() expects parameter 2 to be int, string given in %s on line 5 diff --git a/ext/standard/tests/math/mt_rand_value.phpt b/ext/standard/tests/math/mt_rand_value.phpt index cf7b9f00b6..ab6d732709 100644 --- a/ext/standard/tests/math/mt_rand_value.phpt +++ b/ext/standard/tests/math/mt_rand_value.phpt @@ -37,7 +37,7 @@ echo $x.PHP_EOL; */ ?> ---EXPECTF-- +--EXPECT-- 1614640687 1711027313 857485497 diff --git a/ext/standard/tests/math/mt_rand_variation1.phpt b/ext/standard/tests/math/mt_rand_variation1.phpt index da4fac3e2f..d4f976b98a 100644 --- a/ext/standard/tests/math/mt_rand_variation1.phpt +++ b/ext/standard/tests/math/mt_rand_variation1.phpt @@ -138,37 +138,37 @@ int(%i) -- Iteration 17 -- -Warning: mt_rand() expects parameter 1 to be integer, string given in %s on line %d +Warning: mt_rand() expects parameter 1 to be int, string given in %s on line %d NULL -- Iteration 18 -- -Warning: mt_rand() expects parameter 1 to be integer, string given in %s on line %d +Warning: mt_rand() expects parameter 1 to be int, string given in %s on line %d NULL -- Iteration 19 -- -Warning: mt_rand() expects parameter 1 to be integer, array given in %s on line %d +Warning: mt_rand() expects parameter 1 to be int, array given in %s on line %d NULL -- Iteration 20 -- -Warning: mt_rand() expects parameter 1 to be integer, string given in %s on line %d +Warning: mt_rand() expects parameter 1 to be int, string given in %s on line %d NULL -- Iteration 21 -- -Warning: mt_rand() expects parameter 1 to be integer, string given in %s on line %d +Warning: mt_rand() expects parameter 1 to be int, string given in %s on line %d NULL -- Iteration 22 -- -Warning: mt_rand() expects parameter 1 to be integer, string given in %s on line %d +Warning: mt_rand() expects parameter 1 to be int, string given in %s on line %d NULL -- Iteration 23 -- -Warning: mt_rand() expects parameter 1 to be integer, object given in %s on line %d +Warning: mt_rand() expects parameter 1 to be int, object given in %s on line %d NULL -- Iteration 24 -- @@ -179,6 +179,6 @@ int(%i) -- Iteration 26 -- -Warning: mt_rand() expects parameter 1 to be integer, resource given in %s on line %d +Warning: mt_rand() expects parameter 1 to be int, resource given in %s on line %d NULL ===Done=== diff --git a/ext/standard/tests/math/mt_rand_variation2.phpt b/ext/standard/tests/math/mt_rand_variation2.phpt index f04baa514a..5a5b191b1c 100644 --- a/ext/standard/tests/math/mt_rand_variation2.phpt +++ b/ext/standard/tests/math/mt_rand_variation2.phpt @@ -113,7 +113,7 @@ int(%i) -- Iteration 8 -- -Warning: mt_rand() expects parameter 2 to be integer, float given in %s on line %d +Warning: mt_rand() expects parameter 2 to be int, float given in %s on line %d NULL -- Iteration 9 -- @@ -142,37 +142,37 @@ int(%i) -- Iteration 17 -- -Warning: mt_rand() expects parameter 2 to be integer, string given in %s on line %d +Warning: mt_rand() expects parameter 2 to be int, string given in %s on line %d NULL -- Iteration 18 -- -Warning: mt_rand() expects parameter 2 to be integer, string given in %s on line %d +Warning: mt_rand() expects parameter 2 to be int, string given in %s on line %d NULL -- Iteration 19 -- -Warning: mt_rand() expects parameter 2 to be integer, array given in %s on line %d +Warning: mt_rand() expects parameter 2 to be int, array given in %s on line %d NULL -- Iteration 20 -- -Warning: mt_rand() expects parameter 2 to be integer, string given in %s on line %d +Warning: mt_rand() expects parameter 2 to be int, string given in %s on line %d NULL -- Iteration 21 -- -Warning: mt_rand() expects parameter 2 to be integer, string given in %s on line %d +Warning: mt_rand() expects parameter 2 to be int, string given in %s on line %d NULL -- Iteration 22 -- -Warning: mt_rand() expects parameter 2 to be integer, string given in %s on line %d +Warning: mt_rand() expects parameter 2 to be int, string given in %s on line %d NULL -- Iteration 23 -- -Warning: mt_rand() expects parameter 2 to be integer, object given in %s on line %d +Warning: mt_rand() expects parameter 2 to be int, object given in %s on line %d NULL -- Iteration 24 -- @@ -183,6 +183,6 @@ int(%i) -- Iteration 26 -- -Warning: mt_rand() expects parameter 2 to be integer, resource given in %s on line %d +Warning: mt_rand() expects parameter 2 to be int, resource given in %s on line %d NULL ===Done=== diff --git a/ext/standard/tests/math/mt_srand_basic.phpt b/ext/standard/tests/math/mt_srand_basic.phpt index 4a9c35860f..ec0c24254d 100644 --- a/ext/standard/tests/math/mt_srand_basic.phpt +++ b/ext/standard/tests/math/mt_srand_basic.phpt @@ -13,7 +13,7 @@ var_dump(mt_srand(true)); var_dump(mt_srand(false)); var_dump(mt_srand(NULL)); ?> ---EXPECTF-- +--EXPECT-- NULL NULL NULL diff --git a/ext/standard/tests/math/mt_srand_error.phpt b/ext/standard/tests/math/mt_srand_error.phpt index 44945192d6..569f3d6f21 100644 --- a/ext/standard/tests/math/mt_srand_error.phpt +++ b/ext/standard/tests/math/mt_srand_error.phpt @@ -10,7 +10,7 @@ var_dump(mt_srand("500ABC")); Warning: mt_srand() expects at most 2 parameters, 3 given in %s on line 2 NULL -Warning: mt_srand() expects parameter 1 to be integer, string given in %s on line 3 +Warning: mt_srand() expects parameter 1 to be int, string given in %s on line 3 NULL Notice: A non well formed numeric value encountered in %s on line 4 diff --git a/ext/standard/tests/math/mt_srand_variation1.phpt b/ext/standard/tests/math/mt_srand_variation1.phpt index 5648a8fd2a..2856446e19 100644 --- a/ext/standard/tests/math/mt_srand_variation1.phpt +++ b/ext/standard/tests/math/mt_srand_variation1.phpt @@ -113,7 +113,7 @@ NULL -- Iteration 8 -- -Warning: mt_srand() expects parameter 1 to be integer, float given in %s on line %d +Warning: mt_srand() expects parameter 1 to be int, float given in %s on line %d NULL -- Iteration 9 -- @@ -142,37 +142,37 @@ NULL -- Iteration 17 -- -Warning: mt_srand() expects parameter 1 to be integer, string given in %s on line %d +Warning: mt_srand() expects parameter 1 to be int, string given in %s on line %d NULL -- Iteration 18 -- -Warning: mt_srand() expects parameter 1 to be integer, string given in %s on line %d +Warning: mt_srand() expects parameter 1 to be int, string given in %s on line %d NULL -- Iteration 19 -- -Warning: mt_srand() expects parameter 1 to be integer, array given in %s on line %d +Warning: mt_srand() expects parameter 1 to be int, array given in %s on line %d NULL -- Iteration 20 -- -Warning: mt_srand() expects parameter 1 to be integer, string given in %s on line %d +Warning: mt_srand() expects parameter 1 to be int, string given in %s on line %d NULL -- Iteration 21 -- -Warning: mt_srand() expects parameter 1 to be integer, string given in %s on line %d +Warning: mt_srand() expects parameter 1 to be int, string given in %s on line %d NULL -- Iteration 22 -- -Warning: mt_srand() expects parameter 1 to be integer, string given in %s on line %d +Warning: mt_srand() expects parameter 1 to be int, string given in %s on line %d NULL -- Iteration 23 -- -Warning: mt_srand() expects parameter 1 to be integer, object given in %s on line %d +Warning: mt_srand() expects parameter 1 to be int, object given in %s on line %d NULL -- Iteration 24 -- @@ -183,6 +183,6 @@ NULL -- Iteration 26 -- -Warning: mt_srand() expects parameter 1 to be integer, resource given in %s on line %d +Warning: mt_srand() expects parameter 1 to be int, resource given in %s on line %d NULL ===Done=== diff --git a/ext/standard/tests/math/number_format_basic.phpt b/ext/standard/tests/math/number_format_basic.phpt index 303b5a2662..5a2570126a 100644 --- a/ext/standard/tests/math/number_format_basic.phpt +++ b/ext/standard/tests/math/number_format_basic.phpt @@ -39,7 +39,7 @@ for ($i = 0; $i < count($values); $i++) { var_dump($res); } ?> ---EXPECTF-- +--EXPECT-- number_format tests.....default string(5) "1,235" string(6) "-1,235" diff --git a/ext/standard/tests/math/number_format_multichar.phpt b/ext/standard/tests/math/number_format_multichar.phpt index 3d4eb10e74..b12c81c1a2 100644 --- a/ext/standard/tests/math/number_format_multichar.phpt +++ b/ext/standard/tests/math/number_format_multichar.phpt @@ -33,7 +33,7 @@ for ($i = 0; $i < count($values); $i++) { var_dump($res); } ?> ---EXPECTF-- +--EXPECT-- number_format tests.....multiple character decimal point string(13) "1 234·57" string(14) "-1 234·57" diff --git a/ext/standard/tests/math/octdec_basic.phpt b/ext/standard/tests/math/octdec_basic.phpt index 432773636d..6b23f4e029 100644 --- a/ext/standard/tests/math/octdec_basic.phpt +++ b/ext/standard/tests/math/octdec_basic.phpt @@ -29,7 +29,7 @@ for ($i = 0; $i < count($values); $i++) { var_dump($res); } ?> ---EXPECTF-- +--EXPECT-- int(14489) int(253) int(36947879) diff --git a/ext/standard/tests/math/octdec_basic_64bit.phpt b/ext/standard/tests/math/octdec_basic_64bit.phpt index 2fb9a11397..ba613aedc5 100644 --- a/ext/standard/tests/math/octdec_basic_64bit.phpt +++ b/ext/standard/tests/math/octdec_basic_64bit.phpt @@ -33,7 +33,7 @@ for ($i = 0; $i < count($values); $i++) { } ?> ===Done=== ---EXPECTF-- +--EXPECT-- *** Testing octdec() : basic functionality *** int(14489) int(253) diff --git a/ext/standard/tests/math/pi_basic.phpt b/ext/standard/tests/math/pi_basic.phpt index c00684edcb..10814ae8e8 100644 --- a/ext/standard/tests/math/pi_basic.phpt +++ b/ext/standard/tests/math/pi_basic.phpt @@ -9,6 +9,6 @@ echo M_PI, "\n"; // N.B pi() ignores all specified arguments no error // messages are produced if arguments are spcified. ?> ---EXPECTF-- +--EXPECT-- 3.1415926535898 3.1415926535898 diff --git a/ext/standard/tests/math/pow-operator.phpt b/ext/standard/tests/math/pow-operator.phpt index 15ebbfeae1..66c65f4dea 100644 --- a/ext/standard/tests/math/pow-operator.phpt +++ b/ext/standard/tests/math/pow-operator.phpt @@ -1,7 +1,7 @@ --TEST-- Various pow() tests --FILE-- -<?php // $Id$ +<?php $x = 2; $x **= 3; diff --git a/ext/standard/tests/math/pow.phpt b/ext/standard/tests/math/pow.phpt index bcd7554324..896acd7bcf 100644 --- a/ext/standard/tests/math/pow.phpt +++ b/ext/standard/tests/math/pow.phpt @@ -1,7 +1,7 @@ --TEST-- Various pow() tests --FILE-- -<?php // $Id$ +<?php define('LONG_MAX', is_int(5000000000)? 9223372036854775807 : 0x7FFFFFFF); define('LONG_MIN', -LONG_MAX - 1); diff --git a/ext/standard/tests/math/pow_basic_64bit.phpt b/ext/standard/tests/math/pow_basic_64bit.phpt index eb1441f4fd..512efd034c 100644 --- a/ext/standard/tests/math/pow_basic_64bit.phpt +++ b/ext/standard/tests/math/pow_basic_64bit.phpt @@ -47,7 +47,7 @@ foreach($bases as $base) { } ?> ===Done=== ---EXPECTF-- +--EXPECT-- Base = 23 ..... Exponent = 0 Result = 1 ..... Exponent = 1 Result = 23 diff --git a/ext/standard/tests/math/pow_variation1.phpt b/ext/standard/tests/math/pow_variation1.phpt index 79b5b4d988..a3e13d861c 100644 --- a/ext/standard/tests/math/pow_variation1.phpt +++ b/ext/standard/tests/math/pow_variation1.phpt @@ -172,7 +172,7 @@ int(0) -- Iteration 23 -- -Notice: Object of class classA could not be converted to int in %s on line %d +Notice: Object of class classA could not be converted to number in %s on line %d int(1) -- Iteration 24 -- diff --git a/ext/standard/tests/math/pow_variation1_64bit.phpt b/ext/standard/tests/math/pow_variation1_64bit.phpt index f2979ad4ba..0d8b1960be 100644 --- a/ext/standard/tests/math/pow_variation1_64bit.phpt +++ b/ext/standard/tests/math/pow_variation1_64bit.phpt @@ -172,7 +172,7 @@ int(0) -- Iteration 23 -- -Notice: Object of class classA could not be converted to int in %s on line %d +Notice: Object of class classA could not be converted to number in %s on line %d int(1) -- Iteration 24 -- diff --git a/ext/standard/tests/math/pow_variation2.phpt b/ext/standard/tests/math/pow_variation2.phpt index f5b6717b0b..4876447da9 100644 --- a/ext/standard/tests/math/pow_variation2.phpt +++ b/ext/standard/tests/math/pow_variation2.phpt @@ -168,7 +168,7 @@ float(1) -- Iteration 23 -- -Notice: Object of class classA could not be converted to int in %s on line %d +Notice: Object of class classA could not be converted to number in %s on line %d float(20.3) -- Iteration 24 -- diff --git a/ext/standard/tests/math/rand_error.phpt b/ext/standard/tests/math/rand_error.phpt index ed6b8c1fc2..83de20ac20 100644 --- a/ext/standard/tests/math/rand_error.phpt +++ b/ext/standard/tests/math/rand_error.phpt @@ -12,6 +12,6 @@ Warning: rand() expects exactly 2 parameters, 1 given in %s on line 2 Warning: rand() expects exactly 2 parameters, 3 given in %s on line 3 -Warning: rand() expects parameter 1 to be integer, string given in %s on line 4 +Warning: rand() expects parameter 1 to be int, string given in %s on line 4 -Warning: rand() expects parameter 2 to be integer, string given in %s on line 5 +Warning: rand() expects parameter 2 to be int, string given in %s on line 5 diff --git a/ext/standard/tests/math/rand_inverted_order.phpt b/ext/standard/tests/math/rand_inverted_order.phpt new file mode 100644 index 0000000000..f3af4c0219 --- /dev/null +++ b/ext/standard/tests/math/rand_inverted_order.phpt @@ -0,0 +1,20 @@ +--TEST-- +Test rand function when min and max are in proper or inverted order +--CREDITS-- +PHP TestFEst 2017 - PHPDublin, PHPSP - Joao P V Martins <jp.joao@gmail.com> +--FILE-- +<?php +$min_value = 10; +$max_value = 20; +$correct_order = rand($min_value, $max_value); +$incorrect_order = rand($max_value, $min_value); +var_dump($correct_order >= $min_value); +var_dump($correct_order <= $max_value); +var_dump($incorrect_order >= $min_value); +var_dump($incorrect_order <= $max_value); +?> +--EXPECT-- +bool(true) +bool(true) +bool(true) +bool(true) diff --git a/ext/standard/tests/math/rand_variation1.phpt b/ext/standard/tests/math/rand_variation1.phpt index 3d3d4f502c..d77d48e6a4 100644 --- a/ext/standard/tests/math/rand_variation1.phpt +++ b/ext/standard/tests/math/rand_variation1.phpt @@ -113,7 +113,7 @@ int(%i) -- Iteration 8 -- -Warning: rand() expects parameter 1 to be integer, float given in %s on line %d +Warning: rand() expects parameter 1 to be int, float given in %s on line %d NULL -- Iteration 9 -- @@ -142,37 +142,37 @@ int(%i) -- Iteration 17 -- -Warning: rand() expects parameter 1 to be integer, string given in %s on line %d +Warning: rand() expects parameter 1 to be int, string given in %s on line %d NULL -- Iteration 18 -- -Warning: rand() expects parameter 1 to be integer, string given in %s on line %d +Warning: rand() expects parameter 1 to be int, string given in %s on line %d NULL -- Iteration 19 -- -Warning: rand() expects parameter 1 to be integer, array given in %s on line %d +Warning: rand() expects parameter 1 to be int, array given in %s on line %d NULL -- Iteration 20 -- -Warning: rand() expects parameter 1 to be integer, string given in %s on line %d +Warning: rand() expects parameter 1 to be int, string given in %s on line %d NULL -- Iteration 21 -- -Warning: rand() expects parameter 1 to be integer, string given in %s on line %d +Warning: rand() expects parameter 1 to be int, string given in %s on line %d NULL -- Iteration 22 -- -Warning: rand() expects parameter 1 to be integer, string given in %s on line %d +Warning: rand() expects parameter 1 to be int, string given in %s on line %d NULL -- Iteration 23 -- -Warning: rand() expects parameter 1 to be integer, object given in %s on line %d +Warning: rand() expects parameter 1 to be int, object given in %s on line %d NULL -- Iteration 24 -- @@ -183,6 +183,6 @@ int(%i) -- Iteration 26 -- -Warning: rand() expects parameter 1 to be integer, resource given in %s on line %d +Warning: rand() expects parameter 1 to be int, resource given in %s on line %d NULL ===Done=== diff --git a/ext/standard/tests/math/rand_variation2.phpt b/ext/standard/tests/math/rand_variation2.phpt index f14d6f202b..1aee6af2c7 100644 --- a/ext/standard/tests/math/rand_variation2.phpt +++ b/ext/standard/tests/math/rand_variation2.phpt @@ -113,7 +113,7 @@ int(%i) -- Iteration 8 -- -Warning: rand() expects parameter 2 to be integer, float given in %s on line %d +Warning: rand() expects parameter 2 to be int, float given in %s on line %d NULL -- Iteration 9 -- @@ -142,37 +142,37 @@ int(%i) -- Iteration 17 -- -Warning: rand() expects parameter 2 to be integer, string given in %s on line %d +Warning: rand() expects parameter 2 to be int, string given in %s on line %d NULL -- Iteration 18 -- -Warning: rand() expects parameter 2 to be integer, string given in %s on line %d +Warning: rand() expects parameter 2 to be int, string given in %s on line %d NULL -- Iteration 19 -- -Warning: rand() expects parameter 2 to be integer, array given in %s on line %d +Warning: rand() expects parameter 2 to be int, array given in %s on line %d NULL -- Iteration 20 -- -Warning: rand() expects parameter 2 to be integer, string given in %s on line %d +Warning: rand() expects parameter 2 to be int, string given in %s on line %d NULL -- Iteration 21 -- -Warning: rand() expects parameter 2 to be integer, string given in %s on line %d +Warning: rand() expects parameter 2 to be int, string given in %s on line %d NULL -- Iteration 22 -- -Warning: rand() expects parameter 2 to be integer, string given in %s on line %d +Warning: rand() expects parameter 2 to be int, string given in %s on line %d NULL -- Iteration 23 -- -Warning: rand() expects parameter 2 to be integer, object given in %s on line %d +Warning: rand() expects parameter 2 to be int, object given in %s on line %d NULL -- Iteration 24 -- @@ -183,6 +183,6 @@ int(%i) -- Iteration 26 -- -Warning: rand() expects parameter 2 to be integer, resource given in %s on line %d +Warning: rand() expects parameter 2 to be int, resource given in %s on line %d NULL ===Done=== diff --git a/ext/standard/tests/math/round.phpt b/ext/standard/tests/math/round.phpt index 47f57dad18..6a1615bd9a 100644 --- a/ext/standard/tests/math/round.phpt +++ b/ext/standard/tests/math/round.phpt @@ -1,7 +1,7 @@ --TEST-- Simple math tests --FILE-- -<?php // $Id$ +<?php define('LONG_MAX', is_int(5000000000)? 9223372036854775807 : 0x7FFFFFFF); define('LONG_MIN', -LONG_MAX - 1); diff --git a/ext/standard/tests/math/round_basic.phpt b/ext/standard/tests/math/round_basic.phpt index 94531ba017..d6b927f2d5 100644 --- a/ext/standard/tests/math/round_basic.phpt +++ b/ext/standard/tests/math/round_basic.phpt @@ -45,7 +45,7 @@ for ($i = 0; $i < count($values); $i++) { } ?> ===Done=== ---EXPECTF-- +--EXPECT-- *** Testing round() : basic functionality *** round: 123456789 ...with precision 2-> float(123456789) diff --git a/ext/standard/tests/math/round_variation1.phpt b/ext/standard/tests/math/round_variation1.phpt index f0d893aeeb..454a9129f4 100644 --- a/ext/standard/tests/math/round_variation1.phpt +++ b/ext/standard/tests/math/round_variation1.phpt @@ -159,7 +159,7 @@ float(0) -- Iteration 23 -- -Notice: Object of class classA could not be converted to int in %s on line %d +Notice: Object of class classA could not be converted to number in %s on line %d float(1) -- Iteration 24 -- diff --git a/ext/standard/tests/math/round_variation2.phpt b/ext/standard/tests/math/round_variation2.phpt index 051121a3eb..e0358da735 100644 --- a/ext/standard/tests/math/round_variation2.phpt +++ b/ext/standard/tests/math/round_variation2.phpt @@ -141,37 +141,37 @@ float(123) -- Iteration 17 -- -Warning: round() expects parameter 2 to be integer, string given in %s on line %d +Warning: round() expects parameter 2 to be int, string given in %s on line %d NULL -- Iteration 18 -- -Warning: round() expects parameter 2 to be integer, string given in %s on line %d +Warning: round() expects parameter 2 to be int, string given in %s on line %d NULL -- Iteration 19 -- -Warning: round() expects parameter 2 to be integer, array given in %s on line %d +Warning: round() expects parameter 2 to be int, array given in %s on line %d NULL -- Iteration 20 -- -Warning: round() expects parameter 2 to be integer, string given in %s on line %d +Warning: round() expects parameter 2 to be int, string given in %s on line %d NULL -- Iteration 21 -- -Warning: round() expects parameter 2 to be integer, string given in %s on line %d +Warning: round() expects parameter 2 to be int, string given in %s on line %d NULL -- Iteration 22 -- -Warning: round() expects parameter 2 to be integer, string given in %s on line %d +Warning: round() expects parameter 2 to be int, string given in %s on line %d NULL -- Iteration 23 -- -Warning: round() expects parameter 2 to be integer, object given in %s on line %d +Warning: round() expects parameter 2 to be int, object given in %s on line %d NULL -- Iteration 24 -- @@ -182,6 +182,6 @@ float(123) -- Iteration 26 -- -Warning: round() expects parameter 2 to be integer, resource given in %s on line %d +Warning: round() expects parameter 2 to be int, resource given in %s on line %d NULL ===Done=== diff --git a/ext/standard/tests/math/srand_basic.phpt b/ext/standard/tests/math/srand_basic.phpt index b56ad10ac0..a3788cdf45 100644 --- a/ext/standard/tests/math/srand_basic.phpt +++ b/ext/standard/tests/math/srand_basic.phpt @@ -21,7 +21,7 @@ var_dump(srand(false)); var_dump(srand(NULL)); ?> ===Done=== ---EXPECTF-- +--EXPECT-- *** Testing srand() : basic functionality *** NULL NULL diff --git a/ext/standard/tests/math/srand_error.phpt b/ext/standard/tests/math/srand_error.phpt index 089044d805..420698d0b1 100644 --- a/ext/standard/tests/math/srand_error.phpt +++ b/ext/standard/tests/math/srand_error.phpt @@ -24,7 +24,7 @@ var_dump(srand("500ABC")); Warning: srand() expects at most 2 parameters, 3 given in %s on line %d NULL -Warning: srand() expects parameter 1 to be integer, string given in %s on line %d +Warning: srand() expects parameter 1 to be int, string given in %s on line %d NULL Notice: A non well formed numeric value encountered in %s on line %d diff --git a/ext/standard/tests/math/srand_variation1.phpt b/ext/standard/tests/math/srand_variation1.phpt index 9d1439d910..8e5a1cc5e8 100644 --- a/ext/standard/tests/math/srand_variation1.phpt +++ b/ext/standard/tests/math/srand_variation1.phpt @@ -113,7 +113,7 @@ NULL -- Iteration 8 -- -Warning: srand() expects parameter 1 to be integer, float given in %s on line %d +Warning: srand() expects parameter 1 to be int, float given in %s on line %d NULL -- Iteration 9 -- @@ -142,37 +142,37 @@ NULL -- Iteration 17 -- -Warning: srand() expects parameter 1 to be integer, string given in %s on line %d +Warning: srand() expects parameter 1 to be int, string given in %s on line %d NULL -- Iteration 18 -- -Warning: srand() expects parameter 1 to be integer, string given in %s on line %d +Warning: srand() expects parameter 1 to be int, string given in %s on line %d NULL -- Iteration 19 -- -Warning: srand() expects parameter 1 to be integer, array given in %s on line %d +Warning: srand() expects parameter 1 to be int, array given in %s on line %d NULL -- Iteration 20 -- -Warning: srand() expects parameter 1 to be integer, string given in %s on line %d +Warning: srand() expects parameter 1 to be int, string given in %s on line %d NULL -- Iteration 21 -- -Warning: srand() expects parameter 1 to be integer, string given in %s on line %d +Warning: srand() expects parameter 1 to be int, string given in %s on line %d NULL -- Iteration 22 -- -Warning: srand() expects parameter 1 to be integer, string given in %s on line %d +Warning: srand() expects parameter 1 to be int, string given in %s on line %d NULL -- Iteration 23 -- -Warning: srand() expects parameter 1 to be integer, object given in %s on line %d +Warning: srand() expects parameter 1 to be int, object given in %s on line %d NULL -- Iteration 24 -- @@ -183,6 +183,6 @@ NULL -- Iteration 26 -- -Warning: srand() expects parameter 1 to be integer, resource given in %s on line %d +Warning: srand() expects parameter 1 to be int, resource given in %s on line %d NULL ===Done=== diff --git a/ext/standard/tests/misc/bug77338.phpt b/ext/standard/tests/misc/bug77338.phpt new file mode 100644 index 0000000000..241ad024a2 --- /dev/null +++ b/ext/standard/tests/misc/bug77338.phpt @@ -0,0 +1,81 @@ +--TEST-- +Bug #77338: get_browser with empty string +--INI-- +browscap={PWD}/browscap.ini +--FILE-- +<?php + +var_dump(get_browser("")); + +?> +--EXPECT-- +object(stdClass)#1 (34) { + ["browser_name_regex"]=> + string(6) "~^.*$~" + ["browser_name_pattern"]=> + string(1) "*" + ["browser"]=> + string(15) "Default Browser" + ["version"]=> + string(1) "0" + ["majorver"]=> + string(1) "0" + ["minorver"]=> + string(1) "0" + ["platform"]=> + string(7) "unknown" + ["alpha"]=> + string(0) "" + ["beta"]=> + string(0) "" + ["win16"]=> + string(0) "" + ["win32"]=> + string(0) "" + ["win64"]=> + string(0) "" + ["frames"]=> + string(1) "1" + ["iframes"]=> + string(0) "" + ["tables"]=> + string(1) "1" + ["cookies"]=> + string(0) "" + ["backgroundsounds"]=> + string(0) "" + ["authenticodeupdate"]=> + string(1) "0" + ["cdf"]=> + string(0) "" + ["vbscript"]=> + string(0) "" + ["javaapplets"]=> + string(0) "" + ["javascript"]=> + string(0) "" + ["activexcontrols"]=> + string(0) "" + ["stripper"]=> + string(0) "" + ["isbanned"]=> + string(0) "" + ["wap"]=> + string(0) "" + ["ismobiledevice"]=> + string(0) "" + ["issyndicationreader"]=> + string(0) "" + ["crawler"]=> + string(0) "" + ["css"]=> + string(1) "0" + ["cssversion"]=> + string(1) "0" + ["supportscss"]=> + string(0) "" + ["aol"]=> + string(0) "" + ["aolversion"]=> + string(1) "0" +} diff --git a/ext/standard/tests/misc/get_browser_basic.phpt b/ext/standard/tests/misc/get_browser_basic.phpt index c0468bcc40..312bd89b66 100644 --- a/ext/standard/tests/misc/get_browser_basic.phpt +++ b/ext/standard/tests/misc/get_browser_basic.phpt @@ -33,7 +33,7 @@ for( $x = 0; $x < 20; $x++) { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing get_browser() : basic functionality *** array(35) { ["browser_name_regex"]=> diff --git a/ext/standard/tests/misc/get_browser_variation1.phpt b/ext/standard/tests/misc/get_browser_variation1.phpt index 81164ac22d..551206a569 100644 --- a/ext/standard/tests/misc/get_browser_variation1.phpt +++ b/ext/standard/tests/misc/get_browser_variation1.phpt @@ -34,7 +34,7 @@ for( $x = 20; $x < $count; $x++) { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing get_browser() : variation functionality: extra browser names *** array(35) { ["browser_name_regex"]=> diff --git a/ext/standard/tests/misc/syslog_parameters.phpt b/ext/standard/tests/misc/syslog_parameters.phpt index b925df1891..f3551c044e 100644 --- a/ext/standard/tests/misc/syslog_parameters.phpt +++ b/ext/standard/tests/misc/syslog_parameters.phpt @@ -13,10 +13,10 @@ closelog('Doesnt take any parameters'); --EXPECTF-- Warning: openlog() expects exactly 3 parameters, 0 given in %s on line %d -Warning: openlog() expects parameter 2 to be integer, string given in %s on line %d +Warning: openlog() expects parameter 2 to be int, string given in %s on line %d Warning: syslog() expects exactly 2 parameters, 0 given in %s on line %d -Warning: syslog() expects parameter 1 to be integer, string given in %s on line %d +Warning: syslog() expects parameter 1 to be int, string given in %s on line %d Warning: closelog() expects exactly 0 parameters, 1 given in %s on line %d diff --git a/ext/standard/tests/misc/time_nanosleep_error1.phpt b/ext/standard/tests/misc/time_nanosleep_error1.phpt index 3bbd330e2c..58a71e9e4c 100644 --- a/ext/standard/tests/misc/time_nanosleep_error1.phpt +++ b/ext/standard/tests/misc/time_nanosleep_error1.phpt @@ -11,4 +11,4 @@ $nano = time_nanosleep('A', 100000); ?> --EXPECTF-- -Warning: time_nanosleep() expects parameter 1 to be integer, string given in %s.php on line %d +Warning: time_nanosleep() expects parameter 1 to be int, string given in %s.php on line %d diff --git a/ext/standard/tests/misc/time_nanosleep_error2.phpt b/ext/standard/tests/misc/time_nanosleep_error2.phpt index 72d84c42b6..db1e13f641 100644 --- a/ext/standard/tests/misc/time_nanosleep_error2.phpt +++ b/ext/standard/tests/misc/time_nanosleep_error2.phpt @@ -11,4 +11,4 @@ $nano = time_nanosleep(2, 'B'); ?> --EXPECTF-- -Warning: time_nanosleep() expects parameter 2 to be integer, string given in %s.php on line %d +Warning: time_nanosleep() expects parameter 2 to be int, string given in %s.php on line %d diff --git a/ext/standard/tests/network/bug69948.phpt b/ext/standard/tests/network/bug69948.phpt new file mode 100644 index 0000000000..957d72f99d --- /dev/null +++ b/ext/standard/tests/network/bug69948.phpt @@ -0,0 +1,18 @@ +--TEST-- +Bug #69948 (path/domain are not sanitized for special characters in setcookie) +--FILE-- +<?php +var_dump( + setcookie('foo', 'bar', 0, 'asdf;asdf'), + setcookie('foo', 'bar', 0, '/', 'foobar; secure') +); +?> +===DONE=== +--EXPECTHEADERS-- +--EXPECTF-- +Warning: Cookie paths cannot contain any of the following ',; \t\r\n\013\014' in %s on line %d + +Warning: Cookie domains cannot contain any of the following ',; \t\r\n\013\014' in %s on line %d +bool(false) +bool(false) +===DONE=== diff --git a/ext/standard/tests/network/bug76755.phpt b/ext/standard/tests/network/bug76755.phpt new file mode 100644 index 0000000000..361ae8a1a8 --- /dev/null +++ b/ext/standard/tests/network/bug76755.phpt @@ -0,0 +1,8 @@ +--TEST-- +Bug #76755 (setcookie does not accept "double" type for expire time) +--FILE-- +<?php +var_dump(setcookie('name', 'value', (real)(time() + 1296000))); +?> +--EXPECT-- +bool(true) diff --git a/ext/standard/tests/network/gethostbyname_error006.phpt b/ext/standard/tests/network/gethostbyname_error006.phpt index dc509a1132..8a199f6286 100644 --- a/ext/standard/tests/network/gethostbyname_error006.phpt +++ b/ext/standard/tests/network/gethostbyname_error006.phpt @@ -7,4 +7,4 @@ gethostbyname() function - basic invalid parameter test var_dump(gethostbyname(".toto.toto.toto")); ?> --EXPECTF-- -%string|unicode%(15) ".toto.toto.toto" +string(15) ".toto.toto.toto" diff --git a/ext/standard/tests/network/gethostname.phpt b/ext/standard/tests/network/gethostname.phpt index 5c811b8c6f..e7caaf48eb 100644 --- a/ext/standard/tests/network/gethostname.phpt +++ b/ext/standard/tests/network/gethostname.phpt @@ -2,12 +2,6 @@ string gethostname(void); --CREDITS-- marcosptf - <marcosptf@yahoo.com.br> - #phparty7 - @phpsp - novatec/2015 - sao paulo - br ---SKIPIF-- -<?php -if (phpversion() < "5.3.0") { - die('SKIP php version so lower.'); -} -?> --FILE-- <?php var_dump(gethostname()); diff --git a/ext/standard/tests/network/http-stream.phpt b/ext/standard/tests/network/http-stream.phpt index 1186060096..45c5cb636b 100644 --- a/ext/standard/tests/network/http-stream.phpt +++ b/ext/standard/tests/network/http-stream.phpt @@ -20,5 +20,5 @@ $e = $d->load("http://127.0.0.1:12342/news.rss"); echo "ALIVE\n"; http_server_kill($pid); ?> ---EXPECTF-- +--EXPECT-- ALIVE diff --git a/ext/standard/tests/network/inet.phpt b/ext/standard/tests/network/inet.phpt index 5cc1d0e8b5..a1e70a0020 100644 --- a/ext/standard/tests/network/inet.phpt +++ b/ext/standard/tests/network/inet.phpt @@ -43,33 +43,21 @@ string(13) "255.255.255.0" Warning: inet_ntop() expects exactly 1 parameter, 0 given in %s on line %d bool(false) - -Warning: inet_ntop(): Invalid in_addr value in %s on line %d bool(false) - -Warning: inet_ntop(): Invalid in_addr value in %s on line %d bool(false) - -Warning: inet_ntop(): Invalid in_addr value in %s on line %d bool(false) Warning: inet_pton() expects exactly 1 parameter, 0 given in %s on line %d bool(false) - -Warning: inet_pton(): Unrecognized address in %s on line %d bool(false) - -Warning: inet_pton(): Unrecognized address -1 in %s on line %d bool(false) - -Warning: inet_pton(): Unrecognized address abra in %s on line %d bool(false) -string(%d) "7f000001" +string(8) "7f000001" string(9) "127.0.0.1" -string(%d) "42a3a174" +string(8) "42a3a174" string(14) "66.163.161.116" -string(%d) "ffffffff" +string(8) "ffffffff" string(15) "255.255.255.255" -string(%d) "00000000" +string(8) "00000000" string(7) "0.0.0.0" Done diff --git a/ext/standard/tests/network/inet_ipv6.phpt b/ext/standard/tests/network/inet_ipv6.phpt index 623f04c0ee..062c2094c8 100644 --- a/ext/standard/tests/network/inet_ipv6.phpt +++ b/ext/standard/tests/network/inet_ipv6.phpt @@ -39,10 +39,6 @@ string(3) "::2" string(4) "::35" string(5) "::255" string(6) "::1024" - -Warning: inet_pton(): Unrecognized address in %s on line %d - -Warning: inet_ntop(): Invalid in_addr value in %s on line %d bool(false) string(36) "2001:db8:85a3:8d3:1319:8a2e:370:7344" string(15) "2001:db8:1234::" diff --git a/ext/standard/tests/network/ip.phpt b/ext/standard/tests/network/ip.phpt index 03329802c1..5237c89776 100644 --- a/ext/standard/tests/network/ip.phpt +++ b/ext/standard/tests/network/ip.phpt @@ -61,9 +61,9 @@ Warning: long2ip() expects exactly 1 parameter, 0 given in %sip.php on line %d NULL string(13) "255.254.82.80" -Warning: long2ip() expects parameter 1 to be integer, string given in %sip.php on line %d +Warning: long2ip() expects parameter 1 to be int, string given in %sip.php on line %d NULL -Warning: long2ip() expects parameter 1 to be integer, array given in %sip.php on line %d +Warning: long2ip() expects parameter 1 to be int, array given in %sip.php on line %d NULL Done diff --git a/ext/standard/tests/network/ip_x86_64.phpt b/ext/standard/tests/network/ip_x86_64.phpt index 7b93815f92..3c530b8371 100644 --- a/ext/standard/tests/network/ip_x86_64.phpt +++ b/ext/standard/tests/network/ip_x86_64.phpt @@ -61,9 +61,9 @@ Warning: long2ip() expects exactly 1 parameter, 0 given in %sip_x86_64.php on li NULL string(13) "255.254.82.80" -Warning: long2ip() expects parameter 1 to be integer, string given in %sip_x86_64.php on line %d +Warning: long2ip() expects parameter 1 to be int, string given in %sip_x86_64.php on line %d NULL -Warning: long2ip() expects parameter 1 to be integer, array given in %sip_x86_64.php on line %d +Warning: long2ip() expects parameter 1 to be int, array given in %sip_x86_64.php on line %d NULL Done diff --git a/ext/standard/tests/network/long2ip_variation1.phpt b/ext/standard/tests/network/long2ip_variation1.phpt index 488bea1222..93efc098b5 100644 --- a/ext/standard/tests/network/long2ip_variation1.phpt +++ b/ext/standard/tests/network/long2ip_variation1.phpt @@ -126,19 +126,19 @@ string(15) "255.255.255.246" string(7) "0.0.0.0" --empty array-- -Error: 2 - long2ip() expects parameter 1 to be integer, array given, %slong2ip_variation1.php(%d) +Error: 2 - long2ip() expects parameter 1 to be int, array given, %slong2ip_variation1.php(%d) NULL --int indexed array-- -Error: 2 - long2ip() expects parameter 1 to be integer, array given, %slong2ip_variation1.php(%d) +Error: 2 - long2ip() expects parameter 1 to be int, array given, %slong2ip_variation1.php(%d) NULL --associative array-- -Error: 2 - long2ip() expects parameter 1 to be integer, array given, %slong2ip_variation1.php(%d) +Error: 2 - long2ip() expects parameter 1 to be int, array given, %slong2ip_variation1.php(%d) NULL --nested arrays-- -Error: 2 - long2ip() expects parameter 1 to be integer, array given, %slong2ip_variation1.php(%d) +Error: 2 - long2ip() expects parameter 1 to be int, array given, %slong2ip_variation1.php(%d) NULL --uppercase NULL-- @@ -160,35 +160,35 @@ string(7) "0.0.0.1" string(7) "0.0.0.0" --empty string DQ-- -Error: 2 - long2ip() expects parameter 1 to be integer, string given, %slong2ip_variation1.php(%d) +Error: 2 - long2ip() expects parameter 1 to be int, string given, %slong2ip_variation1.php(%d) NULL --empty string SQ-- -Error: 2 - long2ip() expects parameter 1 to be integer, string given, %slong2ip_variation1.php(%d) +Error: 2 - long2ip() expects parameter 1 to be int, string given, %slong2ip_variation1.php(%d) NULL --string DQ-- -Error: 2 - long2ip() expects parameter 1 to be integer, string given, %slong2ip_variation1.php(%d) +Error: 2 - long2ip() expects parameter 1 to be int, string given, %slong2ip_variation1.php(%d) NULL --string SQ-- -Error: 2 - long2ip() expects parameter 1 to be integer, string given, %slong2ip_variation1.php(%d) +Error: 2 - long2ip() expects parameter 1 to be int, string given, %slong2ip_variation1.php(%d) NULL --mixed case string-- -Error: 2 - long2ip() expects parameter 1 to be integer, string given, %slong2ip_variation1.php(%d) +Error: 2 - long2ip() expects parameter 1 to be int, string given, %slong2ip_variation1.php(%d) NULL --heredoc-- -Error: 2 - long2ip() expects parameter 1 to be integer, string given, %slong2ip_variation1.php(%d) +Error: 2 - long2ip() expects parameter 1 to be int, string given, %slong2ip_variation1.php(%d) NULL --instance of classWithToString-- -Error: 2 - long2ip() expects parameter 1 to be integer, object given, %slong2ip_variation1.php(%d) +Error: 2 - long2ip() expects parameter 1 to be int, object given, %slong2ip_variation1.php(%d) NULL --instance of classWithoutToString-- -Error: 2 - long2ip() expects parameter 1 to be integer, object given, %slong2ip_variation1.php(%d) +Error: 2 - long2ip() expects parameter 1 to be int, object given, %slong2ip_variation1.php(%d) NULL --undefined var-- @@ -198,6 +198,6 @@ string(7) "0.0.0.0" string(7) "0.0.0.0" --resource-- -Error: 2 - long2ip() expects parameter 1 to be integer, resource given, %slong2ip_variation1.php(%d) +Error: 2 - long2ip() expects parameter 1 to be int, resource given, %slong2ip_variation1.php(%d) NULL ===DONE=== diff --git a/ext/standard/tests/network/net_get_interfaces_001.phpt b/ext/standard/tests/network/net_get_interfaces_001.phpt new file mode 100644 index 0000000000..522278e90d --- /dev/null +++ b/ext/standard/tests/network/net_get_interfaces_001.phpt @@ -0,0 +1,30 @@ +--TEST-- +net_get_interfaces IPv4 Loopback +--SKIPIF-- +<?php +function_exists('net_get_interfaces') || print 'skip'; +--FILE-- +<?php + +// Test that we have exactly one unicast address with the address 127.0.0.1 +// On linux this will often be named "lo", but even that isn't guaranteed. + +$ifaces = net_get_interfaces(); + +$found = false; +foreach ($ifaces as $iface) { + foreach ($iface['unicast'] as $unicast) { + if (($unicast['address'] ?? null) === '127.0.0.1') { + $found = true; + break 2; + } + } +} + +var_dump($found); +if (!$found) { + // Extra diagnostics! + var_dump($ifaces); +} +--EXPECT-- +bool(true) diff --git a/ext/standard/tests/network/setcookie.phpt b/ext/standard/tests/network/setcookie.phpt index 3582d341a7..d41bed01f4 100644 --- a/ext/standard/tests/network/setcookie.phpt +++ b/ext/standard/tests/network/setcookie.phpt @@ -1,6 +1,5 @@ --TEST-- setcookie() tests ---DESCRIPTION-- --INI-- date.timezone=UTC --FILE-- @@ -18,6 +17,8 @@ setcookie('name', 'value', 0, '', 'domain.tld'); setcookie('name', 'value', 0, '', '', TRUE); setcookie('name', 'value', 0, '', '', FALSE, TRUE); +setcookie('name', 'value', ['expires' => $tsp]); +setcookie('name', 'value', ['expires' => $tsn, 'path' => '/path/', 'domain' => 'domain.tld', 'secure' => true, 'httponly' => true, 'samesite' => 'Strict']); $expected = array( 'Set-Cookie: name=deleted; expires='.date('D, d-M-Y H:i:s', 1).' GMT; Max-Age=0', @@ -31,7 +32,9 @@ $expected = array( 'Set-Cookie: name=value; path=/path/', 'Set-Cookie: name=value; domain=domain.tld', 'Set-Cookie: name=value; secure', - 'Set-Cookie: name=value; HttpOnly' + 'Set-Cookie: name=value; HttpOnly', + 'Set-Cookie: name=value; expires='.date('D, d-M-Y H:i:s', $tsp).' GMT; Max-Age=5', + 'Set-Cookie: name=value; expires='.date('D, d-M-Y H:i:s', $tsn).' GMT; Max-Age=0; path=/path/; domain=domain.tld; secure; HttpOnly; SameSite=Strict' ); $headers = headers_list(); diff --git a/ext/standard/tests/network/setcookie_error.phpt b/ext/standard/tests/network/setcookie_error.phpt new file mode 100644 index 0000000000..98fb64b851 --- /dev/null +++ b/ext/standard/tests/network/setcookie_error.phpt @@ -0,0 +1,43 @@ +--TEST-- +setcookie() array variant error tests +--INI-- +date.timezone=UTC +--FILE-- +<?php + +ob_start(); + +// Unrecognized key and no valid keys +setcookie('name', 'value', ['unknown_key' => 'only']); +// Numeric key and no valid keys +setcookie('name2', 'value2', [0 => 'numeric_key']); +// Unrecognized key +setcookie('name3', 'value3', ['path' => '/path/', 'foo' => 'bar']); +// Arguments after options array (will not be set) +setcookie('name4', 'value4', [], "path", "domain.tld", true, true); + +var_dump(headers_list()); +--EXPECTHEADERS-- + +--EXPECTF-- +Warning: setcookie(): Unrecognized key 'unknown_key' found in the options array in %s + +Warning: setcookie(): No valid options were found in the given array in %s + +Warning: setcookie(): Numeric key found in the options array in %s + +Warning: setcookie(): No valid options were found in the given array in %s + +Warning: setcookie(): Unrecognized key 'foo' found in the options array in %s + +Warning: setcookie(): Cannot pass arguments after the options array in %s +array(4) { + [0]=> + string(%d) "X-Powered-By: PHP/%s" + [1]=> + string(22) "Set-Cookie: name=value" + [2]=> + string(24) "Set-Cookie: name2=value2" + [3]=> + string(37) "Set-Cookie: name3=value3; path=/path/" +} diff --git a/ext/standard/tests/password/password_get_info_argon2.phpt b/ext/standard/tests/password/password_get_info_argon2.phpt index 6d45b18b8c..b67fc5790e 100644 --- a/ext/standard/tests/password/password_get_info_argon2.phpt +++ b/ext/standard/tests/password/password_get_info_argon2.phpt @@ -1,13 +1,15 @@ --TEST-- -Test normal operation of password_get_info() with Argon2 +Test normal operation of password_get_info() with Argon2i and Argon2id --SKIPIF-- <?php if (!defined('PASSWORD_ARGON2I')) die('skip password_get_info not built with Argon2'); +if (!defined('PASSWORD_ARGON2ID')) die('skip password_get_info not built with Argon2'); ?> --FILE-- <?php var_dump(password_get_info('$argon2i$v=19$m=65536,t=3,p=1$SWhIcG5MT21Pc01PbWdVZw$WagZELICsz7jlqOR2YzoEVTWb2oOX1tYdnhZYXxptbU')); +var_dump(password_get_info('$argon2id$v=19$m=1024,t=2,p=2$Zng1U1RHS0h1aUJjbGhPdA$ajQnG5s01Ws1ad8xv+1qGfXF8mYxxWdyul5rBpomuZQ')); echo "OK!"; ?> --EXPECT-- @@ -26,4 +28,19 @@ array(3) { int(1) } } +array(3) { + ["algo"]=> + int(3) + ["algoName"]=> + string(8) "argon2id" + ["options"]=> + array(3) { + ["memory_cost"]=> + int(1024) + ["time_cost"]=> + int(2) + ["threads"]=> + int(2) + } +} OK! diff --git a/ext/standard/tests/password/password_hash_argon2.phpt b/ext/standard/tests/password/password_hash_argon2.phpt index 53c9c4f523..184bac4ac6 100644 --- a/ext/standard/tests/password/password_hash_argon2.phpt +++ b/ext/standard/tests/password/password_hash_argon2.phpt @@ -1,8 +1,9 @@ --TEST-- -Test normal operation of password_hash() with argon2 +Test normal operation of password_hash() with Argon2i and Argon2id --SKIPIF-- <?php if (!defined('PASSWORD_ARGON2I')) die('skip password_hash not built with Argon2'); +if (!defined('PASSWORD_ARGON2ID')) die('skip password_hash not built with Argon2'); --FILE-- <?php @@ -11,8 +12,12 @@ $password = "the password for testing 12345!"; $hash = password_hash($password, PASSWORD_ARGON2I); var_dump(password_verify($password, $hash)); +$hash = password_hash($password, PASSWORD_ARGON2ID); +var_dump(password_verify($password, $hash)); + echo "OK!"; ?> --EXPECT-- bool(true) +bool(true) OK! diff --git a/ext/standard/tests/password/password_hash_error.phpt b/ext/standard/tests/password/password_hash_error.phpt index 8dc954649d..5f576c3122 100644 --- a/ext/standard/tests/password/password_hash_error.phpt +++ b/ext/standard/tests/password/password_hash_error.phpt @@ -29,7 +29,7 @@ NULL Warning: password_hash() expects at least 2 parameters, 1 given in %s on line %d NULL -Warning: password_hash() expects parameter 2 to be integer, array given in %s on line %d +Warning: password_hash() expects parameter 2 to be int, array given in %s on line %d NULL Warning: password_hash(): Unknown password hashing algorithm: 19 in %s on line %d diff --git a/ext/standard/tests/password/password_hash_error_argon2.phpt b/ext/standard/tests/password/password_hash_error_argon2.phpt index 637919712f..070d61656a 100644 --- a/ext/standard/tests/password/password_hash_error_argon2.phpt +++ b/ext/standard/tests/password/password_hash_error_argon2.phpt @@ -1,14 +1,18 @@ --TEST-- -Test error operation of password_hash() with argon2 +Test error operation of password_hash() with Argon2i and Argon2id --SKIPIF-- <?php if (!defined('PASSWORD_ARGON2I')) die('skip password_hash not built with Argon2'); +if (!defined('PASSWORD_ARGON2ID')) die('skip password_hash not built with Argon2'); ?> --FILE-- <?php var_dump(password_hash('test', PASSWORD_ARGON2I, ['memory_cost' => 0])); var_dump(password_hash('test', PASSWORD_ARGON2I, ['time_cost' => 0])); var_dump(password_hash('test', PASSWORD_ARGON2I, ['threads' => 0])); +var_dump(password_hash('test', PASSWORD_ARGON2ID, ['memory_cost' => 0])); +var_dump(password_hash('test', PASSWORD_ARGON2ID, ['time_cost' => 0])); +var_dump(password_hash('test', PASSWORD_ARGON2ID, ['threads' => 0])); ?> --EXPECTF-- Warning: password_hash(): Memory cost is outside of allowed memory range in %s on line %d @@ -19,3 +23,12 @@ NULL Warning: password_hash(): Invalid number of threads in %s on line %d NULL + +Warning: password_hash(): Memory cost is outside of allowed memory range in %s on line %d +NULL + +Warning: password_hash(): Time cost is outside of allowed time range in %s on line %d +NULL + +Warning: password_hash(): Invalid number of threads in %s on line %d +NULL diff --git a/ext/standard/tests/password/password_needs_rehash_argon2.phpt b/ext/standard/tests/password/password_needs_rehash_argon2.phpt index 129bed5989..69588d02ad 100644 --- a/ext/standard/tests/password/password_needs_rehash_argon2.phpt +++ b/ext/standard/tests/password/password_needs_rehash_argon2.phpt @@ -1,8 +1,9 @@ --TEST-- -Test normal operation of password_needs_rehash() with argon2 +Test normal operation of password_needs_rehash() with Argon2i and Argon2id --SKIPIF-- <?php if (!defined('PASSWORD_ARGON2I')) die('skip password_needs_rehash not built with Argon2'); +if (!defined('PASSWORD_ARGON2ID')) die('skip password_hash not built with Argon2'); ?> --FILE-- <?php @@ -10,11 +11,19 @@ if (!defined('PASSWORD_ARGON2I')) die('skip password_needs_rehash not built with $hash = password_hash('test', PASSWORD_ARGON2I); var_dump(password_needs_rehash($hash, PASSWORD_ARGON2I)); var_dump(password_needs_rehash($hash, PASSWORD_ARGON2I, ['memory_cost' => PASSWORD_ARGON2_DEFAULT_MEMORY_COST * 2])); -var_dump(password_needs_rehash($hash, PASSWORD_ARGON2I, ['time_cost' => PASSWORD_ARGON2_DEFAULT_TIME_COST +1])); +var_dump(password_needs_rehash($hash, PASSWORD_ARGON2I, ['time_cost' => PASSWORD_ARGON2_DEFAULT_TIME_COST + 1])); + +$hash = password_hash('test', PASSWORD_ARGON2ID); +var_dump(password_needs_rehash($hash, PASSWORD_ARGON2ID)); +var_dump(password_needs_rehash($hash, PASSWORD_ARGON2ID, ['memory_cost' => PASSWORD_ARGON2_DEFAULT_MEMORY_COST * 2])); +var_dump(password_needs_rehash($hash, PASSWORD_ARGON2ID, ['time_cost' => PASSWORD_ARGON2_DEFAULT_TIME_COST + 1])); + echo "OK!"; -?> --EXPECT-- bool(false) bool(true) bool(true) +bool(false) +bool(true) +bool(true) OK! diff --git a/ext/standard/tests/password/password_needs_rehash_error.phpt b/ext/standard/tests/password/password_needs_rehash_error.phpt index b5d8691775..65766cb3fe 100644 --- a/ext/standard/tests/password/password_needs_rehash_error.phpt +++ b/ext/standard/tests/password/password_needs_rehash_error.phpt @@ -22,7 +22,7 @@ NULL Warning: password_needs_rehash() expects at least 2 parameters, 1 given in %s on line %d NULL -Warning: password_needs_rehash() expects parameter 2 to be integer, string given in %s on line %d +Warning: password_needs_rehash() expects parameter 2 to be int, string given in %s on line %d NULL Warning: password_needs_rehash() expects parameter 1 to be string, array given in %s on line %d diff --git a/ext/standard/tests/password/password_verify_argon2.phpt b/ext/standard/tests/password/password_verify_argon2.phpt index 28a083e416..43db2926ec 100644 --- a/ext/standard/tests/password/password_verify_argon2.phpt +++ b/ext/standard/tests/password/password_verify_argon2.phpt @@ -1,8 +1,9 @@ --TEST-- -Test normal operation of password_verify() with argon2 +Test normal operation of password_verify() with Argon2i and Argon2id --SKIPIF-- <?php if (!defined('PASSWORD_ARGON2I')) die('skip password_verify not built with Argon2'); +if (!defined('PASSWORD_ARGON2ID')) die('skip password_hash not built with Argon2'); ?> --FILE-- <?php @@ -10,9 +11,14 @@ if (!defined('PASSWORD_ARGON2I')) die('skip password_verify not built with Argon var_dump(password_verify('test', '$argon2i$v=19$m=65536,t=3,p=1$OEVjWWs2Z3YvWlNZQ0ZmNw$JKin7ahjmh8JYvMyFcXri0Ss/Uvd3uYpD7MG6C/5Cy0')); var_dump(password_verify('argon2', '$argon2i$v=19$m=65536,t=3,p=1$OEVjWWs2Z3YvWlNZQ0ZmNw$JKin7ahjmh8JYvMyFcXri0Ss/Uvd3uYpD7MG6C/5Cy0')); + +var_dump(password_verify('test', '$argon2id$v=19$m=1024,t=2,p=2$WS90MHJhd3AwSC5xTDJpZg$8tn2DaIJR2/UX4Cjcy2t3EZaLDL/qh+NbLQAOvTmdAg')); +var_dump(password_verify('argon2id', '$argon2id$v=19$m=1024,t=2,p=2$WS90MHJhd3AwSC5xTDJpZg$8tn2DaIJR2/UX4Cjcy2t3EZaLDL/qh+NbLQAOvTmdAg')); echo "OK!"; ?> --EXPECT-- bool(true) bool(false) +bool(true) +bool(false) OK! diff --git a/ext/standard/tests/php_ini_loaded_file.phpt b/ext/standard/tests/php_ini_loaded_file.phpt deleted file mode 100644 index 7d441582ee..0000000000 --- a/ext/standard/tests/php_ini_loaded_file.phpt +++ /dev/null @@ -1,14 +0,0 @@ ---TEST-- -Check the php_ini_loaded_file() function ---CREDITS-- -Sebastian Schürmann -sschuermann@chip.de -Testfest 2009 Munich ---INI-- -precision=12 ---FILE-- -<?php -var_dump(php_ini_loaded_file()); -?> ---EXPECTREGEX-- -string\(\d+\) ".*php\.ini"|bool\(false\) diff --git a/ext/standard/tests/serialize/005.phpt b/ext/standard/tests/serialize/005.phpt index fc7d717229..7f634b0eea 100644 --- a/ext/standard/tests/serialize/005.phpt +++ b/ext/standard/tests/serialize/005.phpt @@ -1,7 +1,5 @@ --TEST-- serialize()/unserialize() objects ---SKIPIF-- -<?php if (!interface_exists('Serializable')) die('skip Interface Serialzable not defined'); ?> --FILE-- <?php diff --git a/ext/standard/tests/serialize/bug26762.phpt b/ext/standard/tests/serialize/bug26762.phpt index b876874e40..ad6c0e0b41 100644 --- a/ext/standard/tests/serialize/bug26762.phpt +++ b/ext/standard/tests/serialize/bug26762.phpt @@ -22,5 +22,5 @@ catch (Exception $e) { } ?> ---EXPECTF-- +--EXPECT-- string(3) "FOO" diff --git a/ext/standard/tests/serialize/bug64354_1.phpt b/ext/standard/tests/serialize/bug64354_1.phpt index 705b60dc05..499b66466f 100644 --- a/ext/standard/tests/serialize/bug64354_1.phpt +++ b/ext/standard/tests/serialize/bug64354_1.phpt @@ -20,6 +20,6 @@ try { var_dump($e->getMessage()); } ?> ---EXPECTF-- +--EXPECT-- string(6) "Failed" string(6) "Failed" diff --git a/ext/standard/tests/serialize/bug64354_2.phpt b/ext/standard/tests/serialize/bug64354_2.phpt index 82552f426a..6753051321 100644 --- a/ext/standard/tests/serialize/bug64354_2.phpt +++ b/ext/standard/tests/serialize/bug64354_2.phpt @@ -20,5 +20,5 @@ try { var_dump($e->getMessage()); } ?> ---EXPECTF-- +--EXPECT-- string(6) "Failed" diff --git a/ext/standard/tests/serialize/bug64354_3.phpt b/ext/standard/tests/serialize/bug64354_3.phpt index 520e543785..24ee346e4c 100644 --- a/ext/standard/tests/serialize/bug64354_3.phpt +++ b/ext/standard/tests/serialize/bug64354_3.phpt @@ -25,5 +25,5 @@ try { var_dump($e->getMessage()); } ?> ---EXPECTF-- +--EXPECT-- string(6) "Failed" diff --git a/ext/standard/tests/serialize/bug68594.phpt b/ext/standard/tests/serialize/bug68594.phpt index 60fc7a76ab..fbf9310d0b 100644 --- a/ext/standard/tests/serialize/bug68594.phpt +++ b/ext/standard/tests/serialize/bug68594.phpt @@ -19,5 +19,5 @@ for ($i=4; $i<100; $i++) { } ?> ===DONE=== ---EXPECTF-- +--EXPECT-- ===DONE=== diff --git a/ext/standard/tests/serialize/bug68976.phpt b/ext/standard/tests/serialize/bug68976.phpt index be06ea66ac..4e61e65354 100644 --- a/ext/standard/tests/serialize/bug68976.phpt +++ b/ext/standard/tests/serialize/bug68976.phpt @@ -26,7 +26,7 @@ for($i = 0; $i < 5; $i++) { var_dump($data); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- array(2) { [0]=> object(evilClass)#1 (0) { diff --git a/ext/standard/tests/serialize/bug70172.phpt b/ext/standard/tests/serialize/bug70172.phpt index 471d1a4b4e..a2359d6434 100644 --- a/ext/standard/tests/serialize/bug70172.phpt +++ b/ext/standard/tests/serialize/bug70172.phpt @@ -19,7 +19,7 @@ $fakezval .= "\x01"; $fakezval .= "\x00"; $fakezval .= "\x00\x00"; -$inner = 'r:2;'; +$inner = 'R:2;'; $exploit = 'a:2:{i:0;i:1;i:1;C:3:"obj":'.strlen($inner).':{'.$inner.'}}'; $data = unserialize($exploit); diff --git a/ext/standard/tests/serialize/bug70219.phpt b/ext/standard/tests/serialize/bug70219.phpt index 7cd13d05fb..ddd2f317df 100644 --- a/ext/standard/tests/serialize/bug70219.phpt +++ b/ext/standard/tests/serialize/bug70219.phpt @@ -1,5 +1,9 @@ --TEST-- Bug #70219 Use after free vulnerability in session deserializer +--SKIPIF-- +<?php +if (!extension_loaded('session')) die('skip session extension not available'); +?> --XFAIL-- Unfinished merge, needs fix. --FILE-- diff --git a/ext/standard/tests/serialize/bug70963.phpt b/ext/standard/tests/serialize/bug70963.phpt index 0bdfb2c4c9..c4e2267b04 100644 --- a/ext/standard/tests/serialize/bug70963.phpt +++ b/ext/standard/tests/serialize/bug70963.phpt @@ -25,22 +25,6 @@ array(2) { [1]=> string(4) "test" } -array(2) { - [0]=> - object(Exception)#%d (6) { - ["message":protected]=> - string(0) "" - ["string":"Exception":private]=> - string(0) "" - ["code":protected]=> - int(0) - ["file":protected]=> - string(%d) "%s" - ["line":protected]=> - int(3) - ["previous":"Exception":private]=> - NULL - } - [1]=> - string(4) "test" -} + +Notice: unserialize(): Error at offset %d of %d bytes in %sbug70963.php on line 3 +bool(false) diff --git a/ext/standard/tests/serialize/bug71940.phpt b/ext/standard/tests/serialize/bug71940.phpt index c391ba6603..75d227d7c4 100644 --- a/ext/standard/tests/serialize/bug71940.phpt +++ b/ext/standard/tests/serialize/bug71940.phpt @@ -43,7 +43,7 @@ $serialized = serialize([$entry1, $entry2]); print_r(unserialize($serialized)); ?> ---EXPECTF-- +--EXPECT-- Array ( [0] => Entry Object diff --git a/ext/standard/tests/serialize/bug72229.phpt b/ext/standard/tests/serialize/bug72229.phpt index 0ae1ceed03..b8644c44e9 100644 --- a/ext/standard/tests/serialize/bug72229.phpt +++ b/ext/standard/tests/serialize/bug72229.phpt @@ -22,7 +22,7 @@ print_r($Obj1); $Obj2->arr2[0] = 50; print_r($Obj2); ?> ---EXPECTF-- +--EXPECT-- C1 Object ( [arr1] => Array diff --git a/ext/standard/tests/serialize/ref_to_failed_serialize.phpt b/ext/standard/tests/serialize/ref_to_failed_serialize.phpt new file mode 100644 index 0000000000..c69c888132 --- /dev/null +++ b/ext/standard/tests/serialize/ref_to_failed_serialize.phpt @@ -0,0 +1,28 @@ +--TEST-- +References to objects for which Serializable::serialize() returned NULL should use N; +--FILE-- +<?php + +class NotSerializable implements Serializable { + public function serialize() { + return null; + } + + public function unserialize($serialized) { + } +} + +$obj = new NotSerializable(); +$data = [$obj, $obj]; +var_dump($s = serialize($data)); +var_dump(unserialize($s)); + +?> +--EXPECT-- +string(18) "a:2:{i:0;N;i:1;N;}" +array(2) { + [0]=> + NULL + [1]=> + NULL +} diff --git a/ext/standard/tests/serialize/serialization_arrays_001.phpt b/ext/standard/tests/serialize/serialization_arrays_001.phpt index 4b9c7e2c3e..1e8cf1acf2 100644 --- a/ext/standard/tests/serialize/serialization_arrays_001.phpt +++ b/ext/standard/tests/serialize/serialization_arrays_001.phpt @@ -35,7 +35,7 @@ var_dump($arr_asso); echo "\nDone"; ?> ---EXPECTF-- +--EXPECT-- --- Testing Circular reference of an array --- -- Normal array -- string(238) "a:7:{i:0;i:0;i:1;i:1;i:2;i:-2;i:3;d:3.333333000000000101437080957111902534961700439453125;i:4;s:1:"a";i:5;a:0:{}i:6;a:7:{i:0;i:0;i:1;i:1;i:2;i:-2;i:3;d:3.333333000000000101437080957111902534961700439453125;i:4;s:1:"a";i:5;a:0:{}i:6;R:8;}}" diff --git a/ext/standard/tests/serialize/serialization_arrays_002.phpt b/ext/standard/tests/serialize/serialization_arrays_002.phpt index 2134feac58..39212b6455 100644 --- a/ext/standard/tests/serialize/serialization_arrays_002.phpt +++ b/ext/standard/tests/serialize/serialization_arrays_002.phpt @@ -100,7 +100,7 @@ check($a); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- --- No references: array(3) { [0]=> diff --git a/ext/standard/tests/serialize/serialization_arrays_003.phpt b/ext/standard/tests/serialize/serialization_arrays_003.phpt index faff6dbbb5..18238d7b1e 100644 --- a/ext/standard/tests/serialize/serialization_arrays_003.phpt +++ b/ext/standard/tests/serialize/serialization_arrays_003.phpt @@ -70,7 +70,7 @@ check($a); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- --- 0 refs external: array(3) { [0]=> diff --git a/ext/standard/tests/serialize/serialization_arrays_004.phpt b/ext/standard/tests/serialize/serialization_arrays_004.phpt index bde60a4651..a6209688ea 100644 --- a/ext/standard/tests/serialize/serialization_arrays_004.phpt +++ b/ext/standard/tests/serialize/serialization_arrays_004.phpt @@ -51,7 +51,7 @@ check($a); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- --- 1 refs container: array(3) { [0]=> diff --git a/ext/standard/tests/serialize/serialization_arrays_005.phpt b/ext/standard/tests/serialize/serialization_arrays_005.phpt index 0270ec7c0e..9d3bbcabea 100644 --- a/ext/standard/tests/serialize/serialization_arrays_005.phpt +++ b/ext/standard/tests/serialize/serialization_arrays_005.phpt @@ -78,7 +78,7 @@ $a[1] = &$c; check($c); ?> ---EXPECTF-- +--EXPECT-- --- Nested array references 1 element in containing array: array(3) { [0]=> diff --git a/ext/standard/tests/serialize/serialization_miscTypes_001.phpt b/ext/standard/tests/serialize/serialization_miscTypes_001.phpt Binary files differindex e88e98e1b2..e9215cf561 100644 --- a/ext/standard/tests/serialize/serialization_miscTypes_001.phpt +++ b/ext/standard/tests/serialize/serialization_miscTypes_001.phpt diff --git a/ext/standard/tests/serialize/serialization_objects_004.phpt b/ext/standard/tests/serialize/serialization_objects_004.phpt index 44c402b98d..df94923540 100644 --- a/ext/standard/tests/serialize/serialization_objects_004.phpt +++ b/ext/standard/tests/serialize/serialization_objects_004.phpt @@ -39,7 +39,7 @@ var_dump(serialize(array($x, $x))); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- string(37) "a:2:{i:0;O:8:"stdClass":0:{}i:1;r:2;}" string(22) "a:2:{i:0;i:1;i:1;i:1;}" string(30) "a:2:{i:0;s:1:"a";i:1;s:1:"a";}" diff --git a/ext/standard/tests/serialize/serialization_objects_010.phpt b/ext/standard/tests/serialize/serialization_objects_010.phpt index 0da1f368d1..32205209f7 100644 --- a/ext/standard/tests/serialize/serialization_objects_010.phpt +++ b/ext/standard/tests/serialize/serialization_objects_010.phpt @@ -1,7 +1,5 @@ --TEST-- Serialize() must return a string or NULL ---SKIPIF-- -<?php if (!interface_exists('Serializable')) die('skip Interface Serialzable not defined'); ?> --FILE-- <?php /* Prototype : proto string serialize(mixed variable) @@ -32,6 +30,6 @@ try { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- C::serialize() must return a string or NULL Done diff --git a/ext/standard/tests/serialize/serialization_objects_013.phpt b/ext/standard/tests/serialize/serialization_objects_013.phpt index 82970362ee..3ff2d3cc11 100644 --- a/ext/standard/tests/serialize/serialization_objects_013.phpt +++ b/ext/standard/tests/serialize/serialization_objects_013.phpt @@ -1,7 +1,5 @@ --TEST-- Object serialization / unserialization: references amongst properties ---INI-- -error_reporting = E_ALL & ~E_STRICT --FILE-- <?php /* Prototype : proto string serialize(mixed variable) diff --git a/ext/standard/tests/serialize/serialization_objects_014.phpt b/ext/standard/tests/serialize/serialization_objects_014.phpt index 20ed58069a..fa15a577b0 100644 --- a/ext/standard/tests/serialize/serialization_objects_014.phpt +++ b/ext/standard/tests/serialize/serialization_objects_014.phpt @@ -1,7 +1,5 @@ --TEST-- Object serialization / unserialization: references to external values ---INI-- -error_reporting = E_ALL & ~E_STRICT --FILE-- <?php /* Prototype : proto string serialize(mixed variable) diff --git a/ext/standard/tests/serialize/serialization_objects_015.phpt b/ext/standard/tests/serialize/serialization_objects_015.phpt index 69ac7f07ec..c1a6675db4 100644 --- a/ext/standard/tests/serialize/serialization_objects_015.phpt +++ b/ext/standard/tests/serialize/serialization_objects_015.phpt @@ -1,7 +1,5 @@ --TEST-- Object serialization / unserialization: properties reference containing object ---INI-- -error_reporting = E_ALL & ~E_STRICT --FILE-- <?php diff --git a/ext/standard/tests/serialize/serialization_precision_001.phpt b/ext/standard/tests/serialize/serialization_precision_001.phpt index 6b4275ff65..4d17e943c2 100644 --- a/ext/standard/tests/serialize/serialization_precision_001.phpt +++ b/ext/standard/tests/serialize/serialization_precision_001.phpt @@ -17,5 +17,5 @@ serialize_precision=10 var_dump(serialize(0.1)); ?> ---EXPECTF-- +--EXPECT-- string(6) "d:0.1;" diff --git a/ext/standard/tests/serialize/serialization_precision_002.phpt b/ext/standard/tests/serialize/serialization_precision_002.phpt index ee9feec9bf..fa73130241 100644 --- a/ext/standard/tests/serialize/serialization_precision_002.phpt +++ b/ext/standard/tests/serialize/serialization_precision_002.phpt @@ -17,5 +17,5 @@ serialize_precision=75 var_dump(serialize(0.1)); ?> ---EXPECTF-- +--EXPECT-- string(60) "d:0.1000000000000000055511151231257827021181583404541015625;" diff --git a/ext/standard/tests/serialize/serialize_globals_var_refs.phpt b/ext/standard/tests/serialize/serialize_globals_var_refs.phpt new file mode 100644 index 0000000000..3f03cc2a21 --- /dev/null +++ b/ext/standard/tests/serialize/serialize_globals_var_refs.phpt @@ -0,0 +1,22 @@ +--TEST-- +Reference IDs should be correctly generated when $GLOBALS is serialized +--FILE-- +<?php + +$obj = new stdClass; +$obj2 = new stdClass; +$obj2->obj = $obj; +$s = serialize($GLOBALS); +$globals = unserialize($s); +var_dump($obj); +var_dump($obj2); + +?> +--EXPECT-- +object(stdClass)#1 (0) { +} +object(stdClass)#2 (1) { + ["obj"]=> + object(stdClass)#1 (0) { + } +} diff --git a/ext/standard/tests/serialize/unserialize_mem_leak.phpt b/ext/standard/tests/serialize/unserialize_mem_leak.phpt index 97c59f9ad1..2a295d83b9 100644 --- a/ext/standard/tests/serialize/unserialize_mem_leak.phpt +++ b/ext/standard/tests/serialize/unserialize_mem_leak.phpt @@ -8,9 +8,12 @@ function foo() { gc_collect_cycles(); } +$str = 'a:1:{i:0;R:1;}'; +foo(unserialize($str)); $str = 'a:1:{i:0;r:1;}'; foo(unserialize($str)); echo "okey"; ?> ---EXPECT-- +--EXPECTF-- +Notice: unserialize(): Error at offset %d of %d bytes in %sunserialize_mem_leak.php on line 9 okey diff --git a/ext/standard/tests/serialize/unserialize_neg_iv_edge_cases.phpt b/ext/standard/tests/serialize/unserialize_neg_iv_edge_cases.phpt new file mode 100644 index 0000000000..42b89ee32b --- /dev/null +++ b/ext/standard/tests/serialize/unserialize_neg_iv_edge_cases.phpt @@ -0,0 +1,14 @@ +--TEST-- +Negative parse_iv2 edge cases +--SKIPIF-- +<?php if (PHP_INT_SIZE != 8) die("skip 64-bit only"); ?> +--FILE-- +<?php + +var_dump(unserialize('i:-9223372036854775808;')); +var_dump(unserialize('i:-0;')); + +?> +--EXPECT-- +int(-9223372036854775808) +int(0) diff --git a/ext/standard/tests/setrawcookie_basic_001.phpt b/ext/standard/tests/setrawcookie_basic_001.phpt new file mode 100644 index 0000000000..7b9c108bab --- /dev/null +++ b/ext/standard/tests/setrawcookie_basic_001.phpt @@ -0,0 +1,10 @@ +--TEST-- +Test setrawcookie basic functionality +--CREDITS-- +PHP TestFEst 2017 - PHPDublin, PHPSP - Joao P V Martins <jp.joao@gmail.com> +--FILE-- +<?php +var_dump(setrawcookie('cookie_name', rawurlencode('cookie_content'))); +?> +--EXPECT-- +bool(true) diff --git a/ext/standard/tests/setrawcookie_basic_002.phpt b/ext/standard/tests/setrawcookie_basic_002.phpt new file mode 100644 index 0000000000..5f12465cc7 --- /dev/null +++ b/ext/standard/tests/setrawcookie_basic_002.phpt @@ -0,0 +1,12 @@ +--TEST-- +Test setrawcookie to fail when output exists before +--CREDITS-- +PHP TestFEst 2017 - PHPDublin, PHPSP - Joao P V Martins <jp.joao@gmail.com> +--FILE-- +<?php +echo 'output' . PHP_EOL; +var_dump(@setrawcookie('cookie_name', rawurlencode('cookie_content'))); +?> +--EXPECT-- +output +bool(false) diff --git a/ext/standard/tests/streams/bug44712.phpt b/ext/standard/tests/streams/bug44712.phpt index 25e7f725d1..a5a718351f 100644 --- a/ext/standard/tests/streams/bug44712.phpt +++ b/ext/standard/tests/streams/bug44712.phpt @@ -6,4 +6,4 @@ $ctx = stream_context_get_default(); stream_context_set_params($ctx, array("options" => 1)); ?> --EXPECTF-- -Warning: stream_context_set_params(): Invalid stream/context parameter in %sbug44712.php on line %s +Warning: stream_context_set_params(): Invalid stream/context parameter in %sbug44712.php on line %d diff --git a/ext/standard/tests/streams/bug46024.phpt b/ext/standard/tests/streams/bug46024.phpt index 49e6beeefb..548768283c 100644 --- a/ext/standard/tests/streams/bug46024.phpt +++ b/ext/standard/tests/streams/bug46024.phpt @@ -9,7 +9,7 @@ $pipes = array(); $proc = proc_open( "$php -n -i" ,array(0 => array('pipe', 'r'), 1 => array('pipe', 'w')) - ,$pipes, dirname(__FILE__), array(), array('binary_pipes' => true) + ,$pipes, dirname(__FILE__), array(), array() ); var_dump($proc); if (!$proc) { diff --git a/ext/standard/tests/streams/bug48309.phpt b/ext/standard/tests/streams/bug48309.phpt index bb2d9d28f7..300926be51 100644 --- a/ext/standard/tests/streams/bug48309.phpt +++ b/ext/standard/tests/streams/bug48309.phpt @@ -24,7 +24,7 @@ echo "\n"; var_dump(stream_get_contents($tmp)); ?> ---EXPECTF-- +--EXPECT-- -- stream_copy_to_stream() -- te string(2) "st" diff --git a/ext/standard/tests/streams/bug49936.phpt b/ext/standard/tests/streams/bug49936.phpt index d98db1d799..dccf87474c 100644 --- a/ext/standard/tests/streams/bug49936.phpt +++ b/ext/standard/tests/streams/bug49936.phpt @@ -15,7 +15,7 @@ var_dump(@opendir($dir)); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- bool(false) bool(false) ===DONE=== diff --git a/ext/standard/tests/streams/bug64770.phpt b/ext/standard/tests/streams/bug64770.phpt index 86addfd809..bb904d7446 100644 --- a/ext/standard/tests/streams/bug64770.phpt +++ b/ext/standard/tests/streams/bug64770.phpt @@ -9,7 +9,7 @@ $descs = array( 2 => array('pipe', 'w'), // strerr ); -$other_opts = array('suppress_errors' => false, 'binary_pipes' => true); +$other_opts = array('suppress_errors' => false); $cmd = (substr(PHP_OS, 0, 3) == 'WIN') ? 'dir' : 'ls'; $p = proc_open($cmd, $descs, $pipes, '.', NULL, $other_opts); diff --git a/ext/standard/tests/streams/bug67626.phpt b/ext/standard/tests/streams/bug67626.phpt index 0ab69fd877..79aaed55cb 100644 --- a/ext/standard/tests/streams/bug67626.phpt +++ b/ext/standard/tests/streams/bug67626.phpt @@ -40,6 +40,6 @@ try { echo $e->getMessage(); } ?> ---EXPECTF-- +--EXPECT-- stream_read_exception stream_write_exception diff --git a/ext/standard/tests/streams/bug70198.phpt b/ext/standard/tests/streams/bug70198.phpt index 514ef79812..f79a3d03c4 100644 --- a/ext/standard/tests/streams/bug70198.phpt +++ b/ext/standard/tests/streams/bug70198.phpt @@ -55,6 +55,6 @@ proc_close($srv_proc); unlink($srv_fl); ?> ==DONE== ---EXPECTF-- +--EXPECT-- int(0) ==DONE== diff --git a/ext/standard/tests/streams/bug71245.phpt b/ext/standard/tests/streams/bug71245.phpt index e1d82f65f9..c9cad0c6d7 100644 --- a/ext/standard/tests/streams/bug71245.phpt +++ b/ext/standard/tests/streams/bug71245.phpt @@ -18,7 +18,7 @@ $context = stream_context_create($httpContext); $headers = ["Host: bad.com"]; print_r(stream_context_get_options($context)); ?> ---EXPECTF-- +--EXPECT-- Array ( [http] => Array diff --git a/ext/standard/tests/streams/bug71323.phpt b/ext/standard/tests/streams/bug71323.phpt index 29d784719f..12d06cd874 100644 --- a/ext/standard/tests/streams/bug71323.phpt +++ b/ext/standard/tests/streams/bug71323.phpt @@ -8,7 +8,7 @@ $file = 'data:text/plain;z=y;uri=eviluri;mediatype=wut?;mediatype2=hello,somedat $meta = stream_get_meta_data(fopen($file, "r")); var_dump($meta); ?> ---EXPECTF-- +--EXPECT-- array(10) { ["mediatype"]=> string(10) "text/plain" diff --git a/ext/standard/tests/streams/bug72853.phpt b/ext/standard/tests/streams/bug72853.phpt index 48bd60e7a6..8de0264ac0 100644 --- a/ext/standard/tests/streams/bug72853.phpt +++ b/ext/standard/tests/streams/bug72853.phpt @@ -24,7 +24,7 @@ while ($outs = fgets($pipes[1], 1024)) { var_dump(stream_get_meta_data($pipes[1])); proc_close($p); ?> ---EXPECTF-- +--EXPECT-- array(7) { ["timed_out"]=> bool(false) diff --git a/ext/standard/tests/streams/bug74090.phpt b/ext/standard/tests/streams/bug74090.phpt index c0fc85c5ef..f6187003fa 100644 --- a/ext/standard/tests/streams/bug74090.phpt +++ b/ext/standard/tests/streams/bug74090.phpt @@ -17,6 +17,6 @@ var_dump(strlen($ret) > 0); stream_socket_shutdown($fd,STREAM_SHUT_RDWR); ?> ==DONE== ---EXPECTF-- +--EXPECT-- bool(true) ==DONE== diff --git a/ext/standard/tests/streams/bug75031.phpt b/ext/standard/tests/streams/bug75031.phpt new file mode 100644 index 0000000000..4787b97171 --- /dev/null +++ b/ext/standard/tests/streams/bug75031.phpt @@ -0,0 +1,25 @@ +--TEST-- +Bug #75031: Append mode in php://temp and php://memory +--FILE-- +<?php + +function test_75031($type, $mode) { + $fp = fopen($type, $mode); + fwrite($fp, "hello"); + fseek($fp, 0, SEEK_SET); + fwrite($fp, "world"); + var_dump(stream_get_contents($fp, -1, 0)); + fclose($fp); +} + +test_75031("php://temp", "w+"); +test_75031("php://memory", "w+"); +test_75031("php://temp", "a+"); +test_75031("php://memory", "a+"); + +?> +--EXPECT-- +string(5) "world" +string(5) "world" +string(10) "helloworld" +string(10) "helloworld" diff --git a/ext/standard/tests/streams/bug76136.phpt b/ext/standard/tests/streams/bug76136.phpt new file mode 100644 index 0000000000..687d4ae921 --- /dev/null +++ b/ext/standard/tests/streams/bug76136.phpt @@ -0,0 +1,19 @@ +--TEST-- +Bug #76136: stream_socket_get_name should enclose IPv6 in brackets +--SKIPIF-- +<?php +@stream_socket_client('tcp://[::1]:0', $errno); +if ($errno != 111) { + die('skip IPv6 is not supported.'); +} +?> +--FILE-- +<?php +$server = stream_socket_server("tcp://[::1]:1337/"); +echo stream_socket_get_name($server, false).PHP_EOL; +$server = stream_socket_server("tcp://127.0.0.1:1337/"); +echo stream_socket_get_name($server, false); +?> +--EXPECT-- +[::1]:1337 +127.0.0.1:1337 diff --git a/ext/standard/tests/streams/bug77664.phpt b/ext/standard/tests/streams/bug77664.phpt index 6a925417e2..ff2e317026 100644 --- a/ext/standard/tests/streams/bug77664.phpt +++ b/ext/standard/tests/streams/bug77664.phpt @@ -10,8 +10,6 @@ stream_wrapper_register('error',ErrorWrapper::class); file_get_contents('error://test'); ?> --EXPECTF-- -Warning: file_get_contents(error://test): failed to open stream: operation failed in %sbug77664.php on line %d - Fatal error: Uncaught Error: Undefined class constant 'self::INVALID' in %sbug77664.php:%d Stack trace: #0 %sbug77664.php(%d): file_get_contents('error://test') diff --git a/ext/standard/tests/streams/proc_open_bug60120.phpt b/ext/standard/tests/streams/proc_open_bug60120.phpt index 544df47ad9..d12833864a 100644 --- a/ext/standard/tests/streams/proc_open_bug60120.phpt +++ b/ext/standard/tests/streams/proc_open_bug60120.phpt @@ -13,7 +13,7 @@ $descriptors = array(array('pipe', 'r'), array('pipe', 'w'), array('pipe', 'w')) $stdin = str_repeat('*', 1024 * 16) . '!'; $stdin = str_repeat('*', 2049 ); -$options = array_merge(array('suppress_errors' => true, 'binary_pipes' => true, 'bypass_shell' => false)); +$options = array_merge(array('suppress_errors' => true, 'bypass_shell' => false)); $process = proc_open($cmd, $descriptors, $pipes, getcwd(), array(), $options); foreach ($pipes as $pipe) { diff --git a/ext/standard/tests/streams/proc_open_bug64438.phpt b/ext/standard/tests/streams/proc_open_bug64438.phpt index bcddecf401..454d7748c4 100644 --- a/ext/standard/tests/streams/proc_open_bug64438.phpt +++ b/ext/standard/tests/streams/proc_open_bug64438.phpt @@ -13,7 +13,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { $descriptors = array(array('pipe', 'r'), array('pipe', 'w'), array('pipe', 'w')); $stdin = str_repeat('*', 4097); -$options = array_merge(array('suppress_errors' => true, 'binary_pipes' => true, 'bypass_shell' => false)); +$options = array_merge(array('suppress_errors' => true, 'bypass_shell' => false)); $process = proc_open($cmd, $descriptors, $pipes, getcwd(), array(), $options); foreach ($pipes as $pipe) { diff --git a/ext/standard/tests/streams/stream_get_meta_data_file_error.phpt b/ext/standard/tests/streams/stream_get_meta_data_file_error.phpt index 164c24d552..bb98d7c6e7 100644 --- a/ext/standard/tests/streams/stream_get_meta_data_file_error.phpt +++ b/ext/standard/tests/streams/stream_get_meta_data_file_error.phpt @@ -37,21 +37,21 @@ echo "Done"; -- Testing stream_get_meta_data() function with Zero arguments -- -Warning: stream_get_meta_data() expects exactly 1 parameter, 0 given in %s on line %i +Warning: stream_get_meta_data() expects exactly 1 parameter, 0 given in %s on line %d NULL -- Testing stream_get_meta_data() function with more than expected no. of arguments -- -Warning: stream_get_meta_data() expects exactly 1 parameter, 2 given in %s on line %i +Warning: stream_get_meta_data() expects exactly 1 parameter, 2 given in %s on line %d NULL -- Testing stream_get_meta_data() function with invalid stream resource -- -Warning: stream_get_meta_data() expects parameter 1 to be resource, null given in %s on line %i +Warning: stream_get_meta_data() expects parameter 1 to be resource, null given in %s on line %d NULL -- Testing stream_get_meta_data() function with closed stream resource -- -Warning: stream_get_meta_data(): supplied resource is not a valid stream resource in %s on line %i +Warning: stream_get_meta_data(): supplied resource is not a valid stream resource in %s on line %d bool(false) Done diff --git a/ext/standard/tests/streams/stream_get_transports.phpt b/ext/standard/tests/streams/stream_get_transports.phpt index 0d4e194d64..5a30a23cb4 100644 --- a/ext/standard/tests/streams/stream_get_transports.phpt +++ b/ext/standard/tests/streams/stream_get_transports.phpt @@ -2,12 +2,6 @@ array stream_get_transports ( void ); --CREDITS-- marcosptf - <marcosptf@yahoo.com.br> - #phparty7 - @phpsp - novatec/2015 - sao paulo - br ---SKIPIF-- -<?php -if (phpversion() < "5.3.0") { - die('SKIP php version so lower.'); -} -?> --FILE-- <?php print((is_array(stream_get_transports())) ? ("yes") : ("Test 'array stream_get_transports ( void );' has failed")); diff --git a/ext/standard/tests/streams/stream_get_wrappers.phpt b/ext/standard/tests/streams/stream_get_wrappers.phpt index 58dfdc930d..c529dc37bf 100644 --- a/ext/standard/tests/streams/stream_get_wrappers.phpt +++ b/ext/standard/tests/streams/stream_get_wrappers.phpt @@ -2,12 +2,6 @@ array stream_get_wrappers ( void ); --CREDITS-- marcosptf - <marcosptf@yahoo.com.br> - #phparty7 - @phpsp - novatec/2015 - sao paulo - br ---SKIPIF-- -<?php -if (phpversion() < "5.3.0") { - die('SKIP php version so lower.'); -} -?> --FILE-- <?php print((is_array(stream_get_wrappers())) ? ("yes") : ("Test 'array stream_get_wrappers ( void );' has failed")); diff --git a/ext/standard/tests/streams/stream_set_chunk_size.phpt b/ext/standard/tests/streams/stream_set_chunk_size.phpt index 5d7d51adb2..8c2ae9865b 100644 --- a/ext/standard/tests/streams/stream_set_chunk_size.phpt +++ b/ext/standard/tests/streams/stream_set_chunk_size.phpt @@ -88,5 +88,5 @@ bool(false) Warning: stream_set_chunk_size(): The chunk size must be a positive integer, given -1 in %s on line %d bool(false) -Warning: stream_set_chunk_size() expects parameter 2 to be integer, array given in %s on line %d +Warning: stream_set_chunk_size() expects parameter 2 to be int, array given in %s on line %d bool(false) diff --git a/ext/standard/tests/streams/stream_set_timeout_error.phpt b/ext/standard/tests/streams/stream_set_timeout_error.phpt index 1e2f171b1f..0334b951e0 100644 --- a/ext/standard/tests/streams/stream_set_timeout_error.phpt +++ b/ext/standard/tests/streams/stream_set_timeout_error.phpt @@ -57,22 +57,22 @@ echo "Done"; -- Testing stream_set_timeout() function with more than expected no. of arguments -- -Warning: stream_set_timeout() expects at most 3 parameters, 4 given in %s on line %i +Warning: stream_set_timeout() expects at most 3 parameters, 4 given in %s on line %d NULL -- Testing stream_set_timeout() function with less than expected no. of arguments -- -Warning: stream_set_timeout() expects at least 2 parameters, 1 given in %s on line %i +Warning: stream_set_timeout() expects at least 2 parameters, 1 given in %s on line %d NULL -- Testing stream_set_timeout() function with a closed socket -- -Warning: stream_set_timeout(): supplied resource is not a valid stream resource in %s on line %i +Warning: stream_set_timeout(): supplied resource is not a valid stream resource in %s on line %d bool(false) -- Testing stream_set_timeout() function with an invalid stream -- -Warning: stream_set_timeout() expects parameter 1 to be resource, integer given in %s on line %i +Warning: stream_set_timeout() expects parameter 1 to be resource, int given in %s on line %d NULL -- Testing stream_set_timeout() function with a stream that does not support timeouts -- diff --git a/ext/standard/tests/streams/stream_socket_get_name.phpt b/ext/standard/tests/streams/stream_socket_get_name.phpt index 17bf0b7db4..34c88b9c96 100644 --- a/ext/standard/tests/streams/stream_socket_get_name.phpt +++ b/ext/standard/tests/streams/stream_socket_get_name.phpt @@ -2,12 +2,6 @@ string stream_socket_get_name ( resource $handle , bool $want_peer ) ; --CREDITS-- marcosptf - <marcosptf@yahoo.com.br> - #phparty7 - @phpsp - novatec/2015 - sao paulo - br ---SKIPIF-- -<?php -if (phpversion() < "5.3.0") { - die('SKIP php version so lower.'); -} -?> --FILE-- <?php $serverUri = "tcp://127.0.0.1:31854"; diff --git a/ext/standard/tests/streams/stream_socket_recvfrom.phpt b/ext/standard/tests/streams/stream_socket_recvfrom.phpt index f4161288ff..08de4e31a9 100644 --- a/ext/standard/tests/streams/stream_socket_recvfrom.phpt +++ b/ext/standard/tests/streams/stream_socket_recvfrom.phpt @@ -2,12 +2,6 @@ string stream_socket_recvfrom ( resource $socket , int $length [, int $flags = 0 [, string &$address ]] ); --CREDITS-- marcosptf - <marcosptf@yahoo.com.br> - #phparty7 - @phpsp - novatec/2015 - sao paulo - br ---SKIPIF-- -<?php -if (phpversion() < "5.3.0") { - die('SKIP php version so lower.'); -} -?> --FILE-- <?php $serverUri = "tcp://127.0.0.1:31854"; diff --git a/ext/standard/tests/streams/user-stream-error.phpt b/ext/standard/tests/streams/user-stream-error.phpt index 5cc87e7360..1bb46f3094 100644 --- a/ext/standard/tests/streams/user-stream-error.phpt +++ b/ext/standard/tests/streams/user-stream-error.phpt @@ -12,8 +12,6 @@ stream_wrapper_register('mystream', 'FailStream'); fopen('mystream://foo', 'r'); echo 'Done'; --EXPECTF-- -Warning: fopen(mystream://foo): failed to open stream: "FailStream::stream_open" call failed in %s%euser-stream-error.php on line %d - Fatal error: Uncaught Error: Call to undefined function _some_undefined_function() in %s%euser-stream-error.php:%d Stack trace: #0 [internal function]: FailStream->stream_open('mystream://foo', 'r', 0, NULL) diff --git a/ext/standard/tests/streams/user_streams_consumed_bug.phpt b/ext/standard/tests/streams/user_streams_consumed_bug.phpt index bad319cd22..57766324ab 100644 --- a/ext/standard/tests/streams/user_streams_consumed_bug.phpt +++ b/ext/standard/tests/streams/user_streams_consumed_bug.phpt @@ -24,7 +24,7 @@ stream_filter_append(STDOUT, "intercept_filter"); $out = fwrite(STDOUT, "Goodbye\n"); var_dump($out); ---EXPECTF-- +--EXPECT-- Hello int(6) Goodbye diff --git a/ext/standard/tests/strings/005.phpt b/ext/standard/tests/strings/005.phpt index 41ec9dc92f..8595bbfaac 100644 --- a/ext/standard/tests/strings/005.phpt +++ b/ext/standard/tests/strings/005.phpt @@ -16,7 +16,7 @@ var_dump(error_reporting()); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- hello int(8192) bool(false) diff --git a/ext/standard/tests/strings/addcslashes_002.phpt b/ext/standard/tests/strings/addcslashes_002.phpt index 09327706b9..256d39f11a 100644 --- a/ext/standard/tests/strings/addcslashes_002.phpt +++ b/ext/standard/tests/strings/addcslashes_002.phpt @@ -24,7 +24,7 @@ var_dump( addcslashes($obj, "b") ); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing addcslashes() with ASCII code between 0 and 31 *** string(44) "goodyear12345NULL\000truefalse\a\v\f\b\n\r\t" diff --git a/ext/standard/tests/strings/addcslashes_003.phpt b/ext/standard/tests/strings/addcslashes_003.phpt Binary files differindex 5637995796..f743726301 100644 --- a/ext/standard/tests/strings/addcslashes_003.phpt +++ b/ext/standard/tests/strings/addcslashes_003.phpt diff --git a/ext/standard/tests/strings/addslashes_basic.phpt b/ext/standard/tests/strings/addslashes_basic.phpt index 7d5f6f0a48..8b2c7fb2e4 100644 --- a/ext/standard/tests/strings/addslashes_basic.phpt +++ b/ext/standard/tests/strings/addslashes_basic.phpt @@ -29,7 +29,7 @@ foreach( $str_array as $str ) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing addslashes() : basic functionality *** string(16) "How\'s everybody" string(17) "Are you \"JOHN\"?" diff --git a/ext/standard/tests/strings/basename_basic.phpt b/ext/standard/tests/strings/basename_basic.phpt Binary files differindex 4793aca5ec..0a598b8bfa 100644 --- a/ext/standard/tests/strings/basename_basic.phpt +++ b/ext/standard/tests/strings/basename_basic.phpt diff --git a/ext/standard/tests/strings/basename_invalid_path.phpt b/ext/standard/tests/strings/basename_invalid_path.phpt index f6e68cec75..573f8f014a 100644 --- a/ext/standard/tests/strings/basename_invalid_path.phpt +++ b/ext/standard/tests/strings/basename_invalid_path.phpt @@ -16,6 +16,6 @@ if((substr(PHP_OS, 0, 3) == "WIN")) var_dump(basename(chr(-1))); echo "Done\n"; ---EXPECTF-- +--EXPECT-- string(0) "" Done diff --git a/ext/standard/tests/strings/basename_variation.phpt b/ext/standard/tests/strings/basename_variation.phpt index f574b76998..0bcb18e6ac 100644 --- a/ext/standard/tests/strings/basename_variation.phpt +++ b/ext/standard/tests/strings/basename_variation.phpt @@ -85,7 +85,7 @@ echo "*** Testing possible variations in path and suffix ***\n"; check_basename( $file_path_variations ); echo "Done\n"; ---EXPECTF-- +--EXPECT-- *** Testing possible variations in path and suffix *** --Iteration 1-- diff --git a/ext/standard/tests/strings/bug20934.phpt b/ext/standard/tests/strings/bug20934.phpt index e8cf3e90d0..121d9b6ecb 100644 --- a/ext/standard/tests/strings/bug20934.phpt +++ b/ext/standard/tests/strings/bug20934.phpt @@ -1,11 +1,5 @@ --TEST-- Bug #20934 (htmlspecialchars returns latin1 from UTF-8) ---SKIPIF-- -<?php -if (!function_exists("utf8_encode") || !function_exists("utf8_decode")) { - die("SKIP Neither utf8_encode() nor utf8_decode() are available"); -} -?> --FILE-- <?php $str = utf8_encode("\xe0\xe1"); diff --git a/ext/standard/tests/strings/bug38322.phpt b/ext/standard/tests/strings/bug38322.phpt index d0a44a0902..88b4caf471 100644 --- a/ext/standard/tests/strings/bug38322.phpt +++ b/ext/standard/tests/strings/bug38322.phpt @@ -8,6 +8,6 @@ var_dump(sscanf("a ",'%1$s',$str)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- int(1) Done diff --git a/ext/standard/tests/strings/bug39032.phpt b/ext/standard/tests/strings/bug39032.phpt index ac8bdba411..f01df3ff4c 100644 --- a/ext/standard/tests/strings/bug39032.phpt +++ b/ext/standard/tests/strings/bug39032.phpt @@ -10,7 +10,7 @@ var_dump(strcspn(chr(1),"qweqwe")); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- int(1) int(0) int(1) diff --git a/ext/standard/tests/strings/bug39621.phpt b/ext/standard/tests/strings/bug39621.phpt Binary files differindex 924544f2e1..9297050a99 100644 --- a/ext/standard/tests/strings/bug39621.phpt +++ b/ext/standard/tests/strings/bug39621.phpt diff --git a/ext/standard/tests/strings/bug40637.phpt b/ext/standard/tests/strings/bug40637.phpt index d6b56918ff..3f6fc834d8 100644 --- a/ext/standard/tests/strings/bug40637.phpt +++ b/ext/standard/tests/strings/bug40637.phpt @@ -8,6 +8,6 @@ var_dump(strip_tags($html)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(4) "Text" Done diff --git a/ext/standard/tests/strings/bug42107.phpt b/ext/standard/tests/strings/bug42107.phpt index d97f8917e2..aa39da801e 100644 --- a/ext/standard/tests/strings/bug42107.phpt +++ b/ext/standard/tests/strings/bug42107.phpt @@ -15,7 +15,7 @@ var_dump(sscanf('one two', '%1$d %2$d')); var_dump(sscanf('one two', '%1$d')); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- array(2) { [0]=> string(3) "one" diff --git a/ext/standard/tests/strings/bug43957.phpt b/ext/standard/tests/strings/bug43957.phpt index 0380787b73..b74b83a137 100644 --- a/ext/standard/tests/strings/bug43957.phpt +++ b/ext/standard/tests/strings/bug43957.phpt @@ -4,5 +4,5 @@ Bug #43957 (utf8_decode() bogus conversion on multibyte indicator near end of st <?php echo utf8_decode('abc'.chr(0xe0)); ?> ---EXPECTF-- +--EXPECT-- abc? diff --git a/ext/standard/tests/strings/bug46578.phpt b/ext/standard/tests/strings/bug46578.phpt index ba9fbbe460..a5eff1dbe2 100644 --- a/ext/standard/tests/strings/bug46578.phpt +++ b/ext/standard/tests/strings/bug46578.phpt @@ -17,9 +17,9 @@ var_dump(strip_tags('<? ax')); ?> --EXPECTF-- -%string|unicode%(6) "foobar" -%string|unicode%(6) "foobar" -%string|unicode%(6) "foobar" -%string|unicode%(4) "< ax" -%string|unicode%(0) "" -%string|unicode%(0) "" +string(6) "foobar" +string(6) "foobar" +string(6) "foobar" +string(4) "< ax" +string(0) "" +string(0) "" diff --git a/ext/standard/tests/strings/bug47443.phpt b/ext/standard/tests/strings/bug47443.phpt index e30acd80bf..033aeb4d79 100644 --- a/ext/standard/tests/strings/bug47443.phpt +++ b/ext/standard/tests/strings/bug47443.phpt @@ -9,6 +9,6 @@ var_dump(metaphone("scratc")); ?> --EXPECTF-- -%string|unicode%(4) "SKRX" -%string|unicode%(4) "SKR0" -%string|unicode%(5) "SKRTK" +string(4) "SKRX" +string(4) "SKR0" +string(5) "SKRTK" diff --git a/ext/standard/tests/strings/bug47481.phpt b/ext/standard/tests/strings/bug47481.phpt index 4c59a7c377..6cad98ac91 100644 --- a/ext/standard/tests/strings/bug47481.phpt +++ b/ext/standard/tests/strings/bug47481.phpt @@ -25,33 +25,33 @@ echo "Done"; -- Before sorting: -- array(6) { [0]=> - %string|unicode%(6) "Süden" + string(6) "Süden" [1]=> - %string|unicode%(7) "spielen" + string(7) "spielen" [2]=> - %string|unicode%(5) "Sonne" + string(5) "Sonne" [3]=> - %string|unicode%(4) "Wind" + string(4) "Wind" [4]=> - %string|unicode%(5) "Regen" + string(5) "Regen" [5]=> - %string|unicode%(4) "Meer" + string(4) "Meer" } -- After Sorting: -- bool(true) array(6) { [5]=> - %string|unicode%(4) "Meer" + string(4) "Meer" [4]=> - %string|unicode%(5) "Regen" + string(5) "Regen" [2]=> - %string|unicode%(5) "Sonne" + string(5) "Sonne" [1]=> - %string|unicode%(7) "spielen" + string(7) "spielen" [0]=> - %string|unicode%(6) "Süden" + string(6) "Süden" [3]=> - %string|unicode%(4) "Wind" + string(4) "Wind" } Done diff --git a/ext/standard/tests/strings/bug53319.phpt b/ext/standard/tests/strings/bug53319.phpt index 0bcc06d5ec..bae7e88b9e 100644 --- a/ext/standard/tests/strings/bug53319.phpt +++ b/ext/standard/tests/strings/bug53319.phpt @@ -10,7 +10,7 @@ var_dump(strip_tags($str)); var_dump(strip_tags('<a/b>', '<a>')); ?> ---EXPECTF-- +--EXPECT-- string(47) "USD<input type="text"/>CDN<input type="text" />" bool(true) string(6) "USDCDN" diff --git a/ext/standard/tests/strings/bug54322.phpt b/ext/standard/tests/strings/bug54322.phpt index 4623a9a2ad..6b8d10daa7 100644 --- a/ext/standard/tests/strings/bug54322.phpt +++ b/ext/standard/tests/strings/bug54322.phpt @@ -6,5 +6,5 @@ var_dump( get_html_translation_table(NAN, 0, "UTF-8") > 0 ); --EXPECTF-- -Warning: get_html_translation_table() expects parameter 1 to be integer, float given in %s on line %d +Warning: get_html_translation_table() expects parameter 1 to be int, float given in %s on line %d bool(false) diff --git a/ext/standard/tests/strings/bug64879.phpt b/ext/standard/tests/strings/bug64879.phpt index 7131fc2449..6135fbbb52 100644 --- a/ext/standard/tests/strings/bug64879.phpt +++ b/ext/standard/tests/strings/bug64879.phpt @@ -8,5 +8,5 @@ quoted_printable_encode(str_repeat("\xf4", 100000)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- Done diff --git a/ext/standard/tests/strings/bug65230.phpt b/ext/standard/tests/strings/bug65230.phpt index 55c81c703d..4363462934 100644 --- a/ext/standard/tests/strings/bug65230.phpt +++ b/ext/standard/tests/strings/bug65230.phpt @@ -3,7 +3,7 @@ Bug #65230 setting locale randomly broken --SKIPIF-- <?php if (substr(PHP_OS, 0, 3) != 'WIN') { - die('skip'); + die('skip Windows only test'); } ?> --INI-- diff --git a/ext/standard/tests/strings/bug65947.phpt b/ext/standard/tests/strings/bug65947.phpt index 18bcb86b76..a746f96f7a 100644 --- a/ext/standard/tests/strings/bug65947.phpt +++ b/ext/standard/tests/strings/bug65947.phpt @@ -13,5 +13,5 @@ if ($filename != $b2) print "BUG"; else print "OKEY"; ---EXPECTF-- +--EXPECT-- OKEY diff --git a/ext/standard/tests/strings/bug68710.phpt b/ext/standard/tests/strings/bug68710.phpt index 729a12011b..5eeb09b3d6 100644 --- a/ext/standard/tests/strings/bug68710.phpt +++ b/ext/standard/tests/strings/bug68710.phpt @@ -21,5 +21,5 @@ for ($i=4; $i<100; $i++) { } ?> ===DONE=== ---EXPECTF-- +--EXPECT-- ===DONE=== diff --git a/ext/standard/tests/strings/bug70720.phpt b/ext/standard/tests/strings/bug70720.phpt index 6cdc600c2d..d7f64e0874 100644 --- a/ext/standard/tests/strings/bug70720.phpt +++ b/ext/standard/tests/strings/bug70720.phpt @@ -9,7 +9,7 @@ var_dump(strip_tags('<?xml $xml->test(); ?> this is a test')); /* "->" case in HTML */ var_dump(strip_tags("<span class=sf-dump-> this is a test</span>")); ?> ---EXPECTF-- +--EXPECT-- string(15) " this is a test" string(15) " this is a test" string(15) " this is a test" diff --git a/ext/standard/tests/strings/bug72433.phpt b/ext/standard/tests/strings/bug72433.phpt index d5a6612f2b..534b1e6ac6 100644 --- a/ext/standard/tests/strings/bug72433.phpt +++ b/ext/standard/tests/strings/bug72433.phpt @@ -19,41 +19,5 @@ $fill_freed_space_2 = "filler_zval_2"; var_dump($free_me); ?> --EXPECTF-- -array(3) { - [0]=> - array(3) { - [0]=> - *RECURSION* - [1]=> - *RECURSION* - [2]=> - object(ArrayObject)#%d (1) { - ["storage":"ArrayObject":private]=> - *RECURSION* - } - } - [1]=> - array(3) { - [0]=> - *RECURSION* - [1]=> - *RECURSION* - [2]=> - object(ArrayObject)#%d (1) { - ["storage":"ArrayObject":private]=> - *RECURSION* - } - } - [2]=> - object(ArrayObject)#%d (1) { - ["storage":"ArrayObject":private]=> - array(3) { - [0]=> - *RECURSION* - [1]=> - *RECURSION* - [2]=> - *RECURSION* - } - } -} +Notice: unserialize(): Error at offset %d of %d bytes in %sbug72433.php on line 8 +bool(false) diff --git a/ext/standard/tests/strings/bug73058.phpt b/ext/standard/tests/strings/bug73058.phpt index 35ab932dd9..3cd908b24a 100644 --- a/ext/standard/tests/strings/bug73058.phpt +++ b/ext/standard/tests/strings/bug73058.phpt @@ -1,11 +1,5 @@ --TEST-- Bug #73058 crypt broken when salt is 'too' long ---SKIPIF-- -<?php -if (!function_exists('crypt'))) { - die("SKIP crypt() is not available"); -} -?> --FILE-- <?php $pass = 'secret'; diff --git a/ext/standard/tests/strings/bug78003.phpt b/ext/standard/tests/strings/bug78003.phpt new file mode 100644 index 0000000000..4379ca8a71 --- /dev/null +++ b/ext/standard/tests/strings/bug78003.phpt @@ -0,0 +1,16 @@ +--TEST-- +Bug #78003 (strip_tags output change since PHP 7.3) +--FILE-- +<?php +var_dump( + strip_tags('<foo<>bar>'), + strip_tags('<foo<!>bar>'), + strip_tags('<foo<?>bar>') +); +?> +===DONE=== +--EXPECT-- +string(0) "" +string(0) "" +string(0) "" +===DONE=== diff --git a/ext/standard/tests/strings/bug78346.phpt b/ext/standard/tests/strings/bug78346.phpt new file mode 100644 index 0000000000..f2c508f09b --- /dev/null +++ b/ext/standard/tests/strings/bug78346.phpt @@ -0,0 +1,9 @@ +--TEST-- +Bug #78346 (strip_tags no longer handling nested php tags) +--FILE-- +<?php +$str = '<?= \'<?= 1 ?>\' ?>2'; +var_dump(strip_tags($str)); +?> +--EXPECT-- +string(1) "2" diff --git a/ext/standard/tests/strings/chop_basic.phpt b/ext/standard/tests/strings/chop_basic.phpt Binary files differindex ea6944e6da..7e25ec12e3 100644 --- a/ext/standard/tests/strings/chop_basic.phpt +++ b/ext/standard/tests/strings/chop_basic.phpt diff --git a/ext/standard/tests/strings/chop_variation1.phpt b/ext/standard/tests/strings/chop_variation1.phpt index 3a680c216f..51f53f0153 100644 --- a/ext/standard/tests/strings/chop_variation1.phpt +++ b/ext/standard/tests/strings/chop_variation1.phpt @@ -63,7 +63,7 @@ $values = array ( "", '', - // null vlaues + // null values NULL, null, diff --git a/ext/standard/tests/strings/chop_variation3.phpt b/ext/standard/tests/strings/chop_variation3.phpt Binary files differindex 9509fb80a4..36f81d34c8 100644 --- a/ext/standard/tests/strings/chop_variation3.phpt +++ b/ext/standard/tests/strings/chop_variation3.phpt diff --git a/ext/standard/tests/strings/chop_variation4.phpt b/ext/standard/tests/strings/chop_variation4.phpt Binary files differindex 9b44daf3d2..628c87cbce 100644 --- a/ext/standard/tests/strings/chop_variation4.phpt +++ b/ext/standard/tests/strings/chop_variation4.phpt diff --git a/ext/standard/tests/strings/chop_variation5.phpt b/ext/standard/tests/strings/chop_variation5.phpt index 8f283e3c3f..7d915c2c86 100644 --- a/ext/standard/tests/strings/chop_variation5.phpt +++ b/ext/standard/tests/strings/chop_variation5.phpt @@ -25,7 +25,7 @@ echo "*** Testing chop() : with miscellaneous arguments ***\n"; echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing chop() : with miscellaneous arguments *** string(9) "chop test" string(12) "chop test " diff --git a/ext/standard/tests/strings/chr_basic.phpt b/ext/standard/tests/strings/chr_basic.phpt index 5e102b5d83..e072febcff 100644 --- a/ext/standard/tests/strings/chr_basic.phpt +++ b/ext/standard/tests/strings/chr_basic.phpt @@ -16,7 +16,7 @@ echo "World"; echo "\n"; ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing chr() : basic functionality *** Hello World diff --git a/ext/standard/tests/strings/chr_variation1.phpt b/ext/standard/tests/strings/chr_variation1.phpt index e61ed54699..85a2219ecb 100644 --- a/ext/standard/tests/strings/chr_variation1.phpt +++ b/ext/standard/tests/strings/chr_variation1.phpt @@ -78,7 +78,7 @@ fclose($file_handle); //closing the file handle ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing chr() function: with unexpected inputs for 'ascii' argument *** -- Iteration 1 -- string(2) "00" diff --git a/ext/standard/tests/strings/chunk_split_basic.phpt b/ext/standard/tests/strings/chunk_split_basic.phpt index 6a201ec9ca..cce8e4d64c 100644 --- a/ext/standard/tests/strings/chunk_split_basic.phpt +++ b/ext/standard/tests/strings/chunk_split_basic.phpt @@ -37,7 +37,7 @@ var_dump( chunk_split($str) ); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing chunk_split() : basic functionality *** -- Testing chunk_split() with all possible arguments -- string(15) "Te##st##in##g##" diff --git a/ext/standard/tests/strings/chunk_split_variation10.phpt b/ext/standard/tests/strings/chunk_split_variation10.phpt index 5bf678b4ac..755d4ab46a 100644 --- a/ext/standard/tests/strings/chunk_split_variation10.phpt +++ b/ext/standard/tests/strings/chunk_split_variation10.phpt @@ -51,7 +51,7 @@ for($count = 0; $count < count($values); $count++) { echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing chunk_split() : different single quoted strings as 'ending' *** -- Iteration 0 -- string(73) "This is to test chunk_split() with various 'single quoted' ending string." diff --git a/ext/standard/tests/strings/chunk_split_variation11.phpt b/ext/standard/tests/strings/chunk_split_variation11.phpt index f20a4af22b..67b0f3e76b 100644 --- a/ext/standard/tests/strings/chunk_split_variation11.phpt +++ b/ext/standard/tests/strings/chunk_split_variation11.phpt @@ -43,7 +43,7 @@ for($count = 0; $count < count($values); $count++) { echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing chunk_split() : different values for 'ending' with heredoc 'str'*** -- Iteration 1 -- string(113) "This is heredoc string with and diff --git a/ext/standard/tests/strings/chunk_split_variation12.phpt b/ext/standard/tests/strings/chunk_split_variation12.phpt index db5d76a48e..bafd9f44ae 100644 --- a/ext/standard/tests/strings/chunk_split_variation12.phpt +++ b/ext/standard/tests/strings/chunk_split_variation12.phpt @@ -83,7 +83,7 @@ foreach($heredoc_arr as $value) { echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing chunk_split() : different heredoc strings for 'ending' argument *** -- Iteration 1 -- string(102) "This is str to check with heredoc ending.This contains, diff --git a/ext/standard/tests/strings/chunk_split_variation13.phpt b/ext/standard/tests/strings/chunk_split_variation13.phpt index c042d88896..8e4da96e7b 100644 --- a/ext/standard/tests/strings/chunk_split_variation13.phpt +++ b/ext/standard/tests/strings/chunk_split_variation13.phpt @@ -28,7 +28,7 @@ for($count = 0; $count < count($values); $count++) { echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing chunk_split() : default 'chunklen' with long string 'str' *** -- Iteration 0 -- string(85) "1234567890123456789012345678901234567890123456789012345678901234567890123456 diff --git a/ext/standard/tests/strings/chunk_split_variation2.phpt b/ext/standard/tests/strings/chunk_split_variation2.phpt index 3a02320887..b5d58b0d00 100644 --- a/ext/standard/tests/strings/chunk_split_variation2.phpt +++ b/ext/standard/tests/strings/chunk_split_variation2.phpt @@ -100,7 +100,7 @@ Warning: chunk_split(): Chunk length should be greater than zero in %schunk_spli bool(false) -- Iteration 3 -- -Warning: chunk_split() expects parameter 2 to be integer, float given in %s on line %d +Warning: chunk_split() expects parameter 2 to be int, float given in %s on line %d NULL -- Iteration 4 -- @@ -112,23 +112,23 @@ Warning: chunk_split(): Chunk length should be greater than zero in %schunk_spli bool(false) -- Iteration 6 -- -Warning: chunk_split() expects parameter 2 to be integer, array given in %schunk_split_variation2.php on line %d +Warning: chunk_split() expects parameter 2 to be int, array given in %schunk_split_variation2.php on line %d NULL -- Iteration 7 -- -Warning: chunk_split() expects parameter 2 to be integer, array given in %schunk_split_variation2.php on line %d +Warning: chunk_split() expects parameter 2 to be int, array given in %schunk_split_variation2.php on line %d NULL -- Iteration 8 -- -Warning: chunk_split() expects parameter 2 to be integer, array given in %schunk_split_variation2.php on line %d +Warning: chunk_split() expects parameter 2 to be int, array given in %schunk_split_variation2.php on line %d NULL -- Iteration 9 -- -Warning: chunk_split() expects parameter 2 to be integer, array given in %schunk_split_variation2.php on line %d +Warning: chunk_split() expects parameter 2 to be int, array given in %schunk_split_variation2.php on line %d NULL -- Iteration 10 -- -Warning: chunk_split() expects parameter 2 to be integer, array given in %schunk_split_variation2.php on line %d +Warning: chunk_split() expects parameter 2 to be int, array given in %schunk_split_variation2.php on line %d NULL -- Iteration 11 -- @@ -152,23 +152,23 @@ Warning: chunk_split(): Chunk length should be greater than zero in %schunk_spli bool(false) -- Iteration 17 -- -Warning: chunk_split() expects parameter 2 to be integer, string given in %schunk_split_variation2.php on line %d +Warning: chunk_split() expects parameter 2 to be int, string given in %schunk_split_variation2.php on line %d NULL -- Iteration 18 -- -Warning: chunk_split() expects parameter 2 to be integer, string given in %schunk_split_variation2.php on line %d +Warning: chunk_split() expects parameter 2 to be int, string given in %schunk_split_variation2.php on line %d NULL -- Iteration 19 -- -Warning: chunk_split() expects parameter 2 to be integer, string given in %schunk_split_variation2.php on line %d +Warning: chunk_split() expects parameter 2 to be int, string given in %schunk_split_variation2.php on line %d NULL -- Iteration 20 -- -Warning: chunk_split() expects parameter 2 to be integer, string given in %schunk_split_variation2.php on line %d +Warning: chunk_split() expects parameter 2 to be int, string given in %schunk_split_variation2.php on line %d NULL -- Iteration 21 -- -Warning: chunk_split() expects parameter 2 to be integer, object given in %schunk_split_variation2.php on line %d +Warning: chunk_split() expects parameter 2 to be int, object given in %schunk_split_variation2.php on line %d NULL -- Iteration 22 -- @@ -180,6 +180,6 @@ Warning: chunk_split(): Chunk length should be greater than zero in %schunk_spli bool(false) -- Iteration 24 -- -Warning: chunk_split() expects parameter 2 to be integer, resource given in %schunk_split_variation2.php on line %d +Warning: chunk_split() expects parameter 2 to be int, resource given in %schunk_split_variation2.php on line %d NULL ===DONE=== diff --git a/ext/standard/tests/strings/chunk_split_variation4.phpt b/ext/standard/tests/strings/chunk_split_variation4.phpt index f5c926c7a0..e7fc0744ee 100644 --- a/ext/standard/tests/strings/chunk_split_variation4.phpt +++ b/ext/standard/tests/strings/chunk_split_variation4.phpt @@ -84,7 +84,7 @@ foreach($heredoc_arr as $str) { echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing chunk_split() : heredoc strings as 'str' argument *** -- Iteration 1 -- string(2) " diff --git a/ext/standard/tests/strings/chunk_split_variation5.phpt b/ext/standard/tests/strings/chunk_split_variation5.phpt Binary files differindex 19f1c7c66d..8a5a8cd6bb 100644 --- a/ext/standard/tests/strings/chunk_split_variation5.phpt +++ b/ext/standard/tests/strings/chunk_split_variation5.phpt diff --git a/ext/standard/tests/strings/chunk_split_variation6.phpt b/ext/standard/tests/strings/chunk_split_variation6.phpt index 675fcac036..f7fcfb60f3 100644 --- a/ext/standard/tests/strings/chunk_split_variation6.phpt +++ b/ext/standard/tests/strings/chunk_split_variation6.phpt @@ -45,7 +45,7 @@ for($count = 0;$count < count($values);$count++) { echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing chunk_split() : with different single quoted 'str' *** -- Iteration 0 -- string(3) "):(" diff --git a/ext/standard/tests/strings/chunk_split_variation7.phpt b/ext/standard/tests/strings/chunk_split_variation7.phpt Binary files differindex fff05ad73a..fa9cc43086 100644 --- a/ext/standard/tests/strings/chunk_split_variation7.phpt +++ b/ext/standard/tests/strings/chunk_split_variation7.phpt diff --git a/ext/standard/tests/strings/chunk_split_variation8.phpt b/ext/standard/tests/strings/chunk_split_variation8.phpt index 9299dc13cc..bfafd1af0b 100644 --- a/ext/standard/tests/strings/chunk_split_variation8.phpt +++ b/ext/standard/tests/strings/chunk_split_variation8.phpt @@ -83,7 +83,7 @@ It has _speci@l ch@r$ 2222 !!!Now \k as escape char to test chunk_split():::" -- Iteration 7 -- -Warning: chunk_split() expects parameter 2 to be integer, float given in %s on line %d +Warning: chunk_split() expects parameter 2 to be int, float given in %s on line %d NULL -- Iteration 8 -- diff --git a/ext/standard/tests/strings/chunk_split_variation9.phpt b/ext/standard/tests/strings/chunk_split_variation9.phpt Binary files differindex 2196bc64b4..36bb26b4bc 100644 --- a/ext/standard/tests/strings/chunk_split_variation9.phpt +++ b/ext/standard/tests/strings/chunk_split_variation9.phpt diff --git a/ext/standard/tests/strings/convert_cyr_string_basic.phpt b/ext/standard/tests/strings/convert_cyr_string_basic.phpt index e5ccf4cbb9..8a368e17ef 100644 --- a/ext/standard/tests/strings/convert_cyr_string_basic.phpt +++ b/ext/standard/tests/strings/convert_cyr_string_basic.phpt @@ -26,7 +26,7 @@ for ($i = 128; $i < 256; $i++) { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing convert_cyr_string() : basic functionality *** -- First try some simple English text -- diff --git a/ext/standard/tests/strings/convert_uudecode_basic.phpt b/ext/standard/tests/strings/convert_uudecode_basic.phpt index 34e53cbdda..963c163761 100644 --- a/ext/standard/tests/strings/convert_uudecode_basic.phpt +++ b/ext/standard/tests/strings/convert_uudecode_basic.phpt @@ -48,7 +48,7 @@ echo "TEST PASSED\n"; ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing convert_uudecode() : basic functionality *** TEST PASSED ===DONE=== diff --git a/ext/standard/tests/strings/count_chars_basic.phpt b/ext/standard/tests/strings/count_chars_basic.phpt index 587beea95b..c39889be15 100644 --- a/ext/standard/tests/strings/count_chars_basic.phpt +++ b/ext/standard/tests/strings/count_chars_basic.phpt @@ -23,7 +23,7 @@ var_dump(bin2hex(count_chars($string, 4))); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing count_chars() : basic functionality *** array(256) { [0]=> diff --git a/ext/standard/tests/strings/count_chars_variation2.phpt b/ext/standard/tests/strings/count_chars_variation2.phpt index d1ce781933..986312a930 100644 --- a/ext/standard/tests/strings/count_chars_variation2.phpt +++ b/ext/standard/tests/strings/count_chars_variation2.phpt @@ -117,11 +117,11 @@ Warning: count_chars(): Unknown mode in %s on line %d bool(false) -- Iteration 11 -- -Warning: count_chars() expects parameter 2 to be integer, array given in %s on line %d +Warning: count_chars() expects parameter 2 to be int, array given in %s on line %d bool(false) -- Iteration 12 -- -Warning: count_chars() expects parameter 2 to be integer, array given in %s on line %d +Warning: count_chars() expects parameter 2 to be int, array given in %s on line %d bool(false) -- Iteration 13 -- bool(true) @@ -137,11 +137,11 @@ bool(true) bool(true) -- Iteration 19 -- -Warning: count_chars() expects parameter 2 to be integer, string given in %s on line %d +Warning: count_chars() expects parameter 2 to be int, string given in %s on line %d bool(false) -- Iteration 20 -- -Warning: count_chars() expects parameter 2 to be integer, string given in %s on line %d +Warning: count_chars() expects parameter 2 to be int, string given in %s on line %d bool(false) -- Iteration 21 -- @@ -155,7 +155,7 @@ Warning: count_chars(): Unknown mode in %s on line %d bool(false) -- Iteration 23 -- -Warning: count_chars() expects parameter 2 to be integer, object given in %s on line %d +Warning: count_chars() expects parameter 2 to be int, object given in %s on line %d bool(false) -- Iteration 24 -- bool(true) diff --git a/ext/standard/tests/strings/crc32_basic.phpt b/ext/standard/tests/strings/crc32_basic.phpt index 03c9c79b80..9c7794b96f 100644 --- a/ext/standard/tests/strings/crc32_basic.phpt +++ b/ext/standard/tests/strings/crc32_basic.phpt @@ -1,10 +1,5 @@ --TEST-- Test crc32() function : basic functionality ---SKIPIF-- -<?php -if (PHP_INT_SIZE != 4) - die("skip this test is for 32bit platform only"); -?> --FILE-- <?php /* Prototype : string crc32(string $str) @@ -33,7 +28,7 @@ printf("%u\n", crc32($str) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing crc32() : basic functionality *** bool(true) 256895812 diff --git a/ext/standard/tests/strings/crc32_error.phpt b/ext/standard/tests/strings/crc32_error.phpt index 0db522947f..98680cde34 100644 --- a/ext/standard/tests/strings/crc32_error.phpt +++ b/ext/standard/tests/strings/crc32_error.phpt @@ -1,10 +1,5 @@ --TEST-- Test crc32() function : error conditions ---SKIPIF-- -<?php -if (PHP_INT_SIZE != 4) - die("skip this test is for 32bit platform only"); -?> --FILE-- <?php /* Prototype : string crc32(string $str) diff --git a/ext/standard/tests/strings/crc32_variation2.phpt b/ext/standard/tests/strings/crc32_variation2.phpt index ed2eb6b719..76e57c57f7 100644 --- a/ext/standard/tests/strings/crc32_variation2.phpt +++ b/ext/standard/tests/strings/crc32_variation2.phpt @@ -72,7 +72,7 @@ foreach($string_array as $str) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing crc32() : with different strings in single quotes *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/crc32_variation4.phpt b/ext/standard/tests/strings/crc32_variation4.phpt index d3349d2092..f3f11972fb 100644 --- a/ext/standard/tests/strings/crc32_variation4.phpt +++ b/ext/standard/tests/strings/crc32_variation4.phpt @@ -88,7 +88,7 @@ foreach($heredoc_strings as $str) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing crc32() : with different heredoc strings *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/crypt.phpt b/ext/standard/tests/strings/crypt.phpt index d04955412c..f64b61cb5f 100644 --- a/ext/standard/tests/strings/crypt.phpt +++ b/ext/standard/tests/strings/crypt.phpt @@ -1,11 +1,5 @@ --TEST-- crypt() function ---SKIPIF-- -<?php -if (!function_exists('crypt')) { - die("SKIP crypt() is not available"); -} -?> --FILE-- <?php diff --git a/ext/standard/tests/strings/crypt_blowfish.phpt b/ext/standard/tests/strings/crypt_blowfish.phpt index 0bf0d1949e..3af9cb77eb 100644 --- a/ext/standard/tests/strings/crypt_blowfish.phpt +++ b/ext/standard/tests/strings/crypt_blowfish.phpt @@ -1,11 +1,5 @@ --TEST-- Official blowfish tests (http://cvsweb.openwall.com/cgi/cvsweb.cgi/Owl/packages/glibc/crypt_blowfish/wrapper.c) ---SKIPIF-- -<?php -if (!function_exists('crypt') || !defined("CRYPT_BLOWFISH")) { - die("SKIP crypt()-blowfish is not available"); -} -?> --FILE-- <?php diff --git a/ext/standard/tests/strings/crypt_blowfish_variation1.phpt b/ext/standard/tests/strings/crypt_blowfish_variation1.phpt index 4436700104..5cfdbcfbfe 100644 --- a/ext/standard/tests/strings/crypt_blowfish_variation1.phpt +++ b/ext/standard/tests/strings/crypt_blowfish_variation1.phpt @@ -1,11 +1,5 @@ --TEST-- Test Blowfish crypt() with invalid rounds ---SKIPIF-- -<?php -if (!function_exists('crypt') || !defined("CRYPT_BLOWFISH")) { - die("SKIP crypt()-blowfish is not available"); -} -?> --FILE-- <?php diff --git a/ext/standard/tests/strings/crypt_chars.phpt b/ext/standard/tests/strings/crypt_chars.phpt index 09cd868216..c4e65016f1 100644 --- a/ext/standard/tests/strings/crypt_chars.phpt +++ b/ext/standard/tests/strings/crypt_chars.phpt @@ -1,11 +1,5 @@ --TEST-- crypt() function - characters > 0x80 ---SKIPIF-- -<?php -if (!function_exists('crypt')) { - die("SKIP crypt() is not available"); -} -?> --FILE-- <?php var_dump(crypt("À1234abcd", "99")); diff --git a/ext/standard/tests/strings/crypt_des_error.phpt b/ext/standard/tests/strings/crypt_des_error.phpt index f480efc470..6c77ccd9e0 100644 --- a/ext/standard/tests/strings/crypt_des_error.phpt +++ b/ext/standard/tests/strings/crypt_des_error.phpt @@ -1,11 +1,5 @@ --TEST-- crypt(): *0 should return *1 ---SKIPIF-- -<?php -if (!function_exists('crypt')) { - die("SKIP crypt() is not available"); -} -?> --FILE-- <?php diff --git a/ext/standard/tests/strings/crypt_sha256.phpt b/ext/standard/tests/strings/crypt_sha256.phpt index 27f107fc2b..c361dc48cb 100644 --- a/ext/standard/tests/strings/crypt_sha256.phpt +++ b/ext/standard/tests/strings/crypt_sha256.phpt @@ -1,11 +1,5 @@ --TEST-- crypt() SHA-256 ---SKIPIF-- -<?php -if (!function_exists('crypt') || !defined("CRYPT_SHA256")) { - die("SKIP crypt()-sha256 is not available"); -} -?> --FILE-- <?php @@ -59,5 +53,5 @@ Expected: <$t[2]> Got <$res>\n"; } echo "Passes.";?> ---EXPECTF-- +--EXPECT-- Passes. diff --git a/ext/standard/tests/strings/crypt_sha512.phpt b/ext/standard/tests/strings/crypt_sha512.phpt index 8d3de1b4d4..408a5a00c7 100644 --- a/ext/standard/tests/strings/crypt_sha512.phpt +++ b/ext/standard/tests/strings/crypt_sha512.phpt @@ -1,11 +1,5 @@ --TEST-- crypt() SHA-512 ---SKIPIF-- -<?php -if (!function_exists('crypt') || !defined("CRYPT_SHA512")) { - die("SKIP crypt()-sha512 is not available"); -} -?> --FILE-- <?php @@ -60,5 +54,5 @@ Got <$res>\n"; } echo "Passes."; ?> ---EXPECTF-- +--EXPECT-- Passes. diff --git a/ext/standard/tests/strings/crypt_variation1.phpt b/ext/standard/tests/strings/crypt_variation1.phpt index a0d4665f99..3f351a6de4 100644 --- a/ext/standard/tests/strings/crypt_variation1.phpt +++ b/ext/standard/tests/strings/crypt_variation1.phpt @@ -1,11 +1,5 @@ --TEST-- crypt() function - long salt ---SKIPIF-- -<?php -if (!function_exists('crypt')) { - die("SKIP crypt() is not available"); -} -?> --FILE-- <?php @@ -17,7 +11,7 @@ $b = str_repeat("A", 4096); echo crypt("A", "$5$" . $b)."\n"; ?> ---EXPECTF-- +--EXPECT-- $5$AAAAAAAAAAAAAAAA$frotiiztWZiwcncxnY5tWG9Ida2WOZEximjLXCleQu6 $5$AAAAAAAAAAAAAAAA$frotiiztWZiwcncxnY5tWG9Ida2WOZEximjLXCleQu6 $5$AAAAAAAAAAAAAAAA$frotiiztWZiwcncxnY5tWG9Ida2WOZEximjLXCleQu6 diff --git a/ext/standard/tests/strings/explode.phpt b/ext/standard/tests/strings/explode.phpt index 4c7a3fe45a..84cdcb985f 100644 --- a/ext/standard/tests/strings/explode.phpt +++ b/ext/standard/tests/strings/explode.phpt @@ -16,7 +16,7 @@ var_dump(@explode(NULL, "")); var_dump(@explode("a", "")); var_dump(@explode("a", "a")); var_dump(@explode("a", NULL)); -var_dump(@explode(NULL, a)); +var_dump(@explode(NULL, "a")); var_dump(@explode("abc", "acb")); var_dump(@explode("somestring", "otherstring")); var_dump(@explode("somestring", "otherstring", -1)); @@ -32,7 +32,7 @@ var_dump(explode(":","a lazy dog:jumps:over:",-40000000000000)); var_dump(explode(":^:","a lazy dog:^:jumps::over:^:",-1)); var_dump(explode(":^:","a lazy dog:^:jumps::over:^:",-2)); ?> ---EXPECTF-- +--EXPECT-- array ( 0 => 'a', 1 => 'b' . "\0" . 'd', diff --git a/ext/standard/tests/strings/explode_bug.phpt b/ext/standard/tests/strings/explode_bug.phpt index 9766f0b8f4..22d92ea7f5 100644 --- a/ext/standard/tests/strings/explode_bug.phpt +++ b/ext/standard/tests/strings/explode_bug.phpt @@ -8,7 +8,7 @@ memory_limit=256M $res = explode(str_repeat("A",145999999),1); var_dump($res); ?> ---EXPECTF-- +--EXPECT-- array(1) { [0]=> string(1) "1" diff --git a/ext/standard/tests/strings/explode_variation3.phpt b/ext/standard/tests/strings/explode_variation3.phpt index ee072ef066..34c1cdffc3 100644 --- a/ext/standard/tests/strings/explode_variation3.phpt +++ b/ext/standard/tests/strings/explode_variation3.phpt @@ -177,15 +177,15 @@ array(6) { } -- Iteration 10 -- -Warning: explode() expects parameter 3 to be integer, array given in %s on line %d +Warning: explode() expects parameter 3 to be int, array given in %s on line %d NULL -- Iteration 11 -- -Warning: explode() expects parameter 3 to be integer, array given in %s on line %d +Warning: explode() expects parameter 3 to be int, array given in %s on line %d NULL -- Iteration 12 -- -Warning: explode() expects parameter 3 to be integer, array given in %s on line %d +Warning: explode() expects parameter 3 to be int, array given in %s on line %d NULL -- Iteration 13 -- array(1) { @@ -219,11 +219,11 @@ array(1) { } -- Iteration 19 -- -Warning: explode() expects parameter 3 to be integer, object given in %s on line %d +Warning: explode() expects parameter 3 to be int, object given in %s on line %d NULL -- Iteration 20 -- -Warning: explode() expects parameter 3 to be integer, resource given in %s on line %d +Warning: explode() expects parameter 3 to be int, resource given in %s on line %d NULL -- Iteration 21 -- array(1) { diff --git a/ext/standard/tests/strings/fprintf_variation_001.phpt b/ext/standard/tests/strings/fprintf_variation_001.phpt index f08d5cbee7..3a935107a7 100644 --- a/ext/standard/tests/strings/fprintf_variation_001.phpt +++ b/ext/standard/tests/strings/fprintf_variation_001.phpt @@ -38,7 +38,7 @@ echo "\nDone"; unlink($data_file); ?> ---EXPECTF-- +--EXPECT-- *** Testing fprintf() with floats *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/fprintf_variation_002.phpt b/ext/standard/tests/strings/fprintf_variation_002.phpt index fb3ab6c14a..49e62e2b74 100644 --- a/ext/standard/tests/strings/fprintf_variation_002.phpt +++ b/ext/standard/tests/strings/fprintf_variation_002.phpt @@ -38,7 +38,7 @@ echo "\nDone"; unlink($data_file); ?> ---EXPECTF-- +--EXPECT-- *** Testing fprintf() with integers *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/fprintf_variation_003.phpt b/ext/standard/tests/strings/fprintf_variation_003.phpt index c312c49d67..b4860879b0 100644 --- a/ext/standard/tests/strings/fprintf_variation_003.phpt +++ b/ext/standard/tests/strings/fprintf_variation_003.phpt @@ -33,7 +33,7 @@ echo "\nDone"; unlink($data_file); ?> ---EXPECTF-- +--EXPECT-- *** Testing fprintf() with binary *** 0 diff --git a/ext/standard/tests/strings/fprintf_variation_003_64bit.phpt b/ext/standard/tests/strings/fprintf_variation_003_64bit.phpt index 448f5281d5..ba8e525c3f 100644 --- a/ext/standard/tests/strings/fprintf_variation_003_64bit.phpt +++ b/ext/standard/tests/strings/fprintf_variation_003_64bit.phpt @@ -33,7 +33,7 @@ echo "\nDone"; unlink($data_file); ?> ---EXPECTF-- +--EXPECT-- *** Testing fprintf() with binary *** 0 diff --git a/ext/standard/tests/strings/fprintf_variation_005.phpt b/ext/standard/tests/strings/fprintf_variation_005.phpt index 75636ac98e..0967b77cd8 100644 --- a/ext/standard/tests/strings/fprintf_variation_005.phpt +++ b/ext/standard/tests/strings/fprintf_variation_005.phpt @@ -32,7 +32,7 @@ echo "\nDone"; unlink($data_file); ?> ---EXPECTF-- +--EXPECT-- *** Testing fprintf() for scientific type *** 0.000000e+0 diff --git a/ext/standard/tests/strings/fprintf_variation_006.phpt b/ext/standard/tests/strings/fprintf_variation_006.phpt index d7a3278577..8a66fb9fb4 100644 --- a/ext/standard/tests/strings/fprintf_variation_006.phpt +++ b/ext/standard/tests/strings/fprintf_variation_006.phpt @@ -33,7 +33,7 @@ echo "\nDone"; unlink($data_file); ?> ---EXPECTF-- +--EXPECT-- *** Testing fprintf() for unsigned integers *** 0 diff --git a/ext/standard/tests/strings/fprintf_variation_006_64bit.phpt b/ext/standard/tests/strings/fprintf_variation_006_64bit.phpt index d68683e3ee..fe4cc91dd7 100644 --- a/ext/standard/tests/strings/fprintf_variation_006_64bit.phpt +++ b/ext/standard/tests/strings/fprintf_variation_006_64bit.phpt @@ -33,7 +33,7 @@ echo "\nDone"; unlink($data_file); ?> ---EXPECTF-- +--EXPECT-- *** Testing fprintf() for unsigned integers *** 0 diff --git a/ext/standard/tests/strings/fprintf_variation_007.phpt b/ext/standard/tests/strings/fprintf_variation_007.phpt index cb09084b73..16d39bbde3 100644 --- a/ext/standard/tests/strings/fprintf_variation_007.phpt +++ b/ext/standard/tests/strings/fprintf_variation_007.phpt @@ -33,7 +33,7 @@ echo "\nDone"; unlink($data_file); ?> ---EXPECTF-- +--EXPECT-- *** Testing fprintf() for octals *** 0 diff --git a/ext/standard/tests/strings/fprintf_variation_007_64bit.phpt b/ext/standard/tests/strings/fprintf_variation_007_64bit.phpt index c8481e9fd2..55cd946a3b 100644 --- a/ext/standard/tests/strings/fprintf_variation_007_64bit.phpt +++ b/ext/standard/tests/strings/fprintf_variation_007_64bit.phpt @@ -33,7 +33,7 @@ echo "\nDone"; unlink($data_file); ?> ---EXPECTF-- +--EXPECT-- *** Testing fprintf() for octals *** 0 diff --git a/ext/standard/tests/strings/fprintf_variation_008.phpt b/ext/standard/tests/strings/fprintf_variation_008.phpt index f91e7a1a99..d2187c7ccd 100644 --- a/ext/standard/tests/strings/fprintf_variation_008.phpt +++ b/ext/standard/tests/strings/fprintf_variation_008.phpt @@ -34,7 +34,7 @@ echo "\nDone"; unlink($data_file); ?> ---EXPECTF-- +--EXPECT-- *** Testing fprintf() for hexadecimals *** 0 diff --git a/ext/standard/tests/strings/fprintf_variation_008_64bit.phpt b/ext/standard/tests/strings/fprintf_variation_008_64bit.phpt index f619510227..9d326a91c1 100644 --- a/ext/standard/tests/strings/fprintf_variation_008_64bit.phpt +++ b/ext/standard/tests/strings/fprintf_variation_008_64bit.phpt @@ -34,7 +34,7 @@ echo "\nDone"; unlink($data_file); ?> ---EXPECTF-- +--EXPECT-- *** Testing fprintf() for hexadecimals *** 0 diff --git a/ext/standard/tests/strings/fprintf_variation_009.phpt b/ext/standard/tests/strings/fprintf_variation_009.phpt index 40f36bb5f0..e36c0e8c0f 100644 --- a/ext/standard/tests/strings/fprintf_variation_009.phpt +++ b/ext/standard/tests/strings/fprintf_variation_009.phpt @@ -38,7 +38,7 @@ echo "\nDone"; unlink($data_file); ?> ---EXPECTF-- +--EXPECT-- *** Testing fprintf() for string types *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/get_html_translation_table_basic3.phpt b/ext/standard/tests/strings/get_html_translation_table_basic3.phpt index 4e1cdddd29..9fe832eab2 100644 --- a/ext/standard/tests/strings/get_html_translation_table_basic3.phpt +++ b/ext/standard/tests/strings/get_html_translation_table_basic3.phpt @@ -33,7 +33,7 @@ var_dump( $tt ); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing get_html_translation_table() : basic functionality *** -- with table = HTML_SPECIALCHARS & quote_style = ENT_COMPAT -- array(4) { diff --git a/ext/standard/tests/strings/get_html_translation_table_basic4.phpt b/ext/standard/tests/strings/get_html_translation_table_basic4.phpt index 95a5468912..8ec12b2364 100644 --- a/ext/standard/tests/strings/get_html_translation_table_basic4.phpt +++ b/ext/standard/tests/strings/get_html_translation_table_basic4.phpt @@ -24,7 +24,7 @@ var_dump( $tt ); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing get_html_translation_table() : basic functionality/Windows-1252 *** -- with table = HTML_ENTITIES -- array(125) { diff --git a/ext/standard/tests/strings/get_html_translation_table_variation1.phpt b/ext/standard/tests/strings/get_html_translation_table_variation1.phpt index 72aec08648..0794853e8e 100644 --- a/ext/standard/tests/strings/get_html_translation_table_variation1.phpt +++ b/ext/standard/tests/strings/get_html_translation_table_variation1.phpt @@ -49,7 +49,7 @@ $values = array ( "", '', - // null vlaues + // null values NULL, null, @@ -106,38 +106,38 @@ echo "Done\n"; --- Testing get_html_translation_table() by supplying different values for 'table' argument --- -- Iteration 1 -- -Warning: get_html_translation_table() expects parameter 1 to be integer, array given in %s on line %d +Warning: get_html_translation_table() expects parameter 1 to be int, array given in %s on line %d NULL -Warning: get_html_translation_table() expects parameter 1 to be integer, array given in %s on line %d +Warning: get_html_translation_table() expects parameter 1 to be int, array given in %s on line %d NULL -- Iteration 2 -- -Warning: get_html_translation_table() expects parameter 1 to be integer, array given in %s on line %d +Warning: get_html_translation_table() expects parameter 1 to be int, array given in %s on line %d NULL -Warning: get_html_translation_table() expects parameter 1 to be integer, array given in %s on line %d +Warning: get_html_translation_table() expects parameter 1 to be int, array given in %s on line %d NULL -- Iteration 3 -- -Warning: get_html_translation_table() expects parameter 1 to be integer, array given in %s on line %d +Warning: get_html_translation_table() expects parameter 1 to be int, array given in %s on line %d NULL -Warning: get_html_translation_table() expects parameter 1 to be integer, array given in %s on line %d +Warning: get_html_translation_table() expects parameter 1 to be int, array given in %s on line %d NULL -- Iteration 4 -- -Warning: get_html_translation_table() expects parameter 1 to be integer, array given in %s on line %d +Warning: get_html_translation_table() expects parameter 1 to be int, array given in %s on line %d NULL -Warning: get_html_translation_table() expects parameter 1 to be integer, array given in %s on line %d +Warning: get_html_translation_table() expects parameter 1 to be int, array given in %s on line %d NULL -- Iteration 5 -- -Warning: get_html_translation_table() expects parameter 1 to be integer, array given in %s on line %d +Warning: get_html_translation_table() expects parameter 1 to be int, array given in %s on line %d NULL -Warning: get_html_translation_table() expects parameter 1 to be integer, array given in %s on line %d +Warning: get_html_translation_table() expects parameter 1 to be int, array given in %s on line %d NULL -- Iteration 6 -- int(252) @@ -189,38 +189,38 @@ array(4) { } -- Iteration 10 -- -Warning: get_html_translation_table() expects parameter 1 to be integer, string given in %s on line %d +Warning: get_html_translation_table() expects parameter 1 to be int, string given in %s on line %d NULL -Warning: get_html_translation_table() expects parameter 1 to be integer, string given in %s on line %d +Warning: get_html_translation_table() expects parameter 1 to be int, string given in %s on line %d NULL -- Iteration 11 -- -Warning: get_html_translation_table() expects parameter 1 to be integer, string given in %s on line %d +Warning: get_html_translation_table() expects parameter 1 to be int, string given in %s on line %d NULL -Warning: get_html_translation_table() expects parameter 1 to be integer, string given in %s on line %d +Warning: get_html_translation_table() expects parameter 1 to be int, string given in %s on line %d NULL -- Iteration 12 -- -Warning: get_html_translation_table() expects parameter 1 to be integer, object given in %s on line %d +Warning: get_html_translation_table() expects parameter 1 to be int, object given in %s on line %d NULL -Warning: get_html_translation_table() expects parameter 1 to be integer, object given in %s on line %d +Warning: get_html_translation_table() expects parameter 1 to be int, object given in %s on line %d NULL -- Iteration 13 -- -Warning: get_html_translation_table() expects parameter 1 to be integer, string given in %s on line %d +Warning: get_html_translation_table() expects parameter 1 to be int, string given in %s on line %d NULL -Warning: get_html_translation_table() expects parameter 1 to be integer, string given in %s on line %d +Warning: get_html_translation_table() expects parameter 1 to be int, string given in %s on line %d NULL -- Iteration 14 -- -Warning: get_html_translation_table() expects parameter 1 to be integer, string given in %s on line %d +Warning: get_html_translation_table() expects parameter 1 to be int, string given in %s on line %d NULL -Warning: get_html_translation_table() expects parameter 1 to be integer, string given in %s on line %d +Warning: get_html_translation_table() expects parameter 1 to be int, string given in %s on line %d NULL -- Iteration 15 -- array(4) { @@ -266,10 +266,10 @@ array(4) { } -- Iteration 17 -- -Warning: get_html_translation_table() expects parameter 1 to be integer, resource given in %s on line %d +Warning: get_html_translation_table() expects parameter 1 to be int, resource given in %s on line %d NULL -Warning: get_html_translation_table() expects parameter 1 to be integer, resource given in %s on line %d +Warning: get_html_translation_table() expects parameter 1 to be int, resource given in %s on line %d NULL -- Iteration 18 -- array(4) { diff --git a/ext/standard/tests/strings/get_html_translation_table_variation2.phpt b/ext/standard/tests/strings/get_html_translation_table_variation2.phpt index 459cd4fcd5..8d9fe0af56 100644 --- a/ext/standard/tests/strings/get_html_translation_table_variation2.phpt +++ b/ext/standard/tests/strings/get_html_translation_table_variation2.phpt @@ -52,7 +52,7 @@ $values = array ( "", '', - // null vlaues + // null values NULL, null, @@ -88,23 +88,23 @@ echo "Done\n"; --- Testing get_html_translation_table() by supplying different values for 'quote_style' argument --- -- Iteration 1 -- -Warning: get_html_translation_table() expects parameter 2 to be integer, array given in %s on line %s +Warning: get_html_translation_table() expects parameter 2 to be int, array given in %s on line %d NULL -- Iteration 2 -- -Warning: get_html_translation_table() expects parameter 2 to be integer, array given in %s on line %s +Warning: get_html_translation_table() expects parameter 2 to be int, array given in %s on line %d NULL -- Iteration 3 -- -Warning: get_html_translation_table() expects parameter 2 to be integer, array given in %s on line %s +Warning: get_html_translation_table() expects parameter 2 to be int, array given in %s on line %d NULL -- Iteration 4 -- -Warning: get_html_translation_table() expects parameter 2 to be integer, array given in %s on line %s +Warning: get_html_translation_table() expects parameter 2 to be int, array given in %s on line %d NULL -- Iteration 5 -- -Warning: get_html_translation_table() expects parameter 2 to be integer, array given in %s on line %s +Warning: get_html_translation_table() expects parameter 2 to be int, array given in %s on line %d NULL -- Iteration 6 -- array(4) { @@ -148,23 +148,23 @@ array(3) { } -- Iteration 10 -- -Warning: get_html_translation_table() expects parameter 2 to be integer, string given in %s on line %s +Warning: get_html_translation_table() expects parameter 2 to be int, string given in %s on line %d NULL -- Iteration 11 -- -Warning: get_html_translation_table() expects parameter 2 to be integer, string given in %s on line %s +Warning: get_html_translation_table() expects parameter 2 to be int, string given in %s on line %d NULL -- Iteration 12 -- -Warning: get_html_translation_table() expects parameter 2 to be integer, object given in %s on line %s +Warning: get_html_translation_table() expects parameter 2 to be int, object given in %s on line %d NULL -- Iteration 13 -- -Warning: get_html_translation_table() expects parameter 2 to be integer, string given in %s on line %s +Warning: get_html_translation_table() expects parameter 2 to be int, string given in %s on line %d NULL -- Iteration 14 -- -Warning: get_html_translation_table() expects parameter 2 to be integer, string given in %s on line %s +Warning: get_html_translation_table() expects parameter 2 to be int, string given in %s on line %d NULL -- Iteration 15 -- array(3) { @@ -186,7 +186,7 @@ array(3) { } -- Iteration 17 -- -Warning: get_html_translation_table() expects parameter 2 to be integer, resource given in %s on line %s +Warning: get_html_translation_table() expects parameter 2 to be int, resource given in %s on line %d NULL -- Iteration 18 -- array(3) { diff --git a/ext/standard/tests/strings/get_meta_tags.phpt b/ext/standard/tests/strings/get_meta_tags.phpt index ba944d7a95..cc29995046 100644 --- a/ext/standard/tests/strings/get_meta_tags.phpt +++ b/ext/standard/tests/strings/get_meta_tags.phpt @@ -55,7 +55,7 @@ foreach ($array as $html) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- array(4) { ["author"]=> string(4) "name" diff --git a/ext/standard/tests/strings/hebrev_basic.phpt b/ext/standard/tests/strings/hebrev_basic.phpt index f583152047..cc32d654e8 100644 --- a/ext/standard/tests/strings/hebrev_basic.phpt +++ b/ext/standard/tests/strings/hebrev_basic.phpt @@ -17,7 +17,7 @@ var_dump(hebrev($hebrew_text, 15)); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing hebrev() : basic functionality *** string(109) ".The hebrev function converts logical Hebrew text to visual text .The function tries to avoid breaking words diff --git a/ext/standard/tests/strings/hebrev_variation2.phpt b/ext/standard/tests/strings/hebrev_variation2.phpt index 2c72588b42..f312472c82 100644 --- a/ext/standard/tests/strings/hebrev_variation2.phpt +++ b/ext/standard/tests/strings/hebrev_variation2.phpt @@ -180,15 +180,15 @@ string(109) ".The hebrev function converts logical Hebrew text to visual text " -- Iteration 10 -- -Warning: hebrev() expects parameter 2 to be integer, array given in %s on line %d +Warning: hebrev() expects parameter 2 to be int, array given in %s on line %d NULL -- Iteration 11 -- -Warning: hebrev() expects parameter 2 to be integer, array given in %s on line %d +Warning: hebrev() expects parameter 2 to be int, array given in %s on line %d NULL -- Iteration 12 -- -Warning: hebrev() expects parameter 2 to be integer, array given in %s on line %d +Warning: hebrev() expects parameter 2 to be int, array given in %s on line %d NULL -- Iteration 13 -- string(109) "xttel uaisv @@ -230,11 +230,11 @@ string(109) ".The hebrev function converts logical Hebrew text to visual text " -- Iteration 19 -- -Warning: hebrev() expects parameter 2 to be integer, string given in %s on line %d +Warning: hebrev() expects parameter 2 to be int, string given in %s on line %d NULL -- Iteration 20 -- -Warning: hebrev() expects parameter 2 to be integer, string given in %s on line %d +Warning: hebrev() expects parameter 2 to be int, string given in %s on line %d NULL -- Iteration 21 -- @@ -266,11 +266,11 @@ string(109) ".The hebrev function converts logical Hebrew text to visual text " -- Iteration 24 -- -Warning: hebrev() expects parameter 2 to be integer, object given in %s on line %d +Warning: hebrev() expects parameter 2 to be int, object given in %s on line %d NULL -- Iteration 25 -- -Warning: hebrev() expects parameter 2 to be integer, resource given in %s on line %d +Warning: hebrev() expects parameter 2 to be int, resource given in %s on line %d NULL -- Iteration 26 -- string(109) ".The hebrev function converts logical Hebrew text to visual text diff --git a/ext/standard/tests/strings/hebrevc_basic.phpt b/ext/standard/tests/strings/hebrevc_basic.phpt index 1066a4fcb0..d8b4a5484b 100644 --- a/ext/standard/tests/strings/hebrevc_basic.phpt +++ b/ext/standard/tests/strings/hebrevc_basic.phpt @@ -17,7 +17,7 @@ var_dump(hebrevc($hebrew_text, 15)); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing hebrevc() : basic functionality *** string(239) ".The hebrevc function converts logical Hebrew text to visual text<br /> ) This function is similar to hebrev() with the difference that it converts newlines<br /> diff --git a/ext/standard/tests/strings/hebrevc_variation2.phpt b/ext/standard/tests/strings/hebrevc_variation2.phpt index 33c331b94c..334d128989 100644 --- a/ext/standard/tests/strings/hebrevc_variation2.phpt +++ b/ext/standard/tests/strings/hebrevc_variation2.phpt @@ -254,15 +254,15 @@ string(241) ".The hebrevcc function converts logical Hebrew text to visual text< " -- Iteration 10 -- -Warning: hebrevc() expects parameter 2 to be integer, array given in %s on line %d +Warning: hebrevc() expects parameter 2 to be int, array given in %s on line %d NULL -- Iteration 11 -- -Warning: hebrevc() expects parameter 2 to be integer, array given in %s on line %d +Warning: hebrevc() expects parameter 2 to be int, array given in %s on line %d NULL -- Iteration 12 -- -Warning: hebrevc() expects parameter 2 to be integer, array given in %s on line %d +Warning: hebrevc() expects parameter 2 to be int, array given in %s on line %d NULL -- Iteration 13 -- string(331) "xttel uaisv<br /> @@ -338,11 +338,11 @@ string(241) ".The hebrevcc function converts logical Hebrew text to visual text< " -- Iteration 19 -- -Warning: hebrevc() expects parameter 2 to be integer, string given in %s on line %d +Warning: hebrevc() expects parameter 2 to be int, string given in %s on line %d NULL -- Iteration 20 -- -Warning: hebrevc() expects parameter 2 to be integer, string given in %s on line %d +Warning: hebrevc() expects parameter 2 to be int, string given in %s on line %d NULL -- Iteration 21 -- @@ -391,11 +391,11 @@ string(241) ".The hebrevcc function converts logical Hebrew text to visual text< " -- Iteration 24 -- -Warning: hebrevc() expects parameter 2 to be integer, object given in %s on line %d +Warning: hebrevc() expects parameter 2 to be int, object given in %s on line %d NULL -- Iteration 25 -- -Warning: hebrevc() expects parameter 2 to be integer, resource given in %s on line %d +Warning: hebrevc() expects parameter 2 to be int, resource given in %s on line %d NULL -- Iteration 26 -- string(241) ".The hebrevcc function converts logical Hebrew text to visual text<br /> diff --git a/ext/standard/tests/strings/hex2bin_basic.phpt b/ext/standard/tests/strings/hex2bin_basic.phpt index 8f3437d5e5..c8c54d24b1 100644 --- a/ext/standard/tests/strings/hex2bin_basic.phpt +++ b/ext/standard/tests/strings/hex2bin_basic.phpt @@ -11,7 +11,7 @@ var_dump(bin2hex(hex2bin('123abc')) == '123abc'); var_dump(bin2hex(hex2bin('FFFFFF')) == 'ffffff'); ?> ---EXPECTF-- +--EXPECT-- bool(true) bool(true) bool(true) diff --git a/ext/standard/tests/strings/htmlentities-utf-2.phpt b/ext/standard/tests/strings/htmlentities-utf-2.phpt index 25391d5752..3c0b9dde71 100644 --- a/ext/standard/tests/strings/htmlentities-utf-2.phpt +++ b/ext/standard/tests/strings/htmlentities-utf-2.phpt @@ -17,7 +17,7 @@ foreach($strings as $string) { var_dump(bin2hex($ent_encoded)); } ?> ---EXPECTF-- +--EXPECT-- string(8) "266c743b" string(8) "266c743b" string(0) "" diff --git a/ext/standard/tests/strings/htmlentities-utf.phpt b/ext/standard/tests/strings/htmlentities-utf.phpt index 6ad1920343..215f500c91 100644 --- a/ext/standard/tests/strings/htmlentities-utf.phpt +++ b/ext/standard/tests/strings/htmlentities-utf.phpt @@ -17,7 +17,7 @@ foreach($strings as $string) { var_dump(bin2hex($ent_encoded)); } ?> ---EXPECTF-- +--EXPECT-- string(8) "266c743b" string(8) "266c743b" string(0) "" diff --git a/ext/standard/tests/strings/htmlspecialchars_decode_basic.phpt b/ext/standard/tests/strings/htmlspecialchars_decode_basic.phpt index cd78c32206..c43d385563 100644 --- a/ext/standard/tests/strings/htmlspecialchars_decode_basic.phpt +++ b/ext/standard/tests/strings/htmlspecialchars_decode_basic.phpt @@ -29,7 +29,7 @@ var_dump( htmlspecialchars_decode($double_quote_string, ENT_QUOTES) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing htmlspecialchars_decode() : basic functionality *** string(92) "Roy's height > Sam's height. 13 < 25. 1111 & 0000 = 0000. " double quoted string "" string(92) "Roy's height > Sam's height. 13 < 25. 1111 & 0000 = 0000. " double quoted string "" diff --git a/ext/standard/tests/strings/htmlspecialchars_decode_variation2.phpt b/ext/standard/tests/strings/htmlspecialchars_decode_variation2.phpt index da53b0dcc1..4a8f165e9c 100644 --- a/ext/standard/tests/strings/htmlspecialchars_decode_variation2.phpt +++ b/ext/standard/tests/strings/htmlspecialchars_decode_variation2.phpt @@ -103,7 +103,7 @@ string(104) "<html>Roy's height > Sam's height. 13 < 15. 1111 & 0000 = -- Iteration 3 -- -Warning: htmlspecialchars_decode() expects parameter 2 to be integer, float given in %s on line %d +Warning: htmlspecialchars_decode() expects parameter 2 to be int, float given in %s on line %d NULL -- Iteration 4 -- @@ -114,27 +114,27 @@ string(114) "<html>Roy's height > Sam's height. 13 < 15. 1111 & 0000 = -- Iteration 6 -- -Warning: htmlspecialchars_decode() expects parameter 2 to be integer, array given in %shtmlspecialchars_decode_variation2.php on line %d +Warning: htmlspecialchars_decode() expects parameter 2 to be int, array given in %shtmlspecialchars_decode_variation2.php on line %d NULL -- Iteration 7 -- -Warning: htmlspecialchars_decode() expects parameter 2 to be integer, array given in %shtmlspecialchars_decode_variation2.php on line %d +Warning: htmlspecialchars_decode() expects parameter 2 to be int, array given in %shtmlspecialchars_decode_variation2.php on line %d NULL -- Iteration 8 -- -Warning: htmlspecialchars_decode() expects parameter 2 to be integer, array given in %shtmlspecialchars_decode_variation2.php on line %d +Warning: htmlspecialchars_decode() expects parameter 2 to be int, array given in %shtmlspecialchars_decode_variation2.php on line %d NULL -- Iteration 9 -- -Warning: htmlspecialchars_decode() expects parameter 2 to be integer, array given in %shtmlspecialchars_decode_variation2.php on line %d +Warning: htmlspecialchars_decode() expects parameter 2 to be int, array given in %shtmlspecialchars_decode_variation2.php on line %d NULL -- Iteration 10 -- -Warning: htmlspecialchars_decode() expects parameter 2 to be integer, array given in %shtmlspecialchars_decode_variation2.php on line %d +Warning: htmlspecialchars_decode() expects parameter 2 to be int, array given in %shtmlspecialchars_decode_variation2.php on line %d NULL -- Iteration 11 -- @@ -157,27 +157,27 @@ string(114) "<html>Roy's height > Sam's height. 13 < 15. 1111 & 0000 = -- Iteration 17 -- -Warning: htmlspecialchars_decode() expects parameter 2 to be integer, string given in %shtmlspecialchars_decode_variation2.php on line %d +Warning: htmlspecialchars_decode() expects parameter 2 to be int, string given in %shtmlspecialchars_decode_variation2.php on line %d NULL -- Iteration 18 -- -Warning: htmlspecialchars_decode() expects parameter 2 to be integer, string given in %shtmlspecialchars_decode_variation2.php on line %d +Warning: htmlspecialchars_decode() expects parameter 2 to be int, string given in %shtmlspecialchars_decode_variation2.php on line %d NULL -- Iteration 19 -- -Warning: htmlspecialchars_decode() expects parameter 2 to be integer, string given in %shtmlspecialchars_decode_variation2.php on line %d +Warning: htmlspecialchars_decode() expects parameter 2 to be int, string given in %shtmlspecialchars_decode_variation2.php on line %d NULL -- Iteration 20 -- -Warning: htmlspecialchars_decode() expects parameter 2 to be integer, string given in %shtmlspecialchars_decode_variation2.php on line %d +Warning: htmlspecialchars_decode() expects parameter 2 to be int, string given in %shtmlspecialchars_decode_variation2.php on line %d NULL -- Iteration 21 -- -Warning: htmlspecialchars_decode() expects parameter 2 to be integer, object given in %shtmlspecialchars_decode_variation2.php on line %d +Warning: htmlspecialchars_decode() expects parameter 2 to be int, object given in %shtmlspecialchars_decode_variation2.php on line %d NULL -- Iteration 22 -- @@ -188,6 +188,6 @@ string(114) "<html>Roy's height > Sam's height. 13 < 15. 1111 & 0000 = -- Iteration 24 -- -Warning: htmlspecialchars_decode() expects parameter 2 to be integer, resource given in %shtmlspecialchars_decode_variation2.php on line %d +Warning: htmlspecialchars_decode() expects parameter 2 to be int, resource given in %shtmlspecialchars_decode_variation2.php on line %d NULL Done diff --git a/ext/standard/tests/strings/htmlspecialchars_decode_variation3.phpt b/ext/standard/tests/strings/htmlspecialchars_decode_variation3.phpt index 28bc6068fa..de96c04db4 100644 --- a/ext/standard/tests/strings/htmlspecialchars_decode_variation3.phpt +++ b/ext/standard/tests/strings/htmlspecialchars_decode_variation3.phpt @@ -71,7 +71,7 @@ for($index =0; $index < count($res_heredoc_strings); $index ++) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing htmlspecialchars_decode() : usage variations *** -- Iteration 1 -- string(0) "" diff --git a/ext/standard/tests/strings/htmlspecialchars_decode_variation4.phpt b/ext/standard/tests/strings/htmlspecialchars_decode_variation4.phpt index 65b5c58b96..7520dee09c 100644 --- a/ext/standard/tests/strings/htmlspecialchars_decode_variation4.phpt +++ b/ext/standard/tests/strings/htmlspecialchars_decode_variation4.phpt @@ -35,7 +35,7 @@ foreach($values as $value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing htmlspecialchars_decode() : usage variations *** -- Iteration 1 -- string(90) "Roy's height > Sam's \$height... 1111 ≈ 0000 = 0000... " double quote string "" diff --git a/ext/standard/tests/strings/htmlspecialchars_decode_variation5.phpt b/ext/standard/tests/strings/htmlspecialchars_decode_variation5.phpt index d8fb8333ea..b07f21acf6 100644 --- a/ext/standard/tests/strings/htmlspecialchars_decode_variation5.phpt +++ b/ext/standard/tests/strings/htmlspecialchars_decode_variation5.phpt @@ -34,7 +34,7 @@ foreach($strings as $value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing htmlspecialchars_decode() : usage variations *** -- Iteration 1 -- string(89) "Roy's height > Sam's $height... 1111 ≈ 0000 = 0000... " double quote string "" diff --git a/ext/standard/tests/strings/htmlspecialchars_decode_variation6.phpt b/ext/standard/tests/strings/htmlspecialchars_decode_variation6.phpt Binary files differindex 7991547d3b..596a883be2 100644 --- a/ext/standard/tests/strings/htmlspecialchars_decode_variation6.phpt +++ b/ext/standard/tests/strings/htmlspecialchars_decode_variation6.phpt diff --git a/ext/standard/tests/strings/http_build_query_variation1.phpt b/ext/standard/tests/strings/http_build_query_variation1.phpt index 4532fe18af..7b73982c0c 100644 --- a/ext/standard/tests/strings/http_build_query_variation1.phpt +++ b/ext/standard/tests/strings/http_build_query_variation1.phpt @@ -25,6 +25,6 @@ $obj->sort = 'desc,name'; echo http_build_query($obj) . PHP_EOL; echo http_build_query(new UrlBuilder()); ?> ---EXPECTF-- +--EXPECT-- name=homepage&page=1&sort=desc%2Cname name=homepage&page=1 diff --git a/ext/standard/tests/strings/http_build_query_variation2.phpt b/ext/standard/tests/strings/http_build_query_variation2.phpt index 07b362352d..2b8ca148ff 100644 --- a/ext/standard/tests/strings/http_build_query_variation2.phpt +++ b/ext/standard/tests/strings/http_build_query_variation2.phpt @@ -34,6 +34,6 @@ $mDimensional = array( echo http_build_query($mDimensional) . PHP_EOL; echo http_build_query($mDimensional, 'prefix_'); ?> ---EXPECTF-- +--EXPECT-- 0=20&5=13&9%5B1%5D=val1&9%5B3%5D=val2&9%5Bstring%5D=string&name=homepage&page=10&sort%5B0%5D=desc&sort%5Badmin%5D%5B0%5D=admin1&sort%5Badmin%5D%5Badmin2%5D%5Bwho%5D=admin2&sort%5Badmin%5D%5Badmin2%5D%5B2%5D=test prefix_0=20&prefix_5=13&prefix_9%5B1%5D=val1&prefix_9%5B3%5D=val2&prefix_9%5Bstring%5D=string&name=homepage&page=10&sort%5B0%5D=desc&sort%5Badmin%5D%5B0%5D=admin1&sort%5Badmin%5D%5Badmin2%5D%5Bwho%5D=admin2&sort%5Badmin%5D%5Badmin2%5D%5B2%5D=test diff --git a/ext/standard/tests/strings/http_build_query_variation3.phpt b/ext/standard/tests/strings/http_build_query_variation3.phpt index 5b9ea371d2..c9b03141bf 100644 --- a/ext/standard/tests/strings/http_build_query_variation3.phpt +++ b/ext/standard/tests/strings/http_build_query_variation3.phpt @@ -18,6 +18,6 @@ $oDimensional = array( echo http_build_query($oDimensional, '', ini_get('arg_separator.output'), PHP_QUERY_RFC1738) . PHP_EOL; echo http_build_query($oDimensional, '', ini_get('arg_separator.output'), PHP_QUERY_RFC3986); ?> ---EXPECTF-- +--EXPECT-- name=main+page&sort=desc%2Cadmin&equation=10+%2B+10+-+5 name=main%20page&sort=desc%2Cadmin&equation=10%20%2B%2010%20-%205 diff --git a/ext/standard/tests/strings/join_basic.phpt b/ext/standard/tests/strings/join_basic.phpt index 44e7f093c8..483976d942 100644 --- a/ext/standard/tests/strings/join_basic.phpt +++ b/ext/standard/tests/strings/join_basic.phpt @@ -34,7 +34,7 @@ var_dump( join($glue, $pieces) ); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing join() : basic functionality *** string(7) "1,2,3,4" string(30) "Red, Green, Blue, Black, White" diff --git a/ext/standard/tests/strings/join_variation1.phpt b/ext/standard/tests/strings/join_variation1.phpt index 41f2e32d77..e298fec6ae 100644 --- a/ext/standard/tests/strings/join_variation1.phpt +++ b/ext/standard/tests/strings/join_variation1.phpt @@ -68,7 +68,7 @@ $values = array ( "", '', - // null vlaues + // null values NULL, null, diff --git a/ext/standard/tests/strings/join_variation2.phpt b/ext/standard/tests/strings/join_variation2.phpt index 1cc4b5fe5c..03b3250b40 100644 --- a/ext/standard/tests/strings/join_variation2.phpt +++ b/ext/standard/tests/strings/join_variation2.phpt @@ -66,7 +66,7 @@ $values = array ( "", '', - // null vlaues + // null values NULL, null, diff --git a/ext/standard/tests/strings/join_variation6.phpt b/ext/standard/tests/strings/join_variation6.phpt Binary files differindex 71e7f9f42a..08938bfad7 100644 --- a/ext/standard/tests/strings/join_variation6.phpt +++ b/ext/standard/tests/strings/join_variation6.phpt diff --git a/ext/standard/tests/strings/md5_basic1.phpt b/ext/standard/tests/strings/md5_basic1.phpt index 6c12d59dc7..e9898cd0c0 100644 --- a/ext/standard/tests/strings/md5_basic1.phpt +++ b/ext/standard/tests/strings/md5_basic1.phpt @@ -11,7 +11,7 @@ echo "*** Testing md5() : basic functionality ***\n"; var_dump(md5("apple")); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing md5() : basic functionality *** string(32) "1f3870be274f6c49b3e31a0c6728957f" ===DONE=== diff --git a/ext/standard/tests/strings/moneyformat.phpt b/ext/standard/tests/strings/moneyformat.phpt index 39245772bc..0eec563a39 100644 --- a/ext/standard/tests/strings/moneyformat.phpt +++ b/ext/standard/tests/strings/moneyformat.phpt @@ -2,7 +2,7 @@ money_format test --SKIPIF-- <?php - if (!function_exists('money_format') || !function_exists('setlocale')) { + if (!function_exists('money_format')) { die("SKIP money_format - not supported\n"); } @@ -15,5 +15,5 @@ if (setlocale(LC_MONETARY, 'en_US') === false) { setlocale(LC_MONETARY, 'en_US'); var_dump( money_format("X%nY", 3.1415)); ?> ---EXPECTF-- +--EXPECT-- string(7) "X$3.14Y" diff --git a/ext/standard/tests/strings/nl2br_variation1.phpt b/ext/standard/tests/strings/nl2br_variation1.phpt index a3b863391a..1d1d6592b4 100644 --- a/ext/standard/tests/strings/nl2br_variation1.phpt +++ b/ext/standard/tests/strings/nl2br_variation1.phpt @@ -45,7 +45,7 @@ foreach( $strings as $str ){ } echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing nl2br() : usage variations *** -- Iteration 1 -- string(17) "Hello<br /> diff --git a/ext/standard/tests/strings/nl2br_variation2.phpt b/ext/standard/tests/strings/nl2br_variation2.phpt index a4423df319..79be6f5f03 100644 --- a/ext/standard/tests/strings/nl2br_variation2.phpt +++ b/ext/standard/tests/strings/nl2br_variation2.phpt @@ -43,7 +43,7 @@ foreach( $strings as $str ){ } echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing nl2br() : usage variations *** -- Iteration 1 -- string(2) "\n" diff --git a/ext/standard/tests/strings/nl2br_variation3.phpt b/ext/standard/tests/strings/nl2br_variation3.phpt index b1341d13d6..587518d1ee 100644 --- a/ext/standard/tests/strings/nl2br_variation3.phpt +++ b/ext/standard/tests/strings/nl2br_variation3.phpt @@ -34,7 +34,7 @@ var_dump(nl2br($heredoc_str2) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing nl2br() : usage variations *** string(147) "<br /> <br /> diff --git a/ext/standard/tests/strings/nl2br_variation4.phpt b/ext/standard/tests/strings/nl2br_variation4.phpt index 63931afaf0..04244dccce 100644 --- a/ext/standard/tests/strings/nl2br_variation4.phpt +++ b/ext/standard/tests/strings/nl2br_variation4.phpt @@ -28,7 +28,7 @@ foreach( $strings as $str ){ } echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing nl2br() : usage variations *** string(29) "<html>Hello<br />world</html>" string(19) "<html><br /></html>" diff --git a/ext/standard/tests/strings/nl_langinfo_basic.phpt b/ext/standard/tests/strings/nl_langinfo_basic.phpt index a03f734d52..c940479065 100644 --- a/ext/standard/tests/strings/nl_langinfo_basic.phpt +++ b/ext/standard/tests/strings/nl_langinfo_basic.phpt @@ -27,7 +27,7 @@ var_dump(nl_langinfo(RADIXCHAR)); setlocale(LC_ALL, $original); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing nl_langinfo() : basic functionality *** string(3) "Mon" string(9) "Wednesday" diff --git a/ext/standard/tests/strings/nl_langinfo_variation1.phpt b/ext/standard/tests/strings/nl_langinfo_variation1.phpt index 774dc6da6f..180991e400 100644 --- a/ext/standard/tests/strings/nl_langinfo_variation1.phpt +++ b/ext/standard/tests/strings/nl_langinfo_variation1.phpt @@ -83,22 +83,22 @@ Warning: nl_langinfo(): Item '-20' is not valid in %s on line %d bool(false) -- Iteration 4 -- -Warning: nl_langinfo() expects parameter 1 to be integer, array given in %s on line %d +Warning: nl_langinfo() expects parameter 1 to be int, array given in %s on line %d NULL -- Iteration 5 -- -Warning: nl_langinfo() expects parameter 1 to be integer, array given in %s on line %d +Warning: nl_langinfo() expects parameter 1 to be int, array given in %s on line %d NULL -- Iteration 6 -- -Warning: nl_langinfo() expects parameter 1 to be integer, array given in %s on line %d +Warning: nl_langinfo() expects parameter 1 to be int, array given in %s on line %d NULL -- Iteration 7 -- -Warning: nl_langinfo() expects parameter 1 to be integer, object given in %s on line %d +Warning: nl_langinfo() expects parameter 1 to be int, object given in %s on line %d NULL -- Iteration 8 -- -Warning: nl_langinfo() expects parameter 1 to be integer, resource given in %s on line %d +Warning: nl_langinfo() expects parameter 1 to be int, resource given in %s on line %d NULL ===DONE=== diff --git a/ext/standard/tests/strings/number_format_basic.phpt b/ext/standard/tests/strings/number_format_basic.phpt index b52e65953b..79ec7b85ac 100644 --- a/ext/standard/tests/strings/number_format_basic.phpt +++ b/ext/standard/tests/strings/number_format_basic.phpt @@ -48,7 +48,7 @@ for ($i = 0; $i < count($values); $i++) { } ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing number_format() : basic functionality *** -- number_format tests.....default -- diff --git a/ext/standard/tests/strings/pack.phpt b/ext/standard/tests/strings/pack.phpt index 449451c1aa..97a6a687c5 100644 --- a/ext/standard/tests/strings/pack.phpt +++ b/ext/standard/tests/strings/pack.phpt @@ -97,7 +97,7 @@ print_r(unpack("v", pack("v", -1000))); print_r(unpack("v", pack("v", -64434))); print_r(unpack("v", pack("v", -65535))); ?> ---EXPECTF-- +--EXPECT-- Array ( [1] => h diff --git a/ext/standard/tests/strings/pack64.phpt b/ext/standard/tests/strings/pack64.phpt index 9bc24928fe..cccdc1ba6e 100644 --- a/ext/standard/tests/strings/pack64.phpt +++ b/ext/standard/tests/strings/pack64.phpt @@ -32,7 +32,7 @@ print_r(unpack("q", pack("q", 0x8000000000000002))); print_r(unpack("q", pack("q", -1))); print_r(unpack("q", pack("q", 0x8000000000000000))); ?> ---EXPECTF-- +--EXPECT-- Array ( [1] => 281474976710654 diff --git a/ext/standard/tests/strings/pack_float.phpt b/ext/standard/tests/strings/pack_float.phpt index a164d31921..b86c599299 100644 --- a/ext/standard/tests/strings/pack_float.phpt +++ b/ext/standard/tests/strings/pack_float.phpt @@ -113,7 +113,7 @@ var_dump( ); ?> ---EXPECTF-- +--EXPECT-- string(6) "pack e" string(16) "0000000000000000" string(16) "0000000000000000" diff --git a/ext/standard/tests/strings/print_variation1.phpt b/ext/standard/tests/strings/print_variation1.phpt index 077b8270b5..19a28678f2 100644 --- a/ext/standard/tests/strings/print_variation1.phpt +++ b/ext/standard/tests/strings/print_variation1.phpt @@ -51,7 +51,7 @@ $inputs = array ( TRUE, FALSE, - // null vlaues + // null values /*16*/ NULL, null, diff --git a/ext/standard/tests/strings/printf_basic1.phpt b/ext/standard/tests/strings/printf_basic1.phpt index e6fd1d991f..db6edf6374 100644 --- a/ext/standard/tests/strings/printf_basic1.phpt +++ b/ext/standard/tests/strings/printf_basic1.phpt @@ -41,7 +41,7 @@ var_dump($result); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing printf() : basic functionality - using string format *** -- Calling printf() with no arguments -- diff --git a/ext/standard/tests/strings/printf_basic2.phpt b/ext/standard/tests/strings/printf_basic2.phpt index 4b245ebb54..6448fe6609 100644 --- a/ext/standard/tests/strings/printf_basic2.phpt +++ b/ext/standard/tests/strings/printf_basic2.phpt @@ -41,7 +41,7 @@ var_dump($result); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing printf() : basic functionality - using integer format *** -- Calling printf() with no arguments -- diff --git a/ext/standard/tests/strings/printf_basic3.phpt b/ext/standard/tests/strings/printf_basic3.phpt index 6e4c3125ec..711327cd6d 100644 --- a/ext/standard/tests/strings/printf_basic3.phpt +++ b/ext/standard/tests/strings/printf_basic3.phpt @@ -55,7 +55,7 @@ var_dump($result); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing printf() : basic functionality - using float format *** -- Calling printf() with no arguments-- diff --git a/ext/standard/tests/strings/printf_basic4.phpt b/ext/standard/tests/strings/printf_basic4.phpt index 3cebda439a..e5c07fd03c 100644 --- a/ext/standard/tests/strings/printf_basic4.phpt +++ b/ext/standard/tests/strings/printf_basic4.phpt @@ -40,7 +40,7 @@ echo "\n"; var_dump($result); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing printf() : basic functionality - using bool format *** -- Calling printf() with no arguments -- diff --git a/ext/standard/tests/strings/printf_basic5.phpt b/ext/standard/tests/strings/printf_basic5.phpt index b1e55e2776..e7bebd6df7 100644 --- a/ext/standard/tests/strings/printf_basic5.phpt +++ b/ext/standard/tests/strings/printf_basic5.phpt @@ -40,7 +40,7 @@ echo "\n"; var_dump($result); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing printf() : basic functionality - using char format *** -- Calling printf() with no arguments -- diff --git a/ext/standard/tests/strings/printf_basic6.phpt b/ext/standard/tests/strings/printf_basic6.phpt index 95b9d4a042..b3872efdd0 100644 --- a/ext/standard/tests/strings/printf_basic6.phpt +++ b/ext/standard/tests/strings/printf_basic6.phpt @@ -39,7 +39,7 @@ echo "\n"; var_dump($result); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing printf() : basic functionality - using exponential format *** -- Calling printf() with no arguments -- diff --git a/ext/standard/tests/strings/printf_basic7.phpt b/ext/standard/tests/strings/printf_basic7.phpt index a83f3f70a4..6675ddb29e 100644 --- a/ext/standard/tests/strings/printf_basic7.phpt +++ b/ext/standard/tests/strings/printf_basic7.phpt @@ -47,7 +47,7 @@ var_dump($result); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing printf() : basic functionality - using unsigned format *** -- Calling printf() with no arguments -- diff --git a/ext/standard/tests/strings/printf_basic8.phpt b/ext/standard/tests/strings/printf_basic8.phpt index 00953b9720..3ec0eda5ec 100644 --- a/ext/standard/tests/strings/printf_basic8.phpt +++ b/ext/standard/tests/strings/printf_basic8.phpt @@ -46,7 +46,7 @@ var_dump($result); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing printf() : basic functionality - using octal format *** -- Calling printf() with no arguments -- diff --git a/ext/standard/tests/strings/printf_basic9.phpt b/ext/standard/tests/strings/printf_basic9.phpt index f382f2ed28..cb9513d975 100644 --- a/ext/standard/tests/strings/printf_basic9.phpt +++ b/ext/standard/tests/strings/printf_basic9.phpt @@ -56,7 +56,7 @@ var_dump($result); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing printf() : basic functionality - using hexadecimal format *** -- Calling printf() with no arguments -- diff --git a/ext/standard/tests/strings/quoted_printable_decode_basic.phpt b/ext/standard/tests/strings/quoted_printable_decode_basic.phpt index 9556dad30f..654c418dc4 100644 --- a/ext/standard/tests/strings/quoted_printable_decode_basic.phpt +++ b/ext/standard/tests/strings/quoted_printable_decode_basic.phpt @@ -19,7 +19,7 @@ var_dump(bin2hex(quoted_printable_decode($str))); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing quoted_printable_decode() : basic functionality *** string(76) "fa776f772d666163746f72c1d0d5ddc5ceced9c50a20d4cfd2c7cfd7d9c520d0d2cfc5cbd4d9" ===DONE=== diff --git a/ext/standard/tests/strings/quotemeta_basic.phpt b/ext/standard/tests/strings/quotemeta_basic.phpt index da9fe3499c..d2694db6b6 100644 --- a/ext/standard/tests/strings/quotemeta_basic.phpt +++ b/ext/standard/tests/strings/quotemeta_basic.phpt @@ -15,7 +15,7 @@ var_dump(quotemeta("(100 + 50) * 10")); var_dump(quotemeta("\+*?[^]($)")); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing quotemeta() : basic functionality *** string(20) "Hello how are you \?" string(19) "\(100 \+ 50\) \* 10" diff --git a/ext/standard/tests/strings/setlocale_variation3.phpt b/ext/standard/tests/strings/setlocale_variation3.phpt index d1e06a0540..dcdab87bdc 100644 --- a/ext/standard/tests/strings/setlocale_variation3.phpt +++ b/ext/standard/tests/strings/setlocale_variation3.phpt @@ -53,7 +53,7 @@ if($locale_info_before == $locale_info_after){ echo "\nDone\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing setlocale() : usage variations - setting system locale = 0 *** Locale info, before setting the locale array(18) { diff --git a/ext/standard/tests/strings/setlocale_variation4.phpt b/ext/standard/tests/strings/setlocale_variation4.phpt index 8ee8db674e..68728206b7 100644 --- a/ext/standard/tests/strings/setlocale_variation4.phpt +++ b/ext/standard/tests/strings/setlocale_variation4.phpt @@ -51,7 +51,7 @@ if($locale_info_before != $locale_info_after){ echo "\nDone\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing setlocale() : usage variations - Setting system locale = null *** Locale info, before setting the locale array(18) { diff --git a/ext/standard/tests/strings/setlocale_variation5.phpt b/ext/standard/tests/strings/setlocale_variation5.phpt index 123e86e77f..0ba6d89024 100644 --- a/ext/standard/tests/strings/setlocale_variation5.phpt +++ b/ext/standard/tests/strings/setlocale_variation5.phpt @@ -55,7 +55,7 @@ if($locale_info_before != $locale_info_after){ echo "\nDone\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing setlocale() : usage variations - setting system locale = "" *** Locale info, before setting the locale array(18) { diff --git a/ext/standard/tests/strings/sha1_variation2.phpt b/ext/standard/tests/strings/sha1_variation2.phpt index f784a8900f..13c255451a 100644 --- a/ext/standard/tests/strings/sha1_variation2.phpt +++ b/ext/standard/tests/strings/sha1_variation2.phpt @@ -111,23 +111,23 @@ string(40) "0a4d55a8d778e5022fab701977c5d840bbc486d0" string(40) "0a4d55a8d778e5022fab701977c5d840bbc486d0" -- Iteration 10 -- -Warning: sha1() expects parameter 2 to be boolean, array given in %s on line %d +Warning: sha1() expects parameter 2 to be bool, array given in %s on line %d string(0) "" -- Iteration 11 -- -Warning: sha1() expects parameter 2 to be boolean, array given in %s on line %d +Warning: sha1() expects parameter 2 to be bool, array given in %s on line %d string(0) "" -- Iteration 12 -- -Warning: sha1() expects parameter 2 to be boolean, array given in %s on line %d +Warning: sha1() expects parameter 2 to be bool, array given in %s on line %d string(0) "" -- Iteration 13 -- -Warning: sha1() expects parameter 2 to be boolean, array given in %s on line %d +Warning: sha1() expects parameter 2 to be bool, array given in %s on line %d string(0) "" -- Iteration 14 -- -Warning: sha1() expects parameter 2 to be boolean, array given in %s on line %d +Warning: sha1() expects parameter 2 to be bool, array given in %s on line %d string(0) "" -- Iteration 15 -- string(80) "30613464353561386437373865353032326661623730313937376335643834306262633438366430" @@ -147,7 +147,7 @@ string(80) "30613464353561386437373865353032326661623730313937376335643834306262 string(80) "30613464353561386437373865353032326661623730313937376335643834306262633438366430" -- Iteration 23 -- -Warning: sha1() expects parameter 2 to be boolean, object given in %s on line %d +Warning: sha1() expects parameter 2 to be bool, object given in %s on line %d string(0) "" -- Iteration 24 -- string(80) "30613464353561386437373865353032326661623730313937376335643834306262633438366430" @@ -155,6 +155,6 @@ string(80) "30613464353561386437373865353032326661623730313937376335643834306262 string(80) "30613464353561386437373865353032326661623730313937376335643834306262633438366430" -- Iteration 26 -- -Warning: sha1() expects parameter 2 to be boolean, resource given in %s on line %d +Warning: sha1() expects parameter 2 to be bool, resource given in %s on line %d string(0) "" ===DONE=== diff --git a/ext/standard/tests/strings/show_source_basic.phpt b/ext/standard/tests/strings/show_source_basic.phpt index 09a3af407d..4f21adf712 100644 --- a/ext/standard/tests/strings/show_source_basic.phpt +++ b/ext/standard/tests/strings/show_source_basic.phpt @@ -19,7 +19,7 @@ if ( $foo == 'bar' ) show_source(__FILE__); ?> ---EXPECTF-- +--EXPECT-- *** Test by calling method or function with its expected arguments *** <code><span style="color: #000000"> <span style="color: #0000BB"><?php<br /></span><span style="color: #007700">echo </span><span style="color: #DD0000">"*** Test by calling method or function with its expected arguments ***\n"</span><span style="color: #007700">;<br /></span><span style="color: #0000BB">$foo </span><span style="color: #007700">= </span><span style="color: #DD0000">'bar'</span><span style="color: #007700">;<br /></span><span style="color: #0000BB">$baz </span><span style="color: #007700">= </span><span style="color: #DD0000">"something "</span><span style="color: #007700">.</span><span style="color: #0000BB">$foo</span><span style="color: #007700">.</span><span style="color: #DD0000">"\n"</span><span style="color: #007700">;<br /><br />if ( </span><span style="color: #0000BB">$foo </span><span style="color: #007700">== </span><span style="color: #DD0000">'bar' </span><span style="color: #007700">)<br />{<br /> </span><span style="color: #0000BB">$baz </span><span style="color: #007700">= </span><span style="color: #DD0000">'baz'</span><span style="color: #007700">;<br />}<br /><br /> </span><span style="color: #FF8000">/* some code here */<br /><br /></span><span style="color: #0000BB">show_source</span><span style="color: #007700">(</span><span style="color: #0000BB">__FILE__</span><span style="color: #007700">);<br /><br /></span><span style="color: #0000BB">?><br /></span> diff --git a/ext/standard/tests/strings/show_source_variation1.phpt b/ext/standard/tests/strings/show_source_variation1.phpt index b59776a4d2..099dd233a1 100644 --- a/ext/standard/tests/strings/show_source_variation1.phpt +++ b/ext/standard/tests/strings/show_source_variation1.phpt @@ -19,7 +19,7 @@ echo $baz; show_source(__FILE__); echo $foo; ?> ---EXPECTF-- +--EXPECT-- *** Test by calling method or function with its expected arguments and php output *** baz <code><span style="color: #000000"> diff --git a/ext/standard/tests/strings/show_source_variation2.phpt b/ext/standard/tests/strings/show_source_variation2.phpt index d9af024fd9..ca26ef29c9 100644 --- a/ext/standard/tests/strings/show_source_variation2.phpt +++ b/ext/standard/tests/strings/show_source_variation2.phpt @@ -19,7 +19,7 @@ $source = show_source(__FILE__, true); var_dump($source); ?> ---EXPECTF-- +--EXPECT-- *** Test by calling method or function with its expected arguments and output to variable *** string(1975) "<code><span style="color: #000000"> <span style="color: #0000BB"><?php<br /></span><span style="color: #007700">echo </span><span style="color: #DD0000">"*** Test by calling method or function with its expected arguments and output to variable ***\n"</span><span style="color: #007700">;<br /></span><span style="color: #0000BB">$foo </span><span style="color: #007700">= </span><span style="color: #DD0000">'bar'</span><span style="color: #007700">;<br /></span><span style="color: #0000BB">$baz </span><span style="color: #007700">= </span><span style="color: #DD0000">"something "</span><span style="color: #007700">.</span><span style="color: #0000BB">$foo</span><span style="color: #007700">.</span><span style="color: #DD0000">"\n"</span><span style="color: #007700">;<br /><br />if ( </span><span style="color: #0000BB">$foo </span><span style="color: #007700">== </span><span style="color: #DD0000">'bar' </span><span style="color: #007700">)<br />{<br /> </span><span style="color: #0000BB">$baz </span><span style="color: #007700">= </span><span style="color: #DD0000">"baz\n"</span><span style="color: #007700">;<br />}<br /><br /> </span><span style="color: #FF8000">/* some code here */<br /></span><span style="color: #0000BB">$source </span><span style="color: #007700">= </span><span style="color: #0000BB">show_source</span><span style="color: #007700">(</span><span style="color: #0000BB">__FILE__</span><span style="color: #007700">, </span><span style="color: #0000BB">true</span><span style="color: #007700">);<br /><br /></span><span style="color: #0000BB">var_dump</span><span style="color: #007700">(</span><span style="color: #0000BB">$source</span><span style="color: #007700">);<br /></span><span style="color: #0000BB">?><br /></span> diff --git a/ext/standard/tests/strings/similar_text_basic.phpt b/ext/standard/tests/strings/similar_text_basic.phpt index 37b6527180..ad8807f102 100644 --- a/ext/standard/tests/strings/similar_text_basic.phpt +++ b/ext/standard/tests/strings/similar_text_basic.phpt @@ -27,7 +27,7 @@ similar_text("abcdefghabcdef", "zzzzabcdefggg", $percent); var_dump($percent); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- int(3) int(0) int(1) diff --git a/ext/standard/tests/strings/sprintf_basic1.phpt b/ext/standard/tests/strings/sprintf_basic1.phpt index 4507cbd97d..b9327687e9 100644 --- a/ext/standard/tests/strings/sprintf_basic1.phpt +++ b/ext/standard/tests/strings/sprintf_basic1.phpt @@ -32,7 +32,7 @@ var_dump( sprintf($format3, $arg1, $arg2, $arg3) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : basic functionality - using string format *** string(6) "format" string(13) "arg1 argument" diff --git a/ext/standard/tests/strings/sprintf_basic2.phpt b/ext/standard/tests/strings/sprintf_basic2.phpt index a73a2da21b..8d682ad9f9 100644 --- a/ext/standard/tests/strings/sprintf_basic2.phpt +++ b/ext/standard/tests/strings/sprintf_basic2.phpt @@ -33,7 +33,7 @@ var_dump( sprintf($format3, $arg1, $arg2, $arg3) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : basic functionality - using integer format *** string(6) "format" string(3) "111" diff --git a/ext/standard/tests/strings/sprintf_basic3.phpt b/ext/standard/tests/strings/sprintf_basic3.phpt index a8d720a70a..343437615a 100644 --- a/ext/standard/tests/strings/sprintf_basic3.phpt +++ b/ext/standard/tests/strings/sprintf_basic3.phpt @@ -41,7 +41,7 @@ var_dump( sprintf($format33, $arg1, $arg2, $arg3) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : basic functionality - using float format *** string(6) "format" string(9) "11.110000" diff --git a/ext/standard/tests/strings/sprintf_basic4.phpt b/ext/standard/tests/strings/sprintf_basic4.phpt index e9469460e7..21a9ea280b 100644 --- a/ext/standard/tests/strings/sprintf_basic4.phpt +++ b/ext/standard/tests/strings/sprintf_basic4.phpt @@ -33,7 +33,7 @@ var_dump( sprintf($format3, $arg1, $arg2, $arg3) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : basic functionality - using bool format *** string(6) "format" string(1) "1" diff --git a/ext/standard/tests/strings/sprintf_basic5.phpt b/ext/standard/tests/strings/sprintf_basic5.phpt index f0d8029e07..85660544bc 100644 --- a/ext/standard/tests/strings/sprintf_basic5.phpt +++ b/ext/standard/tests/strings/sprintf_basic5.phpt @@ -33,7 +33,7 @@ var_dump( sprintf($format3, $arg1, $arg2, $arg3) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : basic functionality - using char format *** string(6) "format" string(1) "A" diff --git a/ext/standard/tests/strings/sprintf_basic6.phpt b/ext/standard/tests/strings/sprintf_basic6.phpt index 07c92190ee..913817015b 100644 --- a/ext/standard/tests/strings/sprintf_basic6.phpt +++ b/ext/standard/tests/strings/sprintf_basic6.phpt @@ -32,7 +32,7 @@ var_dump( sprintf($format3, $arg1, $arg2, $arg3) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : basic functionality - using exponential format *** string(6) "format" string(11) "1.000000e+3" diff --git a/ext/standard/tests/strings/sprintf_basic7.phpt b/ext/standard/tests/strings/sprintf_basic7.phpt index 0e560716fc..0b3140dd0d 100644 --- a/ext/standard/tests/strings/sprintf_basic7.phpt +++ b/ext/standard/tests/strings/sprintf_basic7.phpt @@ -39,7 +39,7 @@ var_dump( sprintf($format3, $arg1, $arg2, $arg3) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : basic functionality - using unsigned format *** string(6) "format" string(10) "4294966185" diff --git a/ext/standard/tests/strings/sprintf_basic7_64bit.phpt b/ext/standard/tests/strings/sprintf_basic7_64bit.phpt index 74d226660a..c3cd33656e 100644 --- a/ext/standard/tests/strings/sprintf_basic7_64bit.phpt +++ b/ext/standard/tests/strings/sprintf_basic7_64bit.phpt @@ -35,7 +35,7 @@ var_dump( sprintf($format3, $arg1, $arg2, $arg3) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : basic functionality - using unsigned format *** string(6) "format" string(20) "18446744073709550505" diff --git a/ext/standard/tests/strings/sprintf_basic8.phpt b/ext/standard/tests/strings/sprintf_basic8.phpt index dad2cb4cb3..f705e7bd1d 100644 --- a/ext/standard/tests/strings/sprintf_basic8.phpt +++ b/ext/standard/tests/strings/sprintf_basic8.phpt @@ -38,7 +38,7 @@ var_dump( sprintf($format3, $arg1, $arg2, $arg3) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : basic functionality - using octal format *** string(6) "format" string(2) "21" diff --git a/ext/standard/tests/strings/sprintf_basic8_64bit.phpt b/ext/standard/tests/strings/sprintf_basic8_64bit.phpt index 5e5c608d68..ec4063eef7 100644 --- a/ext/standard/tests/strings/sprintf_basic8_64bit.phpt +++ b/ext/standard/tests/strings/sprintf_basic8_64bit.phpt @@ -34,7 +34,7 @@ var_dump( sprintf($format3, $arg1, $arg2, $arg3) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : basic functionality - using octal format *** string(6) "format" string(2) "21" diff --git a/ext/standard/tests/strings/sprintf_basic9.phpt b/ext/standard/tests/strings/sprintf_basic9.phpt index 106a4c42d7..53c8777cfd 100644 --- a/ext/standard/tests/strings/sprintf_basic9.phpt +++ b/ext/standard/tests/strings/sprintf_basic9.phpt @@ -42,7 +42,7 @@ var_dump( sprintf($format33, $arg1, $arg2, $arg3) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : basic functionality - using hexadecimal format *** string(6) "format" string(1) "b" diff --git a/ext/standard/tests/strings/sprintf_variation10.phpt b/ext/standard/tests/strings/sprintf_variation10.phpt index a0e7d0b0ca..c298b083bc 100644 --- a/ext/standard/tests/strings/sprintf_variation10.phpt +++ b/ext/standard/tests/strings/sprintf_variation10.phpt @@ -52,7 +52,7 @@ foreach($integer_values as $int_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : float formats with integer values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation12.phpt b/ext/standard/tests/strings/sprintf_variation12.phpt index be0c32f587..6657ff9cca 100644 --- a/ext/standard/tests/strings/sprintf_variation12.phpt +++ b/ext/standard/tests/strings/sprintf_variation12.phpt @@ -48,7 +48,7 @@ foreach($array_values as $array_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : float formats with arrays *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation13.phpt b/ext/standard/tests/strings/sprintf_variation13.phpt index 6a2ba35626..10900c1438 100644 --- a/ext/standard/tests/strings/sprintf_variation13.phpt +++ b/ext/standard/tests/strings/sprintf_variation13.phpt @@ -53,7 +53,7 @@ foreach($string_values as $string_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : float formats with strings *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation14.phpt b/ext/standard/tests/strings/sprintf_variation14.phpt index 16c819bdb6..49f4d5f12a 100644 --- a/ext/standard/tests/strings/sprintf_variation14.phpt +++ b/ext/standard/tests/strings/sprintf_variation14.phpt @@ -37,7 +37,7 @@ foreach($boolean_values as $boolean_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : float formats with boolean values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation15.phpt b/ext/standard/tests/strings/sprintf_variation15.phpt Binary files differindex 2ee867683e..d908d40632 100644 --- a/ext/standard/tests/strings/sprintf_variation15.phpt +++ b/ext/standard/tests/strings/sprintf_variation15.phpt diff --git a/ext/standard/tests/strings/sprintf_variation16.phpt b/ext/standard/tests/strings/sprintf_variation16.phpt index d314539ba5..40c0e87d14 100644 --- a/ext/standard/tests/strings/sprintf_variation16.phpt +++ b/ext/standard/tests/strings/sprintf_variation16.phpt @@ -48,7 +48,7 @@ foreach($float_values as $float_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : string formats with float values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation18.phpt b/ext/standard/tests/strings/sprintf_variation18.phpt index a0b6cad4c8..2bf9322c83 100644 --- a/ext/standard/tests/strings/sprintf_variation18.phpt +++ b/ext/standard/tests/strings/sprintf_variation18.phpt @@ -47,7 +47,7 @@ foreach($array_values as $array_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : string formats with array values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation19.phpt b/ext/standard/tests/strings/sprintf_variation19.phpt index d6e8a8f516..ede367bbff 100644 --- a/ext/standard/tests/strings/sprintf_variation19.phpt +++ b/ext/standard/tests/strings/sprintf_variation19.phpt @@ -51,7 +51,7 @@ foreach($integer_values as $integer_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : string formats with integer values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation20.phpt b/ext/standard/tests/strings/sprintf_variation20.phpt index 1b7b9d234a..a110311127 100644 --- a/ext/standard/tests/strings/sprintf_variation20.phpt +++ b/ext/standard/tests/strings/sprintf_variation20.phpt @@ -37,7 +37,7 @@ foreach($boolean_values as $boolean_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : string formats with boolean values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation21.phpt b/ext/standard/tests/strings/sprintf_variation21.phpt Binary files differindex 7967dbf262..30c0527277 100644 --- a/ext/standard/tests/strings/sprintf_variation21.phpt +++ b/ext/standard/tests/strings/sprintf_variation21.phpt diff --git a/ext/standard/tests/strings/sprintf_variation22.phpt b/ext/standard/tests/strings/sprintf_variation22.phpt Binary files differindex b4e2e28d0c..e12da7f75f 100644 --- a/ext/standard/tests/strings/sprintf_variation22.phpt +++ b/ext/standard/tests/strings/sprintf_variation22.phpt diff --git a/ext/standard/tests/strings/sprintf_variation24.phpt b/ext/standard/tests/strings/sprintf_variation24.phpt Binary files differindex 19d46c3935..e3324ce417 100644 --- a/ext/standard/tests/strings/sprintf_variation24.phpt +++ b/ext/standard/tests/strings/sprintf_variation24.phpt diff --git a/ext/standard/tests/strings/sprintf_variation25.phpt b/ext/standard/tests/strings/sprintf_variation25.phpt Binary files differindex 17e8af5f4c..195ec29ea1 100644 --- a/ext/standard/tests/strings/sprintf_variation25.phpt +++ b/ext/standard/tests/strings/sprintf_variation25.phpt diff --git a/ext/standard/tests/strings/sprintf_variation26.phpt b/ext/standard/tests/strings/sprintf_variation26.phpt Binary files differindex d0b9adfa12..b6e52fe948 100644 --- a/ext/standard/tests/strings/sprintf_variation26.phpt +++ b/ext/standard/tests/strings/sprintf_variation26.phpt diff --git a/ext/standard/tests/strings/sprintf_variation27.phpt b/ext/standard/tests/strings/sprintf_variation27.phpt Binary files differindex 617b036bcf..0dc39db05d 100644 --- a/ext/standard/tests/strings/sprintf_variation27.phpt +++ b/ext/standard/tests/strings/sprintf_variation27.phpt diff --git a/ext/standard/tests/strings/sprintf_variation28.phpt b/ext/standard/tests/strings/sprintf_variation28.phpt index 0b0bf46921..747629f3f7 100644 --- a/ext/standard/tests/strings/sprintf_variation28.phpt +++ b/ext/standard/tests/strings/sprintf_variation28.phpt @@ -57,7 +57,7 @@ foreach($integer_values as $integer_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : octal formats with integer values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation28_64bit.phpt b/ext/standard/tests/strings/sprintf_variation28_64bit.phpt index 589c01d3d3..0fac9573be 100644 --- a/ext/standard/tests/strings/sprintf_variation28_64bit.phpt +++ b/ext/standard/tests/strings/sprintf_variation28_64bit.phpt @@ -53,7 +53,7 @@ foreach($integer_values as $integer_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : octal formats with integer values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation29.phpt b/ext/standard/tests/strings/sprintf_variation29.phpt index 4ee9edeff8..abb82415cc 100644 --- a/ext/standard/tests/strings/sprintf_variation29.phpt +++ b/ext/standard/tests/strings/sprintf_variation29.phpt @@ -47,7 +47,7 @@ foreach($float_values as $float_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : octal formats with float values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation29_64bit.phpt b/ext/standard/tests/strings/sprintf_variation29_64bit.phpt index fb5dfa590d..8dc7a45d16 100644 --- a/ext/standard/tests/strings/sprintf_variation29_64bit.phpt +++ b/ext/standard/tests/strings/sprintf_variation29_64bit.phpt @@ -43,7 +43,7 @@ foreach($float_values as $float_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : octal formats with float values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation3.phpt b/ext/standard/tests/strings/sprintf_variation3.phpt index 2ebdc0548b..c6fd878c1b 100644 --- a/ext/standard/tests/strings/sprintf_variation3.phpt +++ b/ext/standard/tests/strings/sprintf_variation3.phpt @@ -9,7 +9,7 @@ Test sprintf() function : usage variations - int formats with int values echo "*** Testing sprintf() : integer formats with integer values ***\n"; -// different valid integer vlaues +// different valid integer values $valid_ints = array( 0, 1, @@ -50,7 +50,7 @@ foreach($valid_ints as $int_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : integer formats with integer values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation31.phpt b/ext/standard/tests/strings/sprintf_variation31.phpt index e9c08dbe80..a9a43bd15f 100644 --- a/ext/standard/tests/strings/sprintf_variation31.phpt +++ b/ext/standard/tests/strings/sprintf_variation31.phpt @@ -46,7 +46,7 @@ foreach($array_values as $array_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : octal formats with array values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation32.phpt b/ext/standard/tests/strings/sprintf_variation32.phpt index 81f5dbf451..2d4352e75b 100644 --- a/ext/standard/tests/strings/sprintf_variation32.phpt +++ b/ext/standard/tests/strings/sprintf_variation32.phpt @@ -52,7 +52,7 @@ foreach($string_values as $string_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : octal formats with string values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation33.phpt b/ext/standard/tests/strings/sprintf_variation33.phpt index d0234ee469..54b2403f14 100644 --- a/ext/standard/tests/strings/sprintf_variation33.phpt +++ b/ext/standard/tests/strings/sprintf_variation33.phpt @@ -37,7 +37,7 @@ foreach($boolean_values as $boolean_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : octal formats with boolean values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation34.phpt b/ext/standard/tests/strings/sprintf_variation34.phpt index 4d8f060b9d..81e79d0c02 100644 --- a/ext/standard/tests/strings/sprintf_variation34.phpt +++ b/ext/standard/tests/strings/sprintf_variation34.phpt @@ -57,7 +57,7 @@ foreach($integer_values as $integer_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : hexa formats with integer values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation34_64bit.phpt b/ext/standard/tests/strings/sprintf_variation34_64bit.phpt index 098f0205c3..27ef87796a 100644 --- a/ext/standard/tests/strings/sprintf_variation34_64bit.phpt +++ b/ext/standard/tests/strings/sprintf_variation34_64bit.phpt @@ -53,7 +53,7 @@ foreach($integer_values as $integer_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : hexa formats with integer values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation35.phpt b/ext/standard/tests/strings/sprintf_variation35.phpt index 8431211481..2056f083cb 100644 --- a/ext/standard/tests/strings/sprintf_variation35.phpt +++ b/ext/standard/tests/strings/sprintf_variation35.phpt @@ -52,7 +52,7 @@ foreach($float_values as $float_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : hexa formats with float values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation35_64bit.phpt b/ext/standard/tests/strings/sprintf_variation35_64bit.phpt index 37868f4b5c..386a2b6b58 100644 --- a/ext/standard/tests/strings/sprintf_variation35_64bit.phpt +++ b/ext/standard/tests/strings/sprintf_variation35_64bit.phpt @@ -48,7 +48,7 @@ foreach($float_values as $float_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : hexa formats with float values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation37.phpt b/ext/standard/tests/strings/sprintf_variation37.phpt index 7e34ddb797..a76f7efd5c 100644 --- a/ext/standard/tests/strings/sprintf_variation37.phpt +++ b/ext/standard/tests/strings/sprintf_variation37.phpt @@ -45,7 +45,7 @@ foreach($array_values as $array_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : hexa formats with array values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation38.phpt b/ext/standard/tests/strings/sprintf_variation38.phpt index ee2aa25796..a48a77a6d5 100644 --- a/ext/standard/tests/strings/sprintf_variation38.phpt +++ b/ext/standard/tests/strings/sprintf_variation38.phpt @@ -51,7 +51,7 @@ foreach($string_values as $string_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : hexa formats with string values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation39.phpt b/ext/standard/tests/strings/sprintf_variation39.phpt index f03e58074e..0d842af057 100644 --- a/ext/standard/tests/strings/sprintf_variation39.phpt +++ b/ext/standard/tests/strings/sprintf_variation39.phpt @@ -37,7 +37,7 @@ foreach($boolean_values as $boolean_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : hexa formats with boolean values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation4.phpt b/ext/standard/tests/strings/sprintf_variation4.phpt index 3a4588cff9..5345fd1088 100644 --- a/ext/standard/tests/strings/sprintf_variation4.phpt +++ b/ext/standard/tests/strings/sprintf_variation4.phpt @@ -52,7 +52,7 @@ foreach($float_values as $float_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : integer formats with float values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation40.phpt b/ext/standard/tests/strings/sprintf_variation40.phpt index 3a7c17c686..c6335ebb6a 100644 --- a/ext/standard/tests/strings/sprintf_variation40.phpt +++ b/ext/standard/tests/strings/sprintf_variation40.phpt @@ -58,7 +58,7 @@ foreach($integer_values as $integer_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : unsigned formats with integer values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation40_64bit.phpt b/ext/standard/tests/strings/sprintf_variation40_64bit.phpt index 30f9d93183..ae5928931a 100644 --- a/ext/standard/tests/strings/sprintf_variation40_64bit.phpt +++ b/ext/standard/tests/strings/sprintf_variation40_64bit.phpt @@ -54,7 +54,7 @@ foreach($integer_values as $integer_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : unsigned formats with integer values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation41.phpt b/ext/standard/tests/strings/sprintf_variation41.phpt index ac794eb3ed..e888fac941 100644 --- a/ext/standard/tests/strings/sprintf_variation41.phpt +++ b/ext/standard/tests/strings/sprintf_variation41.phpt @@ -56,7 +56,7 @@ foreach($float_values as $float_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : unsigned formats with float values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation41_64bit.phpt b/ext/standard/tests/strings/sprintf_variation41_64bit.phpt index 4f30c8676b..c976a7b799 100644 --- a/ext/standard/tests/strings/sprintf_variation41_64bit.phpt +++ b/ext/standard/tests/strings/sprintf_variation41_64bit.phpt @@ -52,7 +52,7 @@ foreach($float_values as $float_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : unsigned formats with float values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation43.phpt b/ext/standard/tests/strings/sprintf_variation43.phpt index bf1a8a56a4..0c86b468f5 100644 --- a/ext/standard/tests/strings/sprintf_variation43.phpt +++ b/ext/standard/tests/strings/sprintf_variation43.phpt @@ -47,7 +47,7 @@ foreach($array_values as $array_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : unsigned formats with array values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation44.phpt b/ext/standard/tests/strings/sprintf_variation44.phpt index 363694a196..10c65a8d29 100644 --- a/ext/standard/tests/strings/sprintf_variation44.phpt +++ b/ext/standard/tests/strings/sprintf_variation44.phpt @@ -60,7 +60,7 @@ foreach($string_values as $string_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : unsigned formats with string values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation44_64bit.phpt b/ext/standard/tests/strings/sprintf_variation44_64bit.phpt index 7ab86b9362..24c80ded3b 100644 --- a/ext/standard/tests/strings/sprintf_variation44_64bit.phpt +++ b/ext/standard/tests/strings/sprintf_variation44_64bit.phpt @@ -56,7 +56,7 @@ foreach($string_values as $string_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : unsigned formats with string values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation45.phpt b/ext/standard/tests/strings/sprintf_variation45.phpt index f7100e50c8..d6bf31c56b 100644 --- a/ext/standard/tests/strings/sprintf_variation45.phpt +++ b/ext/standard/tests/strings/sprintf_variation45.phpt @@ -37,7 +37,7 @@ foreach($boolean_values as $boolean_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : unsigned formats with boolean values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation46.phpt b/ext/standard/tests/strings/sprintf_variation46.phpt index 172148f197..3ba8164f4a 100644 --- a/ext/standard/tests/strings/sprintf_variation46.phpt +++ b/ext/standard/tests/strings/sprintf_variation46.phpt @@ -51,7 +51,7 @@ foreach($integer_values as $integer_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : scientific formats with integer values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation47.phpt b/ext/standard/tests/strings/sprintf_variation47.phpt index 3236a2b59b..56ab7c5fc8 100644 --- a/ext/standard/tests/strings/sprintf_variation47.phpt +++ b/ext/standard/tests/strings/sprintf_variation47.phpt @@ -53,7 +53,7 @@ foreach($float_values as $float_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : scientific formats with float values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation49.phpt b/ext/standard/tests/strings/sprintf_variation49.phpt index eb8d710585..f3ab223a06 100644 --- a/ext/standard/tests/strings/sprintf_variation49.phpt +++ b/ext/standard/tests/strings/sprintf_variation49.phpt @@ -48,7 +48,7 @@ foreach($array_values as $array_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : scientific formats with array values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation4_64bit.phpt b/ext/standard/tests/strings/sprintf_variation4_64bit.phpt index 7b792825ca..79aff1fc39 100644 --- a/ext/standard/tests/strings/sprintf_variation4_64bit.phpt +++ b/ext/standard/tests/strings/sprintf_variation4_64bit.phpt @@ -48,7 +48,7 @@ foreach($float_values as $float_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : integer formats with float values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation50.phpt b/ext/standard/tests/strings/sprintf_variation50.phpt index dd41d964d0..ccd8bf1bd4 100644 --- a/ext/standard/tests/strings/sprintf_variation50.phpt +++ b/ext/standard/tests/strings/sprintf_variation50.phpt @@ -53,7 +53,7 @@ foreach($string_values as $string_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : scientific formats with string values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation51.phpt b/ext/standard/tests/strings/sprintf_variation51.phpt index 29064c5dec..ab056b3f2f 100644 --- a/ext/standard/tests/strings/sprintf_variation51.phpt +++ b/ext/standard/tests/strings/sprintf_variation51.phpt @@ -37,7 +37,7 @@ foreach($boolean_values as $boolean_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : scientific formats with boolean values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation53.phpt b/ext/standard/tests/strings/sprintf_variation53.phpt index fa511c91df..b3a034c5a7 100644 --- a/ext/standard/tests/strings/sprintf_variation53.phpt +++ b/ext/standard/tests/strings/sprintf_variation53.phpt @@ -32,7 +32,7 @@ foreach($formats as $format) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : with white spaces in format strings *** string(4) "1234" string(4) "1234" diff --git a/ext/standard/tests/strings/sprintf_variation6.phpt b/ext/standard/tests/strings/sprintf_variation6.phpt index 93d5424366..1480e45a0f 100644 --- a/ext/standard/tests/strings/sprintf_variation6.phpt +++ b/ext/standard/tests/strings/sprintf_variation6.phpt @@ -48,7 +48,7 @@ foreach($array_types as $arr) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : integer formats with arrays *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation7.phpt b/ext/standard/tests/strings/sprintf_variation7.phpt index f50770857f..e910bfb687 100644 --- a/ext/standard/tests/strings/sprintf_variation7.phpt +++ b/ext/standard/tests/strings/sprintf_variation7.phpt @@ -37,7 +37,7 @@ foreach($boolean_values as $boolean_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : integer formats with boolean values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation8.phpt b/ext/standard/tests/strings/sprintf_variation8.phpt index 01427b941e..c20cfcc588 100644 --- a/ext/standard/tests/strings/sprintf_variation8.phpt +++ b/ext/standard/tests/strings/sprintf_variation8.phpt @@ -54,7 +54,7 @@ foreach($string_values as $string_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : integer formats with string values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/sprintf_variation9.phpt b/ext/standard/tests/strings/sprintf_variation9.phpt index 7103b7fed1..d0f9632c98 100644 --- a/ext/standard/tests/strings/sprintf_variation9.phpt +++ b/ext/standard/tests/strings/sprintf_variation9.phpt @@ -64,7 +64,7 @@ foreach($float_values as $float_value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing sprintf() : float formats with float values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/str_pad_variation1.phpt b/ext/standard/tests/strings/str_pad_variation1.phpt index 26902cdd4a..32506ab1a9 100644 --- a/ext/standard/tests/strings/str_pad_variation1.phpt +++ b/ext/standard/tests/strings/str_pad_variation1.phpt @@ -53,7 +53,7 @@ $inputs = array ( TRUE, FALSE, - // null vlaues + // null values /*16*/ NULL, null, diff --git a/ext/standard/tests/strings/str_pad_variation2.phpt b/ext/standard/tests/strings/str_pad_variation2.phpt index ed620d07bb..114d5f5ba1 100644 --- a/ext/standard/tests/strings/str_pad_variation2.phpt +++ b/ext/standard/tests/strings/str_pad_variation2.phpt @@ -52,7 +52,7 @@ $pad_lengths = array ( TRUE, FALSE, - // null vlaues + // null values /*15*/ NULL, null, @@ -102,15 +102,15 @@ string(11) "Test string" string(1012) "Test string " -- Iteration 8 -- -Warning: str_pad() expects parameter 2 to be integer, array given in %s on line %d +Warning: str_pad() expects parameter 2 to be int, array given in %s on line %d NULL -- Iteration 9 -- -Warning: str_pad() expects parameter 2 to be integer, array given in %s on line %d +Warning: str_pad() expects parameter 2 to be int, array given in %s on line %d NULL -- Iteration 10 -- -Warning: str_pad() expects parameter 2 to be integer, array given in %s on line %d +Warning: str_pad() expects parameter 2 to be int, array given in %s on line %d NULL -- Iteration 11 -- string(11) "Test string" @@ -126,11 +126,11 @@ string(11) "Test string" string(11) "Test string" -- Iteration 17 -- -Warning: str_pad() expects parameter 2 to be integer, object given in %s on line %d +Warning: str_pad() expects parameter 2 to be int, object given in %s on line %d NULL -- Iteration 18 -- -Warning: str_pad() expects parameter 2 to be integer, resource given in %s on line %d +Warning: str_pad() expects parameter 2 to be int, resource given in %s on line %d NULL -- Iteration 19 -- string(11) "Test string" diff --git a/ext/standard/tests/strings/str_pad_variation3.phpt b/ext/standard/tests/strings/str_pad_variation3.phpt index b9209e6657..1e58477f21 100644 --- a/ext/standard/tests/strings/str_pad_variation3.phpt +++ b/ext/standard/tests/strings/str_pad_variation3.phpt @@ -53,7 +53,7 @@ $pad_strings = array ( TRUE, FALSE, - // null vlaues + // null values /*16*/ NULL, null, diff --git a/ext/standard/tests/strings/str_pad_variation4.phpt b/ext/standard/tests/strings/str_pad_variation4.phpt index 3574d299b5..22ca2d5270 100644 --- a/ext/standard/tests/strings/str_pad_variation4.phpt +++ b/ext/standard/tests/strings/str_pad_variation4.phpt @@ -60,7 +60,7 @@ $pad_types = array ( TRUE, FALSE, - // null vlaues + // null values /*22*/ NULL, null, @@ -123,11 +123,11 @@ Warning: str_pad(): Padding type has to be STR_PAD_LEFT, STR_PAD_RIGHT, or STR_P NULL -- Iteration 10 -- -Warning: str_pad() expects parameter 4 to be integer, string given in %s on line %d +Warning: str_pad() expects parameter 4 to be int, string given in %s on line %d NULL -- Iteration 11 -- -Warning: str_pad() expects parameter 4 to be integer, string given in %s on line %d +Warning: str_pad() expects parameter 4 to be int, string given in %s on line %d NULL -- Iteration 12 -- string(20) "****Test string*****" @@ -139,15 +139,15 @@ string(20) "*********Test string" string(20) "****Test string*****" -- Iteration 15 -- -Warning: str_pad() expects parameter 4 to be integer, array given in %s on line %d +Warning: str_pad() expects parameter 4 to be int, array given in %s on line %d NULL -- Iteration 16 -- -Warning: str_pad() expects parameter 4 to be integer, array given in %s on line %d +Warning: str_pad() expects parameter 4 to be int, array given in %s on line %d NULL -- Iteration 17 -- -Warning: str_pad() expects parameter 4 to be integer, array given in %s on line %d +Warning: str_pad() expects parameter 4 to be int, array given in %s on line %d NULL -- Iteration 18 -- string(20) "Test string*********" @@ -163,7 +163,7 @@ string(20) "*********Test string" string(20) "*********Test string" -- Iteration 24 -- -Warning: str_pad() expects parameter 4 to be integer, object given in %s on line %d +Warning: str_pad() expects parameter 4 to be int, object given in %s on line %d NULL -- Iteration 25 -- string(20) "*********Test string" diff --git a/ext/standard/tests/strings/str_repeat.phpt b/ext/standard/tests/strings/str_repeat.phpt Binary files differindex 54763ddf8b..306b7d381a 100644 --- a/ext/standard/tests/strings/str_repeat.phpt +++ b/ext/standard/tests/strings/str_repeat.phpt diff --git a/ext/standard/tests/strings/str_replace_array_refs.phpt b/ext/standard/tests/strings/str_replace_array_refs.phpt index 102bcfa8fe..f45ea59c64 100644 --- a/ext/standard/tests/strings/str_replace_array_refs.phpt +++ b/ext/standard/tests/strings/str_replace_array_refs.phpt @@ -11,7 +11,7 @@ $numeric = &$ref['numeric']; var_dump(str_replace(array_keys($data), $data, "a numeric")); var_dump($numeric); var_dump($data['numeric']); ---EXPECTF-- +--EXPECT-- string(3) "b 1" int(1) int(1) diff --git a/ext/standard/tests/strings/str_replace_array_refs2.phpt b/ext/standard/tests/strings/str_replace_array_refs2.phpt index 2c12c0155b..e12681e079 100644 --- a/ext/standard/tests/strings/str_replace_array_refs2.phpt +++ b/ext/standard/tests/strings/str_replace_array_refs2.phpt @@ -21,6 +21,6 @@ var_dump(str_replace(array_keys($obj->prop), $obj->prop, "x property")); $array = ['x' => 'property']; $array = $closure($array, ['x'], 'a'); var_dump(str_replace(array_keys($array), $array, "x property")); ---EXPECTF-- +--EXPECT-- string(10) "a property" string(10) "a property" diff --git a/ext/standard/tests/strings/str_rot13_basic.phpt b/ext/standard/tests/strings/str_rot13_basic.phpt index f5cdf15273..7f5fc1405c 100644 --- a/ext/standard/tests/strings/str_rot13_basic.phpt +++ b/ext/standard/tests/strings/str_rot13_basic.phpt @@ -37,7 +37,7 @@ if (strcmp($str, $decode) == 0) { } ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing str_rot13() : basic functionality *** Basic tests diff --git a/ext/standard/tests/strings/str_shuffle_variation1.phpt b/ext/standard/tests/strings/str_shuffle_variation1.phpt index 67529f49ae..d5681392b5 100644 --- a/ext/standard/tests/strings/str_shuffle_variation1.phpt +++ b/ext/standard/tests/strings/str_shuffle_variation1.phpt @@ -50,7 +50,7 @@ $inputs = array ( TRUE, FALSE, - // null vlaues + // null values /*16*/ NULL, null, diff --git a/ext/standard/tests/strings/str_split_basic.phpt b/ext/standard/tests/strings/str_split_basic.phpt index 3c7ddaa776..b9cc8068bc 100644 --- a/ext/standard/tests/strings/str_split_basic.phpt +++ b/ext/standard/tests/strings/str_split_basic.phpt @@ -26,7 +26,7 @@ var_dump( str_split($str) ); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing str_split() : basic functionality *** -- With all possible arguments -- array(5) { diff --git a/ext/standard/tests/strings/str_split_variation2.phpt b/ext/standard/tests/strings/str_split_variation2.phpt index 2ac629530f..0bb8304b56 100644 --- a/ext/standard/tests/strings/str_split_variation2.phpt +++ b/ext/standard/tests/strings/str_split_variation2.phpt @@ -111,7 +111,7 @@ Warning: str_split(): The length of each segment must be greater than zero in %s bool(false) --Iteration 3 -- -Warning: str_split() expects parameter 2 to be integer, float given in %s on line %d +Warning: str_split() expects parameter 2 to be int, float given in %s on line %d NULL --Iteration 4 -- @@ -123,23 +123,23 @@ Warning: str_split(): The length of each segment must be greater than zero in %s bool(false) --Iteration 6 -- -Warning: str_split() expects parameter 2 to be integer, array given in %sstr_split_variation2.php on line %d +Warning: str_split() expects parameter 2 to be int, array given in %sstr_split_variation2.php on line %d NULL --Iteration 7 -- -Warning: str_split() expects parameter 2 to be integer, array given in %sstr_split_variation2.php on line %d +Warning: str_split() expects parameter 2 to be int, array given in %sstr_split_variation2.php on line %d NULL --Iteration 8 -- -Warning: str_split() expects parameter 2 to be integer, array given in %sstr_split_variation2.php on line %d +Warning: str_split() expects parameter 2 to be int, array given in %sstr_split_variation2.php on line %d NULL --Iteration 9 -- -Warning: str_split() expects parameter 2 to be integer, array given in %sstr_split_variation2.php on line %d +Warning: str_split() expects parameter 2 to be int, array given in %sstr_split_variation2.php on line %d NULL --Iteration 10 -- -Warning: str_split() expects parameter 2 to be integer, array given in %sstr_split_variation2.php on line %d +Warning: str_split() expects parameter 2 to be int, array given in %sstr_split_variation2.php on line %d NULL --Iteration 11 -- @@ -257,23 +257,23 @@ Warning: str_split(): The length of each segment must be greater than zero in %s bool(false) --Iteration 17 -- -Warning: str_split() expects parameter 2 to be integer, string given in %sstr_split_variation2.php on line %d +Warning: str_split() expects parameter 2 to be int, string given in %sstr_split_variation2.php on line %d NULL --Iteration 18 -- -Warning: str_split() expects parameter 2 to be integer, string given in %sstr_split_variation2.php on line %d +Warning: str_split() expects parameter 2 to be int, string given in %sstr_split_variation2.php on line %d NULL --Iteration 19 -- -Warning: str_split() expects parameter 2 to be integer, string given in %sstr_split_variation2.php on line %d +Warning: str_split() expects parameter 2 to be int, string given in %sstr_split_variation2.php on line %d NULL --Iteration 20 -- -Warning: str_split() expects parameter 2 to be integer, string given in %sstr_split_variation2.php on line %d +Warning: str_split() expects parameter 2 to be int, string given in %sstr_split_variation2.php on line %d NULL --Iteration 21 -- -Warning: str_split() expects parameter 2 to be integer, object given in %sstr_split_variation2.php on line %d +Warning: str_split() expects parameter 2 to be int, object given in %sstr_split_variation2.php on line %d NULL --Iteration 22 -- @@ -285,6 +285,6 @@ Warning: str_split(): The length of each segment must be greater than zero in %s bool(false) --Iteration 24 -- -Warning: str_split() expects parameter 2 to be integer, resource given in %sstr_split_variation2.php on line %d +Warning: str_split() expects parameter 2 to be int, resource given in %sstr_split_variation2.php on line %d NULL Done diff --git a/ext/standard/tests/strings/str_split_variation2_64bit.phpt b/ext/standard/tests/strings/str_split_variation2_64bit.phpt index 921c337785..92a07498a4 100644 --- a/ext/standard/tests/strings/str_split_variation2_64bit.phpt +++ b/ext/standard/tests/strings/str_split_variation2_64bit.phpt @@ -124,23 +124,23 @@ Warning: str_split(): The length of each segment must be greater than zero in %s bool(false) --Iteration 6 -- -Warning: str_split() expects parameter 2 to be integer, array given in %s on line %d +Warning: str_split() expects parameter 2 to be int, array given in %s on line %d NULL --Iteration 7 -- -Warning: str_split() expects parameter 2 to be integer, array given in %s on line %d +Warning: str_split() expects parameter 2 to be int, array given in %s on line %d NULL --Iteration 8 -- -Warning: str_split() expects parameter 2 to be integer, array given in %s on line %d +Warning: str_split() expects parameter 2 to be int, array given in %s on line %d NULL --Iteration 9 -- -Warning: str_split() expects parameter 2 to be integer, array given in %s on line %d +Warning: str_split() expects parameter 2 to be int, array given in %s on line %d NULL --Iteration 10 -- -Warning: str_split() expects parameter 2 to be integer, array given in %s on line %d +Warning: str_split() expects parameter 2 to be int, array given in %s on line %d NULL --Iteration 11 -- @@ -258,23 +258,23 @@ Warning: str_split(): The length of each segment must be greater than zero in %s bool(false) --Iteration 17 -- -Warning: str_split() expects parameter 2 to be integer, string given in %s on line %d +Warning: str_split() expects parameter 2 to be int, string given in %s on line %d NULL --Iteration 18 -- -Warning: str_split() expects parameter 2 to be integer, string given in %s on line %d +Warning: str_split() expects parameter 2 to be int, string given in %s on line %d NULL --Iteration 19 -- -Warning: str_split() expects parameter 2 to be integer, string given in %s on line %d +Warning: str_split() expects parameter 2 to be int, string given in %s on line %d NULL --Iteration 20 -- -Warning: str_split() expects parameter 2 to be integer, string given in %s on line %d +Warning: str_split() expects parameter 2 to be int, string given in %s on line %d NULL --Iteration 21 -- -Warning: str_split() expects parameter 2 to be integer, object given in %s on line %d +Warning: str_split() expects parameter 2 to be int, object given in %s on line %d NULL --Iteration 22 -- @@ -286,6 +286,6 @@ Warning: str_split(): The length of each segment must be greater than zero in %s bool(false) --Iteration 24 -- -Warning: str_split() expects parameter 2 to be integer, resource given in %s on line %d +Warning: str_split() expects parameter 2 to be int, resource given in %s on line %d NULL Done diff --git a/ext/standard/tests/strings/str_split_variation3.phpt b/ext/standard/tests/strings/str_split_variation3.phpt Binary files differindex 974d1ecdd4..6c2a3c83f8 100644 --- a/ext/standard/tests/strings/str_split_variation3.phpt +++ b/ext/standard/tests/strings/str_split_variation3.phpt diff --git a/ext/standard/tests/strings/str_split_variation4.phpt b/ext/standard/tests/strings/str_split_variation4.phpt index 17ac646ce2..caeba8a6f2 100644 --- a/ext/standard/tests/strings/str_split_variation4.phpt +++ b/ext/standard/tests/strings/str_split_variation4.phpt @@ -43,7 +43,7 @@ for($count = 0; $count < count($values); $count++) { } echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing str_split() : single quoted strings for 'str' *** -- Iteration 1 -- array(1) { diff --git a/ext/standard/tests/strings/str_split_variation5.phpt b/ext/standard/tests/strings/str_split_variation5.phpt index 71b0c875b4..81247bc0ab 100644 --- a/ext/standard/tests/strings/str_split_variation5.phpt +++ b/ext/standard/tests/strings/str_split_variation5.phpt @@ -86,7 +86,7 @@ foreach($heredoc_array as $str) { echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing str_split() : heredoc strings as 'str' argument *** -- Iteration 1 -- array(1) { diff --git a/ext/standard/tests/strings/str_split_variation6.phpt b/ext/standard/tests/strings/str_split_variation6.phpt index 0294ca6614..a477800a26 100644 --- a/ext/standard/tests/strings/str_split_variation6.phpt +++ b/ext/standard/tests/strings/str_split_variation6.phpt @@ -157,7 +157,7 @@ array(1) { } -- Iteration 7 -- -Warning: str_split() expects parameter 2 to be integer, float given in %s line %d +Warning: str_split() expects parameter 2 to be int, float given in %s line %d NULL -- Iteration 8 -- diff --git a/ext/standard/tests/strings/str_split_variation7.phpt b/ext/standard/tests/strings/str_split_variation7.phpt index a110ea125c..5082c7ba2f 100644 --- a/ext/standard/tests/strings/str_split_variation7.phpt +++ b/ext/standard/tests/strings/str_split_variation7.phpt @@ -135,7 +135,7 @@ array(1) { } -- Iteration 7 -- -Warning: str_split() expects parameter 2 to be integer, float given in %s on line %d +Warning: str_split() expects parameter 2 to be int, float given in %s on line %d NULL -- Iteration 8 -- diff --git a/ext/standard/tests/strings/str_word_count.phpt b/ext/standard/tests/strings/str_word_count.phpt index c99d9a3ebd..f88646370b 100644 --- a/ext/standard/tests/strings/str_word_count.phpt +++ b/ext/standard/tests/strings/str_word_count.phpt @@ -87,10 +87,10 @@ bool(false) Warning: str_word_count(): Invalid format value 999999999 in %s on line %d bool(false) -Warning: str_word_count() expects parameter 2 to be integer, array given in %s on line %d +Warning: str_word_count() expects parameter 2 to be int, array given in %s on line %d NULL -Warning: str_word_count() expects parameter 2 to be integer, string given in %s on line %d +Warning: str_word_count() expects parameter 2 to be int, string given in %s on line %d NULL string(55) "Hello friend, you're looking good today!" diff --git a/ext/standard/tests/strings/strcmp_unterminated.phpt b/ext/standard/tests/strings/strcmp_unterminated.phpt new file mode 100644 index 0000000000..215193567b --- /dev/null +++ b/ext/standard/tests/strings/strcmp_unterminated.phpt @@ -0,0 +1,22 @@ +--TEST-- +strnat(case)cmp(): potential OOB access for unterminated strings +--SKIPIF-- +<?php +if (!function_exists('zend_create_unterminated_string')) die('skip zend_test extension not available'); +?> +--FILE-- +<?php +$a = zend_create_unterminated_string('333'); +$b = zend_create_unterminated_string('333 '); +var_dump( + strnatcmp($a, $b), + strnatcasecmp($b, $a) +); +zend_terminate_string($a); +zend_terminate_string($b); +?> +===DONE=== +--EXPECT-- +int(-1) +int(1) +===DONE=== diff --git a/ext/standard/tests/strings/strcoll.phpt b/ext/standard/tests/strings/strcoll.phpt index 37fe251b66..0d78ff37be 100644 --- a/ext/standard/tests/strings/strcoll.phpt +++ b/ext/standard/tests/strings/strcoll.phpt @@ -1,5 +1,7 @@ --TEST-- Testing Basic behaviour of strcoll() +--SKIPIF-- +<?php if (!function_exists('strcoll')) die('skip strcoll function not available') ?> --CREDITS-- Sebastian Schürmann sebs@php.net diff --git a/ext/standard/tests/strings/strcoll_error.phpt b/ext/standard/tests/strings/strcoll_error.phpt index 20daf38ffb..56466bb63e 100644 --- a/ext/standard/tests/strings/strcoll_error.phpt +++ b/ext/standard/tests/strings/strcoll_error.phpt @@ -1,5 +1,7 @@ --TEST-- Test strcoll() function : error conditions +--SKIPIF-- +<?php if (!function_exists('strcoll')) die('skip strcoll function not available') ?> --FILE-- <?php /* Prototype: int strcoll ( string $str1 , string $str2 ) diff --git a/ext/standard/tests/strings/strcspn_basic.phpt b/ext/standard/tests/strings/strcspn_basic.phpt index d9b56f2436..d31756050c 100644 --- a/ext/standard/tests/strings/strcspn_basic.phpt +++ b/ext/standard/tests/strings/strcspn_basic.phpt @@ -33,7 +33,7 @@ var_dump( strcspn($str, $mask) ); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing strcspn() : basic functionality *** int(2) int(2) diff --git a/ext/standard/tests/strings/strcspn_variation10.phpt b/ext/standard/tests/strings/strcspn_variation10.phpt index 201b19d7ae..1ad369f5dd 100644 --- a/ext/standard/tests/strings/strcspn_variation10.phpt +++ b/ext/standard/tests/strings/strcspn_variation10.phpt @@ -63,7 +63,7 @@ foreach($strings as $str) { echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing strcspn() : with different mask strings and default start and len arguments *** -- Itearation 1 -- diff --git a/ext/standard/tests/strings/strcspn_variation11.phpt b/ext/standard/tests/strings/strcspn_variation11.phpt index fe08df0c16..9acefd074c 100644 --- a/ext/standard/tests/strings/strcspn_variation11.phpt +++ b/ext/standard/tests/strings/strcspn_variation11.phpt @@ -77,7 +77,7 @@ foreach($strings as $str) { echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing strcspn() : with different start and default len values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/strcspn_variation12.phpt b/ext/standard/tests/strings/strcspn_variation12.phpt index 92f7a0aca0..4495e7c26d 100644 --- a/ext/standard/tests/strings/strcspn_variation12.phpt +++ b/ext/standard/tests/strings/strcspn_variation12.phpt @@ -79,7 +79,7 @@ foreach($strings as $str) { echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing strcspn() : with different start and len values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/strcspn_variation3.phpt b/ext/standard/tests/strings/strcspn_variation3.phpt index cb79f3bc7c..745fe88b4c 100644 --- a/ext/standard/tests/strings/strcspn_variation3.phpt +++ b/ext/standard/tests/strings/strcspn_variation3.phpt @@ -123,42 +123,42 @@ int(0) -- Iteration with start value as "Array" -- -Warning: strcspn() expects parameter 3 to be integer, array given in %s on line %d +Warning: strcspn() expects parameter 3 to be int, array given in %s on line %d NULL -Warning: strcspn() expects parameter 3 to be integer, array given in %s on line %d +Warning: strcspn() expects parameter 3 to be int, array given in %s on line %d NULL -- Iteration with start value as "Array" -- -Warning: strcspn() expects parameter 3 to be integer, array given in %s on line %d +Warning: strcspn() expects parameter 3 to be int, array given in %s on line %d NULL -Warning: strcspn() expects parameter 3 to be integer, array given in %s on line %d +Warning: strcspn() expects parameter 3 to be int, array given in %s on line %d NULL -- Iteration with start value as "Array" -- -Warning: strcspn() expects parameter 3 to be integer, array given in %s on line %d +Warning: strcspn() expects parameter 3 to be int, array given in %s on line %d NULL -Warning: strcspn() expects parameter 3 to be integer, array given in %s on line %d +Warning: strcspn() expects parameter 3 to be int, array given in %s on line %d NULL -- Iteration with start value as "Array" -- -Warning: strcspn() expects parameter 3 to be integer, array given in %s on line %d +Warning: strcspn() expects parameter 3 to be int, array given in %s on line %d NULL -Warning: strcspn() expects parameter 3 to be integer, array given in %s on line %d +Warning: strcspn() expects parameter 3 to be int, array given in %s on line %d NULL -- Iteration with start value as "Array" -- -Warning: strcspn() expects parameter 3 to be integer, array given in %s on line %d +Warning: strcspn() expects parameter 3 to be int, array given in %s on line %d NULL -Warning: strcspn() expects parameter 3 to be integer, array given in %s on line %d +Warning: strcspn() expects parameter 3 to be int, array given in %s on line %d NULL -- Iteration with start value as "" -- @@ -187,42 +187,42 @@ int(0) -- Iteration with start value as "" -- -Warning: strcspn() expects parameter 3 to be integer, string given in %s on line %d +Warning: strcspn() expects parameter 3 to be int, string given in %s on line %d NULL -Warning: strcspn() expects parameter 3 to be integer, string given in %s on line %d +Warning: strcspn() expects parameter 3 to be int, string given in %s on line %d NULL -- Iteration with start value as "" -- -Warning: strcspn() expects parameter 3 to be integer, string given in %s on line %d +Warning: strcspn() expects parameter 3 to be int, string given in %s on line %d NULL -Warning: strcspn() expects parameter 3 to be integer, string given in %s on line %d +Warning: strcspn() expects parameter 3 to be int, string given in %s on line %d NULL -- Iteration with start value as "string" -- -Warning: strcspn() expects parameter 3 to be integer, string given in %s on line %d +Warning: strcspn() expects parameter 3 to be int, string given in %s on line %d NULL -Warning: strcspn() expects parameter 3 to be integer, string given in %s on line %d +Warning: strcspn() expects parameter 3 to be int, string given in %s on line %d NULL -- Iteration with start value as "string" -- -Warning: strcspn() expects parameter 3 to be integer, string given in %s on line %d +Warning: strcspn() expects parameter 3 to be int, string given in %s on line %d NULL -Warning: strcspn() expects parameter 3 to be integer, string given in %s on line %d +Warning: strcspn() expects parameter 3 to be int, string given in %s on line %d NULL -- Iteration with start value as "object" -- -Warning: strcspn() expects parameter 3 to be integer, object given in %s on line %d +Warning: strcspn() expects parameter 3 to be int, object given in %s on line %d NULL -Warning: strcspn() expects parameter 3 to be integer, object given in %s on line %d +Warning: strcspn() expects parameter 3 to be int, object given in %s on line %d NULL -- Iteration with start value as "" -- @@ -235,9 +235,9 @@ int(0) -- Iteration with start value as "Resource id #%d" -- -Warning: strcspn() expects parameter 3 to be integer, resource given in %s on line %d +Warning: strcspn() expects parameter 3 to be int, resource given in %s on line %d NULL -Warning: strcspn() expects parameter 3 to be integer, resource given in %s on line %d +Warning: strcspn() expects parameter 3 to be int, resource given in %s on line %d NULL Done diff --git a/ext/standard/tests/strings/strcspn_variation4.phpt b/ext/standard/tests/strings/strcspn_variation4.phpt index 1f84a38cfe..0af1228293 100644 --- a/ext/standard/tests/strings/strcspn_variation4.phpt +++ b/ext/standard/tests/strings/strcspn_variation4.phpt @@ -119,27 +119,27 @@ int(0) -- Iteration with len value as "Array" -- -Warning: strcspn() expects parameter 4 to be integer, array given in %s on line %d +Warning: strcspn() expects parameter 4 to be int, array given in %s on line %d NULL -- Iteration with len value as "Array" -- -Warning: strcspn() expects parameter 4 to be integer, array given in %s on line %d +Warning: strcspn() expects parameter 4 to be int, array given in %s on line %d NULL -- Iteration with len value as "Array" -- -Warning: strcspn() expects parameter 4 to be integer, array given in %s on line %d +Warning: strcspn() expects parameter 4 to be int, array given in %s on line %d NULL -- Iteration with len value as "Array" -- -Warning: strcspn() expects parameter 4 to be integer, array given in %s on line %d +Warning: strcspn() expects parameter 4 to be int, array given in %s on line %d NULL -- Iteration with len value as "Array" -- -Warning: strcspn() expects parameter 4 to be integer, array given in %s on line %d +Warning: strcspn() expects parameter 4 to be int, array given in %s on line %d NULL -- Iteration with len value as "" -- @@ -162,27 +162,27 @@ int(0) -- Iteration with len value as "" -- -Warning: strcspn() expects parameter 4 to be integer, string given in %s on line %d +Warning: strcspn() expects parameter 4 to be int, string given in %s on line %d NULL -- Iteration with len value as "" -- -Warning: strcspn() expects parameter 4 to be integer, string given in %s on line %d +Warning: strcspn() expects parameter 4 to be int, string given in %s on line %d NULL -- Iteration with len value as "string" -- -Warning: strcspn() expects parameter 4 to be integer, string given in %s on line %d +Warning: strcspn() expects parameter 4 to be int, string given in %s on line %d NULL -- Iteration with len value as "string" -- -Warning: strcspn() expects parameter 4 to be integer, string given in %s on line %d +Warning: strcspn() expects parameter 4 to be int, string given in %s on line %d NULL -- Iteration with len value as "object" -- -Warning: strcspn() expects parameter 4 to be integer, object given in %s on line %d +Warning: strcspn() expects parameter 4 to be int, object given in %s on line %d NULL -- Iteration with len value as "" -- @@ -193,6 +193,6 @@ int(0) -- Iteration with len value as "Resource id #%d" -- -Warning: strcspn() expects parameter 4 to be integer, resource given in %s on line %d +Warning: strcspn() expects parameter 4 to be int, resource given in %s on line %d NULL Done diff --git a/ext/standard/tests/strings/strcspn_variation5.phpt b/ext/standard/tests/strings/strcspn_variation5.phpt Binary files differindex dc237b4b41..e6fcae9220 100644 --- a/ext/standard/tests/strings/strcspn_variation5.phpt +++ b/ext/standard/tests/strings/strcspn_variation5.phpt diff --git a/ext/standard/tests/strings/strcspn_variation6.phpt b/ext/standard/tests/strings/strcspn_variation6.phpt index 38ca98310d..4d6c81d0fb 100644 --- a/ext/standard/tests/strings/strcspn_variation6.phpt +++ b/ext/standard/tests/strings/strcspn_variation6.phpt @@ -88,7 +88,7 @@ foreach($heredoc_strings as $str) { echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing strcspn() : with different mask strings *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/strcspn_variation7.phpt b/ext/standard/tests/strings/strcspn_variation7.phpt index d9f11297a8..1f53e20d6f 100644 --- a/ext/standard/tests/strings/strcspn_variation7.phpt +++ b/ext/standard/tests/strings/strcspn_variation7.phpt @@ -103,7 +103,7 @@ foreach($heredoc_strings as $str) { echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing strcspn() : with different start values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/strcspn_variation8.phpt b/ext/standard/tests/strings/strcspn_variation8.phpt index 11cbb15c50..10c42731e7 100644 --- a/ext/standard/tests/strings/strcspn_variation8.phpt +++ b/ext/standard/tests/strings/strcspn_variation8.phpt @@ -109,7 +109,7 @@ foreach($heredoc_strings as $str) { echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing strcspn() : with different start and len values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/strcspn_variation9.phpt b/ext/standard/tests/strings/strcspn_variation9.phpt Binary files differindex 6dc27978b8..632aaa4b5d 100644 --- a/ext/standard/tests/strings/strcspn_variation9.phpt +++ b/ext/standard/tests/strings/strcspn_variation9.phpt diff --git a/ext/standard/tests/strings/strip_tags_basic1.phpt b/ext/standard/tests/strings/strip_tags_basic1.phpt index f00da7ebbc..164cf50452 100644 --- a/ext/standard/tests/strings/strip_tags_basic1.phpt +++ b/ext/standard/tests/strings/strip_tags_basic1.phpt @@ -42,7 +42,7 @@ foreach($string_array as $string) echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strip_tags() : basic functionality *** -- Iteration 1 -- string(5) "hello" diff --git a/ext/standard/tests/strings/strip_tags_basic2.phpt b/ext/standard/tests/strings/strip_tags_basic2.phpt index 4d61c94b54..e9a48af79d 100644 --- a/ext/standard/tests/strings/strip_tags_basic2.phpt +++ b/ext/standard/tests/strings/strip_tags_basic2.phpt @@ -38,7 +38,7 @@ foreach($allowed_tags_array as $tags) echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strip_tags() : basic functionality *** -- Iteration 1 -- string(33) "<html>helloworldOther text</html>" diff --git a/ext/standard/tests/strings/strip_tags_variation10.phpt b/ext/standard/tests/strings/strip_tags_variation10.phpt index a70695b456..eef338fa9c 100644 --- a/ext/standard/tests/strings/strip_tags_variation10.phpt +++ b/ext/standard/tests/strings/strip_tags_variation10.phpt @@ -38,7 +38,7 @@ foreach($single_quote_string as $string_value) echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strip_tags() : usage variations *** -- Iteration 1 -- string(51) "<html> \$ -> This represents the dollar sign</html>" diff --git a/ext/standard/tests/strings/strip_tags_variation11.phpt b/ext/standard/tests/strings/strip_tags_variation11.phpt index 4e6c5fb5c9..63d579f4ad 100644 --- a/ext/standard/tests/strings/strip_tags_variation11.phpt +++ b/ext/standard/tests/strings/strip_tags_variation11.phpt @@ -28,7 +28,7 @@ foreach($string_array as $string) echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strip_tags() : obscure functionality *** -- Iteration 1 -- string(12) "hello world" diff --git a/ext/standard/tests/strings/strip_tags_variation4.phpt b/ext/standard/tests/strings/strip_tags_variation4.phpt index ab01979b78..2118d58959 100644 --- a/ext/standard/tests/strings/strip_tags_variation4.phpt +++ b/ext/standard/tests/strings/strip_tags_variation4.phpt @@ -45,7 +45,7 @@ foreach($strings as $string_value) echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strip_tags() : usage variations *** -- Iteration 1 -- string(32) "hello world... strip_tags_test" diff --git a/ext/standard/tests/strings/strip_tags_variation5.phpt b/ext/standard/tests/strings/strip_tags_variation5.phpt index 7f8481926d..e6b19540e3 100644 --- a/ext/standard/tests/strings/strip_tags_variation5.phpt +++ b/ext/standard/tests/strings/strip_tags_variation5.phpt @@ -77,7 +77,7 @@ for($index =0; $index < count($res_heredoc_strings); $index ++) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strip_tags() : usage variations *** -- Iteration 1 -- string(0) "" diff --git a/ext/standard/tests/strings/strip_tags_variation6.phpt b/ext/standard/tests/strings/strip_tags_variation6.phpt index c838970868..b066e718b3 100644 --- a/ext/standard/tests/strings/strip_tags_variation6.phpt +++ b/ext/standard/tests/strings/strip_tags_variation6.phpt @@ -34,7 +34,7 @@ foreach($strings as $value) echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strip_tags() : usage variations *** -- Iteration 1 -- string(18) " I am html string " diff --git a/ext/standard/tests/strings/strip_tags_variation7.phpt b/ext/standard/tests/strings/strip_tags_variation7.phpt index 784122eaaf..5ff9177b18 100644 --- a/ext/standard/tests/strings/strip_tags_variation7.phpt +++ b/ext/standard/tests/strings/strip_tags_variation7.phpt @@ -43,7 +43,7 @@ foreach($strings as $string_value) echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strip_tags() : usage variations *** -- Iteration 1 -- string(43) "<abc>hello</abc> world... strip_tags_test" diff --git a/ext/standard/tests/strings/strip_tags_variation8.phpt b/ext/standard/tests/strings/strip_tags_variation8.phpt index 53482f7494..f3c5a17136 100644 --- a/ext/standard/tests/strings/strip_tags_variation8.phpt +++ b/ext/standard/tests/strings/strip_tags_variation8.phpt @@ -38,7 +38,7 @@ foreach($quotes as $string_value) } echo "Done"; ---EXPECTF-- +--EXPECT-- *** Testing strip_tags() : usage variations *** -- Iteration 1 -- string(33) "hello world... strip_tags_test " diff --git a/ext/standard/tests/strings/strip_tags_variation9.phpt b/ext/standard/tests/strings/strip_tags_variation9.phpt index 5edf078dc8..843653c208 100644 --- a/ext/standard/tests/strings/strip_tags_variation9.phpt +++ b/ext/standard/tests/strings/strip_tags_variation9.phpt @@ -36,7 +36,7 @@ foreach($double_quote_string as $string_value) } echo "Done"; ---EXPECTF-- +--EXPECT-- *** Testing strip_tags() : usage variations *** -- Iteration 1 -- string(50) "<html> $ -> This represents the dollar sign</html>" diff --git a/ext/standard/tests/strings/stripos.phpt b/ext/standard/tests/strings/stripos.phpt index ef0efe5b23..057b8ca494 100644 --- a/ext/standard/tests/strings/stripos.phpt +++ b/ext/standard/tests/strings/stripos.phpt @@ -28,7 +28,7 @@ stripos() function test echo "Done\n"; ?> ---EXPECT-- +--EXPECTF-- int(0) int(5) int(5) @@ -45,11 +45,23 @@ int(0) bool(false) bool(false) bool(false) + +Deprecated: stripos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) + +Deprecated: stripos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) + +Deprecated: stripos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) + +Deprecated: stripos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) + +Deprecated: stripos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) + +Deprecated: stripos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) int(1) Done diff --git a/ext/standard/tests/strings/stripos_basic1.phpt b/ext/standard/tests/strings/stripos_basic1.phpt index cffbdba1b5..a9424b60c3 100644 --- a/ext/standard/tests/strings/stripos_basic1.phpt +++ b/ext/standard/tests/strings/stripos_basic1.phpt @@ -32,7 +32,7 @@ var_dump( stripos($heredoc_str, $heredoc_str) ); var_dump( stripos("Hello, World", "ooo") ); echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing stripos() function: basic functionality *** -- With default arguments -- int(0) diff --git a/ext/standard/tests/strings/stripos_basic2.phpt b/ext/standard/tests/strings/stripos_basic2.phpt index 226d3f61d2..b2dbece174 100644 --- a/ext/standard/tests/strings/stripos_basic2.phpt +++ b/ext/standard/tests/strings/stripos_basic2.phpt @@ -43,7 +43,7 @@ var_dump( stripos("Hello, World", "o", -4) ); var_dump( stripos("Hello, World", "o", -3) ); echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing stripos() function: basic functionality *** -- With all arguments -- int(0) diff --git a/ext/standard/tests/strings/stripos_variation1.phpt b/ext/standard/tests/strings/stripos_variation1.phpt index ac53cd6139..a3fc324dd7 100644 --- a/ext/standard/tests/strings/stripos_variation1.phpt +++ b/ext/standard/tests/strings/stripos_variation1.phpt @@ -117,16 +117,32 @@ int(9) int(8) bool(false) -- Iteration 12 -- + +Deprecated: stripos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d int(8) + +Deprecated: stripos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) -- Iteration 13 -- + +Deprecated: stripos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d int(8) + +Deprecated: stripos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) -- Iteration 14 -- + +Deprecated: stripos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d int(8) + +Deprecated: stripos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) -- Iteration 15 -- + +Deprecated: stripos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d int(8) + +Deprecated: stripos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) -- Iteration 16 -- bool(false) diff --git a/ext/standard/tests/strings/stripos_variation10.phpt b/ext/standard/tests/strings/stripos_variation10.phpt index fb0a2c8a5b..81b8f5adb1 100644 --- a/ext/standard/tests/strings/stripos_variation10.phpt +++ b/ext/standard/tests/strings/stripos_variation10.phpt @@ -65,7 +65,7 @@ $needles = array ( "", '', - // null vlaues + // null values NULL, null, @@ -95,30 +95,48 @@ echo "*** Done ***"; *** Testing stripos() function with unexpected values for needle *** -- Iteration 1 -- + +Deprecated: stripos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) -- Iteration 2 -- + +Deprecated: stripos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) -- Iteration 3 -- + +Deprecated: stripos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) -- Iteration 4 -- + +Deprecated: stripos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) -- Iteration 5 -- + +Deprecated: stripos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) -- Iteration 6 -- + +Deprecated: stripos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) -- Iteration 7 -- + +Deprecated: stripos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) -- Iteration 8 -- + +Deprecated: stripos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) -- Iteration 9 -- + +Deprecated: stripos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) -- Iteration 10 -- @@ -147,20 +165,30 @@ Warning: stripos(): needle is not a string or an integer in %s on line %d bool(false) -- Iteration 15 -- + +Deprecated: stripos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) -- Iteration 16 -- + +Deprecated: stripos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) -- Iteration 17 -- + +Deprecated: stripos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) -- Iteration 18 -- + +Deprecated: stripos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) -- Iteration 19 -- Notice: Object of class sample could not be converted to int in %s on line %d + +Deprecated: stripos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) -- Iteration 20 -- @@ -170,9 +198,13 @@ bool(false) bool(false) -- Iteration 22 -- + +Deprecated: stripos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) -- Iteration 23 -- + +Deprecated: stripos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) -- Iteration 24 -- @@ -181,8 +213,12 @@ Warning: stripos(): needle is not a string or an integer in %s on line %d %s -- Iteration 25 -- + +Deprecated: stripos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) -- Iteration 26 -- + +Deprecated: stripos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior 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 85ab4ac099..b4b83a1641 100644 --- a/ext/standard/tests/strings/stripos_variation11.phpt +++ b/ext/standard/tests/strings/stripos_variation11.phpt @@ -61,7 +61,7 @@ $values = array ( "", '', - // null vlaues + // null values NULL, null, @@ -91,31 +91,67 @@ echo "*** Done ***"; --EXPECTF-- *** Testing stripos() function with unexpected values for haystack and needle *** -- Iteration 1 -- + +Deprecated: stripos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) + +Deprecated: stripos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) -- Iteration 2 -- + +Deprecated: stripos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) + +Deprecated: stripos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) -- Iteration 3 -- + +Deprecated: stripos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) + +Deprecated: stripos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) -- Iteration 4 -- + +Deprecated: stripos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) + +Deprecated: stripos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) -- Iteration 5 -- + +Deprecated: stripos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) + +Deprecated: stripos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) -- Iteration 6 -- + +Deprecated: stripos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) + +Deprecated: stripos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) -- Iteration 7 -- + +Deprecated: stripos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) + +Deprecated: stripos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) -- Iteration 8 -- + +Deprecated: stripos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) + +Deprecated: stripos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) -- Iteration 9 -- + +Deprecated: stripos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) + +Deprecated: stripos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) -- Iteration 10 -- @@ -153,7 +189,11 @@ NULL Warning: stripos() expects parameter 1 to be string, array given in %s on line %d NULL -- Iteration 15 -- + +Deprecated: stripos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) + +Deprecated: stripos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) -- Iteration 16 -- bool(false) @@ -161,7 +201,11 @@ bool(false) Warning: stripos(): Offset not contained in string in %s on line %d bool(false) -- Iteration 17 -- + +Deprecated: stripos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) + +Deprecated: stripos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) -- Iteration 18 -- bool(false) @@ -171,9 +215,13 @@ bool(false) -- Iteration 19 -- Notice: Object of class sample could not be converted to int in %s on line %d + +Deprecated: stripos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) Notice: Object of class sample could not be converted to int in %s on line %d + +Deprecated: stripos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) -- Iteration 20 -- bool(false) diff --git a/ext/standard/tests/strings/stripos_variation12.phpt b/ext/standard/tests/strings/stripos_variation12.phpt index 8ef1dd3f14..cc419787d6 100644 --- a/ext/standard/tests/strings/stripos_variation12.phpt +++ b/ext/standard/tests/strings/stripos_variation12.phpt @@ -28,7 +28,7 @@ for($index = 0; $index < count($haystacks); $index++ ) { } echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Test stripos() function: binary safe *** int(5) int(5) diff --git a/ext/standard/tests/strings/stripos_variation13.phpt b/ext/standard/tests/strings/stripos_variation13.phpt index 8a65b3386a..a641489755 100644 --- a/ext/standard/tests/strings/stripos_variation13.phpt +++ b/ext/standard/tests/strings/stripos_variation13.phpt @@ -30,7 +30,7 @@ for($index = 0; $index < count($needles); $index++ ) { } echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Test stripos() function: binary safe *** int(1) int(1) diff --git a/ext/standard/tests/strings/stripos_variation14.phpt b/ext/standard/tests/strings/stripos_variation14.phpt index dde934f9d9..10b481fb71 100644 --- a/ext/standard/tests/strings/stripos_variation14.phpt +++ b/ext/standard/tests/strings/stripos_variation14.phpt @@ -59,7 +59,7 @@ $offsets = array ( "", '', - // null vlaues + // null values NULL, null, @@ -100,23 +100,23 @@ int(6) int(6) -- Iteration 6 -- -Warning: stripos() expects parameter 3 to be integer, array given in %s on line %d +Warning: stripos() expects parameter 3 to be int, array given in %s on line %d NULL -- Iteration 7 -- -Warning: stripos() expects parameter 3 to be integer, array given in %s on line %d +Warning: stripos() expects parameter 3 to be int, array given in %s on line %d NULL -- Iteration 8 -- -Warning: stripos() expects parameter 3 to be integer, array given in %s on line %d +Warning: stripos() expects parameter 3 to be int, array given in %s on line %d NULL -- Iteration 9 -- -Warning: stripos() expects parameter 3 to be integer, array given in %s on line %d +Warning: stripos() expects parameter 3 to be int, array given in %s on line %d NULL -- Iteration 10 -- -Warning: stripos() expects parameter 3 to be integer, array given in %s on line %d +Warning: stripos() expects parameter 3 to be int, array given in %s on line %d NULL -- Iteration 11 -- int(6) @@ -128,15 +128,15 @@ int(6) int(6) -- Iteration 15 -- -Warning: stripos() expects parameter 3 to be integer, object given in %s on line %d +Warning: stripos() expects parameter 3 to be int, object given in %s on line %d NULL -- Iteration 16 -- -Warning: stripos() expects parameter 3 to be integer, string given in %s on line %d +Warning: stripos() expects parameter 3 to be int, string given in %s on line %d NULL -- Iteration 17 -- -Warning: stripos() expects parameter 3 to be integer, string given in %s on line %d +Warning: stripos() expects parameter 3 to be int, string given in %s on line %d NULL -- Iteration 18 -- int(6) @@ -144,7 +144,7 @@ int(6) int(6) -- Iteration 20 -- -Warning: stripos() expects parameter 3 to be integer, resource given in %s on line %d +Warning: stripos() expects parameter 3 to be int, resource given in %s on line %d NULL -- Iteration 21 -- int(6) diff --git a/ext/standard/tests/strings/stripos_variation15.phpt b/ext/standard/tests/strings/stripos_variation15.phpt index dbeadc99e2..f8d4f029fe 100644 --- a/ext/standard/tests/strings/stripos_variation15.phpt +++ b/ext/standard/tests/strings/stripos_variation15.phpt @@ -63,7 +63,7 @@ $values = array ( "", '', - // null vlaues + // null values NULL, null, @@ -91,8 +91,12 @@ echo "*** Done ***"; --EXPECTF-- *** Testing stripos() function with unexpected values for haystack, needle & offset *** -- Iteration 1 -- + +Deprecated: stripos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) -- Iteration 2 -- + +Deprecated: stripos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) -- Iteration 3 -- @@ -115,8 +119,12 @@ bool(false) Warning: stripos(): Offset not contained in string in %s on line %d bool(false) -- Iteration 8 -- + +Deprecated: stripos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) -- Iteration 9 -- + +Deprecated: stripos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) -- Iteration 10 -- @@ -139,24 +147,28 @@ NULL Warning: stripos() expects parameter 1 to be string, array given in %s on line %d NULL -- Iteration 15 -- + +Deprecated: stripos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) -- Iteration 16 -- bool(false) -- Iteration 17 -- + +Deprecated: stripos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) -- Iteration 18 -- bool(false) -- Iteration 19 -- -Warning: stripos() expects parameter 3 to be integer, object given in %s on line %d +Warning: stripos() expects parameter 3 to be int, object given in %s on line %d NULL -- Iteration 20 -- -Warning: stripos() expects parameter 3 to be integer, string given in %s on line %d +Warning: stripos() expects parameter 3 to be int, string given in %s on line %d NULL -- Iteration 21 -- -Warning: stripos() expects parameter 3 to be integer, string given in %s on line %d +Warning: stripos() expects parameter 3 to be int, string given in %s on line %d NULL -- Iteration 22 -- bool(false) diff --git a/ext/standard/tests/strings/stripos_variation2.phpt b/ext/standard/tests/strings/stripos_variation2.phpt index c7f3db4005..bb77d1becb 100644 --- a/ext/standard/tests/strings/stripos_variation2.phpt +++ b/ext/standard/tests/strings/stripos_variation2.phpt @@ -119,16 +119,32 @@ bool(false) int(10) int(10) -- Iteration 12 -- + +Deprecated: stripos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) + +Deprecated: stripos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) -- Iteration 13 -- + +Deprecated: stripos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) + +Deprecated: stripos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) -- Iteration 14 -- + +Deprecated: stripos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) + +Deprecated: stripos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) -- Iteration 15 -- + +Deprecated: stripos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) + +Deprecated: stripos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) -- Iteration 16 -- bool(false) @@ -218,7 +234,11 @@ bool(false) bool(false) bool(false) -- Iteration 45 -- + +Deprecated: stripos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d int(26) + +Deprecated: stripos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) -- Iteration 46 -- int(0) diff --git a/ext/standard/tests/strings/stripos_variation3.phpt b/ext/standard/tests/strings/stripos_variation3.phpt index 0382d61195..936f870579 100644 --- a/ext/standard/tests/strings/stripos_variation3.phpt +++ b/ext/standard/tests/strings/stripos_variation3.phpt @@ -26,7 +26,7 @@ var_dump( stripos($multi_line_str, " ") ); echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing stripos() function: with heredoc strings *** -- With heredoc string containing multi lines -- int(14) diff --git a/ext/standard/tests/strings/stripos_variation4.phpt b/ext/standard/tests/strings/stripos_variation4.phpt index ee98a013c2..98e2d25c44 100644 --- a/ext/standard/tests/strings/stripos_variation4.phpt +++ b/ext/standard/tests/strings/stripos_variation4.phpt @@ -28,7 +28,7 @@ var_dump( stripos($special_chars_str, "(special)") ); echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing stripos() function: with heredoc strings *** -- With heredoc string containing special chars -- int(0) diff --git a/ext/standard/tests/strings/stripos_variation5.phpt b/ext/standard/tests/strings/stripos_variation5.phpt index 65f88370ea..095937fabf 100644 --- a/ext/standard/tests/strings/stripos_variation5.phpt +++ b/ext/standard/tests/strings/stripos_variation5.phpt @@ -24,7 +24,7 @@ var_dump( stripos($control_char_str, "\t", 15) ); echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing stripos() function: with heredoc strings *** -- With heredoc string containing escape characters -- int(12) diff --git a/ext/standard/tests/strings/stripos_variation6.phpt b/ext/standard/tests/strings/stripos_variation6.phpt index f0d251380e..fc441e1088 100644 --- a/ext/standard/tests/strings/stripos_variation6.phpt +++ b/ext/standard/tests/strings/stripos_variation6.phpt @@ -25,7 +25,7 @@ var_dump( stripos($quote_char_str, 'things', 0) ); var_dump( stripos($quote_char_str, "things", 20) ); echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing stripos() function: with heredoc strings *** -- With heredoc string containing quote & slash chars -- int(88) diff --git a/ext/standard/tests/strings/stripos_variation8.phpt b/ext/standard/tests/strings/stripos_variation8.phpt index cc20e36d23..41ff384c38 100644 --- a/ext/standard/tests/strings/stripos_variation8.phpt +++ b/ext/standard/tests/strings/stripos_variation8.phpt @@ -35,7 +35,7 @@ for($index = 0; $index < count($needles); $index++) { } echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing stripos() function: strings repetitive chars *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/stripos_variation9.phpt b/ext/standard/tests/strings/stripos_variation9.phpt index 03b8969562..c0713c57ab 100644 --- a/ext/standard/tests/strings/stripos_variation9.phpt +++ b/ext/standard/tests/strings/stripos_variation9.phpt @@ -61,7 +61,7 @@ $haystacks = array ( "", '', - // null vlaues + // null values NULL, null, diff --git a/ext/standard/tests/strings/stripslashes_basic.phpt b/ext/standard/tests/strings/stripslashes_basic.phpt Binary files differindex 1e9a371f89..3e0fb6f2ab 100644 --- a/ext/standard/tests/strings/stripslashes_basic.phpt +++ b/ext/standard/tests/strings/stripslashes_basic.phpt diff --git a/ext/standard/tests/strings/stripslashes_variation2.phpt b/ext/standard/tests/strings/stripslashes_variation2.phpt Binary files differindex 71cde1bc31..e8edf4cd4b 100644 --- a/ext/standard/tests/strings/stripslashes_variation2.phpt +++ b/ext/standard/tests/strings/stripslashes_variation2.phpt diff --git a/ext/standard/tests/strings/stripslashes_variation3.phpt b/ext/standard/tests/strings/stripslashes_variation3.phpt index ef094bcee8..61af9db836 100644 --- a/ext/standard/tests/strings/stripslashes_variation3.phpt +++ b/ext/standard/tests/strings/stripslashes_variation3.phpt @@ -59,7 +59,7 @@ foreach( $str_array as $str ) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing stripslashes() : with strings containing newline and tab characters *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/stripslashes_variation4.phpt b/ext/standard/tests/strings/stripslashes_variation4.phpt index b41c5fe150..32e0c2fdc3 100644 --- a/ext/standard/tests/strings/stripslashes_variation4.phpt +++ b/ext/standard/tests/strings/stripslashes_variation4.phpt @@ -38,7 +38,7 @@ foreach( $str_array as $arr ) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing stripslashes() : with double dimensional arrays *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/stristr2.phpt b/ext/standard/tests/strings/stristr2.phpt index 4b5ca494ac..b899b4739d 100644 --- a/ext/standard/tests/strings/stristr2.phpt +++ b/ext/standard/tests/strings/stristr2.phpt @@ -16,10 +16,14 @@ var_dump(stristr($email, 97)); var_dump(stristr($email, 97, 1)); ?> ---EXPECT-- +--EXPECTF-- string(7) "cCdEfGh" string(2) "Ab" string(5) "eEfGh" string(4) "AbCd" + +Deprecated: stristr(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d string(11) "azAbCdeEfGh" + +Deprecated: stristr(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d string(1) "w" diff --git a/ext/standard/tests/strings/stristr_basic.phpt b/ext/standard/tests/strings/stristr_basic.phpt index 638003f18c..73cbbbe17d 100644 --- a/ext/standard/tests/strings/stristr_basic.phpt +++ b/ext/standard/tests/strings/stristr_basic.phpt @@ -21,7 +21,7 @@ var_dump( stristr("Test String", "String", false) ); var_dump( stristr("Test String", "String", true) ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing stristr() : basic functionality *** string(11) "Test string" string(6) "stRIng" diff --git a/ext/standard/tests/strings/stristr_variation1.phpt b/ext/standard/tests/strings/stristr_variation1.phpt index 2d1844cb31..795bf09323 100644 --- a/ext/standard/tests/strings/stristr_variation1.phpt +++ b/ext/standard/tests/strings/stristr_variation1.phpt @@ -48,7 +48,7 @@ $inputs = array ( TRUE, FALSE, - // null vlaues + // null values /*15*/ NULL, null, diff --git a/ext/standard/tests/strings/stristr_variation2.phpt b/ext/standard/tests/strings/stristr_variation2.phpt index 8b4b2c45e9..4a0b62f261 100644 --- a/ext/standard/tests/strings/stristr_variation2.phpt +++ b/ext/standard/tests/strings/stristr_variation2.phpt @@ -48,7 +48,7 @@ $inputs = array ( TRUE, FALSE, - // null vlaues + // null values /*15*/ NULL, null, @@ -83,18 +83,32 @@ fclose($file_handle); //closing the file handle --EXPECTF-- *** Testing stristr() function: with unexpected inputs for 'needle' argument *** -- Iteration 1 -- + +Deprecated: stristr(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) -- Iteration 2 -- + +Deprecated: stristr(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) -- Iteration 3 -- + +Deprecated: stristr(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) -- Iteration 4 -- + +Deprecated: stristr(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) -- Iteration 5 -- + +Deprecated: stristr(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) -- Iteration 6 -- + +Deprecated: stristr(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) -- Iteration 7 -- + +Deprecated: stristr(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) -- Iteration 8 -- @@ -109,27 +123,45 @@ bool(false) Warning: stristr(): needle is not a string or an integer in %s on line %d bool(false) -- Iteration 11 -- + +Deprecated: stristr(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) -- Iteration 12 -- + +Deprecated: stristr(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) -- Iteration 13 -- + +Deprecated: stristr(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) -- Iteration 14 -- + +Deprecated: stristr(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) -- Iteration 15 -- + +Deprecated: stristr(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) -- Iteration 16 -- + +Deprecated: stristr(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) -- Iteration 17 -- Notice: Object of class sample could not be converted to int in %s on line %d + +Deprecated: stristr(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) -- Iteration 18 -- Warning: stristr(): needle is not a string or an integer in %s on line %d bool(false) -- Iteration 19 -- + +Deprecated: stristr(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) -- Iteration 20 -- + +Deprecated: stristr(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) ===DONE=== diff --git a/ext/standard/tests/strings/strlen_basic.phpt b/ext/standard/tests/strings/strlen_basic.phpt index ba5da3930d..721e4f1d26 100644 --- a/ext/standard/tests/strings/strlen_basic.phpt +++ b/ext/standard/tests/strings/strlen_basic.phpt @@ -15,7 +15,7 @@ var_dump(strlen("")); var_dump(strlen("\x90\x91\x00\x93\x94\x90\x91\x95\x96\x97\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f")); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing strlen() : basic functionality *** int(6) int(7) diff --git a/ext/standard/tests/strings/strnatcmp_leftalign.phpt b/ext/standard/tests/strings/strnatcmp_leftalign.phpt new file mode 100644 index 0000000000..d00b3b83f0 --- /dev/null +++ b/ext/standard/tests/strings/strnatcmp_leftalign.phpt @@ -0,0 +1,28 @@ +--TEST-- +Test strnatcmp() function : left align, whitespace, digits +--CREDITS-- +Sol Richardson <sr5732358@hotmail.com> +--FILE-- +<?php +/* Prototype : int strnatcmp ( string $str1 , string $str2 ) +* Description: String comparisons using a "natural order" algorithm +* Source code: ext/standard/string.c +*/ + +echo "-- Testing strnatcmp() function whitespace, left-align, digit --\n"; +echo "-- Leading whitespace, digits, string 1 longer --\n"; +$str1 = " 00"; +$str2 = " 0"; +var_dump( strnatcmp( $str1, $str2) ); + +echo "-- Leading whitespace, digits, string 2 longer --\n"; +$str1 = " 0"; +$str2 = " 00"; +var_dump( strnatcmp( $str1, $str2) ); +?> +--EXPECT-- +-- Testing strnatcmp() function whitespace, left-align, digit -- +-- Leading whitespace, digits, string 1 longer -- +int(1) +-- Leading whitespace, digits, string 2 longer -- +int(-1) diff --git a/ext/standard/tests/strings/strncasecmp_variation1.phpt b/ext/standard/tests/strings/strncasecmp_variation1.phpt index bcc6ad3d06..eabc164481 100644 --- a/ext/standard/tests/strings/strncasecmp_variation1.phpt +++ b/ext/standard/tests/strings/strncasecmp_variation1.phpt @@ -23,7 +23,7 @@ for($ASCII = 97; $ASCII <= 122; $ASCII++) { } echo "*** Done ***\n"; ?> ---EXPECTF-- +--EXPECT-- *** Test strncasecmp() function: with alphabets *** -- Passing upper-case letters for 'str1' -- int(0) diff --git a/ext/standard/tests/strings/strncasecmp_variation3.phpt b/ext/standard/tests/strings/strncasecmp_variation3.phpt index bf7c765a1d..b6d0f2917b 100644 --- a/ext/standard/tests/strings/strncasecmp_variation3.phpt +++ b/ext/standard/tests/strings/strncasecmp_variation3.phpt @@ -20,7 +20,7 @@ for($len = strlen($str1); $len >= 0; $len--) { } echo "*** Done ***\n"; ?> ---EXPECTF-- +--EXPECT-- *** Test strncasecmp() function: with different lengths *** int(0) int(0) diff --git a/ext/standard/tests/strings/strncasecmp_variation5.phpt b/ext/standard/tests/strings/strncasecmp_variation5.phpt index e88be79a9c..44a58f78e1 100644 --- a/ext/standard/tests/strings/strncasecmp_variation5.phpt +++ b/ext/standard/tests/strings/strncasecmp_variation5.phpt @@ -112,23 +112,23 @@ int(0) int(0) -- Iteration 8 -- -Warning: strncasecmp() expects parameter 3 to be integer, array given in %s on line %d +Warning: strncasecmp() expects parameter 3 to be int, array given in %s on line %d NULL -- Iteration 9 -- -Warning: strncasecmp() expects parameter 3 to be integer, array given in %s on line %d +Warning: strncasecmp() expects parameter 3 to be int, array given in %s on line %d NULL -- Iteration 10 -- -Warning: strncasecmp() expects parameter 3 to be integer, array given in %s on line %d +Warning: strncasecmp() expects parameter 3 to be int, array given in %s on line %d NULL -- Iteration 11 -- -Warning: strncasecmp() expects parameter 3 to be integer, array given in %s on line %d +Warning: strncasecmp() expects parameter 3 to be int, array given in %s on line %d NULL -- Iteration 12 -- -Warning: strncasecmp() expects parameter 3 to be integer, array given in %s on line %d +Warning: strncasecmp() expects parameter 3 to be int, array given in %s on line %d NULL -- Iteration 13 -- int(0) @@ -144,11 +144,11 @@ int(0) int(0) -- Iteration 19 -- -Warning: strncasecmp() expects parameter 3 to be integer, string given in %s on line %d +Warning: strncasecmp() expects parameter 3 to be int, string given in %s on line %d NULL -- Iteration 20 -- -Warning: strncasecmp() expects parameter 3 to be integer, string given in %s on line %d +Warning: strncasecmp() expects parameter 3 to be int, string given in %s on line %d NULL -- Iteration 21 -- int(0) @@ -156,10 +156,10 @@ int(0) int(0) -- Iteration 23 -- -Warning: strncasecmp() expects parameter 3 to be integer, resource given in %s on line %d +Warning: strncasecmp() expects parameter 3 to be int, resource given in %s on line %d NULL -- Iteration 24 -- -Warning: strncasecmp() expects parameter 3 to be integer, object given in %s on line %d +Warning: strncasecmp() expects parameter 3 to be int, object given in %s on line %d NULL *** Done *** diff --git a/ext/standard/tests/strings/strncasecmp_variation6.phpt b/ext/standard/tests/strings/strncasecmp_variation6.phpt index 56276e9554..5c6bdf6d22 100644 --- a/ext/standard/tests/strings/strncasecmp_variation6.phpt +++ b/ext/standard/tests/strings/strncasecmp_variation6.phpt @@ -31,7 +31,7 @@ var_dump( strncasecmp($str1, $str2, 8) ); //comparing all the 8-bits; expected: echo "\n*** Done ***\n"; ?> ---EXPECTF-- +--EXPECT-- *** Test strncasecmp() function: with binary inputs *** -- Checking with all 256 characters given, in binary format -- diff --git a/ext/standard/tests/strings/strncasecmp_variation7.phpt b/ext/standard/tests/strings/strncasecmp_variation7.phpt index e22fad7659..0c711ea42f 100644 --- a/ext/standard/tests/strings/strncasecmp_variation7.phpt +++ b/ext/standard/tests/strings/strncasecmp_variation7.phpt @@ -20,7 +20,7 @@ var_dump( strncasecmp($str3, "Hello,world", 12) ); echo "*** Done ***\n"; ?> ---EXPECTF-- +--EXPECT-- *** Test strncasecmp() function: with null terminated strings and binary inputs *** int(5) int(-119) diff --git a/ext/standard/tests/strings/strncasecmp_variation9.phpt b/ext/standard/tests/strings/strncasecmp_variation9.phpt index 0d713032e0..9841bb4e47 100644 --- a/ext/standard/tests/strings/strncasecmp_variation9.phpt +++ b/ext/standard/tests/strings/strncasecmp_variation9.phpt @@ -73,7 +73,7 @@ for($index1 = 0; $index1 < count($strings); $index1++) { } echo "*** Done ***\n"; ?> ---EXPECTF-- +--EXPECT-- *** Test strncasecmp() function: with here-doc strings *** int(0) int(63) diff --git a/ext/standard/tests/strings/strncmp_variation5.phpt b/ext/standard/tests/strings/strncmp_variation5.phpt index 22aaa439e8..85e50f5929 100644 --- a/ext/standard/tests/strings/strncmp_variation5.phpt +++ b/ext/standard/tests/strings/strncmp_variation5.phpt @@ -126,23 +126,23 @@ int(0) int(0) -- Iteration 11 -- -Warning: strncmp() expects parameter 3 to be integer, array given in%s on line %d +Warning: strncmp() expects parameter 3 to be int, array given in%s on line %d NULL -- Iteration 12 -- -Warning: strncmp() expects parameter 3 to be integer, array given in%s on line %d +Warning: strncmp() expects parameter 3 to be int, array given in%s on line %d NULL -- Iteration 13 -- -Warning: strncmp() expects parameter 3 to be integer, array given in%s on line %d +Warning: strncmp() expects parameter 3 to be int, array given in%s on line %d NULL -- Iteration 14 -- -Warning: strncmp() expects parameter 3 to be integer, array given in%s on line %d +Warning: strncmp() expects parameter 3 to be int, array given in%s on line %d NULL -- Iteration 15 -- -Warning: strncmp() expects parameter 3 to be integer, array given in%s on line %d +Warning: strncmp() expects parameter 3 to be int, array given in%s on line %d NULL -- Iteration 16 -- int(0) @@ -158,11 +158,11 @@ int(0) int(0) -- Iteration 22 -- -Warning: strncmp() expects parameter 3 to be integer, string given in%s on line %d +Warning: strncmp() expects parameter 3 to be int, string given in%s on line %d NULL -- Iteration 23 -- -Warning: strncmp() expects parameter 3 to be integer, string given in%s on line %d +Warning: strncmp() expects parameter 3 to be int, string given in%s on line %d NULL -- Iteration 24 -- int(0) @@ -170,10 +170,10 @@ int(0) int(0) -- Iteration 26 -- -Warning: strncmp() expects parameter 3 to be integer, resource given in%s on line %d +Warning: strncmp() expects parameter 3 to be int, resource given in%s on line %d NULL -- Iteration 27 -- -Warning: strncmp() expects parameter 3 to be integer, object given in%s on line %d +Warning: strncmp() expects parameter 3 to be int, object given in%s on line %d NULL *** Done *** diff --git a/ext/standard/tests/strings/strncmp_variation6.phpt b/ext/standard/tests/strings/strncmp_variation6.phpt index 1ee41ccc4c..f71119faf5 100644 --- a/ext/standard/tests/strings/strncmp_variation6.phpt +++ b/ext/standard/tests/strings/strncmp_variation6.phpt @@ -32,7 +32,7 @@ var_dump( strncmp($str1, $str2, 8) ); //comparing all the 8-bits; expected: int echo "\n*** Done ***\n"; ?> ---EXPECTF-- +--EXPECT-- *** Test strncmp() function: with binary inputs *** -- Checking with all 256 characters given, in binary format -- diff --git a/ext/standard/tests/strings/strncmp_variation7.phpt b/ext/standard/tests/strings/strncmp_variation7.phpt index 35d11d981a..6634b22c4e 100644 --- a/ext/standard/tests/strings/strncmp_variation7.phpt +++ b/ext/standard/tests/strings/strncmp_variation7.phpt @@ -18,7 +18,7 @@ var_dump( strncmp($str1, $str2, 12) ); //expected: int(5); echo "*** Done ***\n"; ?> ---EXPECTF-- +--EXPECT-- *** Test strncmp() function: Checking with the null terminated strings *** int(5) *** Done *** diff --git a/ext/standard/tests/strings/strncmp_variation9.phpt b/ext/standard/tests/strings/strncmp_variation9.phpt index 282f241849..1c83e80f09 100644 --- a/ext/standard/tests/strings/strncmp_variation9.phpt +++ b/ext/standard/tests/strings/strncmp_variation9.phpt @@ -52,7 +52,7 @@ for($index1 = 0; $index1 < count($strings); $index1++) { } echo "*** Done ***\n"; ?> ---EXPECTF-- +--EXPECT-- *** Test strncmp() function: with different input strings *** int(0) int(0) diff --git a/ext/standard/tests/strings/strpos.phpt b/ext/standard/tests/strings/strpos.phpt Binary files differindex d127d9d77c..578539804d 100644 --- a/ext/standard/tests/strings/strpos.phpt +++ b/ext/standard/tests/strings/strpos.phpt diff --git a/ext/standard/tests/strings/strpos_number.phpt b/ext/standard/tests/strings/strpos_number.phpt index 73da09500d..fd045c64d3 100644 --- a/ext/standard/tests/strings/strpos_number.phpt +++ b/ext/standard/tests/strings/strpos_number.phpt @@ -9,7 +9,10 @@ var_dump(strpos("foo bar", 111)); // string("11") is contained var_dump(strpos("foo 11", "11")); ?> ---EXPECT-- +--EXPECTF-- +Deprecated: strpos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) + +Deprecated: strpos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d int(1) int(4) diff --git a/ext/standard/tests/strings/strrchr.phpt b/ext/standard/tests/strings/strrchr.phpt index 26253f0b3a..2af3726480 100644 --- a/ext/standard/tests/strings/strrchr.phpt +++ b/ext/standard/tests/strings/strrchr.phpt @@ -12,7 +12,7 @@ var_dump(strrchr("test".chr(0)."string", "t")); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- bool(false) bool(false) bool(false) diff --git a/ext/standard/tests/strings/strrchr_basic.phpt b/ext/standard/tests/strings/strrchr_basic.phpt index e61fb8c108..822a755322 100644 --- a/ext/standard/tests/strings/strrchr_basic.phpt +++ b/ext/standard/tests/strings/strrchr_basic.phpt @@ -37,7 +37,7 @@ var_dump( strrchr("Hello, World", "ooo") ); var_dump( strrchr("Hello, World", "Zzzz") ); //non-existent needle in haystack echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strrchr() function: basic functionality *** string(12) "Hello, World" string(12) "Hello, World" diff --git a/ext/standard/tests/strings/strrchr_variation1.phpt b/ext/standard/tests/strings/strrchr_variation1.phpt Binary files differindex 7100f5e824..5043128945 100644 --- a/ext/standard/tests/strings/strrchr_variation1.phpt +++ b/ext/standard/tests/strings/strrchr_variation1.phpt diff --git a/ext/standard/tests/strings/strrchr_variation10.phpt b/ext/standard/tests/strings/strrchr_variation10.phpt index 8d93bd0335..3b06b20be1 100644 --- a/ext/standard/tests/strings/strrchr_variation10.phpt +++ b/ext/standard/tests/strings/strrchr_variation10.phpt @@ -96,7 +96,7 @@ $needles = array ( TRUE, FALSE, - // null vlaues + // null values NULL, null, @@ -132,22 +132,40 @@ echo "*** Done ***"; --EXPECTF-- *** Testing strrchr() function with unexpected inputs for needle *** -- Iteration 1 -- + +Deprecated: strrchr(): Non-string needles will be interpreted as strings in %s on line %d bool(false) -- Iteration 2 -- + +Deprecated: strrchr(): Non-string needles will be interpreted as strings in %s on line %d bool(false) -- Iteration 3 -- + +Deprecated: strrchr(): Non-string needles will be interpreted as strings in %s on line %d bool(false) -- Iteration 4 -- + +Deprecated: strrchr(): Non-string needles will be interpreted as strings in %s on line %d bool(false) -- Iteration 5 -- + +Deprecated: strrchr(): Non-string needles will be interpreted as strings in %s on line %d bool(false) -- Iteration 6 -- + +Deprecated: strrchr(): Non-string needles will be interpreted as strings in %s on line %d bool(false) -- Iteration 7 -- + +Deprecated: strrchr(): Non-string needles will be interpreted as strings in %s on line %d bool(false) -- Iteration 8 -- + +Deprecated: strrchr(): Non-string needles will be interpreted as strings in %s on line %d bool(false) -- Iteration 9 -- + +Deprecated: strrchr(): Non-string needles will be interpreted as strings in %s on line %d bool(false) -- Iteration 10 -- @@ -170,20 +188,34 @@ bool(false) Warning: strrchr(): needle is not a string or an integer in %s on line %d bool(false) -- Iteration 15 -- + +Deprecated: strrchr(): Non-string needles will be interpreted as strings in %s on line %d bool(false) -- Iteration 16 -- + +Deprecated: strrchr(): Non-string needles will be interpreted as strings in %s on line %d bool(false) -- Iteration 17 -- + +Deprecated: strrchr(): Non-string needles will be interpreted as strings in %s on line %d bool(false) -- Iteration 18 -- + +Deprecated: strrchr(): Non-string needles will be interpreted as strings in %s on line %d bool(false) -- Iteration 19 -- + +Deprecated: strrchr(): Non-string needles will be interpreted as strings in %s on line %d bool(false) -- Iteration 20 -- + +Deprecated: strrchr(): Non-string needles will be interpreted as strings in %s on line %d bool(false) -- Iteration 21 -- Notice: Object of class sample could not be converted to int in %s on line %d + +Deprecated: strrchr(): Non-string needles will be interpreted as strings in %s on line %d bool(false) -- Iteration 22 -- bool(false) @@ -194,7 +226,11 @@ bool(false) Warning: strrchr(): needle is not a string or an integer in %s on line %d bool(false) -- Iteration 25 -- + +Deprecated: strrchr(): Non-string needles will be interpreted as strings in %s on line %d bool(false) -- Iteration 26 -- + +Deprecated: strrchr(): Non-string needles will be interpreted as strings in %s on line %d bool(false) *** Done *** diff --git a/ext/standard/tests/strings/strrchr_variation11.phpt b/ext/standard/tests/strings/strrchr_variation11.phpt index 4f1ecd2c1d..108ba2e0f2 100644 --- a/ext/standard/tests/strings/strrchr_variation11.phpt +++ b/ext/standard/tests/strings/strrchr_variation11.phpt @@ -61,7 +61,7 @@ $values = array ( "", '', - // null vlaues + // null values NULL, null, @@ -91,22 +91,40 @@ echo "*** Done ***"; --EXPECTF-- *** Testing strrchr() function: with unexpected inputs for haystack and needle *** -- Iteration 1 -- + +Deprecated: strrchr(): Non-string needles will be interpreted as strings in %s on line %d bool(false) -- Iteration 2 -- + +Deprecated: strrchr(): Non-string needles will be interpreted as strings in %s on line %d bool(false) -- Iteration 3 -- + +Deprecated: strrchr(): Non-string needles will be interpreted as strings in %s on line %d bool(false) -- Iteration 4 -- + +Deprecated: strrchr(): Non-string needles will be interpreted as strings in %s on line %d bool(false) -- Iteration 5 -- + +Deprecated: strrchr(): Non-string needles will be interpreted as strings in %s on line %d bool(false) -- Iteration 6 -- + +Deprecated: strrchr(): Non-string needles will be interpreted as strings in %s on line %d bool(false) -- Iteration 7 -- + +Deprecated: strrchr(): Non-string needles will be interpreted as strings in %s on line %d bool(false) -- Iteration 8 -- + +Deprecated: strrchr(): Non-string needles will be interpreted as strings in %s on line %d bool(false) -- Iteration 9 -- + +Deprecated: strrchr(): Non-string needles will be interpreted as strings in %s on line %d bool(false) -- Iteration 10 -- @@ -129,31 +147,49 @@ NULL Warning: strrchr() expects parameter 1 to be string, array given in %s on line %d NULL -- Iteration 15 -- + +Deprecated: strrchr(): Non-string needles will be interpreted as strings in %s on line %d bool(false) -- Iteration 16 -- + +Deprecated: strrchr(): Non-string needles will be interpreted as strings in %s on line %d bool(false) -- Iteration 17 -- + +Deprecated: strrchr(): Non-string needles will be interpreted as strings in %s on line %d bool(false) -- Iteration 18 -- + +Deprecated: strrchr(): Non-string needles will be interpreted as strings in %s on line %d bool(false) -- Iteration 19 -- Notice: Object of class sample could not be converted to int in %s on line %d + +Deprecated: strrchr(): Non-string needles will be interpreted as strings in %s on line %d bool(false) -- Iteration 20 -- bool(false) -- Iteration 21 -- bool(false) -- Iteration 22 -- + +Deprecated: strrchr(): Non-string needles will be interpreted as strings in %s on line %d bool(false) -- Iteration 23 -- + +Deprecated: strrchr(): Non-string needles will be interpreted as strings in %s on line %d bool(false) -- Iteration 24 -- Warning: strrchr() expects parameter 1 to be string, resource given in %s on line %d NULL -- Iteration 25 -- + +Deprecated: strrchr(): Non-string needles will be interpreted as strings in %s on line %d bool(false) -- Iteration 26 -- + +Deprecated: strrchr(): Non-string needles will be interpreted as strings in %s on line %d bool(false) *** Done *** diff --git a/ext/standard/tests/strings/strrchr_variation12.phpt b/ext/standard/tests/strings/strrchr_variation12.phpt Binary files differindex c31e0c86ce..730811ea47 100644 --- a/ext/standard/tests/strings/strrchr_variation12.phpt +++ b/ext/standard/tests/strings/strrchr_variation12.phpt diff --git a/ext/standard/tests/strings/strrchr_variation2.phpt b/ext/standard/tests/strings/strrchr_variation2.phpt index f0505c2b8c..ddce2c2ccb 100644 --- a/ext/standard/tests/strings/strrchr_variation2.phpt +++ b/ext/standard/tests/strings/strrchr_variation2.phpt @@ -117,15 +117,23 @@ bool(false) string(5) "\101 " -- Iteration 12 -- + +Deprecated: strrchr(): Non-string needles will be interpreted as strings in %s on line %d bool(false) -- Iteration 13 -- + +Deprecated: strrchr(): Non-string needles will be interpreted as strings in %s on line %d bool(false) -- Iteration 14 -- + +Deprecated: strrchr(): Non-string needles will be interpreted as strings in %s on line %d bool(false) -- Iteration 15 -- + +Deprecated: strrchr(): Non-string needles will be interpreted as strings in %s on line %d bool(false) -- Iteration 16 -- @@ -213,6 +221,8 @@ bool(false) string(7) "4 \101 " -- Iteration 44 -- + +Deprecated: strrchr(): Non-string needles will be interpreted as strings in %s on line %d string(37) "*+-./:;<=>?@hello123456he \x234 \101 " -- Iteration 45 -- diff --git a/ext/standard/tests/strings/strrchr_variation3.phpt b/ext/standard/tests/strings/strrchr_variation3.phpt index e22efe9e5c..a9695fad6f 100644 --- a/ext/standard/tests/strings/strrchr_variation3.phpt +++ b/ext/standard/tests/strings/strrchr_variation3.phpt @@ -32,7 +32,7 @@ foreach($needles as $needle) { echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strrchr() function: with heredoc strings *** string(19) "ing heredoc syntax." bool(false) diff --git a/ext/standard/tests/strings/strrchr_variation4.phpt b/ext/standard/tests/strings/strrchr_variation4.phpt index 10f4ea5aba..1bef8a9512 100644 --- a/ext/standard/tests/strings/strrchr_variation4.phpt +++ b/ext/standard/tests/strings/strrchr_variation4.phpt @@ -38,7 +38,7 @@ foreach($needles as $needle) { } echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strrchr() function: with heredoc strings *** string(24) "!$#$^^&*(special) chars." diff --git a/ext/standard/tests/strings/strrchr_variation5.phpt b/ext/standard/tests/strings/strrchr_variation5.phpt index e2f590afa1..0d67fda06d 100644 --- a/ext/standard/tests/strings/strrchr_variation5.phpt +++ b/ext/standard/tests/strings/strrchr_variation5.phpt @@ -32,7 +32,7 @@ foreach($needles as $needle) { echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strrchr() function: with heredoc strings *** string(32) " st
ch
using scape \seque diff --git a/ext/standard/tests/strings/strrchr_variation6.phpt b/ext/standard/tests/strings/strrchr_variation6.phpt index ba0ffadbd7..fff943b179 100644 --- a/ext/standard/tests/strings/strrchr_variation6.phpt +++ b/ext/standard/tests/strings/strrchr_variation6.phpt @@ -32,7 +32,7 @@ foreach($needles as $needle) { } echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strrchr() function: with heredoc strings *** string(3) "te'" string(32) "" diff --git a/ext/standard/tests/strings/strrchr_variation7.phpt b/ext/standard/tests/strings/strrchr_variation7.phpt index 1425502b1a..bd58189c20 100644 --- a/ext/standard/tests/strings/strrchr_variation7.phpt +++ b/ext/standard/tests/strings/strrchr_variation7.phpt @@ -32,7 +32,7 @@ foreach($needles as $needle) { } echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strrchr() function: with heredoc strings *** bool(false) bool(false) diff --git a/ext/standard/tests/strings/strrchr_variation8.phpt b/ext/standard/tests/strings/strrchr_variation8.phpt index 3e298a0b3a..6b49b698f4 100644 --- a/ext/standard/tests/strings/strrchr_variation8.phpt +++ b/ext/standard/tests/strings/strrchr_variation8.phpt @@ -34,7 +34,11 @@ echo "*** Done ***"; *** Testing strrchr() function: with heredoc strings *** bool(false) bool(false) + +Deprecated: strrchr(): Non-string needles will be interpreted as strings in %s on line %d bool(false) + +Deprecated: strrchr(): Non-string needles will be interpreted as strings in %s on line %d bool(false) bool(false) bool(false) diff --git a/ext/standard/tests/strings/strrchr_variation9.phpt b/ext/standard/tests/strings/strrchr_variation9.phpt index 0c78663c06..760bfa6067 100644 --- a/ext/standard/tests/strings/strrchr_variation9.phpt +++ b/ext/standard/tests/strings/strrchr_variation9.phpt @@ -56,7 +56,7 @@ $haystacks = array ( TRUE, FALSE, - // null vlaues + // null values NULL, null, diff --git a/ext/standard/tests/strings/strrev_basic.phpt b/ext/standard/tests/strings/strrev_basic.phpt index 377a2d147e..64687272c0 100644 --- a/ext/standard/tests/strings/strrev_basic.phpt +++ b/ext/standard/tests/strings/strrev_basic.phpt @@ -32,7 +32,7 @@ var_dump( strrev('Hello, World\n') ); var_dump( strrev($heredoc) ); echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strrev() : basic functionality *** string(12) "dlroW ,olleH" string(12) "dlroW ,olleH" diff --git a/ext/standard/tests/strings/strrev_variation1.phpt b/ext/standard/tests/strings/strrev_variation1.phpt Binary files differindex 8fd957777a..b13579f20b 100644 --- a/ext/standard/tests/strings/strrev_variation1.phpt +++ b/ext/standard/tests/strings/strrev_variation1.phpt diff --git a/ext/standard/tests/strings/strrev_variation2.phpt b/ext/standard/tests/strings/strrev_variation2.phpt Binary files differindex d5e0592551..d8ddda476c 100644 --- a/ext/standard/tests/strings/strrev_variation2.phpt +++ b/ext/standard/tests/strings/strrev_variation2.phpt diff --git a/ext/standard/tests/strings/strrev_variation3.phpt b/ext/standard/tests/strings/strrev_variation3.phpt Binary files differindex bd25c1d08e..6648c1b7fc 100644 --- a/ext/standard/tests/strings/strrev_variation3.phpt +++ b/ext/standard/tests/strings/strrev_variation3.phpt diff --git a/ext/standard/tests/strings/strripos_offset.phpt b/ext/standard/tests/strings/strripos_offset.phpt index 4ba98d137f..70a9534ebd 100644 --- a/ext/standard/tests/strings/strripos_offset.phpt +++ b/ext/standard/tests/strings/strripos_offset.phpt @@ -1,7 +1,5 @@ --TEST-- strripos() offset integer overflow ---SKIPIF-- -<?php if (PHP_INT_SIZE !== 4) die("skip this test is for 32-bit only"); --FILE-- <?php @@ -18,27 +16,31 @@ var_dump(strripos(1024, "te", -PHP_INT_MAX-1)); echo "Done\n"; ?> --EXPECTF-- -Warning: strripos() expects parameter 3 to be integer, float given in %s on line %d +Warning: strripos() expects parameter 3 to be int, float given in %s on line %d bool(false) -Warning: strripos() expects parameter 3 to be integer, float given in %s on line %d +Warning: strripos() expects parameter 3 to be int, float given in %s on line %d bool(false) -Warning: strripos() expects parameter 3 to be integer, float given in %s on line %d +Warning: strripos() expects parameter 3 to be int, float given in %s on line %d bool(false) -Warning: strripos() expects parameter 3 to be integer, float given in %s on line %d +Warning: strripos() expects parameter 3 to be int, float given in %s on line %d bool(false) Warning: strripos() expects parameter 1 to be string, array given in %s on line %d bool(false) +Deprecated: strripos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d + Warning: strripos(): Offset is greater than the length of haystack string in %s on line %d bool(false) Warning: strripos(): Offset is greater than the length of haystack string in %s on line %d bool(false) +Deprecated: strripos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d + Warning: strripos(): Offset is greater than the length of haystack string in %s on line %d bool(false) diff --git a/ext/standard/tests/strings/strripos_variation1.phpt b/ext/standard/tests/strings/strripos_variation1.phpt index 56d2cd6a07..59d7a64686 100644 --- a/ext/standard/tests/strings/strripos_variation1.phpt +++ b/ext/standard/tests/strings/strripos_variation1.phpt @@ -132,24 +132,56 @@ int(8) bool(false) int(8) -- Iteration 12 -- + +Deprecated: strripos(): Non-string needles will be interpreted as strings in %s on line %d int(8) + +Deprecated: strripos(): Non-string needles will be interpreted as strings in %s on line %d int(8) + +Deprecated: strripos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) + +Deprecated: strripos(): Non-string needles will be interpreted as strings in %s on line %d int(8) -- Iteration 13 -- + +Deprecated: strripos(): Non-string needles will be interpreted as strings in %s on line %d int(8) + +Deprecated: strripos(): Non-string needles will be interpreted as strings in %s on line %d int(8) + +Deprecated: strripos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) + +Deprecated: strripos(): Non-string needles will be interpreted as strings in %s on line %d int(8) -- Iteration 14 -- + +Deprecated: strripos(): Non-string needles will be interpreted as strings in %s on line %d int(8) + +Deprecated: strripos(): Non-string needles will be interpreted as strings in %s on line %d int(8) + +Deprecated: strripos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) + +Deprecated: strripos(): Non-string needles will be interpreted as strings in %s on line %d int(8) -- Iteration 15 -- + +Deprecated: strripos(): Non-string needles will be interpreted as strings in %s on line %d int(8) + +Deprecated: strripos(): Non-string needles will be interpreted as strings in %s on line %d int(8) + +Deprecated: strripos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) + +Deprecated: strripos(): Non-string needles will be interpreted as strings in %s on line %d int(8) -- Iteration 16 -- bool(false) diff --git a/ext/standard/tests/strings/strripos_variation2.phpt b/ext/standard/tests/strings/strripos_variation2.phpt index 529943bddd..7b47b787be 100644 --- a/ext/standard/tests/strings/strripos_variation2.phpt +++ b/ext/standard/tests/strings/strripos_variation2.phpt @@ -75,7 +75,7 @@ foreach ($needles as $needle) { } ?> ===DONE=== ---EXPECT-- +--EXPECTF-- *** Testing strripos() function: with single quoted strings *** -- Iteration 1 -- int(32) @@ -133,24 +133,56 @@ int(10) bool(false) int(10) -- Iteration 12 -- + +Deprecated: strripos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) + +Deprecated: strripos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) + +Deprecated: strripos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) + +Deprecated: strripos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) -- Iteration 13 -- + +Deprecated: strripos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) + +Deprecated: strripos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) + +Deprecated: strripos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) + +Deprecated: strripos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) -- Iteration 14 -- + +Deprecated: strripos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) + +Deprecated: strripos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) + +Deprecated: strripos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) + +Deprecated: strripos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) -- Iteration 15 -- + +Deprecated: strripos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) + +Deprecated: strripos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) + +Deprecated: strripos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) + +Deprecated: strripos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) -- Iteration 16 -- bool(false) @@ -248,9 +280,17 @@ bool(false) bool(false) bool(false) -- Iteration 35 -- + +Deprecated: strripos(): Non-string needles will be interpreted as strings in %s on line %d int(23) + +Deprecated: strripos(): Non-string needles will be interpreted as strings in %s on line %d int(23) + +Deprecated: strripos(): Non-string needles will be interpreted as strings in %s on line %d int(23) + +Deprecated: strripos(): Non-string needles will be interpreted as strings in %s on line %d int(23) -- Iteration 36 -- int(0) diff --git a/ext/standard/tests/strings/strripos_variation4.phpt b/ext/standard/tests/strings/strripos_variation4.phpt index f76ea41d36..3583f3646c 100644 --- a/ext/standard/tests/strings/strripos_variation4.phpt +++ b/ext/standard/tests/strings/strripos_variation4.phpt @@ -28,7 +28,7 @@ var_dump( strripos($special_chars_str, "(speCIal)") ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing strripos() function: with heredoc strings *** -- With heredoc string containing special chars -- int(0) diff --git a/ext/standard/tests/strings/strripos_variation5.phpt b/ext/standard/tests/strings/strripos_variation5.phpt index 66802870d4..677e108e33 100644 --- a/ext/standard/tests/strings/strripos_variation5.phpt +++ b/ext/standard/tests/strings/strripos_variation5.phpt @@ -24,7 +24,7 @@ var_dump( strripos($control_char_str, "\t", 15) ); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing strripos() function: with heredoc strings *** -- With heredoc string containing escape characters -- int(13) diff --git a/ext/standard/tests/strings/strrpos_basic1.phpt b/ext/standard/tests/strings/strrpos_basic1.phpt index 26497fb3ff..e8fc24ade3 100644 --- a/ext/standard/tests/strings/strrpos_basic1.phpt +++ b/ext/standard/tests/strings/strrpos_basic1.phpt @@ -30,7 +30,7 @@ var_dump( strrpos($heredoc_str, $heredoc_str) ); echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strrpos() function: basic functionality *** -- With default arguments -- int(0) diff --git a/ext/standard/tests/strings/strrpos_basic2.phpt b/ext/standard/tests/strings/strrpos_basic2.phpt index a65bbf3fd2..4698aafebf 100644 --- a/ext/standard/tests/strings/strrpos_basic2.phpt +++ b/ext/standard/tests/strings/strrpos_basic2.phpt @@ -32,7 +32,7 @@ var_dump( strrpos("Hello, World", "o", 6) ); var_dump( strrpos("Hello, World", "o", 10) ); echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strrpos() function: basic functionality *** -- With all arguments -- int(0) diff --git a/ext/standard/tests/strings/strrpos_offset.phpt b/ext/standard/tests/strings/strrpos_offset.phpt index 18dcf7b850..9ef4f42d18 100644 --- a/ext/standard/tests/strings/strrpos_offset.phpt +++ b/ext/standard/tests/strings/strrpos_offset.phpt @@ -1,7 +1,5 @@ --TEST-- strrpos() offset integer overflow ---SKIPIF-- -<?php if (PHP_INT_SIZE !== 4) die("skip this test is for 32-bit only"); --FILE-- <?php @@ -17,24 +15,28 @@ var_dump(strrpos(1024, "te", -PHP_INT_MAX-1)); echo "Done\n"; ?> --EXPECTF-- -Warning: strrpos() expects parameter 3 to be integer, float given in %s on line %d +Warning: strrpos() expects parameter 3 to be int, float given in %s on line %d bool(false) -Warning: strrpos() expects parameter 3 to be integer, float given in %s on line %d +Warning: strrpos() expects parameter 3 to be int, float given in %s on line %d bool(false) -Warning: strrpos() expects parameter 3 to be integer, float given in %s on line %d +Warning: strrpos() expects parameter 3 to be int, float given in %s on line %d bool(false) -Warning: strrpos() expects parameter 3 to be integer, float given in %s on line %d +Warning: strrpos() expects parameter 3 to be int, float given in %s on line %d bool(false) +Deprecated: strrpos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d + Warning: strrpos(): Offset is greater than the length of haystack string in %s on line %d bool(false) Warning: strrpos(): Offset is greater than the length of haystack string in %s on line %d bool(false) +Deprecated: strrpos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d + Warning: strrpos(): Offset is greater than the length of haystack string in %s on line %d bool(false) diff --git a/ext/standard/tests/strings/strrpos_variation1.phpt b/ext/standard/tests/strings/strrpos_variation1.phpt index cb7078f622..fd236d04d4 100644 --- a/ext/standard/tests/strings/strrpos_variation1.phpt +++ b/ext/standard/tests/strings/strrpos_variation1.phpt @@ -108,16 +108,32 @@ int(9) int(8) bool(false) -- Iteration 12 -- + +Deprecated: strrpos(): Non-string needles will be interpreted as strings in %s on line %d int(8) + +Deprecated: strrpos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) -- Iteration 13 -- + +Deprecated: strrpos(): Non-string needles will be interpreted as strings in %s on line %d int(8) + +Deprecated: strrpos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) -- Iteration 14 -- + +Deprecated: strrpos(): Non-string needles will be interpreted as strings in %s on line %d int(8) + +Deprecated: strrpos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) -- Iteration 15 -- + +Deprecated: strrpos(): Non-string needles will be interpreted as strings in %s on line %d int(8) + +Deprecated: strrpos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) -- Iteration 16 -- bool(false) diff --git a/ext/standard/tests/strings/strrpos_variation10.phpt b/ext/standard/tests/strings/strrpos_variation10.phpt index dabfa0d4a8..b9b24b9cb1 100644 --- a/ext/standard/tests/strings/strrpos_variation10.phpt +++ b/ext/standard/tests/strings/strrpos_variation10.phpt @@ -65,7 +65,7 @@ $needles = array ( "", '', - // null vlaues + // null values NULL, null, @@ -94,22 +94,40 @@ echo "*** Done ***"; --EXPECTF-- *** Testing strrpos() function with unexpected values for needle *** -- Iteration 1 -- + +Deprecated: strrpos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) -- Iteration 2 -- + +Deprecated: strrpos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) -- Iteration 3 -- + +Deprecated: strrpos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) -- Iteration 4 -- + +Deprecated: strrpos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) -- Iteration 5 -- + +Deprecated: strrpos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) -- Iteration 6 -- + +Deprecated: strrpos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) -- Iteration 7 -- + +Deprecated: strrpos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) -- Iteration 8 -- + +Deprecated: strrpos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) -- Iteration 9 -- + +Deprecated: strrpos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) -- Iteration 10 -- @@ -132,31 +150,49 @@ bool(false) Warning: strrpos(): needle is not a string or an integer in %s on line %d bool(false) -- Iteration 15 -- + +Deprecated: strrpos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) -- Iteration 16 -- + +Deprecated: strrpos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) -- Iteration 17 -- + +Deprecated: strrpos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) -- Iteration 18 -- + +Deprecated: strrpos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) -- Iteration 19 -- Notice: Object of class sample could not be converted to int in %s on line %d + +Deprecated: strrpos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) -- Iteration 20 -- bool(false) -- Iteration 21 -- bool(false) -- Iteration 22 -- + +Deprecated: strrpos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) -- Iteration 23 -- + +Deprecated: strrpos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) -- Iteration 24 -- Warning: strrpos(): needle is not a string or an integer in %s on line %d bool(false) -- Iteration 25 -- + +Deprecated: strrpos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) -- Iteration 26 -- + +Deprecated: strrpos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) *** Done *** diff --git a/ext/standard/tests/strings/strrpos_variation11.phpt b/ext/standard/tests/strings/strrpos_variation11.phpt index de4013b917..94c1b9d96d 100644 --- a/ext/standard/tests/strings/strrpos_variation11.phpt +++ b/ext/standard/tests/strings/strrpos_variation11.phpt @@ -61,7 +61,7 @@ $values = array ( "", '', - // null vlaues + // null values NULL, null, @@ -91,31 +91,67 @@ echo "*** Done ***"; --EXPECTF-- *** Testing strrpos() function with unexpected values for haystack and needle *** -- Iteration 1 -- + +Deprecated: strrpos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) + +Deprecated: strrpos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) -- Iteration 2 -- + +Deprecated: strrpos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) + +Deprecated: strrpos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) -- Iteration 3 -- + +Deprecated: strrpos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) + +Deprecated: strrpos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) -- Iteration 4 -- + +Deprecated: strrpos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) + +Deprecated: strrpos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) -- Iteration 5 -- + +Deprecated: strrpos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) + +Deprecated: strrpos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) -- Iteration 6 -- + +Deprecated: strrpos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) + +Deprecated: strrpos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) -- Iteration 7 -- + +Deprecated: strrpos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) + +Deprecated: strrpos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) -- Iteration 8 -- + +Deprecated: strrpos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) + +Deprecated: strrpos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) -- Iteration 9 -- + +Deprecated: strrpos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) + +Deprecated: strrpos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) -- Iteration 10 -- @@ -153,23 +189,43 @@ bool(false) Warning: strrpos() expects parameter 1 to be string, array given in %s on line %d bool(false) -- Iteration 15 -- + +Deprecated: strrpos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) + +Deprecated: strrpos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) -- Iteration 16 -- + +Deprecated: strrpos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) + +Deprecated: strrpos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) -- Iteration 17 -- + +Deprecated: strrpos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) + +Deprecated: strrpos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) -- Iteration 18 -- + +Deprecated: strrpos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) + +Deprecated: strrpos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) -- Iteration 19 -- Notice: Object of class sample could not be converted to int in %s on line %d + +Deprecated: strrpos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) Notice: Object of class sample could not be converted to int in %s on line %d + +Deprecated: strrpos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) -- Iteration 20 -- bool(false) @@ -178,10 +234,18 @@ bool(false) bool(false) bool(false) -- Iteration 22 -- + +Deprecated: strrpos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) + +Deprecated: strrpos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) -- Iteration 23 -- + +Deprecated: strrpos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) + +Deprecated: strrpos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) -- Iteration 24 -- @@ -191,9 +255,17 @@ bool(false) Warning: strrpos() expects parameter 1 to be string, resource given in %s on line %d bool(false) -- Iteration 25 -- + +Deprecated: strrpos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) + +Deprecated: strrpos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) -- Iteration 26 -- + +Deprecated: strrpos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) + +Deprecated: strrpos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) *** Done *** diff --git a/ext/standard/tests/strings/strrpos_variation12.phpt b/ext/standard/tests/strings/strrpos_variation12.phpt index 7517eaa707..8f9946faf3 100644 --- a/ext/standard/tests/strings/strrpos_variation12.phpt +++ b/ext/standard/tests/strings/strrpos_variation12.phpt @@ -28,7 +28,7 @@ for($index = 0; $index < count($haystacks); $index++ ) { } echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Test strrpos() function: binary safe *** int(5) int(5) diff --git a/ext/standard/tests/strings/strrpos_variation13.phpt b/ext/standard/tests/strings/strrpos_variation13.phpt index 7c8ef27457..bb8258ea0c 100644 --- a/ext/standard/tests/strings/strrpos_variation13.phpt +++ b/ext/standard/tests/strings/strrpos_variation13.phpt @@ -30,7 +30,7 @@ for($index = 0; $index < count($needles); $index++ ) { } echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Test strrpos() function: binary safe *** int(1) int(1) diff --git a/ext/standard/tests/strings/strrpos_variation14.phpt b/ext/standard/tests/strings/strrpos_variation14.phpt index 75df2033ff..db4a0590d0 100644 --- a/ext/standard/tests/strings/strrpos_variation14.phpt +++ b/ext/standard/tests/strings/strrpos_variation14.phpt @@ -61,7 +61,7 @@ $offsets = array ( "", '', - // null vlaues + // null values NULL, null, @@ -94,7 +94,7 @@ int(6) int(6) -- Iteration 3 -- -Warning: strrpos() expects parameter 3 to be integer, float given in %s on line %d +Warning: strrpos() expects parameter 3 to be int, float given in %s on line %d bool(false) -- Iteration 4 -- int(6) @@ -102,23 +102,23 @@ int(6) int(6) -- Iteration 6 -- -Warning: strrpos() expects parameter 3 to be integer, array given in %s on line %d +Warning: strrpos() expects parameter 3 to be int, array given in %s on line %d bool(false) -- Iteration 7 -- -Warning: strrpos() expects parameter 3 to be integer, array given in %s on line %d +Warning: strrpos() expects parameter 3 to be int, array given in %s on line %d bool(false) -- Iteration 8 -- -Warning: strrpos() expects parameter 3 to be integer, array given in %s on line %d +Warning: strrpos() expects parameter 3 to be int, array given in %s on line %d bool(false) -- Iteration 9 -- -Warning: strrpos() expects parameter 3 to be integer, array given in %s on line %d +Warning: strrpos() expects parameter 3 to be int, array given in %s on line %d bool(false) -- Iteration 10 -- -Warning: strrpos() expects parameter 3 to be integer, array given in %s on line %d +Warning: strrpos() expects parameter 3 to be int, array given in %s on line %d bool(false) -- Iteration 11 -- int(6) @@ -130,15 +130,15 @@ int(6) int(6) -- Iteration 15 -- -Warning: strrpos() expects parameter 3 to be integer, object given in %s on line %d +Warning: strrpos() expects parameter 3 to be int, object given in %s on line %d bool(false) -- Iteration 16 -- -Warning: strrpos() expects parameter 3 to be integer, string given in %s on line %d +Warning: strrpos() expects parameter 3 to be int, string given in %s on line %d bool(false) -- Iteration 17 -- -Warning: strrpos() expects parameter 3 to be integer, string given in %s on line %d +Warning: strrpos() expects parameter 3 to be int, string given in %s on line %d bool(false) -- Iteration 18 -- int(6) @@ -146,7 +146,7 @@ int(6) int(6) -- Iteration 20 -- -Warning: strrpos() expects parameter 3 to be integer, resource given in %s on line %d +Warning: strrpos() expects parameter 3 to be int, resource given in %s on line %d bool(false) -- Iteration 21 -- int(6) diff --git a/ext/standard/tests/strings/strrpos_variation15.phpt b/ext/standard/tests/strings/strrpos_variation15.phpt index 48e72ccee4..798a6877e4 100644 --- a/ext/standard/tests/strings/strrpos_variation15.phpt +++ b/ext/standard/tests/strings/strrpos_variation15.phpt @@ -63,7 +63,7 @@ $values = array ( "", '', - // null vlaues + // null values NULL, null, @@ -91,32 +91,48 @@ echo "*** Done ***"; --EXPECTF-- *** Testing strrpos() function: with unexpected values for haystack, needle & offset *** -- Iteration 1 -- + +Deprecated: strrpos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) -- Iteration 2 -- + +Deprecated: strrpos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) -- Iteration 3 -- +Deprecated: strrpos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d + Warning: strrpos(): Offset is greater than the length of haystack string in %s on line %d bool(false) -- Iteration 4 -- +Deprecated: strrpos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d + Warning: strrpos(): Offset is greater than the length of haystack string in %s on line %d bool(false) -- Iteration 5 -- +Deprecated: strrpos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d + Warning: strrpos(): Offset is greater than the length of haystack string in %s on line %d bool(false) -- Iteration 6 -- +Deprecated: strrpos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d + Warning: strrpos(): Offset is greater than the length of haystack string in %s on line %d bool(false) -- Iteration 7 -- -Warning: strrpos() expects parameter 3 to be integer, float given in %s on line %d +Warning: strrpos() expects parameter 3 to be int, float given in %s on line %d bool(false) -- Iteration 8 -- + +Deprecated: strrpos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) -- Iteration 9 -- + +Deprecated: strrpos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) -- Iteration 10 -- @@ -139,35 +155,51 @@ bool(false) Warning: strrpos() expects parameter 1 to be string, array given in %s on line %d bool(false) -- Iteration 15 -- + +Deprecated: strrpos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) -- Iteration 16 -- + +Deprecated: strrpos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) -- Iteration 17 -- + +Deprecated: strrpos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) -- Iteration 18 -- + +Deprecated: strrpos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) -- Iteration 19 -- -Warning: strrpos() expects parameter 3 to be integer, object given in %s on line %d +Warning: strrpos() expects parameter 3 to be int, object given in %s on line %d bool(false) -- Iteration 20 -- -Warning: strrpos() expects parameter 3 to be integer, string given in %s on line %d +Warning: strrpos() expects parameter 3 to be int, string given in %s on line %d bool(false) -- Iteration 21 -- -Warning: strrpos() expects parameter 3 to be integer, string given in %s on line %d +Warning: strrpos() expects parameter 3 to be int, string given in %s on line %d bool(false) -- Iteration 22 -- + +Deprecated: strrpos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) -- Iteration 23 -- + +Deprecated: strrpos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) -- Iteration 24 -- Warning: strrpos() expects parameter 1 to be string, resource given in %s on line %d bool(false) -- Iteration 25 -- + +Deprecated: strrpos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) -- Iteration 26 -- + +Deprecated: strrpos(): Non-string needles will be interpreted as strings in the future. Use an explicit chr() call to preserve the current behavior in %s on line %d bool(false) *** Done *** diff --git a/ext/standard/tests/strings/strrpos_variation2.phpt b/ext/standard/tests/strings/strrpos_variation2.phpt index 803b2943d6..9c0a320785 100644 --- a/ext/standard/tests/strings/strrpos_variation2.phpt +++ b/ext/standard/tests/strings/strrpos_variation2.phpt @@ -109,16 +109,32 @@ bool(false) int(10) int(10) -- Iteration 12 -- + +Deprecated: strrpos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) + +Deprecated: strrpos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) -- Iteration 13 -- + +Deprecated: strrpos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) + +Deprecated: strrpos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) -- Iteration 14 -- + +Deprecated: strrpos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) + +Deprecated: strrpos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) -- Iteration 15 -- + +Deprecated: strrpos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) + +Deprecated: strrpos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) -- Iteration 16 -- bool(false) @@ -178,7 +194,11 @@ bool(false) bool(false) bool(false) -- Iteration 35 -- + +Deprecated: strrpos(): Non-string needles will be interpreted as strings in %s on line %d int(23) + +Deprecated: strrpos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) -- Iteration 36 -- int(0) diff --git a/ext/standard/tests/strings/strrpos_variation3.phpt b/ext/standard/tests/strings/strrpos_variation3.phpt index b8cb6ce136..460f18cca5 100644 --- a/ext/standard/tests/strings/strrpos_variation3.phpt +++ b/ext/standard/tests/strings/strrpos_variation3.phpt @@ -26,7 +26,7 @@ var_dump( strrpos($multi_line_str, " ") ); echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strrpos() function: with heredoc strings *** -- With heredoc string containing multi lines -- int(44) diff --git a/ext/standard/tests/strings/strrpos_variation4.phpt b/ext/standard/tests/strings/strrpos_variation4.phpt index ae2e2ffcc8..1d9184d787 100644 --- a/ext/standard/tests/strings/strrpos_variation4.phpt +++ b/ext/standard/tests/strings/strrpos_variation4.phpt @@ -28,7 +28,7 @@ var_dump( strrpos($special_chars_str, "(special)") ); echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strrpos() function: with heredoc strings *** -- With heredoc string containing special chars -- int(0) diff --git a/ext/standard/tests/strings/strrpos_variation5.phpt b/ext/standard/tests/strings/strrpos_variation5.phpt index 26b31b033a..6a7f37beeb 100644 --- a/ext/standard/tests/strings/strrpos_variation5.phpt +++ b/ext/standard/tests/strings/strrpos_variation5.phpt @@ -24,7 +24,7 @@ var_dump( strrpos($control_char_str, "\t", 15) ); echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strrpos() function: with heredoc strings *** -- With heredoc string containing escape characters -- int(13) diff --git a/ext/standard/tests/strings/strrpos_variation6.phpt b/ext/standard/tests/strings/strrpos_variation6.phpt index ec5dcbf566..46f754dbc8 100644 --- a/ext/standard/tests/strings/strrpos_variation6.phpt +++ b/ext/standard/tests/strings/strrpos_variation6.phpt @@ -25,7 +25,7 @@ var_dump( strrpos($quote_char_str, 'things', 0) ); var_dump( strrpos($quote_char_str, "things", 20) ); echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strrpos() function: with heredoc strings *** -- With heredoc string containing quote & slash chars -- int(88) diff --git a/ext/standard/tests/strings/strrpos_variation7.phpt b/ext/standard/tests/strings/strrpos_variation7.phpt index 52037532d1..54db4b372e 100644 --- a/ext/standard/tests/strings/strrpos_variation7.phpt +++ b/ext/standard/tests/strings/strrpos_variation7.phpt @@ -27,6 +27,10 @@ echo "*** Done ***"; -- With empty heredoc string -- bool(false) bool(false) + +Deprecated: strrpos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) + +Deprecated: strrpos(): Non-string needles will be interpreted as strings in %s on line %d bool(false) *** Done *** diff --git a/ext/standard/tests/strings/strrpos_variation8.phpt b/ext/standard/tests/strings/strrpos_variation8.phpt index de6bce2f33..caf4928e24 100644 --- a/ext/standard/tests/strings/strrpos_variation8.phpt +++ b/ext/standard/tests/strings/strrpos_variation8.phpt @@ -24,7 +24,7 @@ for($offset = -1; $offset <= strlen($haystack); $offset++ ) { } echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strrpos() function: strings repetitive chars *** -- Iteration 1 -- int(4) diff --git a/ext/standard/tests/strings/strrpos_variation9.phpt b/ext/standard/tests/strings/strrpos_variation9.phpt index ca9a121def..576d5b41e4 100644 --- a/ext/standard/tests/strings/strrpos_variation9.phpt +++ b/ext/standard/tests/strings/strrpos_variation9.phpt @@ -61,7 +61,7 @@ $haystacks = array ( "", '', - // null vlaues + // null values NULL, null, diff --git a/ext/standard/tests/strings/strspn_basic.phpt b/ext/standard/tests/strings/strspn_basic.phpt index 74e858ab5d..cab4349677 100644 --- a/ext/standard/tests/strings/strspn_basic.phpt +++ b/ext/standard/tests/strings/strspn_basic.phpt @@ -33,7 +33,7 @@ var_dump( strspn($str, $mask) ); echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing strspn() : basic functionality *** int(11) int(11) diff --git a/ext/standard/tests/strings/strspn_variation10.phpt b/ext/standard/tests/strings/strspn_variation10.phpt index f0f60a6336..d8eb52aa6f 100644 --- a/ext/standard/tests/strings/strspn_variation10.phpt +++ b/ext/standard/tests/strings/strspn_variation10.phpt @@ -65,7 +65,7 @@ foreach($strings as $str) { echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing strspn() : with different mask strings and default start and len arguments *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/strspn_variation11.phpt b/ext/standard/tests/strings/strspn_variation11.phpt index a76771eb4b..ecbe6a4967 100644 --- a/ext/standard/tests/strings/strspn_variation11.phpt +++ b/ext/standard/tests/strings/strspn_variation11.phpt @@ -77,7 +77,7 @@ foreach($strings as $str) { echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing strspn() : with different start and default len values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/strspn_variation12.phpt b/ext/standard/tests/strings/strspn_variation12.phpt index 37cf74f05f..1c404c1914 100644 --- a/ext/standard/tests/strings/strspn_variation12.phpt +++ b/ext/standard/tests/strings/strspn_variation12.phpt @@ -79,7 +79,7 @@ foreach($strings as $str) { echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing strspn() : with different start and len values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/strspn_variation3.phpt b/ext/standard/tests/strings/strspn_variation3.phpt index d12a2f8b19..76f11acc26 100644 --- a/ext/standard/tests/strings/strspn_variation3.phpt +++ b/ext/standard/tests/strings/strspn_variation3.phpt @@ -123,42 +123,42 @@ int(2) -- Iteration with start value as "Array" -- -Warning: strspn() expects parameter 3 to be integer, array given in %s on line %d +Warning: strspn() expects parameter 3 to be int, array given in %s on line %d NULL -Warning: strspn() expects parameter 3 to be integer, array given in %s on line %d +Warning: strspn() expects parameter 3 to be int, array given in %s on line %d NULL -- Iteration with start value as "Array" -- -Warning: strspn() expects parameter 3 to be integer, array given in %s on line %d +Warning: strspn() expects parameter 3 to be int, array given in %s on line %d NULL -Warning: strspn() expects parameter 3 to be integer, array given in %s on line %d +Warning: strspn() expects parameter 3 to be int, array given in %s on line %d NULL -- Iteration with start value as "Array" -- -Warning: strspn() expects parameter 3 to be integer, array given in %s on line %d +Warning: strspn() expects parameter 3 to be int, array given in %s on line %d NULL -Warning: strspn() expects parameter 3 to be integer, array given in %s on line %d +Warning: strspn() expects parameter 3 to be int, array given in %s on line %d NULL -- Iteration with start value as "Array" -- -Warning: strspn() expects parameter 3 to be integer, array given in %s on line %d +Warning: strspn() expects parameter 3 to be int, array given in %s on line %d NULL -Warning: strspn() expects parameter 3 to be integer, array given in %s on line %d +Warning: strspn() expects parameter 3 to be int, array given in %s on line %d NULL -- Iteration with start value as "Array" -- -Warning: strspn() expects parameter 3 to be integer, array given in %s on line %d +Warning: strspn() expects parameter 3 to be int, array given in %s on line %d NULL -Warning: strspn() expects parameter 3 to be integer, array given in %s on line %d +Warning: strspn() expects parameter 3 to be int, array given in %s on line %d NULL -- Iteration with start value as "" -- @@ -187,42 +187,42 @@ int(2) -- Iteration with start value as "" -- -Warning: strspn() expects parameter 3 to be integer, string given in %s on line %d +Warning: strspn() expects parameter 3 to be int, string given in %s on line %d NULL -Warning: strspn() expects parameter 3 to be integer, string given in %s on line %d +Warning: strspn() expects parameter 3 to be int, string given in %s on line %d NULL -- Iteration with start value as "" -- -Warning: strspn() expects parameter 3 to be integer, string given in %s on line %d +Warning: strspn() expects parameter 3 to be int, string given in %s on line %d NULL -Warning: strspn() expects parameter 3 to be integer, string given in %s on line %d +Warning: strspn() expects parameter 3 to be int, string given in %s on line %d NULL -- Iteration with start value as "string" -- -Warning: strspn() expects parameter 3 to be integer, string given in %s on line %d +Warning: strspn() expects parameter 3 to be int, string given in %s on line %d NULL -Warning: strspn() expects parameter 3 to be integer, string given in %s on line %d +Warning: strspn() expects parameter 3 to be int, string given in %s on line %d NULL -- Iteration with start value as "string" -- -Warning: strspn() expects parameter 3 to be integer, string given in %s on line %d +Warning: strspn() expects parameter 3 to be int, string given in %s on line %d NULL -Warning: strspn() expects parameter 3 to be integer, string given in %s on line %d +Warning: strspn() expects parameter 3 to be int, string given in %s on line %d NULL -- Iteration with start value as "object" -- -Warning: strspn() expects parameter 3 to be integer, object given in %s on line %d +Warning: strspn() expects parameter 3 to be int, object given in %s on line %d NULL -Warning: strspn() expects parameter 3 to be integer, object given in %s on line %d +Warning: strspn() expects parameter 3 to be int, object given in %s on line %d NULL -- Iteration with start value as "" -- @@ -235,9 +235,9 @@ int(2) -- Iteration with start value as "Resource id #%d" -- -Warning: strspn() expects parameter 3 to be integer, resource given in %s on line %d +Warning: strspn() expects parameter 3 to be int, resource given in %s on line %d NULL -Warning: strspn() expects parameter 3 to be integer, resource given in %s on line %d +Warning: strspn() expects parameter 3 to be int, resource given in %s on line %d NULL Done diff --git a/ext/standard/tests/strings/strspn_variation4.phpt b/ext/standard/tests/strings/strspn_variation4.phpt index f0c597441a..858a4fb608 100644 --- a/ext/standard/tests/strings/strspn_variation4.phpt +++ b/ext/standard/tests/strings/strspn_variation4.phpt @@ -117,27 +117,27 @@ int(0) -- Iteration with len value as "Array" -- -Warning: strspn() expects parameter 4 to be integer, array given in %s on line %d +Warning: strspn() expects parameter 4 to be int, array given in %s on line %d NULL -- Iteration with len value as "Array" -- -Warning: strspn() expects parameter 4 to be integer, array given in %s on line %d +Warning: strspn() expects parameter 4 to be int, array given in %s on line %d NULL -- Iteration with len value as "Array" -- -Warning: strspn() expects parameter 4 to be integer, array given in %s on line %d +Warning: strspn() expects parameter 4 to be int, array given in %s on line %d NULL -- Iteration with len value as "Array" -- -Warning: strspn() expects parameter 4 to be integer, array given in %s on line %d +Warning: strspn() expects parameter 4 to be int, array given in %s on line %d NULL -- Iteration with len value as "Array" -- -Warning: strspn() expects parameter 4 to be integer, array given in %s on line %d +Warning: strspn() expects parameter 4 to be int, array given in %s on line %d NULL -- Iteration with len value as "" -- @@ -160,27 +160,27 @@ int(0) -- Iteration with len value as "" -- -Warning: strspn() expects parameter 4 to be integer, string given in %s on line %d +Warning: strspn() expects parameter 4 to be int, string given in %s on line %d NULL -- Iteration with len value as "" -- -Warning: strspn() expects parameter 4 to be integer, string given in %s on line %d +Warning: strspn() expects parameter 4 to be int, string given in %s on line %d NULL -- Iteration with len value as "string" -- -Warning: strspn() expects parameter 4 to be integer, string given in %s on line %d +Warning: strspn() expects parameter 4 to be int, string given in %s on line %d NULL -- Iteration with len value as "string" -- -Warning: strspn() expects parameter 4 to be integer, string given in %s on line %d +Warning: strspn() expects parameter 4 to be int, string given in %s on line %d NULL -- Iteration with len value as "object" -- -Warning: strspn() expects parameter 4 to be integer, object given in %s on line %d +Warning: strspn() expects parameter 4 to be int, object given in %s on line %d NULL -- Iteration with len value as "" -- @@ -191,6 +191,6 @@ int(0) -- Iteration with len value as "Resource id #%d" -- -Warning: strspn() expects parameter 4 to be integer, resource given in %s on line %d +Warning: strspn() expects parameter 4 to be int, resource given in %s on line %d NULL Done diff --git a/ext/standard/tests/strings/strspn_variation5.phpt b/ext/standard/tests/strings/strspn_variation5.phpt Binary files differindex 3338169ac3..229fc1fbb6 100644 --- a/ext/standard/tests/strings/strspn_variation5.phpt +++ b/ext/standard/tests/strings/strspn_variation5.phpt diff --git a/ext/standard/tests/strings/strspn_variation6.phpt b/ext/standard/tests/strings/strspn_variation6.phpt index 7ad3501749..b202bb8234 100644 --- a/ext/standard/tests/strings/strspn_variation6.phpt +++ b/ext/standard/tests/strings/strspn_variation6.phpt @@ -90,7 +90,7 @@ foreach($heredoc_strings as $str) { echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing strspn() : with different mask strings *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/strspn_variation7.phpt b/ext/standard/tests/strings/strspn_variation7.phpt index 691a6c1b5f..bbfe5d4868 100644 --- a/ext/standard/tests/strings/strspn_variation7.phpt +++ b/ext/standard/tests/strings/strspn_variation7.phpt @@ -103,7 +103,7 @@ foreach($heredoc_strings as $str) { echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing strspn() : with different start values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/strspn_variation8.phpt b/ext/standard/tests/strings/strspn_variation8.phpt index 21f774ad7a..0ff0000132 100644 --- a/ext/standard/tests/strings/strspn_variation8.phpt +++ b/ext/standard/tests/strings/strspn_variation8.phpt @@ -111,7 +111,7 @@ foreach($heredoc_strings as $str) { echo "Done" ?> ---EXPECTF-- +--EXPECT-- *** Testing strspn() : with different start and len values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/strspn_variation9.phpt b/ext/standard/tests/strings/strspn_variation9.phpt Binary files differindex 09ad531d2e..0835047ff5 100644 --- a/ext/standard/tests/strings/strspn_variation9.phpt +++ b/ext/standard/tests/strings/strspn_variation9.phpt diff --git a/ext/standard/tests/strings/strstr.phpt b/ext/standard/tests/strings/strstr.phpt Binary files differindex d3050f93a2..2908de7a27 100644 --- a/ext/standard/tests/strings/strstr.phpt +++ b/ext/standard/tests/strings/strstr.phpt diff --git a/ext/standard/tests/strings/strtok_basic.phpt b/ext/standard/tests/strings/strtok_basic.phpt index 8855bac639..f0774c8644 100644 --- a/ext/standard/tests/strings/strtok_basic.phpt +++ b/ext/standard/tests/strings/strtok_basic.phpt @@ -31,7 +31,7 @@ for( $i = 2; $i <=7; $i++ ) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strtok() : basic functionality *** The Input string is: diff --git a/ext/standard/tests/strings/strtok_variation1.phpt b/ext/standard/tests/strings/strtok_variation1.phpt index 38d4b5ac8b..9c46428a65 100644 --- a/ext/standard/tests/strings/strtok_variation1.phpt +++ b/ext/standard/tests/strings/strtok_variation1.phpt @@ -65,7 +65,7 @@ $values = array ( "", '', - // null vlaues + // null values NULL, null, diff --git a/ext/standard/tests/strings/strtok_variation2.phpt b/ext/standard/tests/strings/strtok_variation2.phpt index 2f88efc0ef..26de1ae0b5 100644 --- a/ext/standard/tests/strings/strtok_variation2.phpt +++ b/ext/standard/tests/strings/strtok_variation2.phpt @@ -65,7 +65,7 @@ $values = array ( "", '', - // null vlaues + // null values NULL, null, diff --git a/ext/standard/tests/strings/strtok_variation3.phpt b/ext/standard/tests/strings/strtok_variation3.phpt index 3026d86a01..d26947afde 100644 --- a/ext/standard/tests/strings/strtok_variation3.phpt +++ b/ext/standard/tests/strings/strtok_variation3.phpt @@ -67,7 +67,7 @@ foreach($heredoc_strings as $string) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strtok() : with heredoc strings *** --- Iteration 1 --- diff --git a/ext/standard/tests/strings/strtok_variation4.phpt b/ext/standard/tests/strings/strtok_variation4.phpt index 6f4fa6621b..5db1d39650 100644 --- a/ext/standard/tests/strings/strtok_variation4.phpt +++ b/ext/standard/tests/strings/strtok_variation4.phpt @@ -41,7 +41,7 @@ foreach( $strings_with_nulls as $string ) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strtok() : with embedded nulls in the strings *** --- Iteration 1 --- diff --git a/ext/standard/tests/strings/strtok_variation5.phpt b/ext/standard/tests/strings/strtok_variation5.phpt index 170adfd40b..a99d13eb7a 100644 --- a/ext/standard/tests/strings/strtok_variation5.phpt +++ b/ext/standard/tests/strings/strtok_variation5.phpt @@ -57,7 +57,7 @@ foreach( $string_array as $string ) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strtok() : with miscellaneous inputs *** --- Iteration 1 --- diff --git a/ext/standard/tests/strings/strtok_variation6.phpt b/ext/standard/tests/strings/strtok_variation6.phpt index 7008e3b67e..cd7f3b3041 100644 --- a/ext/standard/tests/strings/strtok_variation6.phpt +++ b/ext/standard/tests/strings/strtok_variation6.phpt @@ -47,7 +47,7 @@ foreach( $string_array as $string ) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strtok() : with invalid escape sequences in token *** --- Iteration 1 --- diff --git a/ext/standard/tests/strings/strtok_variation7.phpt b/ext/standard/tests/strings/strtok_variation7.phpt index aed1c7f8a3..aeb6820f2a 100644 --- a/ext/standard/tests/strings/strtok_variation7.phpt +++ b/ext/standard/tests/strings/strtok_variation7.phpt @@ -37,7 +37,7 @@ for( $count = 1; $count <=10; $count++ ) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strtok() : with modification of input string in between tokenising *** *** Testing strtok() when string being tokenised is prefixed with another string in between the process *** diff --git a/ext/standard/tests/strings/strtr_basic.phpt b/ext/standard/tests/strings/strtr_basic.phpt index 633e3f93ef..5660be9f9b 100644 --- a/ext/standard/tests/strings/strtr_basic.phpt +++ b/ext/standard/tests/strings/strtr_basic.phpt @@ -37,7 +37,7 @@ var_dump( strtr('test strtr', $trans2_arr) ); var_dump( strtr($heredoc_str, $trans1_arr) ); echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strtr() : basic functionality *** string(10) "TesT sTrTr" string(10) "TesT sTrTr" diff --git a/ext/standard/tests/strings/strtr_variation1.phpt b/ext/standard/tests/strings/strtr_variation1.phpt index 640194fd48..44326ad4aa 100644 --- a/ext/standard/tests/strings/strtr_variation1.phpt +++ b/ext/standard/tests/strings/strtr_variation1.phpt @@ -56,7 +56,7 @@ for($index = 0; $index < count($str_arr); $index++) { } echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strtr() : numeric & regular double quoted strings *** -- Iteration 1 -- string(3) "abc" diff --git a/ext/standard/tests/strings/strtr_variation2.phpt b/ext/standard/tests/strings/strtr_variation2.phpt index 5772f01fc4..1ca96af3bf 100644 --- a/ext/standard/tests/strings/strtr_variation2.phpt +++ b/ext/standard/tests/strings/strtr_variation2.phpt @@ -60,7 +60,7 @@ for($index = 0; $index < count($str_arr); $index++) { } echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strtr() : string containing special chars for 'str' arg *** -- Iteration 1 -- string(1) "s" diff --git a/ext/standard/tests/strings/strtr_variation3.phpt b/ext/standard/tests/strings/strtr_variation3.phpt index 5baed1490e..5bec076e7e 100644 --- a/ext/standard/tests/strings/strtr_variation3.phpt +++ b/ext/standard/tests/strings/strtr_variation3.phpt @@ -65,7 +65,7 @@ for($index = 0; $index < count($str_arr); $index++) { } echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strtr() : string containing escape sequences for 'str' arg *** -- Iteration 1 -- string(9) "SesSTsttE" diff --git a/ext/standard/tests/strings/strtr_variation4.phpt b/ext/standard/tests/strings/strtr_variation4.phpt index faec849830..899a17af85 100644 --- a/ext/standard/tests/strings/strtr_variation4.phpt +++ b/ext/standard/tests/strings/strtr_variation4.phpt @@ -53,7 +53,7 @@ for($index = 0; $index < count($str_arr); $index++) { } echo "*** Done ***"; ?> ---EXPECTF-- +--EXPECT-- *** Testing strtr() : empty string & null for 'str' arg *** -- Iteration 1 -- string(0) "" diff --git a/ext/standard/tests/strings/strtr_variation5.phpt b/ext/standard/tests/strings/strtr_variation5.phpt index fc5f2f5911..cb6ad267ad 100644 --- a/ext/standard/tests/strings/strtr_variation5.phpt +++ b/ext/standard/tests/strings/strtr_variation5.phpt @@ -52,7 +52,7 @@ $strings = array ( TRUE, FALSE, - // null vlaues + // null values /*14*/ NULL, null, diff --git a/ext/standard/tests/strings/strtr_variation6.phpt b/ext/standard/tests/strings/strtr_variation6.phpt index 9058664030..5e06da6178 100644 --- a/ext/standard/tests/strings/strtr_variation6.phpt +++ b/ext/standard/tests/strings/strtr_variation6.phpt @@ -55,7 +55,7 @@ $from_arr = array ( TRUE, FALSE, - // null vlaues + // null values /*14*/ NULL, null, diff --git a/ext/standard/tests/strings/strtr_variation7.phpt b/ext/standard/tests/strings/strtr_variation7.phpt index 981f56688e..9f7cb95371 100644 --- a/ext/standard/tests/strings/strtr_variation7.phpt +++ b/ext/standard/tests/strings/strtr_variation7.phpt @@ -58,7 +58,7 @@ $to_arr = array ( TRUE, FALSE, - // null vlaues + // null values /*14*/ NULL, null, diff --git a/ext/standard/tests/strings/strtr_variation8.phpt b/ext/standard/tests/strings/strtr_variation8.phpt index 4233a166d7..8d29db1cc3 100644 --- a/ext/standard/tests/strings/strtr_variation8.phpt +++ b/ext/standard/tests/strings/strtr_variation8.phpt @@ -55,7 +55,7 @@ $replace_pairs_arr = array ( TRUE, FALSE, - // null vlaues + // null values NULL, null, diff --git a/ext/standard/tests/strings/strtr_variation9.phpt b/ext/standard/tests/strings/strtr_variation9.phpt index 38b863b2c6..427fde5f75 100644 --- a/ext/standard/tests/strings/strtr_variation9.phpt +++ b/ext/standard/tests/strings/strtr_variation9.phpt @@ -52,7 +52,7 @@ $values = array ( TRUE, FALSE, - // null vlaues + // null values /*16*/ NULL, null, diff --git a/ext/standard/tests/strings/strval_basic.phpt b/ext/standard/tests/strings/strval_basic.phpt index cbf6c0b93c..65f1c98366 100644 --- a/ext/standard/tests/strings/strval_basic.phpt +++ b/ext/standard/tests/strings/strval_basic.phpt @@ -47,7 +47,7 @@ foreach($values as $value) { }; ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing strval() : basic variations *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/strval_variation2.phpt b/ext/standard/tests/strings/strval_variation2.phpt index 5e7fd528aa..3fa99f7718 100644 --- a/ext/standard/tests/strings/strval_variation2.phpt +++ b/ext/standard/tests/strings/strval_variation2.phpt @@ -61,7 +61,7 @@ echo "\n"; ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing strval() : usage variations - Pass all valid char codes *** 000102030405060708090a0b0c0d0e0f 101112131415161718191a1b1c1d1e1f diff --git a/ext/standard/tests/strings/substr_compare.phpt b/ext/standard/tests/strings/substr_compare.phpt index a0ed6f077d..f1edf0afdf 100644 --- a/ext/standard/tests/strings/substr_compare.phpt +++ b/ext/standard/tests/strings/substr_compare.phpt @@ -31,7 +31,7 @@ int(-1) bool(true) int(0) -Warning: substr_compare() expects parameter 5 to be boolean, object given in %s on line %d +Warning: substr_compare() expects parameter 5 to be bool, object given in %s on line %d bool(false) Test @@ -39,6 +39,6 @@ Warning: substr_compare(): The length must be greater than or equal to zero in % bool(false) bool(true) -Warning: substr_compare() expects parameter 4 to be integer, string given in %s on line %d +Warning: substr_compare() expects parameter 4 to be int, string given in %s on line %d bool(false) Done diff --git a/ext/standard/tests/strings/substr_count_basic.phpt b/ext/standard/tests/strings/substr_count_basic.phpt index d1af858db7..4023a774d8 100644 --- a/ext/standard/tests/strings/substr_count_basic.phpt +++ b/ext/standard/tests/strings/substr_count_basic.phpt @@ -24,7 +24,7 @@ var_dump(substr_count($a, "bca", -200, -50)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- ***Testing basic operations *** bool(false) bool(false) diff --git a/ext/standard/tests/strings/substr_count_error.phpt b/ext/standard/tests/strings/substr_count_error.phpt index b4cf3d05df..eecc251e6c 100644 --- a/ext/standard/tests/strings/substr_count_error.phpt +++ b/ext/standard/tests/strings/substr_count_error.phpt @@ -49,7 +49,7 @@ bool(false) Warning: substr_count(): Invalid length value in %s on line %d bool(false) -Warning: substr_count() expects parameter 3 to be integer, string given in %s on line %d +Warning: substr_count() expects parameter 3 to be int, string given in %s on line %d NULL Warning: substr_count(): Invalid length value in %s on line %d diff --git a/ext/standard/tests/strings/substr_count_variation_001.phpt b/ext/standard/tests/strings/substr_count_variation_001.phpt index 2e70c734c5..71f2d223e1 100644 --- a/ext/standard/tests/strings/substr_count_variation_001.phpt +++ b/ext/standard/tests/strings/substr_count_variation_001.phpt @@ -68,13 +68,13 @@ int(2) -- 3rd or 4th arg as NULL -- -Warning: substr_count() expects parameter 3 to be integer, string given %s on line %d +Warning: substr_count() expects parameter 3 to be int, string given %s on line %d NULL -Warning: substr_count() expects parameter 3 to be integer, string given %s on line %d +Warning: substr_count() expects parameter 3 to be int, string given %s on line %d NULL -Warning: substr_count() expects parameter 3 to be integer, string given %s on line %d +Warning: substr_count() expects parameter 3 to be int, string given %s on line %d NULL int(0) int(2) diff --git a/ext/standard/tests/strings/substr_count_variation_002.phpt b/ext/standard/tests/strings/substr_count_variation_002.phpt index a3c8ecf5ab..29b8afd9f5 100644 --- a/ext/standard/tests/strings/substr_count_variation_002.phpt +++ b/ext/standard/tests/strings/substr_count_variation_002.phpt @@ -34,7 +34,7 @@ var_dump(substr_count($str, "0")); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing possible variations *** -- complex strings containing other than 7-bit chars -- diff --git a/ext/standard/tests/strings/substr_replace_array.phpt b/ext/standard/tests/strings/substr_replace_array.phpt index dbb8b17147..240e8c108c 100644 --- a/ext/standard/tests/strings/substr_replace_array.phpt +++ b/ext/standard/tests/strings/substr_replace_array.phpt @@ -9,7 +9,7 @@ $newarr = substr_replace($arr, 'zzz', 0, -2); print_r($newarr); ?> ---EXPECTF-- +--EXPECT-- Array ( [abc] => zzzkk diff --git a/ext/standard/tests/strings/trim1.phpt b/ext/standard/tests/strings/trim1.phpt Binary files differindex 07e9e52040..d0e4070d80 100644 --- a/ext/standard/tests/strings/trim1.phpt +++ b/ext/standard/tests/strings/trim1.phpt diff --git a/ext/standard/tests/strings/ucwords_basic.phpt b/ext/standard/tests/strings/ucwords_basic.phpt index 0ef6a850a9..e35a2c5cb4 100644 --- a/ext/standard/tests/strings/ucwords_basic.phpt +++ b/ext/standard/tests/strings/ucwords_basic.phpt @@ -41,7 +41,7 @@ for($index = 0; $index < count($str_array); $index++) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing ucwords() : basic functionality *** -- Iteration 1 -- string(15) "Testing Ucwords" diff --git a/ext/standard/tests/strings/ucwords_variation2.phpt b/ext/standard/tests/strings/ucwords_variation2.phpt index 4c24d97a0d..b224caf491 100644 --- a/ext/standard/tests/strings/ucwords_variation2.phpt +++ b/ext/standard/tests/strings/ucwords_variation2.phpt @@ -69,7 +69,7 @@ for($index =0; $index < count($heredoc_strings); $index ++) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing ucwords() : usage variations *** -- Iteration 1 -- string(0) "" diff --git a/ext/standard/tests/strings/ucwords_variation3.phpt b/ext/standard/tests/strings/ucwords_variation3.phpt index df6d6fd015..c807990091 100644 --- a/ext/standard/tests/strings/ucwords_variation3.phpt +++ b/ext/standard/tests/strings/ucwords_variation3.phpt @@ -56,7 +56,7 @@ for($index = 0; $index < count($str_array); $index++) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing ucwords() : usage variations *** -- Iteration 1 -- string(18) "Testing Ucwords" diff --git a/ext/standard/tests/strings/ucwords_variation4.phpt b/ext/standard/tests/strings/ucwords_variation4.phpt index 301b2f4284..be6764bc5f 100644 --- a/ext/standard/tests/strings/ucwords_variation4.phpt +++ b/ext/standard/tests/strings/ucwords_variation4.phpt @@ -63,7 +63,7 @@ for($index = 0; $index < count($str_array); $index++) { echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing ucwords() : usage variations *** -- Iteration 1 -- string(18) "Testing Ucwords" diff --git a/ext/standard/tests/strings/unpack_bug68225.phpt b/ext/standard/tests/strings/unpack_bug68225.phpt index 80c76b99d2..b02b0383bf 100644 --- a/ext/standard/tests/strings/unpack_bug68225.phpt +++ b/ext/standard/tests/strings/unpack_bug68225.phpt @@ -16,7 +16,7 @@ var_dump($result); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- array(1) { ["a"]=> int(1) diff --git a/ext/standard/tests/strings/vfprintf_basic.phpt b/ext/standard/tests/strings/vfprintf_basic.phpt index ecdae30241..2843e33af5 100644 --- a/ext/standard/tests/strings/vfprintf_basic.phpt +++ b/ext/standard/tests/strings/vfprintf_basic.phpt @@ -50,7 +50,7 @@ $file = 'vfprintf_test.txt'; unlink( $file ); ?> ---EXPECTF-- +--EXPECT-- *** Testing vfprintf() : basic functionality *** string(17) "Foo is 30 and bar" int(17) diff --git a/ext/standard/tests/strings/vfprintf_variation1.phpt b/ext/standard/tests/strings/vfprintf_variation1.phpt index 6ba79341b2..6358bccd1c 100644 --- a/ext/standard/tests/strings/vfprintf_variation1.phpt +++ b/ext/standard/tests/strings/vfprintf_variation1.phpt @@ -63,7 +63,7 @@ $file = 'vfprintf_test.txt'; unlink( $file ); ?> ---EXPECTF-- +--EXPECT-- *** Testing vfprintf() : variation functionality *** string(6) "format" int(6) diff --git a/ext/standard/tests/strings/vfprintf_variation9.phpt b/ext/standard/tests/strings/vfprintf_variation9.phpt Binary files differindex 6f5c7dc6e6..677840a584 100644 --- a/ext/standard/tests/strings/vfprintf_variation9.phpt +++ b/ext/standard/tests/strings/vfprintf_variation9.phpt diff --git a/ext/standard/tests/strings/vprintf_basic7.phpt b/ext/standard/tests/strings/vprintf_basic7.phpt index ab1ea6ab3e..7633e08f51 100644 --- a/ext/standard/tests/strings/vprintf_basic7.phpt +++ b/ext/standard/tests/strings/vprintf_basic7.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); ?> --FILE-- <?php -/* Prototype : string vprintf(string $format , aaray $args) +/* Prototype : string vprintf(string $format , array $args) * Description: Output a formatted string * Source code: ext/standard/formatted_print.c */ diff --git a/ext/standard/tests/strings/vprintf_basic7_64bit.phpt b/ext/standard/tests/strings/vprintf_basic7_64bit.phpt index 163e1388a9..564e6f1168 100644 --- a/ext/standard/tests/strings/vprintf_basic7_64bit.phpt +++ b/ext/standard/tests/strings/vprintf_basic7_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php -/* Prototype : string vprintf(string $format , aaray $args) +/* Prototype : string vprintf(string $format , array $args) * Description: Output a formatted string * Source code: ext/standard/formatted_print.c */ @@ -35,7 +35,7 @@ echo "\n"; var_dump($result); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing vprintf() : basic functionality - using unsigned format *** 18446744073709550505 int(20) diff --git a/ext/standard/tests/strings/vprintf_variation12_64bit.phpt b/ext/standard/tests/strings/vprintf_variation12_64bit.phpt index 4839484ef1..27b420a7b0 100644 --- a/ext/standard/tests/strings/vprintf_variation12_64bit.phpt +++ b/ext/standard/tests/strings/vprintf_variation12_64bit.phpt @@ -80,7 +80,7 @@ foreach($args_array as $args) { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing vprintf() : octal formats and non-octal values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/vprintf_variation15_64bit.phpt b/ext/standard/tests/strings/vprintf_variation15_64bit.phpt index 53071c6da1..6e27b55dd3 100644 --- a/ext/standard/tests/strings/vprintf_variation15_64bit.phpt +++ b/ext/standard/tests/strings/vprintf_variation15_64bit.phpt @@ -50,7 +50,7 @@ foreach($formats as $format) { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing vprintf() : unsigned formats and unsigned values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/vprintf_variation9.phpt b/ext/standard/tests/strings/vprintf_variation9.phpt Binary files differindex 7d55d94f87..128af1a692 100644 --- a/ext/standard/tests/strings/vprintf_variation9.phpt +++ b/ext/standard/tests/strings/vprintf_variation9.phpt diff --git a/ext/standard/tests/strings/vsprintf_basic1.phpt b/ext/standard/tests/strings/vsprintf_basic1.phpt index 8191731e71..611e4b8fbd 100644 --- a/ext/standard/tests/strings/vsprintf_basic1.phpt +++ b/ext/standard/tests/strings/vsprintf_basic1.phpt @@ -25,7 +25,7 @@ var_dump( vsprintf($format3,$arg3) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing vsprintf() : basic functionality - using string format *** string(3) "one" string(7) "one two" diff --git a/ext/standard/tests/strings/vsprintf_basic2.phpt b/ext/standard/tests/strings/vsprintf_basic2.phpt index 609b05cece..1afaeb9615 100644 --- a/ext/standard/tests/strings/vsprintf_basic2.phpt +++ b/ext/standard/tests/strings/vsprintf_basic2.phpt @@ -28,7 +28,7 @@ var_dump( vsprintf($format3,$arg3) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing vsprintf() : basic functionality - using integer format *** string(3) "111" string(7) "111 222" diff --git a/ext/standard/tests/strings/vsprintf_basic3.phpt b/ext/standard/tests/strings/vsprintf_basic3.phpt index 89ef291d97..44da08c536 100644 --- a/ext/standard/tests/strings/vsprintf_basic3.phpt +++ b/ext/standard/tests/strings/vsprintf_basic3.phpt @@ -34,7 +34,7 @@ var_dump( vsprintf($format33,$arg3) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing vsprintf() : basic functionality - using float format *** string(9) "11.110000" string(9) "11.110000" diff --git a/ext/standard/tests/strings/vsprintf_basic4.phpt b/ext/standard/tests/strings/vsprintf_basic4.phpt index c132459627..569ba93987 100644 --- a/ext/standard/tests/strings/vsprintf_basic4.phpt +++ b/ext/standard/tests/strings/vsprintf_basic4.phpt @@ -24,7 +24,7 @@ var_dump( vsprintf($format3,$arg3) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing vsprintf() : basic functionality - using bool format *** string(1) "1" string(3) "1 0" diff --git a/ext/standard/tests/strings/vsprintf_basic5.phpt b/ext/standard/tests/strings/vsprintf_basic5.phpt index 1a5e41c5cb..78abb4523d 100644 --- a/ext/standard/tests/strings/vsprintf_basic5.phpt +++ b/ext/standard/tests/strings/vsprintf_basic5.phpt @@ -24,7 +24,7 @@ var_dump( vsprintf($format3,$arg3) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing vsprintf() : basic functionality - using char format *** string(1) "A" string(3) "A B" diff --git a/ext/standard/tests/strings/vsprintf_basic6.phpt b/ext/standard/tests/strings/vsprintf_basic6.phpt index 1d435715bb..fe8e31d168 100644 --- a/ext/standard/tests/strings/vsprintf_basic6.phpt +++ b/ext/standard/tests/strings/vsprintf_basic6.phpt @@ -24,7 +24,7 @@ var_dump( vsprintf($format3,$arg3) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing vsprintf() : basic functionality - using exponential format *** string(11) "1.000000e+3" string(23) "1.000000e+3 2.000000e+3" diff --git a/ext/standard/tests/strings/vsprintf_basic7.phpt b/ext/standard/tests/strings/vsprintf_basic7.phpt index 84711b4034..bb4bc246fe 100644 --- a/ext/standard/tests/strings/vsprintf_basic7.phpt +++ b/ext/standard/tests/strings/vsprintf_basic7.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); ?> --FILE-- <?php -/* Prototype : string vsprintf(string $format , aaray $args) +/* Prototype : string vsprintf(string $format , array $args) * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ @@ -28,7 +28,7 @@ var_dump( vsprintf($format3,$arg3) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing vsprintf() : basic functionality - using unsigned format *** string(10) "4294966185" string(21) "4294966185 4293732729" diff --git a/ext/standard/tests/strings/vsprintf_basic7_64bit.phpt b/ext/standard/tests/strings/vsprintf_basic7_64bit.phpt index 4bc85c29f9..fa040715df 100644 --- a/ext/standard/tests/strings/vsprintf_basic7_64bit.phpt +++ b/ext/standard/tests/strings/vsprintf_basic7_64bit.phpt @@ -6,7 +6,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- <?php -/* Prototype : string vsprintf(string $format , aaray $args) +/* Prototype : string vsprintf(string $format , array $args) * Description: Return a formatted string * Source code: ext/standard/formatted_print.c */ @@ -28,7 +28,7 @@ var_dump( vsprintf($format3,$arg3) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing vsprintf() : basic functionality - using unsigned format *** string(20) "18446744073709550505" string(41) "18446744073709550505 18446744073708317049" diff --git a/ext/standard/tests/strings/vsprintf_basic8.phpt b/ext/standard/tests/strings/vsprintf_basic8.phpt index 72ad6ec0cf..e7728af3ca 100644 --- a/ext/standard/tests/strings/vsprintf_basic8.phpt +++ b/ext/standard/tests/strings/vsprintf_basic8.phpt @@ -24,7 +24,7 @@ var_dump( vsprintf($format3,$arg3) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing vsprintf() : basic functionality - using octal format *** string(2) "21" string(6) "21 347" diff --git a/ext/standard/tests/strings/vsprintf_basic9.phpt b/ext/standard/tests/strings/vsprintf_basic9.phpt index d3f9319f9a..6dc5a4f4b7 100644 --- a/ext/standard/tests/strings/vsprintf_basic9.phpt +++ b/ext/standard/tests/strings/vsprintf_basic9.phpt @@ -34,7 +34,7 @@ var_dump( vsprintf($format33,$arg3) ); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing vsprintf() : basic functionality - using hexadecimal format *** string(1) "b" string(1) "B" diff --git a/ext/standard/tests/strings/vsprintf_variation10.phpt b/ext/standard/tests/strings/vsprintf_variation10.phpt Binary files differindex 21b875cdb5..205be0ac45 100644 --- a/ext/standard/tests/strings/vsprintf_variation10.phpt +++ b/ext/standard/tests/strings/vsprintf_variation10.phpt diff --git a/ext/standard/tests/strings/vsprintf_variation11.phpt b/ext/standard/tests/strings/vsprintf_variation11.phpt index 51cb054d15..defcd593e0 100644 --- a/ext/standard/tests/strings/vsprintf_variation11.phpt +++ b/ext/standard/tests/strings/vsprintf_variation11.phpt @@ -55,7 +55,7 @@ foreach($formats as $format) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing vsprintf() : octal formats with octal values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/vsprintf_variation11_64bit.phpt b/ext/standard/tests/strings/vsprintf_variation11_64bit.phpt index d525ad15bb..127d3f594d 100644 --- a/ext/standard/tests/strings/vsprintf_variation11_64bit.phpt +++ b/ext/standard/tests/strings/vsprintf_variation11_64bit.phpt @@ -55,7 +55,7 @@ foreach($formats as $format) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing vsprintf() : octal formats with octal values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/vsprintf_variation12.phpt b/ext/standard/tests/strings/vsprintf_variation12.phpt index c4f7d02bf1..4385cdfe39 100644 --- a/ext/standard/tests/strings/vsprintf_variation12.phpt +++ b/ext/standard/tests/strings/vsprintf_variation12.phpt @@ -78,7 +78,7 @@ foreach($args_array as $args) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing vsprintf() : octal formats and non-octal values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/vsprintf_variation12_64bit.phpt b/ext/standard/tests/strings/vsprintf_variation12_64bit.phpt index ea9b4793ee..b843bfaa89 100644 --- a/ext/standard/tests/strings/vsprintf_variation12_64bit.phpt +++ b/ext/standard/tests/strings/vsprintf_variation12_64bit.phpt @@ -78,7 +78,7 @@ foreach($args_array as $args) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing vsprintf() : octal formats and non-octal values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/vsprintf_variation13.phpt b/ext/standard/tests/strings/vsprintf_variation13.phpt index 881a74c1c9..6899766b0a 100644 --- a/ext/standard/tests/strings/vsprintf_variation13.phpt +++ b/ext/standard/tests/strings/vsprintf_variation13.phpt @@ -55,7 +55,7 @@ foreach($formats as $format) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing vsprintf() : hexa formats with hexa values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/vsprintf_variation13_64bit.phpt b/ext/standard/tests/strings/vsprintf_variation13_64bit.phpt index 7c6ca39534..3828414360 100644 --- a/ext/standard/tests/strings/vsprintf_variation13_64bit.phpt +++ b/ext/standard/tests/strings/vsprintf_variation13_64bit.phpt @@ -55,7 +55,7 @@ foreach($formats as $format) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing vsprintf() : hexa formats with hexa values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/vsprintf_variation14.phpt b/ext/standard/tests/strings/vsprintf_variation14.phpt index 559e0397c4..749d8fa2df 100644 --- a/ext/standard/tests/strings/vsprintf_variation14.phpt +++ b/ext/standard/tests/strings/vsprintf_variation14.phpt @@ -79,7 +79,7 @@ foreach($args_array as $args) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing vsprintf() : hexa formats and non-hexa values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/vsprintf_variation14_64bit.phpt b/ext/standard/tests/strings/vsprintf_variation14_64bit.phpt index 6b78bfc767..5e1eca1055 100644 --- a/ext/standard/tests/strings/vsprintf_variation14_64bit.phpt +++ b/ext/standard/tests/strings/vsprintf_variation14_64bit.phpt @@ -79,7 +79,7 @@ foreach($args_array as $args) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing vsprintf() : hexa formats and non-hexa values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/vsprintf_variation15_64bit.phpt b/ext/standard/tests/strings/vsprintf_variation15_64bit.phpt index b95d635800..d4efd44fbd 100644 --- a/ext/standard/tests/strings/vsprintf_variation15_64bit.phpt +++ b/ext/standard/tests/strings/vsprintf_variation15_64bit.phpt @@ -48,7 +48,7 @@ foreach($formats as $format) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing vsprintf() : unsigned formats and unsigned values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/vsprintf_variation16.phpt b/ext/standard/tests/strings/vsprintf_variation16.phpt index 03678f851e..7e86f2890e 100644 --- a/ext/standard/tests/strings/vsprintf_variation16.phpt +++ b/ext/standard/tests/strings/vsprintf_variation16.phpt @@ -71,7 +71,7 @@ foreach($args_array as $args) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing vsprintf() : unsigned formats and signed & other types of values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/vsprintf_variation16_64bit.phpt b/ext/standard/tests/strings/vsprintf_variation16_64bit.phpt index 8783615371..00fdfdbf68 100644 --- a/ext/standard/tests/strings/vsprintf_variation16_64bit.phpt +++ b/ext/standard/tests/strings/vsprintf_variation16_64bit.phpt @@ -71,7 +71,7 @@ foreach($args_array as $args) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing vsprintf() : unsigned formats and signed & other types of values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/vsprintf_variation17.phpt b/ext/standard/tests/strings/vsprintf_variation17.phpt index ec80b8f69e..17790432aa 100644 --- a/ext/standard/tests/strings/vsprintf_variation17.phpt +++ b/ext/standard/tests/strings/vsprintf_variation17.phpt @@ -44,7 +44,7 @@ foreach($formats as $format) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing vsprintf() : scientific formats and scientific values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/vsprintf_variation18.phpt b/ext/standard/tests/strings/vsprintf_variation18.phpt index 233916fe8a..0d6c17a561 100644 --- a/ext/standard/tests/strings/vsprintf_variation18.phpt +++ b/ext/standard/tests/strings/vsprintf_variation18.phpt @@ -67,7 +67,7 @@ foreach($args_array as $args) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing vsprintf() : scientific formats and non-scientific values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/vsprintf_variation19.phpt b/ext/standard/tests/strings/vsprintf_variation19.phpt index 5d3c8d6314..e2b3fe0778 100644 --- a/ext/standard/tests/strings/vsprintf_variation19.phpt +++ b/ext/standard/tests/strings/vsprintf_variation19.phpt @@ -53,7 +53,7 @@ foreach($formats as $format) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing vsprintf() : with white spaces in format strings *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/vsprintf_variation19_64bit.phpt b/ext/standard/tests/strings/vsprintf_variation19_64bit.phpt index c889b32343..5cef628edb 100644 --- a/ext/standard/tests/strings/vsprintf_variation19_64bit.phpt +++ b/ext/standard/tests/strings/vsprintf_variation19_64bit.phpt @@ -53,7 +53,7 @@ foreach($formats as $format) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing vsprintf() : with white spaces in format strings *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/vsprintf_variation3.phpt b/ext/standard/tests/strings/vsprintf_variation3.phpt index eb1bf36856..4fa51c92de 100644 --- a/ext/standard/tests/strings/vsprintf_variation3.phpt +++ b/ext/standard/tests/strings/vsprintf_variation3.phpt @@ -52,7 +52,7 @@ foreach($formats as $format) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing vsprintf() : int formats with int values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/vsprintf_variation4.phpt b/ext/standard/tests/strings/vsprintf_variation4.phpt index df15475fa9..8fe8aba5cd 100644 --- a/ext/standard/tests/strings/vsprintf_variation4.phpt +++ b/ext/standard/tests/strings/vsprintf_variation4.phpt @@ -71,7 +71,7 @@ foreach($args_array as $args) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing vsprintf() : int formats and non-integer values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/vsprintf_variation4_64bit.phpt b/ext/standard/tests/strings/vsprintf_variation4_64bit.phpt index de95bffea6..aa18d6647c 100644 --- a/ext/standard/tests/strings/vsprintf_variation4_64bit.phpt +++ b/ext/standard/tests/strings/vsprintf_variation4_64bit.phpt @@ -71,7 +71,7 @@ foreach($args_array as $args) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing vsprintf() : int formats and non-integer values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/vsprintf_variation5.phpt b/ext/standard/tests/strings/vsprintf_variation5.phpt index 6355106123..8c7046021b 100644 --- a/ext/standard/tests/strings/vsprintf_variation5.phpt +++ b/ext/standard/tests/strings/vsprintf_variation5.phpt @@ -52,7 +52,7 @@ foreach($formats as $format) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing vsprintf() : int formats with float values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/vsprintf_variation6.phpt b/ext/standard/tests/strings/vsprintf_variation6.phpt index 7eb6df8105..0f167fe8d1 100644 --- a/ext/standard/tests/strings/vsprintf_variation6.phpt +++ b/ext/standard/tests/strings/vsprintf_variation6.phpt @@ -67,7 +67,7 @@ foreach($args_array as $args) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing vsprintf() : float formats and non-float values *** -- Iteration 1 -- diff --git a/ext/standard/tests/strings/vsprintf_variation9.phpt b/ext/standard/tests/strings/vsprintf_variation9.phpt Binary files differindex ea92bc12f1..fc9b16dbee 100644 --- a/ext/standard/tests/strings/vsprintf_variation9.phpt +++ b/ext/standard/tests/strings/vsprintf_variation9.phpt diff --git a/ext/standard/tests/strings/wordwrap_basic.phpt b/ext/standard/tests/strings/wordwrap_basic.phpt index 83cbdb4168..37f15a3db2 100644 --- a/ext/standard/tests/strings/wordwrap_basic.phpt +++ b/ext/standard/tests/strings/wordwrap_basic.phpt @@ -35,7 +35,7 @@ $cut = false; var_dump( wordwrap($str, $width, $break, $cut) ); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing wordwrap() : basic functionality *** string(96) "The quick brown foooooooooox jummmmmmmmmmmmped over the lazzzzzzzzzzzy doooooooooooooooooooooog." diff --git a/ext/standard/tests/strings/wordwrap_variation2.phpt b/ext/standard/tests/strings/wordwrap_variation2.phpt index 194af0e22f..4756e98674 100644 --- a/ext/standard/tests/strings/wordwrap_variation2.phpt +++ b/ext/standard/tests/strings/wordwrap_variation2.phpt @@ -128,68 +128,68 @@ string(39) "testing<br />\nwordwrap<br />\nfunction" string(223) "<br />\nt<br />\ne<br />\ns<br />\nt<br />\ni<br />\nn<br />\ng<br />\n<br />\nw<br />\no<br />\nr<br />\nd<br />\nw<br />\nr<br />\na<br />\np<br />\n<br />\nf<br />\nu<br />\nn<br />\nc<br />\nt<br />\ni<br />\no<br />\nn" -- Iteration 4 -- -Warning: wordwrap() expects parameter 2 to be integer, array given in %s on line %d +Warning: wordwrap() expects parameter 2 to be int, array given in %s on line %d NULL -Warning: wordwrap() expects parameter 2 to be integer, array given in %s on line %d +Warning: wordwrap() expects parameter 2 to be int, array given in %s on line %d NULL -Warning: wordwrap() expects parameter 2 to be integer, array given in %s on line %d +Warning: wordwrap() expects parameter 2 to be int, array given in %s on line %d NULL -Warning: wordwrap() expects parameter 2 to be integer, array given in %s on line %d +Warning: wordwrap() expects parameter 2 to be int, array given in %s on line %d NULL -- Iteration 5 -- -Warning: wordwrap() expects parameter 2 to be integer, array given in %s on line %d +Warning: wordwrap() expects parameter 2 to be int, array given in %s on line %d NULL -Warning: wordwrap() expects parameter 2 to be integer, array given in %s on line %d +Warning: wordwrap() expects parameter 2 to be int, array given in %s on line %d NULL -Warning: wordwrap() expects parameter 2 to be integer, array given in %s on line %d +Warning: wordwrap() expects parameter 2 to be int, array given in %s on line %d NULL -Warning: wordwrap() expects parameter 2 to be integer, array given in %s on line %d +Warning: wordwrap() expects parameter 2 to be int, array given in %s on line %d NULL -- Iteration 6 -- -Warning: wordwrap() expects parameter 2 to be integer, array given in %s on line %d +Warning: wordwrap() expects parameter 2 to be int, array given in %s on line %d NULL -Warning: wordwrap() expects parameter 2 to be integer, array given in %s on line %d +Warning: wordwrap() expects parameter 2 to be int, array given in %s on line %d NULL -Warning: wordwrap() expects parameter 2 to be integer, array given in %s on line %d +Warning: wordwrap() expects parameter 2 to be int, array given in %s on line %d NULL -Warning: wordwrap() expects parameter 2 to be integer, array given in %s on line %d +Warning: wordwrap() expects parameter 2 to be int, array given in %s on line %d NULL -- Iteration 7 -- -Warning: wordwrap() expects parameter 2 to be integer, array given in %s on line %d +Warning: wordwrap() expects parameter 2 to be int, array given in %s on line %d NULL -Warning: wordwrap() expects parameter 2 to be integer, array given in %s on line %d +Warning: wordwrap() expects parameter 2 to be int, array given in %s on line %d NULL -Warning: wordwrap() expects parameter 2 to be integer, array given in %s on line %d +Warning: wordwrap() expects parameter 2 to be int, array given in %s on line %d NULL -Warning: wordwrap() expects parameter 2 to be integer, array given in %s on line %d +Warning: wordwrap() expects parameter 2 to be int, array given in %s on line %d NULL -- Iteration 8 -- -Warning: wordwrap() expects parameter 2 to be integer, array given in %s on line %d +Warning: wordwrap() expects parameter 2 to be int, array given in %s on line %d NULL -Warning: wordwrap() expects parameter 2 to be integer, array given in %s on line %d +Warning: wordwrap() expects parameter 2 to be int, array given in %s on line %d NULL -Warning: wordwrap() expects parameter 2 to be integer, array given in %s on line %d +Warning: wordwrap() expects parameter 2 to be int, array given in %s on line %d NULL -Warning: wordwrap() expects parameter 2 to be integer, array given in %s on line %d +Warning: wordwrap() expects parameter 2 to be int, array given in %s on line %d NULL -- Iteration 9 -- string(25) "testing @@ -225,42 +225,42 @@ Warning: wordwrap(): Can't force cut when width is zero in %s on line %d bool(false) -- Iteration 13 -- -Warning: wordwrap() expects parameter 2 to be integer, string given in %s on line %d +Warning: wordwrap() expects parameter 2 to be int, string given in %s on line %d NULL -Warning: wordwrap() expects parameter 2 to be integer, string given in %s on line %d +Warning: wordwrap() expects parameter 2 to be int, string given in %s on line %d NULL -Warning: wordwrap() expects parameter 2 to be integer, string given in %s on line %d +Warning: wordwrap() expects parameter 2 to be int, string given in %s on line %d NULL -Warning: wordwrap() expects parameter 2 to be integer, string given in %s on line %d +Warning: wordwrap() expects parameter 2 to be int, string given in %s on line %d NULL -- Iteration 14 -- -Warning: wordwrap() expects parameter 2 to be integer, string given in %s on line %d +Warning: wordwrap() expects parameter 2 to be int, string given in %s on line %d NULL -Warning: wordwrap() expects parameter 2 to be integer, string given in %s on line %d +Warning: wordwrap() expects parameter 2 to be int, string given in %s on line %d NULL -Warning: wordwrap() expects parameter 2 to be integer, string given in %s on line %d +Warning: wordwrap() expects parameter 2 to be int, string given in %s on line %d NULL -Warning: wordwrap() expects parameter 2 to be integer, string given in %s on line %d +Warning: wordwrap() expects parameter 2 to be int, string given in %s on line %d NULL -- Iteration 15 -- -Warning: wordwrap() expects parameter 2 to be integer, object given in %s on line %d +Warning: wordwrap() expects parameter 2 to be int, object given in %s on line %d NULL -Warning: wordwrap() expects parameter 2 to be integer, object given in %s on line %d +Warning: wordwrap() expects parameter 2 to be int, object given in %s on line %d NULL -Warning: wordwrap() expects parameter 2 to be integer, object given in %s on line %d +Warning: wordwrap() expects parameter 2 to be int, object given in %s on line %d NULL -Warning: wordwrap() expects parameter 2 to be integer, object given in %s on line %d +Warning: wordwrap() expects parameter 2 to be int, object given in %s on line %d NULL -- Iteration 16 -- string(25) "testing @@ -282,42 +282,42 @@ Warning: wordwrap(): Can't force cut when width is zero in %s on line %d bool(false) -- Iteration 18 -- -Warning: wordwrap() expects parameter 2 to be integer, string given in %s on line %d +Warning: wordwrap() expects parameter 2 to be int, string given in %s on line %d NULL -Warning: wordwrap() expects parameter 2 to be integer, string given in %s on line %d +Warning: wordwrap() expects parameter 2 to be int, string given in %s on line %d NULL -Warning: wordwrap() expects parameter 2 to be integer, string given in %s on line %d +Warning: wordwrap() expects parameter 2 to be int, string given in %s on line %d NULL -Warning: wordwrap() expects parameter 2 to be integer, string given in %s on line %d +Warning: wordwrap() expects parameter 2 to be int, string given in %s on line %d NULL -- Iteration 19 -- -Warning: wordwrap() expects parameter 2 to be integer, string given in %s on line %d +Warning: wordwrap() expects parameter 2 to be int, string given in %s on line %d NULL -Warning: wordwrap() expects parameter 2 to be integer, string given in %s on line %d +Warning: wordwrap() expects parameter 2 to be int, string given in %s on line %d NULL -Warning: wordwrap() expects parameter 2 to be integer, string given in %s on line %d +Warning: wordwrap() expects parameter 2 to be int, string given in %s on line %d NULL -Warning: wordwrap() expects parameter 2 to be integer, string given in %s on line %d +Warning: wordwrap() expects parameter 2 to be int, string given in %s on line %d NULL -- Iteration 20 -- -Warning: wordwrap() expects parameter 2 to be integer, resource given in %s on line %d +Warning: wordwrap() expects parameter 2 to be int, resource given in %s on line %d NULL -Warning: wordwrap() expects parameter 2 to be integer, resource given in %s on line %d +Warning: wordwrap() expects parameter 2 to be int, resource given in %s on line %d NULL -Warning: wordwrap() expects parameter 2 to be integer, resource given in %s on line %d +Warning: wordwrap() expects parameter 2 to be int, resource given in %s on line %d NULL -Warning: wordwrap() expects parameter 2 to be integer, resource given in %s on line %d +Warning: wordwrap() expects parameter 2 to be int, resource given in %s on line %d NULL -- Iteration 21 -- string(25) "testing diff --git a/ext/standard/tests/strings/wordwrap_variation4.phpt b/ext/standard/tests/strings/wordwrap_variation4.phpt index 7111f2d2ba..656db58b15 100644 --- a/ext/standard/tests/strings/wordwrap_variation4.phpt +++ b/ext/standard/tests/strings/wordwrap_variation4.phpt @@ -107,23 +107,23 @@ string(39) "testing<br />\nwordwrap<br />\nfunction" string(39) "testing<br />\nwordwrap<br />\nfunction" -- Iteration 10 -- -Warning: wordwrap() expects parameter 4 to be boolean, array given in %s on line %d +Warning: wordwrap() expects parameter 4 to be bool, array given in %s on line %d NULL -- Iteration 11 -- -Warning: wordwrap() expects parameter 4 to be boolean, array given in %s on line %d +Warning: wordwrap() expects parameter 4 to be bool, array given in %s on line %d NULL -- Iteration 12 -- -Warning: wordwrap() expects parameter 4 to be boolean, array given in %s on line %d +Warning: wordwrap() expects parameter 4 to be bool, array given in %s on line %d NULL -- Iteration 13 -- -Warning: wordwrap() expects parameter 4 to be boolean, array given in %s on line %d +Warning: wordwrap() expects parameter 4 to be bool, array given in %s on line %d NULL -- Iteration 14 -- -Warning: wordwrap() expects parameter 4 to be boolean, array given in %s on line %d +Warning: wordwrap() expects parameter 4 to be bool, array given in %s on line %d NULL -- Iteration 15 -- string(39) "testing<br />\nwordwrap<br />\nfunction" @@ -131,7 +131,7 @@ string(39) "testing<br />\nwordwrap<br />\nfunction" string(39) "testing<br />\nwordwrap<br />\nfunction" -- Iteration 17 -- -Warning: wordwrap() expects parameter 4 to be boolean, object given in %s on line %d +Warning: wordwrap() expects parameter 4 to be bool, object given in %s on line %d NULL -- Iteration 18 -- string(39) "testing<br />\nwordwrap<br />\nfunction" diff --git a/ext/standard/tests/strings/wordwrap_variation5.phpt b/ext/standard/tests/strings/wordwrap_variation5.phpt index 0235271c7a..9efa096555 100644 --- a/ext/standard/tests/strings/wordwrap_variation5.phpt +++ b/ext/standard/tests/strings/wordwrap_variation5.phpt @@ -40,7 +40,7 @@ var_dump( wordwrap($str, $width, $break1, $cut) ); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- *** Testing wordwrap() : usage variations *** -- Testing wordwrap() with default break value and single space as value -- diff --git a/ext/standard/tests/time/001.phpt b/ext/standard/tests/time/001.phpt index 045271fada..b8498850f1 100644 --- a/ext/standard/tests/time/001.phpt +++ b/ext/standard/tests/time/001.phpt @@ -3,7 +3,6 @@ microtime() function --SKIPIF-- <?php if (!function_exists('microtime')) die('skip microtime() not available'); - die('warn system dependent'); ?> --FILE-- <?php diff --git a/ext/standard/tests/time/strptime_basic.phpt b/ext/standard/tests/time/strptime_basic.phpt index d9593bd04a..f352e9d06a 100644 --- a/ext/standard/tests/time/strptime_basic.phpt +++ b/ext/standard/tests/time/strptime_basic.phpt @@ -34,7 +34,7 @@ var_dump(strptime($str, '%A %B %e %R')); setlocale(LC_ALL, $orig); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing strptime() : basic functionality *** array(9) { ["tm_sec"]=> diff --git a/ext/standard/tests/url/base64_decode_basic_001.phpt b/ext/standard/tests/url/base64_decode_basic_001.phpt index 8d29f387fd..2ce6ce6354 100644 --- a/ext/standard/tests/url/base64_decode_basic_001.phpt +++ b/ext/standard/tests/url/base64_decode_basic_001.phpt @@ -16,7 +16,7 @@ var_dump(bin2hex(base64_decode($allbase64, true))); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- Decode an input string containing the whole base64 alphabet: string(98) "00108310518720928b30d38f41149351559761969b71d79f8218a39259a7a29aabb2dbafc31cb3d35db7e39ebbf3dfbf55" string(98) "00108310518720928b30d38f41149351559761969b71d79f8218a39259a7a29aabb2dbafc31cb3d35db7e39ebbf3dfbf55" diff --git a/ext/standard/tests/url/base64_decode_basic_002.phpt b/ext/standard/tests/url/base64_decode_basic_002.phpt index 7cb4f13b10..c538d15997 100644 --- a/ext/standard/tests/url/base64_decode_basic_002.phpt +++ b/ext/standard/tests/url/base64_decode_basic_002.phpt @@ -29,7 +29,7 @@ var_dump(base64_decode($badChars, true)); echo "Done"; ?> ---EXPECTF-- +--EXPECT-- Decode 'hello world!': string(12) "hello world!" string(12) "hello world!" diff --git a/ext/standard/tests/url/base64_decode_basic_003.phpt b/ext/standard/tests/url/base64_decode_basic_003.phpt index 0407926b02..3bcd51e192 100644 --- a/ext/standard/tests/url/base64_decode_basic_003.phpt +++ b/ext/standard/tests/url/base64_decode_basic_003.phpt @@ -38,7 +38,7 @@ foreach ($data as $a) { } echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- Test base64_decode (output as JSON): base64 "" non-strict "" strict "" base64 "=" non-strict "" strict false diff --git a/ext/standard/tests/url/base64_decode_variation_002.phpt b/ext/standard/tests/url/base64_decode_variation_002.phpt index 71c381beda..56232f58c4 100644 --- a/ext/standard/tests/url/base64_decode_variation_002.phpt +++ b/ext/standard/tests/url/base64_decode_variation_002.phpt @@ -116,23 +116,23 @@ bool(false) bool(false) -- Arg value array() -- -Error: 2 - base64_decode() expects parameter 2 to be boolean, array given, %s(%d) +Error: 2 - base64_decode() expects parameter 2 to be bool, array given, %s(%d) NULL -- Arg value array(0) -- -Error: 2 - base64_decode() expects parameter 2 to be boolean, array given, %s(%d) +Error: 2 - base64_decode() expects parameter 2 to be bool, array given, %s(%d) NULL -- Arg value array(1) -- -Error: 2 - base64_decode() expects parameter 2 to be boolean, array given, %s(%d) +Error: 2 - base64_decode() expects parameter 2 to be bool, array given, %s(%d) NULL -- Arg value array(1, 2) -- -Error: 2 - base64_decode() expects parameter 2 to be boolean, array given, %s(%d) +Error: 2 - base64_decode() expects parameter 2 to be bool, array given, %s(%d) NULL -- Arg value array('color' => 'red', 'item' => 'pen' -- -Error: 2 - base64_decode() expects parameter 2 to be boolean, array given, %s(%d) +Error: 2 - base64_decode() expects parameter 2 to be bool, array given, %s(%d) NULL -- Arg value NULL -- @@ -160,7 +160,7 @@ string(12) "hello world!" string(12) "hello world!" -- Arg value stdClass object -- -Error: 2 - base64_decode() expects parameter 2 to be boolean, object given, %s(%d) +Error: 2 - base64_decode() expects parameter 2 to be bool, object given, %s(%d) NULL -- Arg value undefined variable -- @@ -170,6 +170,6 @@ string(12) "hello world!" string(12) "hello world!" -- Arg value resource -- -Error: 2 - base64_decode() expects parameter 2 to be boolean, resource given, %s(%d) +Error: 2 - base64_decode() expects parameter 2 to be bool, resource given, %s(%d) NULL ===Done=== diff --git a/ext/standard/tests/url/base64_encode_basic_001.phpt b/ext/standard/tests/url/base64_encode_basic_001.phpt index c3cbf12c55..764e15f377 100644 --- a/ext/standard/tests/url/base64_encode_basic_001.phpt +++ b/ext/standard/tests/url/base64_encode_basic_001.phpt @@ -22,7 +22,7 @@ for ($i=0; $i<256; $i++) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing base64_encode() : basic functionality *** 0x0: AA== 0x1: AQ== diff --git a/ext/standard/tests/url/base64_encode_basic_002.phpt b/ext/standard/tests/url/base64_encode_basic_002.phpt index 749757c79f..2bcb7519ab 100644 --- a/ext/standard/tests/url/base64_encode_basic_002.phpt +++ b/ext/standard/tests/url/base64_encode_basic_002.phpt @@ -42,7 +42,7 @@ foreach($values as $str) { ?> ===Done=== ---EXPECTF-- +--EXPECT-- *** Testing base64_encode() : basic functionality *** --- Testing base64_encode() with binary string input --- diff --git a/ext/standard/tests/url/bug53248.phpt b/ext/standard/tests/url/bug53248.phpt index 64faabdf7a..434478dab7 100644 --- a/ext/standard/tests/url/bug53248.phpt +++ b/ext/standard/tests/url/bug53248.phpt @@ -7,6 +7,6 @@ var_dump(rawurlencode('A1_-.~')); var_dump(rawurldecode('%41%31%5F%2D%2E%7E')); ?> ---EXPECTF-- +--EXPECT-- string(6) "A1_-.~" string(6) "A1_-.~" diff --git a/ext/standard/tests/url/bug54180.phpt b/ext/standard/tests/url/bug54180.phpt index 2e64e27d07..815784c28d 100644 --- a/ext/standard/tests/url/bug54180.phpt +++ b/ext/standard/tests/url/bug54180.phpt @@ -7,7 +7,7 @@ var_dump(parse_url("http://example.com/path/script.html?t=1#fragment?data")); var_dump(parse_url("http://example.com/path/script.html#fragment?data")); ?> ---EXPECTF-- +--EXPECT-- array(5) { ["scheme"]=> string(4) "http" diff --git a/ext/standard/tests/url/get_headers_error_002.phpt b/ext/standard/tests/url/get_headers_error_002.phpt index b5cfb5909c..17984534a7 100644 --- a/ext/standard/tests/url/get_headers_error_002.phpt +++ b/ext/standard/tests/url/get_headers_error_002.phpt @@ -39,16 +39,16 @@ echo "Done" -- Testing get_headers() function with format argument as type string -- -Warning: get_headers() expects parameter 2 to be integer, string given in %s on line 13 +Warning: get_headers() expects parameter 2 to be int, string given in %s on line 13 NULL -- Testing get_headers() function with format argument as type array -- -Warning: get_headers() expects parameter 2 to be integer, array given in %s on line 17 +Warning: get_headers() expects parameter 2 to be int, array given in %s on line 17 NULL -- Testing get_headers() function with format argument as type object -- -Warning: get_headers() expects parameter 2 to be integer, object given in %s on line 26 +Warning: get_headers() expects parameter 2 to be int, object given in %s on line 26 NULL Done diff --git a/ext/standard/tests/url/get_headers_error_003.phpt b/ext/standard/tests/url/get_headers_error_003.phpt index ab6f26d4d9..c65305af2c 100644 --- a/ext/standard/tests/url/get_headers_error_003.phpt +++ b/ext/standard/tests/url/get_headers_error_003.phpt @@ -22,7 +22,7 @@ echo $headers["X-Request-Method"]."\n"; echo "Done"; ?> ---EXPECTF-- +--EXPECT-- HEAD HEAD Done diff --git a/ext/standard/tests/url/parse_url_basic_001.phpt b/ext/standard/tests/url/parse_url_basic_001.phpt index 4606849c57..7340d24323 100644 --- a/ext/standard/tests/url/parse_url_basic_001.phpt +++ b/ext/standard/tests/url/parse_url_basic_001.phpt @@ -20,7 +20,7 @@ foreach ($urls as $url) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- --> 64.246.30.37: array(1) { ["path"]=> string(12) "64.246.30.37" diff --git a/ext/standard/tests/url/parse_url_basic_002.phpt b/ext/standard/tests/url/parse_url_basic_002.phpt index 2e5a060a51..5f8b6bf145 100644 --- a/ext/standard/tests/url/parse_url_basic_002.phpt +++ b/ext/standard/tests/url/parse_url_basic_002.phpt @@ -21,7 +21,7 @@ foreach ($urls as $url) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- --> 64.246.30.37 : NULL --> http://64.246.30.37 : string(4) "http" --> http://64.246.30.37/ : string(4) "http" diff --git a/ext/standard/tests/url/parse_url_basic_003.phpt b/ext/standard/tests/url/parse_url_basic_003.phpt index 3d5a4a344a..bced2757de 100644 --- a/ext/standard/tests/url/parse_url_basic_003.phpt +++ b/ext/standard/tests/url/parse_url_basic_003.phpt @@ -20,7 +20,7 @@ foreach ($urls as $url) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- --> 64.246.30.37 : NULL --> http://64.246.30.37 : string(12) "64.246.30.37" --> http://64.246.30.37/ : string(12) "64.246.30.37" diff --git a/ext/standard/tests/url/parse_url_basic_004.phpt b/ext/standard/tests/url/parse_url_basic_004.phpt index 34e1bde22b..f705d408d3 100644 --- a/ext/standard/tests/url/parse_url_basic_004.phpt +++ b/ext/standard/tests/url/parse_url_basic_004.phpt @@ -20,7 +20,7 @@ foreach ($urls as $url) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- --> 64.246.30.37 : NULL --> http://64.246.30.37 : NULL --> http://64.246.30.37/ : NULL diff --git a/ext/standard/tests/url/parse_url_basic_005.phpt b/ext/standard/tests/url/parse_url_basic_005.phpt index aefb33964b..dafb784860 100644 --- a/ext/standard/tests/url/parse_url_basic_005.phpt +++ b/ext/standard/tests/url/parse_url_basic_005.phpt @@ -20,7 +20,7 @@ foreach ($urls as $url) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- --> 64.246.30.37 : NULL --> http://64.246.30.37 : NULL --> http://64.246.30.37/ : NULL diff --git a/ext/standard/tests/url/parse_url_basic_006.phpt b/ext/standard/tests/url/parse_url_basic_006.phpt index d348274f02..d881c9527e 100644 --- a/ext/standard/tests/url/parse_url_basic_006.phpt +++ b/ext/standard/tests/url/parse_url_basic_006.phpt @@ -20,7 +20,7 @@ foreach ($urls as $url) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- --> 64.246.30.37 : NULL --> http://64.246.30.37 : NULL --> http://64.246.30.37/ : NULL diff --git a/ext/standard/tests/url/parse_url_basic_007.phpt b/ext/standard/tests/url/parse_url_basic_007.phpt index 8d871f10bf..fc5593ea3b 100644 --- a/ext/standard/tests/url/parse_url_basic_007.phpt +++ b/ext/standard/tests/url/parse_url_basic_007.phpt @@ -20,7 +20,7 @@ foreach ($urls as $url) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- --> 64.246.30.37 : string(12) "64.246.30.37" --> http://64.246.30.37 : NULL --> http://64.246.30.37/ : string(1) "/" diff --git a/ext/standard/tests/url/parse_url_basic_008.phpt b/ext/standard/tests/url/parse_url_basic_008.phpt index acc7d501ed..753432107b 100644 --- a/ext/standard/tests/url/parse_url_basic_008.phpt +++ b/ext/standard/tests/url/parse_url_basic_008.phpt @@ -20,7 +20,7 @@ foreach ($urls as $url) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- --> 64.246.30.37 : NULL --> http://64.246.30.37 : NULL --> http://64.246.30.37/ : NULL diff --git a/ext/standard/tests/url/parse_url_basic_009.phpt b/ext/standard/tests/url/parse_url_basic_009.phpt index b5b378cb5f..b5d32b2053 100644 --- a/ext/standard/tests/url/parse_url_basic_009.phpt +++ b/ext/standard/tests/url/parse_url_basic_009.phpt @@ -20,7 +20,7 @@ foreach ($urls as $url) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- --> 64.246.30.37 : NULL --> http://64.246.30.37 : NULL --> http://64.246.30.37/ : NULL diff --git a/ext/standard/tests/url/parse_url_basic_010.phpt b/ext/standard/tests/url/parse_url_basic_010.phpt index f5735166b3..8fecb9d8eb 100644 --- a/ext/standard/tests/url/parse_url_basic_010.phpt +++ b/ext/standard/tests/url/parse_url_basic_010.phpt @@ -19,7 +19,7 @@ foreach(get_defined_constants() as $constantName => $constantValue) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- PHP_URL_SCHEME: 0 PHP_URL_HOST: 1 PHP_URL_PORT: 2 diff --git a/ext/standard/tests/url/parse_url_unterminated.phpt b/ext/standard/tests/url/parse_url_unterminated.phpt index 912b6a5641..c83e458085 100644 --- a/ext/standard/tests/url/parse_url_unterminated.phpt +++ b/ext/standard/tests/url/parse_url_unterminated.phpt @@ -22,7 +22,7 @@ foreach ($urls as $url) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- --> 64.246.30.37: array(1) { ["path"]=> string(12) "64.246.30.37" diff --git a/ext/standard/tests/url/parse_url_variation_002_32bit.phpt b/ext/standard/tests/url/parse_url_variation_002_32bit.phpt index 444ae62a4d..70138ffe77 100644 --- a/ext/standard/tests/url/parse_url_variation_002_32bit.phpt +++ b/ext/standard/tests/url/parse_url_variation_002_32bit.phpt @@ -108,7 +108,7 @@ array(8) { } Arg value 101234567000 -Error: 2 - parse_url() expects parameter 2 to be integer, float given, %s(%d) +Error: 2 - parse_url() expects parameter 2 to be int, float given, %s(%d) NULL Arg value 1.07654321E-9 @@ -119,27 +119,27 @@ string(4) "http" Error: 8 - Array to string conversion, %s(%d) Arg value Array -Error: 2 - parse_url() expects parameter 2 to be integer, array given, %s(%d) +Error: 2 - parse_url() expects parameter 2 to be int, array given, %s(%d) NULL Error: 8 - Array to string conversion, %s(%d) Arg value Array -Error: 2 - parse_url() expects parameter 2 to be integer, array given, %s(%d) +Error: 2 - parse_url() expects parameter 2 to be int, array given, %s(%d) NULL Error: 8 - Array to string conversion, %s(%d) Arg value Array -Error: 2 - parse_url() expects parameter 2 to be integer, array given, %s(%d) +Error: 2 - parse_url() expects parameter 2 to be int, array given, %s(%d) NULL Error: 8 - Array to string conversion, %s(%d) Arg value Array -Error: 2 - parse_url() expects parameter 2 to be integer, array given, %s(%d) +Error: 2 - parse_url() expects parameter 2 to be int, array given, %s(%d) NULL Error: 8 - Array to string conversion, %s(%d) Arg value Array -Error: 2 - parse_url() expects parameter 2 to be integer, array given, %s(%d) +Error: 2 - parse_url() expects parameter 2 to be int, array given, %s(%d) NULL Arg value @@ -161,24 +161,24 @@ Arg value string(4) "http" Arg value -Error: 2 - parse_url() expects parameter 2 to be integer, string given, %s(%d) +Error: 2 - parse_url() expects parameter 2 to be int, string given, %s(%d) NULL Arg value -Error: 2 - parse_url() expects parameter 2 to be integer, string given, %s(%d) +Error: 2 - parse_url() expects parameter 2 to be int, string given, %s(%d) NULL Arg value string -Error: 2 - parse_url() expects parameter 2 to be integer, string given, %s(%d) +Error: 2 - parse_url() expects parameter 2 to be int, string given, %s(%d) NULL Arg value string -Error: 2 - parse_url() expects parameter 2 to be integer, string given, %s(%d) +Error: 2 - parse_url() expects parameter 2 to be int, string given, %s(%d) NULL Error: 4096 - Object of class stdClass could not be converted to string, %s(%d) Arg value -Error: 2 - parse_url() expects parameter 2 to be integer, object given, %s(%d) +Error: 2 - parse_url() expects parameter 2 to be int, object given, %s(%d) NULL Arg value diff --git a/ext/standard/tests/url/parse_url_variation_002_64bit.phpt b/ext/standard/tests/url/parse_url_variation_002_64bit.phpt index 162465e908..69ebe274b5 100644 --- a/ext/standard/tests/url/parse_url_variation_002_64bit.phpt +++ b/ext/standard/tests/url/parse_url_variation_002_64bit.phpt @@ -119,27 +119,27 @@ string(4) "http" Error: 8 - Array to string conversion, %sparse_url_variation_002_64bit.php(%d) Arg value Array -Error: 2 - parse_url() expects parameter 2 to be integer, array given, %s(71) +Error: 2 - parse_url() expects parameter 2 to be int, array given, %s(71) NULL Error: 8 - Array to string conversion, %sparse_url_variation_002_64bit.php(%d) Arg value Array -Error: 2 - parse_url() expects parameter 2 to be integer, array given, %s(71) +Error: 2 - parse_url() expects parameter 2 to be int, array given, %s(71) NULL Error: 8 - Array to string conversion, %sparse_url_variation_002_64bit.php(%d) Arg value Array -Error: 2 - parse_url() expects parameter 2 to be integer, array given, %s(71) +Error: 2 - parse_url() expects parameter 2 to be int, array given, %s(71) NULL Error: 8 - Array to string conversion, %sparse_url_variation_002_64bit.php(%d) Arg value Array -Error: 2 - parse_url() expects parameter 2 to be integer, array given, %s(71) +Error: 2 - parse_url() expects parameter 2 to be int, array given, %s(71) NULL Error: 8 - Array to string conversion, %sparse_url_variation_002_64bit.php(%d) Arg value Array -Error: 2 - parse_url() expects parameter 2 to be integer, array given, %s(71) +Error: 2 - parse_url() expects parameter 2 to be int, array given, %s(71) NULL Arg value @@ -161,24 +161,24 @@ Arg value string(4) "http" Arg value -Error: 2 - parse_url() expects parameter 2 to be integer, string given, %s(71) +Error: 2 - parse_url() expects parameter 2 to be int, string given, %s(71) NULL Arg value -Error: 2 - parse_url() expects parameter 2 to be integer, string given, %s(71) +Error: 2 - parse_url() expects parameter 2 to be int, string given, %s(71) NULL Arg value string -Error: 2 - parse_url() expects parameter 2 to be integer, string given, %s(71) +Error: 2 - parse_url() expects parameter 2 to be int, string given, %s(71) NULL Arg value string -Error: 2 - parse_url() expects parameter 2 to be integer, string given, %s(71) +Error: 2 - parse_url() expects parameter 2 to be int, string given, %s(71) NULL Error: 4096 - Object of class stdClass could not be converted to string, %s(70) Arg value -Error: 2 - parse_url() expects parameter 2 to be integer, object given, %s(71) +Error: 2 - parse_url() expects parameter 2 to be int, object given, %s(71) NULL Arg value diff --git a/ext/standard/tests/versioning/phpversion.phpt b/ext/standard/tests/versioning/phpversion.phpt index 275a139ae7..9cd70c488c 100644 --- a/ext/standard/tests/versioning/phpversion.phpt +++ b/ext/standard/tests/versioning/phpversion.phpt @@ -6,6 +6,7 @@ phpversion test print phpversion(); print "\n"; print phpversion('standard'); +?> --EXPECTF-- %s %s |